From 7f8c29a40733a5d5093121839ec5a7ece45890e7 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 15 Jun 2006 17:14:37 +0200
Subject: [PATCH] ddraw: Make some functions static.

---
 dlls/ddraw/ddraw.c        | 2 +-
 dlls/ddraw/main.c         | 5 +----
 dlls/ddraw/material.c     | 8 ++++----
 dlls/ddraw/surface.c      | 8 ++++----
 dlls/ddraw/vertexbuffer.c | 8 ++++----
 dlls/ddraw/viewport.c     | 2 +-
 6 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index f86321e1952..cdf4d46ab28 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -2703,7 +2703,7 @@ D3D7CB_CreateDepthStencilSurface(IUnknown *device,
  * so the WineD3DSwapchain has a parent and can be released when the D3D
  * device is destroyed
  *****************************************************************************/
-HRESULT WINAPI
+static HRESULT WINAPI
 D3D7CB_CreateAdditionalSwapChain(IUnknown *device,
                                  WINED3DPRESENT_PARAMETERS* pPresentationParameters,
                                  IWineD3DSwapChain ** ppSwapChain)
diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index 84f88238235..4c33d9d5fd4 100644
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -50,9 +50,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
-/* The driver's guid */
-GUID guid = {0x40c1b248,0x9d7d,0x4a29,{0xd7,0xb7,0x4c,0xd8,0x10,0x9f,0x3d,0x5d}};
-
 /* The configured default surface */
 WINED3DSURFTYPE DefaultSurfaceType = SURFACE_UNKNOWN;
 
@@ -720,7 +717,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
  * Returns:
  *  DDENUMRET_OK;
  *******************************************************************************/
-HRESULT WINAPI
+static HRESULT WINAPI
 DestroyCallback(IDirectDrawSurface7 *surf,
                 DDSURFACEDESC2 *desc,
                 void *context)
diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c
index df5783d1cf1..36e617d74b4 100644
--- a/dlls/ddraw/material.c
+++ b/dlls/ddraw/material.c
@@ -312,7 +312,7 @@ IDirect3DMaterialImpl_GetHandle(IDirect3DMaterial3 *iface,
     return DD_OK;
 }
 
-HRESULT WINAPI
+static HRESULT WINAPI
 Thunk_IDirect3DMaterialImpl_2_GetHandle(LPDIRECT3DMATERIAL2 iface,
 					LPDIRECT3DDEVICE2 lpDirect3DDevice2,
 					LPD3DMATERIALHANDLE lpHandle)
@@ -323,7 +323,7 @@ Thunk_IDirect3DMaterialImpl_2_GetHandle(LPDIRECT3DMATERIAL2 iface,
 					lpHandle);
 }
 
-HRESULT WINAPI
+static HRESULT WINAPI
 Thunk_IDirect3DMaterialImpl_1_GetHandle(LPDIRECT3DMATERIAL iface,
 					LPDIRECT3DDEVICE lpDirect3DDevice,
 					LPD3DMATERIALHANDLE lpHandle)
@@ -334,7 +334,7 @@ Thunk_IDirect3DMaterialImpl_1_GetHandle(LPDIRECT3DMATERIAL iface,
 					lpHandle);
 }
 
-HRESULT WINAPI
+static HRESULT WINAPI
 Thunk_IDirect3DMaterialImpl_2_QueryInterface(LPDIRECT3DMATERIAL2 iface,
                                              REFIID riid,
                                              LPVOID* obp)
@@ -345,7 +345,7 @@ Thunk_IDirect3DMaterialImpl_2_QueryInterface(LPDIRECT3DMATERIAL2 iface,
                                              obp);
 }
 
