diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 5f1181833b6..0a5234219cc 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2880,8 +2880,8 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, D3DRENDE
     case WINED3DRS_STENCILFAIL               :
         {
             GLenum fail  ;
-            GLenum zpass ;
-            GLenum zfail ;
+            GLint  zpass ;
+            GLint  zfail ;
 
             fail = StencilOp(Value);
             glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &zpass);
@@ -2896,8 +2896,8 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, D3DRENDE
         break;
     case WINED3DRS_STENCILZFAIL              :
         {
-            GLenum fail  ;
-            GLenum zpass ;
+            GLint  fail  ;
+            GLint  zpass ;
             GLenum zfail ;
 
             glGetIntegerv(GL_STENCIL_FAIL, &fail);
@@ -2913,9 +2913,9 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, D3DRENDE
         break;
     case WINED3DRS_STENCILPASS               :
         {
-            GLenum fail  ;
+            GLint  fail  ;
             GLenum zpass ;
-            GLenum zfail ;
+            GLint  zfail ;
 
             glGetIntegerv(GL_STENCIL_FAIL, &fail);
             checkGLcall("glGetIntegerv(GL_STENCIL_FAIL, &fail);");
@@ -4871,7 +4871,8 @@ HRESULT  WINAPI  IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, IWineD3
      *       NOTE: move code to surface to accomplish this
       ****************************************/
     IWineD3DSurfaceImpl *pSrcSurface  = (IWineD3DSurfaceImpl *)pSourceSurface;
-    int srcWidth, srcHeight, srcSurfaceWidth, srcSurfaceHeight, destSurfaceWidth, destSurfaceHeight;
+    int srcWidth, srcHeight;
+    unsigned int srcSurfaceWidth, srcSurfaceHeight, destSurfaceWidth, destSurfaceHeight;
     WINED3DFORMAT destFormat, srcFormat;
     UINT destSize;
     int destLeft, destTop;
@@ -5325,8 +5326,8 @@ HRESULT WINAPI IWineD3DDeviceImpl_CleanRender(IWineD3DDevice* iface, IWineD3DSwa
 HRESULT WINAPI IWineD3DDeviceImpl_FindGLContext(IWineD3DDevice *iface, IWineD3DSurface *pSurface, glContext **context) {
     IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
     int i;
-    int width;
-    int height;
+    unsigned int width;
+    unsigned int height;
     WINED3DFORMAT format;
     WINED3DSURFACE_DESC surfaceDesc;
     memset(&surfaceDesc, 0, sizeof(surfaceDesc));
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index a5f2eb3ae87..2b449c2ed0a 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -562,7 +562,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display)
         }
     }
 
-#define USE_GL_FUNC(type, pfn) gl_info->pfn = (type) glXGetProcAddressARB(#pfn);
+#define USE_GL_FUNC(type, pfn) gl_info->pfn = (type) glXGetProcAddressARB( (const GLubyte *) #pfn);
     GL_EXT_FUNCS_GEN;
 #undef USE_GL_FUNC
 
@@ -588,7 +588,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display)
         }
     }
 
-#define USE_GL_FUNC(type, pfn) gl_info->pfn = (type) glXGetProcAddressARB(#pfn);
+#define USE_GL_FUNC(type, pfn) gl_info->pfn = (type) glXGetProcAddressARB( (const GLubyte *) #pfn);
     GLX_EXT_FUNCS_GEN;
 #undef USE_GL_FUNC
 
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 79358cc0e70..1f79ad633f2 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -370,7 +370,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, D3DLOCKED_RE
     } else if (D3DUSAGE_RENDERTARGET & This->resource.usage && !(Flags&D3DLOCK_DISCARD)) { /* render surfaces */
 
         GLint  prev_store;
-        GLenum prev_read;
+        GLint  prev_read;
         BOOL notInContext = FALSE;
         IWineD3DSwapChainImpl *targetSwapChain = NULL;
 
@@ -610,7 +610,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) {
 
         if (iface ==  implSwapChain->backBuffer || iface ==  implSwapChain->frontBuffer || iface == myDevice->renderTarget) {
             GLint  prev_store;
-            GLenum prev_draw;
+            GLint  prev_draw;
             GLint  prev_rasterpos[4];
 
             ENTER_GL();
@@ -797,7 +797,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) {
                  This->resource.format == WINED3DFMT_DXT5)
             FIXME("Format %d not supported\n", This->resource.format);
         else {
-            GLenum prevRead;
+            GLint prevRead;
             glGetIntegerv(GL_READ_BUFFER, &prevRead);
             vcheckGLcall("glGetIntegerv");
             glReadBuffer(GL_BACK);