Hi Jean,

I would say a winery is un vignoble or un établissement viticole 

and 

a winemaker is un viticulteur ( or even une viticultrice) which is a winegrower or wine producer.

But it depends on what you mean exactly by those English nouns.

Hope this helps!