From: Alistair Leslie-Hughes leslie_alistair@hotmail.com
--- dlls/dplayx/dplay_global.h | 18 +++++++++--------- dlls/dplayx/dplayx_global.h | 24 ++++++++++++------------ dlls/dplayx/dplayx_messages.h | 12 ++++++------ dlls/dplayx/dplayx_queue.h | 2 +- dlls/dplayx/dplobby.c | 2 +- dlls/dplayx/lobbysp.h | 2 +- dlls/dplayx/name_server.h | 26 +++++++++++++------------- 7 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index 7def46bc2dd..7ee91ba0402 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -29,7 +29,7 @@
extern HRESULT DPL_EnumAddress( LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, LPCVOID lpAddress, DWORD dwAddressSize, - LPVOID lpContext ) DECLSPEC_HIDDEN; + LPVOID lpContext );
typedef struct tagEnumSessionAsyncCallbackData { @@ -197,18 +197,18 @@ typedef struct IDirectPlayImpl
HRESULT DP_HandleMessage( IDirectPlayImpl *This, const void *lpMessageBody, DWORD dwMessageBodySize, const void *lpMessageHeader, WORD wCommandId, WORD wVersion, - void **lplpReply, DWORD *lpdwMsgSize ) DECLSPEC_HIDDEN; + void **lplpReply, DWORD *lpdwMsgSize );
/* DP SP external interfaces into DirectPlay */ -extern HRESULT DP_GetSPPlayerData( IDirectPlayImpl *lpDP, DPID idPlayer, void **lplpData ) DECLSPEC_HIDDEN; -extern HRESULT DP_SetSPPlayerData( IDirectPlayImpl *lpDP, DPID idPlayer, void *lpData ) DECLSPEC_HIDDEN; +extern HRESULT DP_GetSPPlayerData( IDirectPlayImpl *lpDP, DPID idPlayer, void **lplpData ); +extern HRESULT DP_SetSPPlayerData( IDirectPlayImpl *lpDP, DPID idPlayer, void *lpData );
/* DP external interfaces to call into DPSP interface */ -extern LPVOID DPSP_CreateSPPlayerData(void) DECLSPEC_HIDDEN; +extern LPVOID DPSP_CreateSPPlayerData(void);
-extern HRESULT dplay_create( REFIID riid, void **ppv ) DECLSPEC_HIDDEN; -extern HRESULT dplobby_create( REFIID riid, void **ppv ) DECLSPEC_HIDDEN; -extern HRESULT dplaysp_create( REFIID riid, void **ppv, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN; -extern HRESULT dplobbysp_create( REFIID riid, void **ppv, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN; +extern HRESULT dplay_create( REFIID riid, void **ppv ); +extern HRESULT dplobby_create( REFIID riid, void **ppv ); +extern HRESULT dplaysp_create( REFIID riid, void **ppv, IDirectPlayImpl *dp ); +extern HRESULT dplobbysp_create( REFIID riid, void **ppv, IDirectPlayImpl *dp );
#endif /* __WINE_DPLAY_GLOBAL_INCLUDED */ diff --git a/dlls/dplayx/dplayx_global.h b/dlls/dplayx/dplayx_global.h index 848771bced6..5650348efd3 100644 --- a/dlls/dplayx/dplayx_global.h +++ b/dlls/dplayx/dplayx_global.h @@ -26,35 +26,35 @@ #include "winuser.h" #include "dplay.h"
-BOOL DPLAYX_ConstructData(void) DECLSPEC_HIDDEN; -BOOL DPLAYX_DestructData(void) DECLSPEC_HIDDEN; +BOOL DPLAYX_ConstructData(void); +BOOL DPLAYX_DestructData(void);
HRESULT DPLAYX_GetConnectionSettingsA ( DWORD dwAppID, LPVOID lpData, - LPDWORD lpdwDataSize ) DECLSPEC_HIDDEN; + LPDWORD lpdwDataSize ); HRESULT DPLAYX_GetConnectionSettingsW ( DWORD dwAppID, LPVOID lpData, - LPDWORD lpdwDataSize ) DECLSPEC_HIDDEN; + LPDWORD lpdwDataSize );
HRESULT DPLAYX_SetConnectionSettingsA ( DWORD dwFlags, DWORD dwAppID, - const DPLCONNECTION *lpConn ) DECLSPEC_HIDDEN; + const DPLCONNECTION *lpConn ); HRESULT DPLAYX_SetConnectionSettingsW ( DWORD dwFlags, DWORD dwAppID, - const DPLCONNECTION *lpConn ) DECLSPEC_HIDDEN; + const DPLCONNECTION *lpConn );
-BOOL DPLAYX_CreateLobbyApplication( DWORD dwAppID ) DECLSPEC_HIDDEN; +BOOL DPLAYX_CreateLobbyApplication( DWORD dwAppID );
-BOOL DPLAYX_WaitForConnectionSettings( BOOL bWait ) DECLSPEC_HIDDEN; -BOOL DPLAYX_AnyLobbiesWaitingForConnSettings(void) DECLSPEC_HIDDEN; +BOOL DPLAYX_WaitForConnectionSettings( BOOL bWait ); +BOOL DPLAYX_AnyLobbiesWaitingForConnSettings(void);
BOOL DPLAYX_SetLobbyHandles( DWORD dwAppID, - HANDLE hStart, HANDLE hDeath, HANDLE hConnRead ) DECLSPEC_HIDDEN; + HANDLE hStart, HANDLE hDeath, HANDLE hConnRead );
-BOOL DPLAYX_SetLobbyMsgThreadId( DWORD dwAppId, DWORD dwThreadId ) DECLSPEC_HIDDEN; +BOOL DPLAYX_SetLobbyMsgThreadId( DWORD dwAppId, DWORD dwThreadId );
/* Convert a DP or DPL HRESULT code into a string for human consumption */ -LPCSTR DPLAYX_HresultToString( HRESULT hr ) DECLSPEC_HIDDEN; +LPCSTR DPLAYX_HresultToString( HRESULT hr );
#endif /* __WINE_DPLAYX_GLOBAL */ diff --git a/dlls/dplayx/dplayx_messages.h b/dlls/dplayx/dplayx_messages.h index c6f7f8af57f..8c09c8d3749 100644 --- a/dlls/dplayx/dplayx_messages.h +++ b/dlls/dplayx/dplayx_messages.h @@ -29,17 +29,17 @@ #include "dplay_global.h"
DWORD CreateLobbyMessageReceptionThread( HANDLE hNotifyEvent, HANDLE hStart, - HANDLE hDeath, HANDLE hConnRead ) DECLSPEC_HIDDEN; + HANDLE hDeath, HANDLE hConnRead );
HRESULT DP_MSG_SendRequestPlayerId( IDirectPlayImpl *This, DWORD dwFlags, - LPDPID lpdipidAllocatedId ) DECLSPEC_HIDDEN; -HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlayImpl *This, DPID dpidServer ) DECLSPEC_HIDDEN; + LPDPID lpdipidAllocatedId ); +HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlayImpl *This, DPID dpidServer );
void DP_MSG_ReplyReceived( IDirectPlayImpl *This, WORD wCommandId, - LPCVOID lpMsgBody, DWORD dwMsgBodySize ) DECLSPEC_HIDDEN; + LPCVOID lpMsgBody, DWORD dwMsgBodySize ); void DP_MSG_ErrorReceived( IDirectPlayImpl *This, WORD wCommandId, - LPCVOID lpMsgBody, DWORD dwMsgBodySize ) DECLSPEC_HIDDEN; -void DP_MSG_ToSelf( IDirectPlayImpl *This, DPID dpidSelf ) DECLSPEC_HIDDEN; + LPCVOID lpMsgBody, DWORD dwMsgBodySize ); +void DP_MSG_ToSelf( IDirectPlayImpl *This, DPID dpidSelf );
/* Timings -> 1000 ticks/sec */ #define DPMSG_WAIT_5_SECS 5000 diff --git a/dlls/dplayx/dplayx_queue.h b/dlls/dplayx/dplayx_queue.h index e704d9a7077..78207170835 100644 --- a/dlls/dplayx/dplayx_queue.h +++ b/dlls/dplayx/dplayx_queue.h @@ -211,6 +211,6 @@ do \ #define DPQ_DECL_DELETECB( name, type ) void name( type elem )
/* Prototype of a method which just performs a HeapFree on the elem */ -DPQ_DECL_DELETECB( cbDeleteElemFromHeap, LPVOID ) DECLSPEC_HIDDEN; +DPQ_DECL_DELETECB( cbDeleteElemFromHeap, LPVOID );
#endif /* __WINE_DPLAYX_QUEUE_H */ diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 52b5618b98f..8dfddb719a2 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay);
/* Forward declarations for this module helper methods */ HRESULT DPL_CreateCompoundAddress ( LPCDPCOMPOUNDADDRESSELEMENT lpElements, DWORD dwElementCount, - LPVOID lpAddress, LPDWORD lpdwAddressSize, BOOL bAnsiInterface )DECLSPEC_HIDDEN; + LPVOID lpAddress, LPDWORD lpdwAddressSize, BOOL bAnsiInterface );
static HRESULT DPL_CreateAddress( REFGUID guidSP, REFGUID guidDataType, LPCVOID lpData, DWORD dwDataSize, LPVOID lpAddress, LPDWORD lpdwAddressSize, BOOL bAnsiInterface ); diff --git a/dlls/dplayx/lobbysp.h b/dlls/dplayx/lobbysp.h index 8d871160b65..55066b379f1 100644 --- a/dlls/dplayx/lobbysp.h +++ b/dlls/dplayx/lobbysp.h @@ -514,6 +514,6 @@ DECLARE_INTERFACE_(IDPLobbySP,IUnknown) /* This variable is exported from the DLL at ordinal 6 to be accessed by the * SP directly. This is the same variable that the DP SP will use. */ -extern DWORD gdwDPlaySPRefCount DECLSPEC_HIDDEN; +extern DWORD gdwDPlaySPRefCount;
#endif diff --git a/dlls/dplayx/name_server.h b/dlls/dplayx/name_server.h index 2ad012c2faa..30c5bc7e9ae 100644 --- a/dlls/dplayx/name_server.h +++ b/dlls/dplayx/name_server.h @@ -28,32 +28,32 @@ #include "dplayx_messages.h" #include "dplay_global.h"
-void NS_SetLocalComputerAsNameServer( LPCDPSESSIONDESC2 lpsd, LPVOID lpNSInfo ) DECLSPEC_HIDDEN; +void NS_SetLocalComputerAsNameServer( LPCDPSESSIONDESC2 lpsd, LPVOID lpNSInfo ); void NS_AddRemoteComputerAsNameServer( LPCVOID lpNSAddrHdr, DWORD dwHdrSize, LPCDPMSG_ENUMSESSIONSREPLY lpcMsg, - LPVOID lpNSInfo ) DECLSPEC_HIDDEN; -LPVOID NS_GetNSAddr( LPVOID lpNSInfo ) DECLSPEC_HIDDEN; -DWORD NS_GetNsMagic( LPVOID lpNSInfo ) DECLSPEC_HIDDEN; -void NS_SetLocalAddr( LPVOID lpNSInfo, LPCVOID lpHdr, DWORD dwHdrSize ) DECLSPEC_HIDDEN; + LPVOID lpNSInfo ); +LPVOID NS_GetNSAddr( LPVOID lpNSInfo ); +DWORD NS_GetNsMagic( LPVOID lpNSInfo ); +void NS_SetLocalAddr( LPVOID lpNSInfo, LPCVOID lpHdr, DWORD dwHdrSize );
void NS_ReplyToEnumSessionsRequest( LPCVOID lpcMsg, LPVOID* lplpReplyData, LPDWORD lpdwReplySize, - IDirectPlayImpl *lpDP ) DECLSPEC_HIDDEN; + IDirectPlayImpl *lpDP );
HRESULT NS_SendSessionRequestBroadcast( LPCGUID lpcGuid, DWORD dwFlags, - const SPINITDATA *lpSpData ) DECLSPEC_HIDDEN; + const SPINITDATA *lpSpData );
-BOOL NS_InitializeSessionCache( LPVOID* lplpNSInfo ) DECLSPEC_HIDDEN; -void NS_DeleteSessionCache( LPVOID lpNSInfo ) DECLSPEC_HIDDEN; -void NS_InvalidateSessionCache( LPVOID lpNSInfo ) DECLSPEC_HIDDEN; +BOOL NS_InitializeSessionCache( LPVOID* lplpNSInfo ); +void NS_DeleteSessionCache( LPVOID lpNSInfo ); +void NS_InvalidateSessionCache( LPVOID lpNSInfo );
-void NS_ResetSessionEnumeration( LPVOID lpNSInfo ) DECLSPEC_HIDDEN; -LPDPSESSIONDESC2 NS_WalkSessions( LPVOID lpNSInfo ) DECLSPEC_HIDDEN; -void NS_PruneSessionCache( LPVOID lpNSInfo ) DECLSPEC_HIDDEN; +void NS_ResetSessionEnumeration( LPVOID lpNSInfo ); +LPDPSESSIONDESC2 NS_WalkSessions( LPVOID lpNSInfo ); +void NS_PruneSessionCache( LPVOID lpNSInfo );
#endif /* __WINE_DPLAYX_NAMESERVER */