From ec7cbc26f58d3c7f49e26cfd10f30a8124db20f2 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Sat, 13 Dec 2008 12:02:24 +0100 Subject: [PATCH] d3d8: Make D3D8CB_CreateSurface() static. --- dlls/d3d8/d3d8_private.h | 5 ----- dlls/d3d8/device.c | 5 ++++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index c8051dcd8e3..c3f3dbfb851 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -638,11 +638,6 @@ UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elem size_t parse_token(const DWORD* pToken); /* Callbacks */ -extern HRESULT WINAPI D3D8CB_CreateSurface(IUnknown *device, IUnknown *pSuperior, UINT Width, UINT Height, - WINED3DFORMAT Format, DWORD Usage, WINED3DPOOL Pool, UINT Level, - WINED3DCUBEMAP_FACES Face, IWineD3DSurface** ppSurface, - HANDLE* pSharedHandle); - extern HRESULT WINAPI D3D8CB_CreateVolume(IUnknown *pDevice, IUnknown *pSuperior, UINT Width, UINT Height, UINT Depth, WINED3DFORMAT Format, WINED3DPOOL Pool, DWORD Usage, IWineD3DVolume **ppVolume, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f9a0150b4fa..6c1da89156c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -36,6 +36,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); +static HRESULT WINAPI D3D8CB_CreateSurface(IUnknown*,IUnknown*,UINT,UINT,WINED3DFORMAT,DWORD,WINED3DPOOL,UINT,WINED3DCUBEMAP_FACES,IWineD3DSurface**,HANDLE*); + + /* Shader handle functions */ static shader_handle *alloc_shader_handle(IDirect3DDevice8Impl *This) { if (This->free_shader_handles) { @@ -2207,7 +2210,7 @@ const IDirect3DDevice8Vtbl Direct3DDevice8_Vtbl = }; /* Internal function called back during the CreateDevice to create a render target */ -HRESULT WINAPI D3D8CB_CreateSurface(IUnknown *device, IUnknown *pSuperior, UINT Width, UINT Height, +static HRESULT WINAPI D3D8CB_CreateSurface(IUnknown *device, IUnknown *pSuperior, UINT Width, UINT Height, WINED3DFORMAT Format, DWORD Usage, WINED3DPOOL Pool, UINT Level, WINED3DCUBEMAP_FACES Face, IWineD3DSurface **ppSurface, HANDLE *pSharedHandle) {