Andrew Talbot : dplayx: Declare some functions static.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jan 8 06:35:33 CST 2007
Module: wine
Branch: master
Commit: f0763b91ab42d9625a6ff03197af991aada3365a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0763b91ab42d9625a6ff03197af991aada3365a
Author: Andrew Talbot <Andrew.Talbot at talbotville.com>
Date: Sat Jan 6 19:31:56 2007 +0000
dplayx: Declare some functions static.
---
dlls/dplayx/dplayx_global.c | 26 ++++++++++++++------------
dlls/dplayx/dplayx_global.h | 3 ---
dlls/dplayx/dplobby.c | 8 ++++----
dlls/dplayx/name_server.c | 4 ++--
4 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c
index 99e0d8e..28b462b 100644
--- a/dlls/dplayx/dplayx_global.c
+++ b/dlls/dplayx/dplayx_global.c
@@ -199,14 +199,16 @@ static DPSESSIONDESC2* sessionData = NUL
/* static DPSESSIONDESC2* sessionData[ numSupportedSessions ]; */
/* Function prototypes */
-DWORD DPLAYX_SizeOfLobbyDataA( LPDPLCONNECTION lpDplData );
-DWORD DPLAYX_SizeOfLobbyDataW( LPDPLCONNECTION lpDplData );
-void DPLAYX_CopyConnStructA( LPDPLCONNECTION dest, LPDPLCONNECTION src );
-void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, LPDPLCONNECTION src );
-BOOL DPLAYX_IsAppIdLobbied( DWORD dwAppId, LPDPLAYX_LOBBYDATA* dplData );
-void DPLAYX_InitializeLobbyDataEntry( LPDPLAYX_LOBBYDATA lpData );
-BOOL DPLAYX_CopyIntoSessionDesc2A( LPDPSESSIONDESC2 lpSessionDest,
- LPCDPSESSIONDESC2 lpSessionSrc );
+static DWORD DPLAYX_SizeOfLobbyDataA( LPDPLCONNECTION lpDplData );
+static DWORD DPLAYX_SizeOfLobbyDataW( LPDPLCONNECTION lpDplData );
+static void DPLAYX_CopyConnStructA( LPDPLCONNECTION dest, LPDPLCONNECTION src );
+static void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, LPDPLCONNECTION src );
+static BOOL DPLAYX_IsAppIdLobbied( DWORD dwAppId, LPDPLAYX_LOBBYDATA* dplData );
+static void DPLAYX_InitializeLobbyDataEntry( LPDPLAYX_LOBBYDATA lpData );
+static BOOL DPLAYX_CopyIntoSessionDesc2A( LPDPSESSIONDESC2 lpSessionDest,
+ LPCDPSESSIONDESC2 lpSessionSrc );
+static BOOL DPLAYX_GetThisLobbyHandles( LPHANDLE lphStart, LPHANDLE lphDeath,
+ LPHANDLE lphConnRead, BOOL bClearSetHandles );
@@ -527,10 +529,10 @@ BOOL DPLAYX_SetLobbyHandles( DWORD dwApp
return TRUE;
}
-BOOL DPLAYX_GetThisLobbyHandles( LPHANDLE lphStart,
- LPHANDLE lphDeath,
- LPHANDLE lphConnRead,
- BOOL bClearSetHandles )
+static BOOL DPLAYX_GetThisLobbyHandles( LPHANDLE lphStart,
+ LPHANDLE lphDeath,
+ LPHANDLE lphConnRead,
+ BOOL bClearSetHandles )
{
LPDPLAYX_LOBBYDATA lpLData;
diff --git a/dlls/dplayx/dplayx_global.h b/dlls/dplayx/dplayx_global.h
index ddc384b..d7f7e73 100644
--- a/dlls/dplayx/dplayx_global.h
+++ b/dlls/dplayx/dplayx_global.h
@@ -51,9 +51,6 @@ BOOL DPLAYX_AnyLobbiesWaitingForConnSett
BOOL DPLAYX_SetLobbyHandles( DWORD dwAppID,
HANDLE hStart, HANDLE hDeath, HANDLE hConnRead );
-BOOL DPLAYX_GetThisLobbyHandles( LPHANDLE lphStart,
- LPHANDLE lphDeath,
- LPHANDLE lphConnRead, BOOL bClearSetHandles );
LPDPSESSIONDESC2 DPLAYX_CopyAndAllocateLocalSession( UINT* index );
BOOL DPLAYX_CopyLocalSession( UINT* index, LPDPSESSIONDESC2 lpsd );
diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c
index 73e3e6e..6a8cf6b 100644
--- a/dlls/dplayx/dplobby.c
+++ b/dlls/dplayx/dplobby.c
@@ -50,7 +50,7 @@ typedef struct IDirectPlayLobby3Impl IDi
HRESULT DPL_CreateCompoundAddress ( LPCDPCOMPOUNDADDRESSELEMENT lpElements, DWORD dwElementCount,
LPVOID lpAddress, LPDWORD lpdwAddressSize, BOOL bAnsiInterface );
-HRESULT DPL_CreateAddress( REFGUID guidSP, REFGUID guidDataType, LPCVOID lpData, DWORD dwDataSize,
+static HRESULT DPL_CreateAddress( REFGUID guidSP, REFGUID guidDataType, LPCVOID lpData, DWORD dwDataSize,
LPVOID lpAddress, LPDWORD lpdwAddressSize, BOOL bAnsiInterface );
@@ -62,7 +62,7 @@ static HRESULT WINAPI DPL_ConnectEx( IDi
DWORD dwFlags, REFIID riid,
LPVOID* lplpDP, IUnknown* pUnk );
-BOOL DPL_CreateAndSetLobbyHandles( DWORD dwDestProcessId, HANDLE hDestProcess,
+static BOOL DPL_CreateAndSetLobbyHandles( DWORD dwDestProcessId, HANDLE hDestProcess,
LPHANDLE lphStart, LPHANDLE lphDeath,
LPHANDLE lphRead );
@@ -610,7 +610,7 @@ static HRESULT WINAPI IDirectPlayLobbyWI
lpAddress, lpdwAddressSize, FALSE );
}
-HRESULT DPL_CreateAddress(
+static HRESULT DPL_CreateAddress(
REFGUID guidSP,
REFGUID guidDataType,
LPCVOID lpData,
@@ -1143,7 +1143,7 @@ static BOOL CALLBACK RunApplicationA_Enu
return TRUE; /* Keep enumerating, haven't found the application yet */
}
-BOOL DPL_CreateAndSetLobbyHandles( DWORD dwDestProcessId, HANDLE hDestProcess,
+static BOOL DPL_CreateAndSetLobbyHandles( DWORD dwDestProcessId, HANDLE hDestProcess,
LPHANDLE lphStart, LPHANDLE lphDeath,
LPHANDLE lphRead )
{
diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c
index 86d333e..c731ea6 100644
--- a/dlls/dplayx/name_server.c
+++ b/dlls/dplayx/name_server.c
@@ -67,7 +67,7 @@ struct NSCache
typedef struct NSCache NSCache, *lpNSCache;
/* Function prototypes */
-DPQ_DECL_DELETECB( cbDeleteNSNodeFromHeap, lpNSCacheData );
+static DPQ_DECL_DELETECB( cbDeleteNSNodeFromHeap, lpNSCacheData );
/* Name Server functions
* ---------------------
@@ -245,7 +245,7 @@ HRESULT NS_SendSessionRequestBroadcast(
}
/* Delete a name server node which has been allocated on the heap */
-DPQ_DECL_DELETECB( cbDeleteNSNodeFromHeap, lpNSCacheData )
+static DPQ_DECL_DELETECB( cbDeleteNSNodeFromHeap, lpNSCacheData )
{
/* NOTE: This proc doesn't deal with the walking pointer */
More information about the wine-cvs
mailing list