Both.  They refer to different things.  A wine glass is an object.  It can hold wine or anything else.  I often serve other drinks in a wine glass.  A glass of wine need not be served in a wine glass.  It can even be poured into a tea cup. 

Hello Xarmanla! How are you?

I really appreciated your help.

Thank you.

Selma.