Module: wine Branch: master Commit: c0e271c4de0d4ef90e702757b49222deff394d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e271c4de0d4ef90e702757b4...
Author: Francois Gouget fgouget@codeweavers.com Date: Mon Nov 24 17:23:10 2008 +0100
wined3d: Remove WINAPI on static functions where not needed.
---
dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/surface.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0cb539b..be0bdb2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -52,7 +52,7 @@ const WINED3DLIGHT WINED3D_default_light = { };
/* static function declarations */ -static void WINAPI IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3DResource *resource); +static void IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3DResource *resource);
/* helper macros */ #define D3DMEMCHECK(object, ppResult) if(NULL == object) { *ppResult = NULL; WARN("Out of memory\n"); return WINED3DERR_OUTOFVIDEOMEMORY;} @@ -1311,7 +1311,7 @@ static LONG fullscreen_exStyle(LONG orig_exStyle) { return exStyle; }
-static void WINAPI IWineD3DDeviceImpl_SetupFullscreenWindow(IWineD3DDevice *iface, HWND window, UINT w, UINT h) { +static void IWineD3DDeviceImpl_SetupFullscreenWindow(IWineD3DDevice *iface, HWND window, UINT w, UINT h) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
LONG style, exStyle; @@ -1355,7 +1355,7 @@ static void WINAPI IWineD3DDeviceImpl_SetupFullscreenWindow(IWineD3DDevice *ifac * window: Window to setup * *****************************************************************************/ -static void WINAPI IWineD3DDeviceImpl_RestoreWindow(IWineD3DDevice *iface, HWND window) { +static void IWineD3DDeviceImpl_RestoreWindow(IWineD3DDevice *iface, HWND window) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; LONG style, exStyle;
@@ -7318,14 +7318,14 @@ static void WINAPI IWineD3DDeviceImpl_GetGammaRamp(IWineD3DDevice *iface, UINT i * any handles to other resource held by the caller must be closed * (e.g. a texture should release all held surfaces because telling the device that it's been released.) *****************************************************/ -static void WINAPI IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3DResource *resource){ +static void IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3DResource *resource){ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
TRACE("(%p) : Adding Resource %p\n", This, resource); list_add_head(&This->resources, &((IWineD3DResourceImpl *) resource)->resource.resource_list_entry); }
-static void WINAPI IWineD3DDeviceImpl_RemoveResource(IWineD3DDevice *iface, IWineD3DResource *resource){ +static void IWineD3DDeviceImpl_RemoveResource(IWineD3DDevice *iface, IWineD3DResource *resource){ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
TRACE("(%p) : Removing resource %p\n", This, resource); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 77f32ef..b147058 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3671,7 +3671,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * return WINED3DERR_INVALIDCALL; }
-static HRESULT WINAPI IWineD3DSurfaceImpl_BltZ(IWineD3DSurfaceImpl *This, RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, WINEDDBLTFX *DDBltFx) +static HRESULT IWineD3DSurfaceImpl_BltZ(IWineD3DSurfaceImpl *This, RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, WINEDDBLTFX *DDBltFx) { IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; float depth;