-HRESULT WINAPI
+static HRESULT WINAPI
 Thunk_IDirect3DMaterialImpl_1_QueryInterface(LPDIRECT3DMATERIAL iface,
                                              REFIID riid,
                                              LPVOID* obp)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 113ec5f6ee2..212b9b37aa9 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -1144,7 +1144,7 @@ IDirectDrawSurfaceImpl_PageUnlock(IDirectDrawSurface7 *iface,
  *  DDERR_UNSUPPORTED
  *
  *****************************************************************************/
-HRESULT WINAPI IDirectDrawSurfaceImpl_BltBatch(IDirectDrawSurface7 *iface, DDBLTBATCH *Batch, DWORD Count, DWORD Flags)
+static HRESULT WINAPI IDirectDrawSurfaceImpl_BltBatch(IDirectDrawSurface7 *iface, DDBLTBATCH *Batch, DWORD Count, DWORD Flags)
 {
     TRACE("(%p)->(%p,%ld,%08lx)\n",iface,Batch,Count,Flags);
 
@@ -1218,7 +1218,7 @@ IDirectDrawSurfaceImpl_EnumAttachedSurfaces(IDirectDrawSurface7 *iface,
  *  DD_OK, because it's a stub
  *
  *****************************************************************************/
-HRESULT WINAPI
+static HRESULT WINAPI
 IDirectDrawSurfaceImpl_EnumOverlayZOrders(IDirectDrawSurface7 *iface,
                                           DWORD Flags,
                                           void *context,
@@ -1628,7 +1628,7 @@ IDirectDrawSurfaceImpl_GetDDInterface(IDirectDrawSurface7 *iface,
 }
 
 /* This seems also windows implementation specific - I don't think WineD3D needs this */
-HRESULT WINAPI IDirectDrawSurfaceImpl_ChangeUniquenessValue(IDirectDrawSurface7 *iface)
+static HRESULT WINAPI IDirectDrawSurfaceImpl_ChangeUniquenessValue(IDirectDrawSurface7 *iface)
 {
     ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface);
     volatile IDirectDrawSurfaceImpl* vThis = This;
@@ -1653,7 +1653,7 @@ HRESULT WINAPI IDirectDrawSurfaceImpl_ChangeUniquenessValue(IDirectDrawSurface7
     return DD_OK;
 }
 
-HRESULT WINAPI IDirectDrawSurfaceImpl_GetUniquenessValue(IDirectDrawSurface7 *iface, LPDWORD pValue)
+static HRESULT WINAPI IDirectDrawSurfaceImpl_GetUniquenessValue(IDirectDrawSurface7 *iface, LPDWORD pValue)
 {
     ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface);
 
diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c
index 05140384bb0..9dfe9ce9661 100644
--- a/dlls/ddraw/vertexbuffer.c
+++ b/dlls/ddraw/vertexbuffer.c
@@ -124,7 +124,7 @@ Thunk_IDirect3DVertexBufferImpl_1_QueryInterface(IDirect3DVertexBuffer *iface,
  *  The new refcount
  *
  *****************************************************************************/
-ULONG WINAPI
+static ULONG WINAPI
 IDirect3DVertexBufferImpl_AddRef(IDirect3DVertexBuffer7 *iface)
 {
     ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface);
@@ -135,7 +135,7 @@ IDirect3DVertexBufferImpl_AddRef(IDirect3DVertexBuffer7 *iface)
     return ref;
 }
 
-ULONG WINAPI
+static ULONG WINAPI
 Thunk_IDirect3DVertexBufferImpl_1_AddRef(IDirect3DVertexBuffer *iface)
 {
     ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer, iface);
@@ -154,7 +154,7 @@ Thunk_IDirect3DVertexBufferImpl_1_AddRef(IDirect3DVertexBuffer *iface)
  *  The new refcount
  *
  *****************************************************************************/
-ULONG WINAPI
+static ULONG WINAPI
 IDirect3DVertexBufferImpl_Release(IDirect3DVertexBuffer7 *iface)
 {
     ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface);
@@ -171,7 +171,7 @@ IDirect3DVertexBufferImpl_Release(IDirect3DVertexBuffer7 *iface)
     return ref;
 }
 
-ULONG WINAPI
+static ULONG WINAPI
 Thunk_IDirect3DVertexBufferImpl_1_Release(IDirect3DVertexBuffer *iface)
 {
     ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer, iface);
diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c
index ab06eceb787..f1ac9e37e8b 100644
--- a/dlls/ddraw/viewport.c
+++ b/dlls/ddraw/viewport.c
@@ -283,7 +283,7 @@ IDirect3DViewportImpl_GetViewport(IDirect3DViewport3 *iface,
  *  DDERR_INVALIDPARAMS if Data is NULL
  *
  *****************************************************************************/
-HRESULT WINAPI
+static HRESULT WINAPI
 IDirect3DViewportImpl_SetViewport(IDirect3DViewport3 *iface,
                                   D3DVIEWPORT *lpData)
 {