texture.c, opengl_private.h: Fixing compiler warnings
Magnus Lundborg
magnus.lundborg.6955 at student.uu.se
Thu Jun 8 05:55:21 CDT 2006
Sorry, the changes weren't attached in the last mail.
Magnus Lundborg wrote:
> These changes were made to avoid the warnings when compiling
> dlls/ddraw/texture.c. One function had to be declared in
> opengl_private.h.
>
> /Magnus
>
-------------- next part --------------
2006-06-05 Magnus Lundborg <magnus.lundborg.6955 at student.uu.se>
* dlls/ddraw/opengl_private.h:
Added declaration of a function used in texture.c
* dlls/ddraw/texture.c:
Declared 17 functions as static to avoid compiler warnings
-------------- next part --------------
? patch.diff
Index: dlls/ddraw/opengl_private.h
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/opengl_private.h,v
retrieving revision 1.4
diff -u -u -p -r1.4 opengl_private.h
--- dlls/ddraw/opengl_private.h 23 May 2006 12:47:48 -0000 1.4
+++ dlls/ddraw/opengl_private.h 8 Jun 2006 10:46:06 -0000
@@ -217,6 +217,9 @@ extern HRESULT upload_surface_to_tex_mem
/* Some utilities functions needed to be shared.. */
extern GLenum convert_D3D_compare_to_GL(D3DCMPFUNC dwRenderState) ;
+/* Shared function defined in texture.c */
+extern HRESULT WINAPI Main_IDirect3DTextureImpl_2_1T_Load(LPDIRECT3DTEXTURE2 iface, LPDIRECT3DTEXTURE2 lpD3DTexture2);
+
#endif /* HAVE_OPENGL */
#endif /* __GRAPHICS_WINE_MESA_PRIVATE_H */
Index: dlls/ddraw/texture.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/texture.c,v
retrieving revision 1.6
diff -u -u -p -r1.6 texture.c
--- dlls/ddraw/texture.c 23 May 2006 12:47:48 -0000 1.6
+++ dlls/ddraw/texture.c 8 Jun 2006 10:46:06 -0000
@@ -80,7 +80,7 @@ get_sub_mimaplevel(IDirectDrawSurfaceImp
* IDirectSurface callback methods
*/
-HRESULT
+static HRESULT
gltex_download_texture(IDirectDrawSurfaceImpl *surf_ptr) {
IDirect3DTextureGLImpl *gl_surf_ptr = (IDirect3DTextureGLImpl *) surf_ptr->tex_private;
@@ -325,7 +325,7 @@ gltex_upload_texture(IDirectDrawSurfaceI
return DD_OK;
}
-HRESULT WINAPI
+static HRESULT WINAPI
Main_IDirect3DTextureImpl_1_Initialize(LPDIRECT3DTEXTURE iface,
LPDIRECT3DDEVICE lpDirect3DDevice,
LPDIRECTDRAWSURFACE lpDDSurface)
@@ -360,7 +360,7 @@ gltex_setcolorkey_cb(IDirectDrawSurfaceI
return DD_OK;
}
-HRESULT
+static HRESULT
gltex_blt(IDirectDrawSurfaceImpl *This, LPRECT rdst,
LPDIRECTDRAWSURFACE7 src, LPRECT rsrc,
DWORD dwFlags, LPDDBLTFX lpbltfx)
@@ -374,7 +374,7 @@ gltex_blt(IDirectDrawSurfaceImpl *This,
return DDERR_INVALIDPARAMS;
}
-HRESULT
+static HRESULT
gltex_bltfast(IDirectDrawSurfaceImpl *surf_ptr, DWORD dstx,
DWORD dsty, LPDIRECTDRAWSURFACE7 src,
LPRECT rsrc, DWORD trans)
@@ -490,7 +490,7 @@ gltex_bltfast(IDirectDrawSurfaceImpl *su
return DDERR_INVALIDPARAMS;
}
-HRESULT WINAPI
+static HRESULT WINAPI
Main_IDirect3DTextureImpl_2_1T_PaletteChanged(LPDIRECT3DTEXTURE2 iface,
DWORD dwStart,
DWORD dwCount)
@@ -500,7 +500,7 @@ Main_IDirect3DTextureImpl_2_1T_PaletteCh
return DD_OK;
}
-HRESULT WINAPI
+static HRESULT WINAPI
Main_IDirect3DTextureImpl_1_Unload(LPDIRECT3DTEXTURE iface)
{
ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirect3DTexture, iface);
@@ -508,7 +508,7 @@ Main_IDirect3DTextureImpl_1_Unload(LPDIR
return DD_OK;
}
-HRESULT WINAPI
+static HRESULT WINAPI
Main_IDirect3DTextureImpl_2_1T_GetHandle(LPDIRECT3DTEXTURE2 iface,
LPDIRECT3DDEVICE2 lpDirect3DDevice2,
LPD3DTEXTUREHANDLE lpHandle)
@@ -621,7 +621,7 @@ gltex_unlock_update(IDirectDrawSurfaceIm
}
}
-HRESULT WINAPI
+static HRESULT WINAPI
GL_IDirect3DTextureImpl_2_1T_Load(LPDIRECT3DTEXTURE2 iface,
LPDIRECT3DTEXTURE2 lpD3DTexture2)
{
@@ -738,7 +738,7 @@ GL_IDirect3DTextureImpl_2_1T_Load(LPDIRE
return ret_value;
}
-HRESULT WINAPI
+static HRESULT WINAPI
Thunk_IDirect3DTextureImpl_2_QueryInterface(LPDIRECT3DTEXTURE2 iface,
REFIID riid,
LPVOID* obp)
@@ -749,21 +749,21 @@ Thunk_IDirect3DTextureImpl_2_QueryInterf
obp);
}
-ULONG WINAPI
+static ULONG WINAPI
Thunk_IDirect3DTextureImpl_2_AddRef(LPDIRECT3DTEXTURE2 iface)
{
TRACE("(%p)->() thunking to IDirectDrawSurface7 interface.\n", iface);
return IDirectDrawSurface7_AddRef(COM_INTERFACE_CAST(IDirectDrawSurfaceImpl, IDirect3DTexture2, IDirectDrawSurface7, iface));
}
-ULONG WINAPI
+static ULONG WINAPI
Thunk_IDirect3DTextureImpl_2_Release(LPDIRECT3DTEXTURE2 iface)
{
TRACE("(%p)->() thunking to IDirectDrawSurface7 interface.\n", iface);
return IDirectDrawSurface7_Release(COM_INTERFACE_CAST(IDirectDrawSurfaceImpl, IDirect3DTexture2, IDirectDrawSurface7, iface));
}
-HRESULT WINAPI
+static HRESULT WINAPI
Thunk_IDirect3DTextureImpl_1_QueryInterface(LPDIRECT3DTEXTURE iface,
REFIID riid,
LPVOID* obp)
@@ -774,21 +774,21 @@ Thunk_IDirect3DTextureImpl_1_QueryInterf
obp);
}
-ULONG WINAPI
+static ULONG WINAPI
Thunk_IDirect3DTextureImpl_1_AddRef(LPDIRECT3DTEXTURE iface)
{
TRACE("(%p)->() thunking to IDirectDrawSurface7 interface.\n", iface);
return IDirectDrawSurface7_AddRef(COM_INTERFACE_CAST(IDirectDrawSurfaceImpl, IDirect3DTexture, IDirectDrawSurface7, iface));
}
-ULONG WINAPI
+static ULONG WINAPI
Thunk_IDirect3DTextureImpl_1_Release(LPDIRECT3DTEXTURE iface)
{
TRACE("(%p)->() thunking to IDirectDrawSurface7 interface.\n", iface);
return IDirectDrawSurface7_Release(COM_INTERFACE_CAST(IDirectDrawSurfaceImpl, IDirect3DTexture, IDirectDrawSurface7, iface));
}
-HRESULT WINAPI
+static HRESULT WINAPI
Thunk_IDirect3DTextureImpl_1_PaletteChanged(LPDIRECT3DTEXTURE iface,
DWORD dwStart,
DWORD dwCount)
@@ -799,7 +799,7 @@ Thunk_IDirect3DTextureImpl_1_PaletteChan
dwCount);
}
-HRESULT WINAPI
+static HRESULT WINAPI
Thunk_IDirect3DTextureImpl_1_GetHandle(LPDIRECT3DTEXTURE iface,
LPDIRECT3DDEVICE lpDirect3DDevice,
LPD3DTEXTUREHANDLE lpHandle)
@@ -810,7 +810,7 @@ Thunk_IDirect3DTextureImpl_1_GetHandle(L
lpHandle);
}
-HRESULT WINAPI
+static HRESULT WINAPI
Thunk_IDirect3DTextureImpl_1_Load(LPDIRECT3DTEXTURE iface,
LPDIRECT3DTEXTURE lpD3DTexture)
{
More information about the wine-patches
mailing list