ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dplayx: Get rid of the IDirectPlayImpl aliases.

This commit is contained in:
Michael Stefaniuc 2013-03-29 17:12:33 +01:00 committed by Alexandre Julliard
parent 5e03836603
commit f546609d09
8 changed files with 90 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
dlls/dplayx/dplay.c
View File

@ -50,7 +50,7 @@ extern HRESULT DPL_CreateCompoundAddress
/* Local function prototypes */ /* Local function prototypes */
static lpPlayerList DP_FindPlayer( IDirectPlay2AImpl* This, DPID dpid ); static lpPlayerList DP_FindPlayer( IDirectPlayImpl *This, DPID dpid );
static BOOL DP_CopyDPNAMEStruct( LPDPNAME lpDst, const DPNAME *lpSrc, BOOL bAnsi ); static BOOL DP_CopyDPNAMEStruct( LPDPNAME lpDst, const DPNAME *lpSrc, BOOL bAnsi );
static void DP_SetGroupData( lpGroupData lpGData, DWORD dwFlags, static void DP_SetGroupData( lpGroupData lpGData, DWORD dwFlags,
LPVOID lpData, DWORD dwDataSize ); LPVOID lpData, DWORD dwDataSize );
@ -60,16 +60,13 @@ static BOOL CALLBACK cbDeletePlayerFromAllGroups( DPID dpId,
LPCDPNAME lpName, LPCDPNAME lpName,
DWORD dwFlags, DWORD dwFlags,
LPVOID lpContext ); LPVOID lpContext );
static lpGroupData DP_FindAnyGroup( IDirectPlay2AImpl* This, DPID dpid ); static lpGroupData DP_FindAnyGroup( IDirectPlayImpl *This, DPID dpid );
/* Helper methods for player/group interfaces */ /* Helper methods for player/group interfaces */
static HRESULT DP_SetSessionDesc static HRESULT DP_SetSessionDesc( IDirectPlayImpl *This, const DPSESSIONDESC2 *lpSessDesc,
( IDirectPlay2Impl* This, LPCDPSESSIONDESC2 lpSessDesc, DWORD dwFlags, BOOL bInitial, BOOL bAnsi );
DWORD dwFlags, BOOL bInitial, BOOL bAnsi ); static HRESULT DP_SP_SendEx( IDirectPlayImpl *This, DWORD dwFlags, void *lpData, DWORD dwDataSize,
static HRESULT DP_SP_SendEx DWORD dwPriority, DWORD dwTimeout, void *lpContext, DWORD *lpdwMsgID );
( IDirectPlay2Impl* This, DWORD dwFlags,
LPVOID lpData, DWORD dwDataSize, DWORD dwPriority, DWORD dwTimeout,
LPVOID lpContext, LPDWORD lpdwMsgID );
static BOOL DP_BuildSPCompoundAddr( LPGUID lpcSpGuid, LPVOID* lplpAddrBuf, static BOOL DP_BuildSPCompoundAddr( LPGUID lpcSpGuid, LPVOID* lplpAddrBuf,
LPDWORD lpdwBufSize ); LPDWORD lpdwBufSize );
@ -106,7 +103,7 @@ static inline IDirectPlayImpl *impl_from_IDirectPlay4( IDirectPlay4 *iface )
static BOOL DP_CreateDirectPlay2( LPVOID lpDP ) static BOOL DP_CreateDirectPlay2( LPVOID lpDP )
{ {
IDirectPlay2AImpl *This = lpDP; IDirectPlayImpl *This = lpDP;
This->dp2 = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dp2) ) ); This->dp2 = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dp2) ) );
if ( This->dp2 == NULL ) if ( This->dp2 == NULL )
@ -185,7 +182,7 @@ DPQ_DECL_DELETECB( cbDeleteElemFromHeap, LPVOID )
static BOOL DP_DestroyDirectPlay2( LPVOID lpDP ) static BOOL DP_DestroyDirectPlay2( LPVOID lpDP )
{ {
IDirectPlay2AImpl *This = lpDP; IDirectPlayImpl *This = lpDP;
if( This->dp2->hEnumSessionThread != INVALID_HANDLE_VALUE ) if( This->dp2->hEnumSessionThread != INVALID_HANDLE_VALUE )
{ {
@ -250,10 +247,9 @@ static inline DPID DP_NextObjectId(void)
} }
/* *lplpReply will be non NULL iff there is something to reply */ /* *lplpReply will be non NULL iff there is something to reply */
HRESULT DP_HandleMessage( IDirectPlay2Impl* This, LPCVOID lpcMessageBody, HRESULT DP_HandleMessage( IDirectPlayImpl *This, const void *lpcMessageBody,
DWORD dwMessageBodySize, LPCVOID lpcMessageHeader, DWORD dwMessageBodySize, const void *lpcMessageHeader, WORD wCommandId, WORD wVersion,
WORD wCommandId, WORD wVersion, void **lplpReply, DWORD *lpdwMsgSize )
LPVOID* lplpReply, LPDWORD lpdwMsgSize )
{ {
TRACE( "(%p)->(%p,0x%08x,%p,%u,%u)\n", TRACE( "(%p)->(%p,0x%08x,%p,%u,%u)\n",
This, lpcMessageBody, dwMessageBodySize, lpcMessageHeader, wCommandId, This, lpcMessageBody, dwMessageBodySize, lpcMessageHeader, wCommandId,
@ -569,10 +565,8 @@ static HRESULT WINAPI IDirectPlay4Impl_Close( IDirectPlay4 *iface )
return hr; return hr;
} }
static static lpGroupData DP_CreateGroup( IDirectPlayImpl *This, const DPID *lpid, const DPNAME *lpName,
lpGroupData DP_CreateGroup( IDirectPlay2AImpl* This, const DPID *lpid, DWORD dwFlags, DPID idParent, BOOL bAnsi )
const DPNAME *lpName, DWORD dwFlags,
DPID idParent, BOOL bAnsi )
{ {
lpGroupData lpGData; lpGroupData lpGData;
@ -604,8 +598,7 @@ lpGroupData DP_CreateGroup( IDirectPlay2AImpl* This, const DPID *lpid,
} }
/* This method assumes that all links to it are already deleted */ /* This method assumes that all links to it are already deleted */
static void static void DP_DeleteGroup( IDirectPlayImpl *This, DPID dpid )
DP_DeleteGroup( IDirectPlay2Impl* This, DPID dpid )
{ {
lpGroupList lpGList; lpGroupList lpGList;
@ -634,7 +627,7 @@ DP_DeleteGroup( IDirectPlay2Impl* This, DPID dpid )
} }
static lpGroupData DP_FindAnyGroup( IDirectPlay2AImpl* This, DPID dpid ) static lpGroupData DP_FindAnyGroup( IDirectPlayImpl *This, DPID dpid )
{ {
lpGroupList lpGroups; lpGroupList lpGroups;
@ -657,10 +650,8 @@ static lpGroupData DP_FindAnyGroup( IDirectPlay2AImpl* This, DPID dpid )
return lpGroups->lpGData; return lpGroups->lpGData;
} }
static HRESULT DP_IF_CreateGroup static HRESULT DP_IF_CreateGroup( IDirectPlayImpl *This, void *lpMsgHdr, DPID *lpidGroup,
( IDirectPlay2AImpl* This, LPVOID lpMsgHdr, LPDPID lpidGroup, DPNAME *lpGroupName, void *lpData, DWORD dwDataSize, DWORD dwFlags, BOOL bAnsi )
LPDPNAME lpGroupName, LPVOID lpData, DWORD dwDataSize,
DWORD dwFlags, BOOL bAnsi )
{ {
lpGroupData lpGData; lpGroupData lpGData;
@ -842,10 +833,8 @@ DP_SetGroupData( lpGroupData lpGData, DWORD dwFlags,
} }
/* This function will just create the storage for the new player. */ /* This function will just create the storage for the new player. */
static static lpPlayerData DP_CreatePlayer( IDirectPlayImpl *This, DPID *lpid, DPNAME *lpName,
lpPlayerData DP_CreatePlayer( IDirectPlay2Impl* This, LPDPID lpid, DWORD dwFlags, HANDLE hEvent, BOOL bAnsi )
LPDPNAME lpName, DWORD dwFlags,
HANDLE hEvent, BOOL bAnsi )
{ {
lpPlayerData lpPData; lpPlayerData lpPData;
@ -898,8 +887,7 @@ DP_DeleteDPNameStruct( LPDPNAME lpDPName )
} }
/* This method assumes that all links to it are already deleted */ /* This method assumes that all links to it are already deleted */
static void static void DP_DeletePlayer( IDirectPlayImpl *This, DPID dpid )
DP_DeletePlayer( IDirectPlay2Impl* This, DPID dpid )
{ {
lpPlayerList lpPList; lpPlayerList lpPList;
@ -930,7 +918,7 @@ DP_DeletePlayer( IDirectPlay2Impl* This, DPID dpid )
HeapFree( GetProcessHeap(), 0, lpPList ); HeapFree( GetProcessHeap(), 0, lpPList );
} }
static lpPlayerList DP_FindPlayer( IDirectPlay2AImpl* This, DPID dpid ) static lpPlayerList DP_FindPlayer( IDirectPlayImpl *This, DPID dpid )
{ {
lpPlayerList lpPlayers; lpPlayerList lpPlayers;
@ -1043,16 +1031,10 @@ DP_SetPlayerData( lpPlayerData lpPData, DWORD dwFlags,
} }
static HRESULT DP_IF_CreatePlayer /* Note: lpMsgHdr is NULL for local creation, non NULL for remote creation */
( IDirectPlay2Impl* This, static HRESULT DP_IF_CreatePlayer( IDirectPlayImpl *This, void *lpMsgHdr, DPID *lpidPlayer,
LPVOID lpMsgHdr, /* NULL for local creation, non NULL for remote creation */ DPNAME *lpPlayerName, HANDLE hEvent, void *lpData, DWORD dwDataSize, DWORD dwFlags,
LPDPID lpidPlayer, BOOL bAnsi )
LPDPNAME lpPlayerName,
HANDLE hEvent,
LPVOID lpData,
DWORD dwDataSize,
DWORD dwFlags,
BOOL bAnsi )
{ {
HRESULT hr = DP_OK; HRESULT hr = DP_OK;
lpPlayerData lpPData; lpPlayerData lpPData;
@ -1371,7 +1353,7 @@ static HRESULT WINAPI IDirectPlay4Impl_DeletePlayerFromGroup( IDirectPlay4 *ifac
typedef struct _DPRGOPContext typedef struct _DPRGOPContext
{ {
IDirectPlay3Impl* This; IDirectPlayImpl *This;
BOOL bAnsi; BOOL bAnsi;
DPID idGroup; DPID idGroup;
} DPRGOPContext, *lpDPRGOPContext; } DPRGOPContext, *lpDPRGOPContext;
@ -1402,8 +1384,7 @@ cbRemoveGroupOrPlayer(
return TRUE; /* Continue enumeration */ return TRUE; /* Continue enumeration */
} }
static HRESULT DP_IF_DestroyGroup static HRESULT DP_IF_DestroyGroup( IDirectPlayImpl *This, void *lpMsgHdr, DPID idGroup, BOOL bAnsi )
( IDirectPlay2Impl* This, LPVOID lpMsgHdr, DPID idGroup, BOOL bAnsi )
{ {
lpGroupData lpGData; lpGroupData lpGData;
DPRGOPContext context; DPRGOPContext context;
@ -1469,13 +1450,13 @@ static HRESULT WINAPI IDirectPlay4Impl_DestroyGroup( IDirectPlay4 *iface, DPID i
typedef struct _DPFAGContext typedef struct _DPFAGContext
{ {
IDirectPlay2Impl* This; IDirectPlayImpl *This;
DPID idPlayer; DPID idPlayer;
BOOL bAnsi; BOOL bAnsi;
} DPFAGContext, *lpDPFAGContext; } DPFAGContext, *lpDPFAGContext;
static HRESULT DP_IF_DestroyPlayer static HRESULT DP_IF_DestroyPlayer( IDirectPlayImpl *This, void *lpMsgHdr, DPID idPlayer,
( IDirectPlay2Impl* This, LPVOID lpMsgHdr, DPID idPlayer, BOOL bAnsi ) BOOL bAnsi )
{ {
DPFAGContext cbContext; DPFAGContext cbContext;
@ -1726,7 +1707,7 @@ static DWORD CALLBACK DP_EnumSessionsSendAsyncRequestThread( LPVOID lpContext )
return 1; return 1;
} }
static void DP_KillEnumSessionThread( IDirectPlay2Impl* This ) static void DP_KillEnumSessionThread( IDirectPlayImpl *This )
{ {
/* Does a thread exist? If so we were doing an async enum session */ /* Does a thread exist? If so we were doing an async enum session */
if( This->dp2->hEnumSessionThread != INVALID_HANDLE_VALUE ) if( This->dp2->hEnumSessionThread != INVALID_HANDLE_VALUE )
@ -1931,9 +1912,8 @@ static HRESULT WINAPI IDirectPlay4Impl_GetGroupData( IDirectPlay4 *iface, DPID g
return DP_OK; return DP_OK;
} }
static HRESULT DP_IF_GetGroupName static HRESULT DP_IF_GetGroupName( IDirectPlayImpl *This, DPID idGroup, void *lpData,
( IDirectPlay2Impl* This, DPID idGroup, LPVOID lpData, DWORD *lpdwDataSize, BOOL bAnsi )
LPDWORD lpdwDataSize, BOOL bAnsi )
{ {
lpGroupData lpGData; lpGroupData lpGData;
LPDPNAME lpName = lpData; LPDPNAME lpName = lpData;
@ -2108,9 +2088,8 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerData( IDirectPlay4 *iface, DPID
return DP_OK; return DP_OK;
} }
static HRESULT DP_IF_GetPlayerName static HRESULT DP_IF_GetPlayerName( IDirectPlayImpl *This, DPID idPlayer, void *lpData,
( IDirectPlay2Impl* This, DPID idPlayer, LPVOID lpData, DWORD *lpdwDataSize, BOOL bAnsi )
LPDWORD lpdwDataSize, BOOL bAnsi )
{ {
lpPlayerList lpPList; lpPlayerList lpPList;
LPDPNAME lpName = lpData; LPDPNAME lpName = lpData;
@ -2189,9 +2168,8 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerName( IDirectPlay4 *iface, DPID
return DP_IF_GetPlayerName( This, idPlayer, lpData, lpdwDataSize, FALSE ); return DP_IF_GetPlayerName( This, idPlayer, lpData, lpdwDataSize, FALSE );
} }
static HRESULT DP_GetSessionDesc static HRESULT DP_GetSessionDesc( IDirectPlayImpl *This, void *lpData, DWORD *lpdwDataSize,
( IDirectPlay2Impl* This, LPVOID lpData, LPDWORD lpdwDataSize, BOOL bAnsi )
BOOL bAnsi )
{ {
DWORD dwRequiredSize; DWORD dwRequiredSize;
@ -2253,10 +2231,8 @@ static HRESULT WINAPI IDirectPlay4Impl_Initialize( IDirectPlay4 *iface, GUID *gu
} }
static HRESULT DP_SecureOpen static HRESULT DP_SecureOpen( IDirectPlayImpl *This, const DPSESSIONDESC2 *lpsd, DWORD dwFlags,
( IDirectPlay2Impl* This, LPCDPSESSIONDESC2 lpsd, DWORD dwFlags, const DPSECURITYDESC *lpSecurity, const DPCREDENTIALS *lpCredentials, BOOL bAnsi )
LPCDPSECURITYDESC lpSecurity, LPCDPCREDENTIALS lpCredentials,
BOOL bAnsi )
{ {
HRESULT hr = DP_OK; HRESULT hr = DP_OK;
@ -2377,9 +2353,8 @@ static HRESULT WINAPI IDirectPlay4Impl_Open( IDirectPlay4 *iface, DPSESSIONDESC2
return IDirectPlayX_SecureOpen( iface, sdesc, flags, NULL, NULL ); return IDirectPlayX_SecureOpen( iface, sdesc, flags, NULL, NULL );
} }
static HRESULT DP_IF_Receive static HRESULT DP_IF_Receive( IDirectPlayImpl *This, DPID *lpidFrom, DPID *lpidTo, DWORD dwFlags,
( IDirectPlay2Impl* This, LPDPID lpidFrom, LPDPID lpidTo, void *lpData, DWORD *lpdwDataSize, BOOL bAnsi )
DWORD dwFlags, LPVOID lpData, LPDWORD lpdwDataSize, BOOL bAnsi )
{ {
LPDPMSG lpMsg = NULL; LPDPMSG lpMsg = NULL;
@ -2503,9 +2478,8 @@ static HRESULT WINAPI IDirectPlay4Impl_SetGroupData( IDirectPlay4 *iface, DPID g
return DP_OK; return DP_OK;
} }
static HRESULT DP_IF_SetGroupName static HRESULT DP_IF_SetGroupName( IDirectPlayImpl *This, DPID idGroup, DPNAME *lpGroupName,
( IDirectPlay2Impl* This, DPID idGroup, LPDPNAME lpGroupName, DWORD dwFlags, BOOL bAnsi )
DWORD dwFlags, BOOL bAnsi )
{ {
lpGroupData lpGData; lpGroupData lpGData;
@ -2581,9 +2555,8 @@ static HRESULT WINAPI IDirectPlay4Impl_SetPlayerData( IDirectPlay4 *iface, DPID
return DP_OK; return DP_OK;
} }
static HRESULT DP_IF_SetPlayerName static HRESULT DP_IF_SetPlayerName( IDirectPlayImpl *This, DPID idPlayer, DPNAME *lpPlayerName,
( IDirectPlay2Impl* This, DPID idPlayer, LPDPNAME lpPlayerName, DWORD dwFlags, BOOL bAnsi )
DWORD dwFlags, BOOL bAnsi )
{ {
lpPlayerList lpPList; lpPlayerList lpPList;
@ -2622,9 +2595,8 @@ static HRESULT WINAPI IDirectPlay4Impl_SetPlayerName( IDirectPlay4 *iface, DPID
return DP_IF_SetPlayerName( This, idPlayer, lpPlayerName, dwFlags, FALSE ); return DP_IF_SetPlayerName( This, idPlayer, lpPlayerName, dwFlags, FALSE );
} }
static HRESULT DP_SetSessionDesc static HRESULT DP_SetSessionDesc( IDirectPlayImpl *This, const DPSESSIONDESC2 *lpSessDesc,
( IDirectPlay2Impl* This, LPCDPSESSIONDESC2 lpSessDesc, DWORD dwFlags, BOOL bInitial, BOOL bAnsi )
DWORD dwFlags, BOOL bInitial, BOOL bAnsi )
{ {
DWORD dwRequiredSize; DWORD dwRequiredSize;
LPDPSESSIONDESC2 lpTempSessDesc; LPDPSESSIONDESC2 lpTempSessDesc;
@ -2835,10 +2807,9 @@ static HRESULT WINAPI IDirectPlay4Impl_AddGroupToGroup( IDirectPlay4 *iface, DPI
return DP_OK; return DP_OK;
} }
static HRESULT DP_IF_CreateGroupInGroup static HRESULT DP_IF_CreateGroupInGroup( IDirectPlayImpl *This, void *lpMsgHdr, DPID idParentGroup,
( IDirectPlay3Impl* This, LPVOID lpMsgHdr, DPID idParentGroup, DPID *lpidGroup, DPNAME *lpGroupName, void *lpData, DWORD dwDataSize, DWORD dwFlags,
LPDPID lpidGroup, LPDPNAME lpGroupName, LPVOID lpData, BOOL bAnsi )
DWORD dwDataSize, DWORD dwFlags, BOOL bAnsi )
{ {
lpGroupData lpGParentData; lpGroupData lpGParentData;
lpGroupList lpGList; lpGroupList lpGList;
@ -3483,8 +3454,7 @@ static HMODULE DP_LoadSP( LPCGUID lpcGuid, LPSPINITDATA lpSpData, LPBOOL lpbIsDp
return 0; return 0;
} }
static static HRESULT DP_InitializeDPSP( IDirectPlayImpl *This, HMODULE hServiceProvider )
HRESULT DP_InitializeDPSP( IDirectPlay3Impl* This, HMODULE hServiceProvider )
{ {
HRESULT hr; HRESULT hr;
LPDPSP_SPINIT SPInit; LPDPSP_SPINIT SPInit;
@ -3523,8 +3493,7 @@ HRESULT DP_InitializeDPSP( IDirectPlay3Impl* This, HMODULE hServiceProvider )
return hr; return hr;
} }
static static HRESULT DP_InitializeDPLSP( IDirectPlayImpl *This, HMODULE hLobbyProvider )
HRESULT DP_InitializeDPLSP( IDirectPlay3Impl* This, HMODULE hLobbyProvider )
{ {
HRESULT hr; HRESULT hr;
LPSP_INIT DPLSPInit; LPSP_INIT DPLSPInit;
@ -3867,10 +3836,8 @@ static HRESULT WINAPI IDirectPlay4Impl_SendEx( IDirectPlay4 *iface, DPID from, D
return DP_OK; return DP_OK;
} }
static HRESULT DP_SP_SendEx static HRESULT DP_SP_SendEx( IDirectPlayImpl *This, DWORD dwFlags, void *lpData, DWORD dwDataSize,
( IDirectPlay2Impl* This, DWORD dwFlags, DWORD dwPriority, DWORD dwTimeout, void *lpContext, DWORD *lpdwMsgID )
LPVOID lpData, DWORD dwDataSize, DWORD dwPriority, DWORD dwTimeout,
LPVOID lpContext, LPDWORD lpdwMsgID )
{ {
LPDPMSG lpMElem; LPDPMSG lpMElem;
@ -4143,9 +4110,7 @@ HRESULT dplay_create( REFIID riid, void **ppv )
} }
HRESULT DP_GetSPPlayerData( IDirectPlay2Impl* lpDP, HRESULT DP_GetSPPlayerData( IDirectPlayImpl *lpDP, DPID idPlayer, void **lplpData )
DPID idPlayer,
LPVOID* lplpData )
{ {
lpPlayerList lpPlayer = DP_FindPlayer( lpDP, idPlayer ); lpPlayerList lpPlayer = DP_FindPlayer( lpDP, idPlayer );
@ -4159,9 +4124,7 @@ HRESULT DP_GetSPPlayerData( IDirectPlay2Impl* lpDP,
return DP_OK; return DP_OK;
} }
HRESULT DP_SetSPPlayerData( IDirectPlay2Impl* lpDP, HRESULT DP_SetSPPlayerData( IDirectPlayImpl *lpDP, DPID idPlayer, void *lpData )
DPID idPlayer,
LPVOID lpData )
{ {
lpPlayerList lpPlayer = DP_FindPlayer( lpDP, idPlayer ); lpPlayerList lpPlayer = DP_FindPlayer( lpDP, idPlayer );

18
dlls/dplayx/dplay_global.h
View File

@ -190,21 +190,13 @@ typedef struct IDirectPlayImpl
DirectPlay2Data *dp2; DirectPlay2Data *dp2;
} IDirectPlayImpl; } IDirectPlayImpl;
typedef struct IDirectPlayImpl IDirectPlay2Impl; HRESULT DP_HandleMessage( IDirectPlayImpl *This, const void *lpMessageBody,
typedef struct IDirectPlayImpl IDirectPlay2AImpl; DWORD dwMessageBodySize, const void *lpMessageHeader, WORD wCommandId, WORD wVersion,
typedef struct IDirectPlayImpl IDirectPlay3Impl; void **lplpReply, DWORD *lpdwMsgSize ) DECLSPEC_HIDDEN;
typedef struct IDirectPlayImpl IDirectPlay3AImpl;
typedef struct IDirectPlayImpl IDirectPlay4Impl;
typedef struct IDirectPlayImpl IDirectPlay4AImpl;
HRESULT DP_HandleMessage( IDirectPlay2Impl* This, LPCVOID lpMessageBody,
DWORD dwMessageBodySize, LPCVOID lpMessageHeader,
WORD wCommandId, WORD wVersion,
LPVOID* lplpReply, LPDWORD lpdwMsgSize ) DECLSPEC_HIDDEN;
/* DP SP external interfaces into DirectPlay */ /* DP SP external interfaces into DirectPlay */
extern HRESULT DP_GetSPPlayerData( IDirectPlay2Impl* lpDP, DPID idPlayer, LPVOID* lplpData ) DECLSPEC_HIDDEN; extern HRESULT DP_GetSPPlayerData( IDirectPlayImpl *lpDP, DPID idPlayer, void **lplpData ) DECLSPEC_HIDDEN;
extern HRESULT DP_SetSPPlayerData( IDirectPlay2Impl* lpDP, DPID idPlayer, LPVOID lpData ) DECLSPEC_HIDDEN; extern HRESULT DP_SetSPPlayerData( IDirectPlayImpl *lpDP, DPID idPlayer, void *lpData ) DECLSPEC_HIDDEN;
/* DP external interfaces to call into DPSP interface */ /* DP external interfaces to call into DPSP interface */
extern LPVOID DPSP_CreateSPPlayerData(void) DECLSPEC_HIDDEN; extern LPVOID DPSP_CreateSPPlayerData(void) DECLSPEC_HIDDEN;

8
dlls/dplayx/dplaysp.c
View File

@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay);
/* Prototypes */ /* Prototypes */
static BOOL DPSP_CreateIUnknown( LPVOID lpSP ); static BOOL DPSP_CreateIUnknown( LPVOID lpSP );
static BOOL DPSP_DestroyIUnknown( LPVOID lpSP ); static BOOL DPSP_DestroyIUnknown( LPVOID lpSP );
static BOOL DPSP_CreateDirectPlaySP( LPVOID lpSP, IDirectPlay2Impl* dp ); static BOOL DPSP_CreateDirectPlaySP( void *lpSP, IDirectPlayImpl *dp );
static BOOL DPSP_DestroyDirectPlaySP( LPVOID lpSP ); static BOOL DPSP_DestroyDirectPlaySP( LPVOID lpSP );
/* Predefine the interface */ /* Predefine the interface */
@ -56,7 +56,7 @@ typedef struct tagDirectPlaySPData
LPVOID lpSpLocalData; LPVOID lpSpLocalData;
DWORD dwSpLocalDataSize; /* Size of data pointed to by lpSpLocalData */ DWORD dwSpLocalDataSize; /* Size of data pointed to by lpSpLocalData */
IDirectPlay2Impl* dplay; /* FIXME: This should perhaps be iface not impl */ IDirectPlayImpl *dplay; /* FIXME: This should perhaps be iface not impl */
} DirectPlaySPData; } DirectPlaySPData;
@ -85,7 +85,7 @@ typedef struct tagDP_SPPLAYERDATA
} DP_SPPLAYERDATA, *LPDP_SPPLAYERDATA; } DP_SPPLAYERDATA, *LPDP_SPPLAYERDATA;
/* Create the SP interface */ /* Create the SP interface */
HRESULT DPSP_CreateInterface( REFIID riid, LPVOID* ppvObj, IDirectPlay2Impl* dp ) HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp )
{ {
TRACE( " for %s\n", debugstr_guid( riid ) ); TRACE( " for %s\n", debugstr_guid( riid ) );
@ -159,7 +159,7 @@ static BOOL DPSP_DestroyIUnknown( LPVOID lpSP )
} }
static BOOL DPSP_CreateDirectPlaySP( LPVOID lpSP, IDirectPlay2Impl* dp ) static BOOL DPSP_CreateDirectPlaySP( void *lpSP, IDirectPlayImpl *dp )
{ {
IDirectPlaySPImpl *This = lpSP; IDirectPlaySPImpl *This = lpSP;

31
dlls/dplayx/dplayx_messages.c
View File

@ -45,9 +45,8 @@ typedef struct tagMSGTHREADINFO
} MSGTHREADINFO, *LPMSGTHREADINFO; } MSGTHREADINFO, *LPMSGTHREADINFO;
static DWORD CALLBACK DPL_MSG_ThreadMain( LPVOID lpContext ); static DWORD CALLBACK DPL_MSG_ThreadMain( LPVOID lpContext );
static LPVOID DP_MSG_ExpectReply( IDirectPlay2AImpl* This, LPDPSP_SENDDATA data, static void *DP_MSG_ExpectReply( IDirectPlayImpl *This, DPSP_SENDDATA *data, DWORD dwWaitTime,
DWORD dwWaitTime, WORD wReplyCommandId, WORD wReplyCommandId, void **lplpReplyMsg, DWORD *lpdwMsgBodySize );
LPVOID* lplpReplyMsg, LPDWORD lpdwMsgBodySize );
/* Create the message reception thread to allow the application to receive /* Create the message reception thread to allow the application to receive
@ -154,9 +153,8 @@ end_of_thread:
} }
/* DP messaging stuff */ /* DP messaging stuff */
static static HANDLE DP_MSG_BuildAndLinkReplyStruct( IDirectPlayImpl *This,
HANDLE DP_MSG_BuildAndLinkReplyStruct( IDirectPlay2Impl* This, DP_MSG_REPLY_STRUCT_LIST *lpReplyStructList, WORD wReplyCommandId )
LPDP_MSG_REPLY_STRUCT_LIST lpReplyStructList, WORD wReplyCommandId )
{ {
lpReplyStructList->replyExpected.hReceipt = CreateEventW( NULL, FALSE, FALSE, NULL ); lpReplyStructList->replyExpected.hReceipt = CreateEventW( NULL, FALSE, FALSE, NULL );
lpReplyStructList->replyExpected.wExpectedReply = wReplyCommandId; lpReplyStructList->replyExpected.wExpectedReply = wReplyCommandId;
@ -183,8 +181,7 @@ LPVOID DP_MSG_CleanReplyStruct( LPDP_MSG_REPLY_STRUCT_LIST lpReplyStructList,
return lpReplyStructList->replyExpected.lpReplyMsg; return lpReplyStructList->replyExpected.lpReplyMsg;
} }
HRESULT DP_MSG_SendRequestPlayerId( IDirectPlay2AImpl* This, DWORD dwFlags, HRESULT DP_MSG_SendRequestPlayerId( IDirectPlayImpl *This, DWORD dwFlags, DPID *lpdpidAllocatedId )
LPDPID lpdpidAllocatedId )
{ {
LPVOID lpMsg; LPVOID lpMsg;
LPDPMSG_REQUESTNEWPLAYERID lpMsgBody; LPDPMSG_REQUESTNEWPLAYERID lpMsgBody;
@ -250,7 +247,7 @@ HRESULT DP_MSG_SendRequestPlayerId( IDirectPlay2AImpl* This, DWORD dwFlags,
return hr; return hr;
} }
HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlay2AImpl* This, DPID dpidServer ) HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlayImpl *This, DPID dpidServer )
{ {
LPVOID lpMsg; LPVOID lpMsg;
LPDPMSG_FORWARDADDPLAYER lpMsgBody; LPDPMSG_FORWARDADDPLAYER lpMsgBody;
@ -368,10 +365,8 @@ HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlay2AImpl* This, DPID dpidServer )
* ordering issues on sends and receives from the opposite machine. No wonder MS is not * ordering issues on sends and receives from the opposite machine. No wonder MS is not
* a networking company. * a networking company.
*/ */
static static void *DP_MSG_ExpectReply( IDirectPlayImpl *This, DPSP_SENDDATA *lpData, DWORD dwWaitTime,
LPVOID DP_MSG_ExpectReply( IDirectPlay2AImpl* This, LPDPSP_SENDDATA lpData, WORD wReplyCommandId, void **lplpReplyMsg, DWORD *lpdwMsgBodySize )
DWORD dwWaitTime, WORD wReplyCommandId,
LPVOID* lplpReplyMsg, LPDWORD lpdwMsgBodySize )
{ {
HRESULT hr; HRESULT hr;
HANDLE hMsgReceipt; HANDLE hMsgReceipt;
@ -410,8 +405,8 @@ LPVOID DP_MSG_ExpectReply( IDirectPlay2AImpl* This, LPDPSP_SENDDATA lpData,
* all important data. It is quite silly to have to copy the message, but the documents * all important data. It is quite silly to have to copy the message, but the documents
* indicate that a copy is taken. Silly really. * indicate that a copy is taken. Silly really.
*/ */
void DP_MSG_ReplyReceived( IDirectPlay2AImpl* This, WORD wCommandId, void DP_MSG_ReplyReceived( IDirectPlayImpl *This, WORD wCommandId, const void *lpcMsgBody,
LPCVOID lpcMsgBody, DWORD dwMsgBodySize ) DWORD dwMsgBodySize )
{ {
LPDP_MSG_REPLY_STRUCT_LIST lpReplyList; LPDP_MSG_REPLY_STRUCT_LIST lpReplyList;
@ -449,7 +444,7 @@ void DP_MSG_ReplyReceived( IDirectPlay2AImpl* This, WORD wCommandId,
} }
} }
void DP_MSG_ToSelf( IDirectPlay2AImpl* This, DPID dpidSelf ) void DP_MSG_ToSelf( IDirectPlayImpl *This, DPID dpidSelf )
{ {
LPVOID lpMsg; LPVOID lpMsg;
LPDPMSG_SENDENVELOPE lpMsgBody; LPDPMSG_SENDENVELOPE lpMsgBody;
@ -486,8 +481,8 @@ void DP_MSG_ToSelf( IDirectPlay2AImpl* This, DPID dpidSelf )
} }
} }
void DP_MSG_ErrorReceived( IDirectPlay2AImpl* This, WORD wCommandId, void DP_MSG_ErrorReceived( IDirectPlayImpl *This, WORD wCommandId, const void *lpMsgBody,
LPCVOID lpMsgBody, DWORD dwMsgBodySize ) DWORD dwMsgBodySize )
{ {
LPCDPMSG_FORWARDADDPLAYERNACK lpcErrorMsg; LPCDPMSG_FORWARDADDPLAYERNACK lpcErrorMsg;

10
dlls/dplayx/dplayx_messages.h
View File

@ -31,15 +31,15 @@
DWORD CreateLobbyMessageReceptionThread( HANDLE hNotifyEvent, HANDLE hStart, DWORD CreateLobbyMessageReceptionThread( HANDLE hNotifyEvent, HANDLE hStart,
HANDLE hDeath, HANDLE hConnRead ) DECLSPEC_HIDDEN; HANDLE hDeath, HANDLE hConnRead ) DECLSPEC_HIDDEN;
HRESULT DP_MSG_SendRequestPlayerId( IDirectPlay2AImpl* This, DWORD dwFlags, HRESULT DP_MSG_SendRequestPlayerId( IDirectPlayImpl *This, DWORD dwFlags,
LPDPID lpdipidAllocatedId ) DECLSPEC_HIDDEN; LPDPID lpdipidAllocatedId ) DECLSPEC_HIDDEN;
HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlay2AImpl* This, DPID dpidServer ) DECLSPEC_HIDDEN; HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlayImpl *This, DPID dpidServer ) DECLSPEC_HIDDEN;
void DP_MSG_ReplyReceived( IDirectPlay2AImpl* This, WORD wCommandId, void DP_MSG_ReplyReceived( IDirectPlayImpl *This, WORD wCommandId,
LPCVOID lpMsgBody, DWORD dwMsgBodySize ) DECLSPEC_HIDDEN; LPCVOID lpMsgBody, DWORD dwMsgBodySize ) DECLSPEC_HIDDEN;
void DP_MSG_ErrorReceived( IDirectPlay2AImpl* This, WORD wCommandId, void DP_MSG_ErrorReceived( IDirectPlayImpl *This, WORD wCommandId,
LPCVOID lpMsgBody, DWORD dwMsgBodySize ) DECLSPEC_HIDDEN; LPCVOID lpMsgBody, DWORD dwMsgBodySize ) DECLSPEC_HIDDEN;
void DP_MSG_ToSelf( IDirectPlay2AImpl* This, DPID dpidSelf ) DECLSPEC_HIDDEN; void DP_MSG_ToSelf( IDirectPlayImpl *This, DPID dpidSelf ) DECLSPEC_HIDDEN;
/* Timings -> 1000 ticks/sec */ /* Timings -> 1000 ticks/sec */
#define DPMSG_WAIT_5_SECS 5000 #define DPMSG_WAIT_5_SECS 5000

8
dlls/dplayx/lobbysp.c
View File

@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay);
/* Prototypes */ /* Prototypes */
static BOOL DPLSP_CreateIUnknown( LPVOID lpSP ); static BOOL DPLSP_CreateIUnknown( LPVOID lpSP );
static BOOL DPLSP_DestroyIUnknown( LPVOID lpSP ); static BOOL DPLSP_DestroyIUnknown( LPVOID lpSP );
static BOOL DPLSP_CreateDPLobbySP( LPVOID lpSP, IDirectPlay2Impl* dp ); static BOOL DPLSP_CreateDPLobbySP( void *lpSP, IDirectPlayImpl *dp );
static BOOL DPLSP_DestroyDPLobbySP( LPVOID lpSP ); static BOOL DPLSP_DestroyDPLobbySP( LPVOID lpSP );
@ -44,7 +44,7 @@ typedef struct tagDPLobbySPIUnknownData
typedef struct tagDPLobbySPData typedef struct tagDPLobbySPData
{ {
IDirectPlay2Impl* dplay; IDirectPlayImpl *dplay;
} DPLobbySPData; } DPLobbySPData;
#define DPLSP_IMPL_FIELDS \ #define DPLSP_IMPL_FIELDS \
@ -61,7 +61,7 @@ struct IDPLobbySPImpl
/* Forward declaration of virtual tables */ /* Forward declaration of virtual tables */
static const IDPLobbySPVtbl dpLobbySPVT; static const IDPLobbySPVtbl dpLobbySPVT;
HRESULT DPLSP_CreateInterface( REFIID riid, LPVOID* ppvObj, IDirectPlay2Impl* dp ) HRESULT DPLSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp )
{ {
TRACE( " for %s\n", debugstr_guid( riid ) ); TRACE( " for %s\n", debugstr_guid( riid ) );
@ -134,7 +134,7 @@ static BOOL DPLSP_DestroyIUnknown( LPVOID lpSP )
return TRUE; return TRUE;
} }
static BOOL DPLSP_CreateDPLobbySP( LPVOID lpSP, IDirectPlay2Impl* dp ) static BOOL DPLSP_CreateDPLobbySP( void *lpSP, IDirectPlayImpl *dp )
{ {
IDPLobbySPImpl *This = lpSP; IDPLobbySPImpl *This = lpSP;

6
dlls/dplayx/name_server.c
View File

@ -353,10 +353,8 @@ void NS_PruneSessionCache( LPVOID lpNSInfo )
} }
/* NAME SERVER Message stuff */ /* NAME SERVER Message stuff */
void NS_ReplyToEnumSessionsRequest( LPCVOID lpcMsg, void NS_ReplyToEnumSessionsRequest( const void *lpcMsg, void **lplpReplyData, DWORD *lpdwReplySize,
LPVOID* lplpReplyData, IDirectPlayImpl *lpDP )
LPDWORD lpdwReplySize,
IDirectPlay2Impl* lpDP )
{ {
LPDPMSG_ENUMSESSIONSREPLY rmsg; LPDPMSG_ENUMSESSIONSREPLY rmsg;
DWORD dwVariableSize; DWORD dwVariableSize;

2
dlls/dplayx/name_server.h
View File

@ -40,7 +40,7 @@ void NS_SetLocalAddr( LPVOID lpNSInfo, LPCVOID lpHdr, DWORD dwHdrSize ) DECLSPEC
void NS_ReplyToEnumSessionsRequest( LPCVOID lpcMsg, void NS_ReplyToEnumSessionsRequest( LPCVOID lpcMsg,
LPVOID* lplpReplyData, LPVOID* lplpReplyData,
LPDWORD lpdwReplySize, LPDWORD lpdwReplySize,
IDirectPlay2Impl* lpDP ) DECLSPEC_HIDDEN; IDirectPlayImpl *lpDP ) DECLSPEC_HIDDEN;
HRESULT NS_SendSessionRequestBroadcast( LPCGUID lpcGuid, HRESULT NS_SendSessionRequestBroadcast( LPCGUID lpcGuid,
DWORD dwFlags, DWORD dwFlags,