[PATCH 50/54] dplayx: Get rid of the IDirectPlayImpl aliases.
Michael Stefaniuc
mstefani at redhat.de
Fri Mar 29 11:12:33 CDT 2013
---
dlls/dplayx/dplay.c | 149 ++++++++++++++++--------------------------
dlls/dplayx/dplay_global.h | 18 ++---
dlls/dplayx/dplaysp.c | 8 +--
dlls/dplayx/dplayx_messages.c | 31 ++++-----
dlls/dplayx/dplayx_messages.h | 10 +--
dlls/dplayx/lobbysp.c | 8 +--
dlls/dplayx/name_server.c | 6 +-
dlls/dplayx/name_server.h | 2 +-
8 files changed, 90 insertions(+), 142 deletions(-)
diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index 7634e27..d5c3e81 100644
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -50,7 +50,7 @@ extern HRESULT DPL_CreateCompoundAddress
/* 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 void DP_SetGroupData( lpGroupData lpGData, DWORD dwFlags,
LPVOID lpData, DWORD dwDataSize );
@@ -60,16 +60,13 @@ static BOOL CALLBACK cbDeletePlayerFromAllGroups( DPID dpId,
LPCDPNAME lpName,
DWORD dwFlags,
LPVOID lpContext );
-static lpGroupData DP_FindAnyGroup( IDirectPlay2AImpl* This, DPID dpid );
+static lpGroupData DP_FindAnyGroup( IDirectPlayImpl *This, DPID dpid );
/* Helper methods for player/group interfaces */
-static HRESULT DP_SetSessionDesc
- ( IDirectPlay2Impl* This, LPCDPSESSIONDESC2 lpSessDesc,
- DWORD dwFlags, BOOL bInitial, BOOL bAnsi );
-static HRESULT DP_SP_SendEx
- ( IDirectPlay2Impl* This, DWORD dwFlags,
- LPVOID lpData, DWORD dwDataSize, DWORD dwPriority, DWORD dwTimeout,
- LPVOID lpContext, LPDWORD lpdwMsgID );
+static HRESULT DP_SetSessionDesc( IDirectPlayImpl *This, const DPSESSIONDESC2 *lpSessDesc,
+ DWORD dwFlags, BOOL bInitial, BOOL bAnsi );
+static HRESULT DP_SP_SendEx( IDirectPlayImpl *This, DWORD dwFlags, void *lpData, DWORD dwDataSize,
+ DWORD dwPriority, DWORD dwTimeout, void *lpContext, DWORD *lpdwMsgID );
static BOOL DP_BuildSPCompoundAddr( LPGUID lpcSpGuid, LPVOID* lplpAddrBuf,
LPDWORD lpdwBufSize );
@@ -106,7 +103,7 @@ static inline IDirectPlayImpl *impl_from_IDirectPlay4( IDirectPlay4 *iface )
static BOOL DP_CreateDirectPlay2( LPVOID lpDP )
{
- IDirectPlay2AImpl *This = lpDP;
+ IDirectPlayImpl *This = lpDP;
This->dp2 = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dp2) ) );
if ( This->dp2 == NULL )
@@ -185,7 +182,7 @@ DPQ_DECL_DELETECB( cbDeleteElemFromHeap, LPVOID )
static BOOL DP_DestroyDirectPlay2( LPVOID lpDP )
{
- IDirectPlay2AImpl *This = lpDP;
+ IDirectPlayImpl *This = lpDP;
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 */
-HRESULT DP_HandleMessage( IDirectPlay2Impl* This, LPCVOID lpcMessageBody,
- DWORD dwMessageBodySize, LPCVOID lpcMessageHeader,
- WORD wCommandId, WORD wVersion,
- LPVOID* lplpReply, LPDWORD lpdwMsgSize )
+HRESULT DP_HandleMessage( IDirectPlayImpl *This, const void *lpcMessageBody,
+ DWORD dwMessageBodySize, const void *lpcMessageHeader, WORD wCommandId, WORD wVersion,
+ void **lplpReply, DWORD *lpdwMsgSize )
{
TRACE( "(%p)->(%p,0x%08x,%p,%u,%u)\n",
This, lpcMessageBody, dwMessageBodySize, lpcMessageHeader, wCommandId,
@@ -569,10 +565,8 @@ static HRESULT WINAPI IDirectPlay4Impl_Close( IDirectPlay4 *iface )
return hr;
}
-static
-lpGroupData DP_CreateGroup( IDirectPlay2AImpl* This, const DPID *lpid,
- const DPNAME *lpName, DWORD dwFlags,
- DPID idParent, BOOL bAnsi )
+static lpGroupData DP_CreateGroup( IDirectPlayImpl *This, const DPID *lpid, const DPNAME *lpName,
+ DWORD dwFlags, DPID idParent, BOOL bAnsi )
{
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 */
-static void
-DP_DeleteGroup( IDirectPlay2Impl* This, DPID dpid )
+static void DP_DeleteGroup( IDirectPlayImpl *This, DPID dpid )
{
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;
@@ -657,10 +650,8 @@ static lpGroupData DP_FindAnyGroup( IDirectPlay2AImpl* This, DPID dpid )
return lpGroups->lpGData;
}
-static HRESULT DP_IF_CreateGroup
- ( IDirectPlay2AImpl* This, LPVOID lpMsgHdr, LPDPID lpidGroup,
- LPDPNAME lpGroupName, LPVOID lpData, DWORD dwDataSize,
- DWORD dwFlags, BOOL bAnsi )
+static HRESULT DP_IF_CreateGroup( IDirectPlayImpl *This, void *lpMsgHdr, DPID *lpidGroup,
+ DPNAME *lpGroupName, void *lpData, DWORD dwDataSize, DWORD dwFlags, BOOL bAnsi )
{
lpGroupData lpGData;
@@ -842,10 +833,8 @@ DP_SetGroupData( lpGroupData lpGData, DWORD dwFlags,
}
/* This function will just create the storage for the new player. */
-static
-lpPlayerData DP_CreatePlayer( IDirectPlay2Impl* This, LPDPID lpid,
- LPDPNAME lpName, DWORD dwFlags,
- HANDLE hEvent, BOOL bAnsi )
+static lpPlayerData DP_CreatePlayer( IDirectPlayImpl *This, DPID *lpid, DPNAME *lpName,
+ DWORD dwFlags, HANDLE hEvent, BOOL bAnsi )
{
lpPlayerData lpPData;
@@ -898,8 +887,7 @@ DP_DeleteDPNameStruct( LPDPNAME lpDPName )
}
/* This method assumes that all links to it are already deleted */
-static void
-DP_DeletePlayer( IDirectPlay2Impl* This, DPID dpid )
+static void DP_DeletePlayer( IDirectPlayImpl *This, DPID dpid )
{
lpPlayerList lpPList;
@@ -930,7 +918,7 @@ DP_DeletePlayer( IDirectPlay2Impl* This, DPID dpid )
HeapFree( GetProcessHeap(), 0, lpPList );
}
-static lpPlayerList DP_FindPlayer( IDirectPlay2AImpl* This, DPID dpid )
+static lpPlayerList DP_FindPlayer( IDirectPlayImpl *This, DPID dpid )
{
lpPlayerList lpPlayers;
@@ -1043,16 +1031,10 @@ DP_SetPlayerData( lpPlayerData lpPData, DWORD dwFlags,
}
-static HRESULT DP_IF_CreatePlayer
-( IDirectPlay2Impl* This,
- LPVOID lpMsgHdr, /* NULL for local creation, non NULL for remote creation */
- LPDPID lpidPlayer,
- LPDPNAME lpPlayerName,
- HANDLE hEvent,
- LPVOID lpData,
- DWORD dwDataSize,
- DWORD dwFlags,
- BOOL bAnsi )
+/* Note: lpMsgHdr is NULL for local creation, non NULL for remote creation */
+static HRESULT DP_IF_CreatePlayer( IDirectPlayImpl *This, void *lpMsgHdr, DPID *lpidPlayer,
+ DPNAME *lpPlayerName, HANDLE hEvent, void *lpData, DWORD dwDataSize, DWORD dwFlags,
+ BOOL bAnsi )
{
HRESULT hr = DP_OK;
lpPlayerData lpPData;
@@ -1371,7 +1353,7 @@ static HRESULT WINAPI IDirectPlay4Impl_DeletePlayerFromGroup( IDirectPlay4 *ifac
typedef struct _DPRGOPContext
{
- IDirectPlay3Impl* This;
+ IDirectPlayImpl *This;
BOOL bAnsi;
DPID idGroup;
} DPRGOPContext, *lpDPRGOPContext;
@@ -1402,8 +1384,7 @@ cbRemoveGroupOrPlayer(
return TRUE; /* Continue enumeration */
}
-static HRESULT DP_IF_DestroyGroup
- ( IDirectPlay2Impl* This, LPVOID lpMsgHdr, DPID idGroup, BOOL bAnsi )
+static HRESULT DP_IF_DestroyGroup( IDirectPlayImpl *This, void *lpMsgHdr, DPID idGroup, BOOL bAnsi )
{
lpGroupData lpGData;
DPRGOPContext context;
@@ -1469,13 +1450,13 @@ static HRESULT WINAPI IDirectPlay4Impl_DestroyGroup( IDirectPlay4 *iface, DPID i
typedef struct _DPFAGContext
{
- IDirectPlay2Impl* This;
+ IDirectPlayImpl *This;
DPID idPlayer;
BOOL bAnsi;
} DPFAGContext, *lpDPFAGContext;
-static HRESULT DP_IF_DestroyPlayer
- ( IDirectPlay2Impl* This, LPVOID lpMsgHdr, DPID idPlayer, BOOL bAnsi )
+static HRESULT DP_IF_DestroyPlayer( IDirectPlayImpl *This, void *lpMsgHdr, DPID idPlayer,
+ BOOL bAnsi )
{
DPFAGContext cbContext;
@@ -1726,7 +1707,7 @@ static DWORD CALLBACK DP_EnumSessionsSendAsyncRequestThread( LPVOID lpContext )
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 */
if( This->dp2->hEnumSessionThread != INVALID_HANDLE_VALUE )
@@ -1931,9 +1912,8 @@ static HRESULT WINAPI IDirectPlay4Impl_GetGroupData( IDirectPlay4 *iface, DPID g
return DP_OK;
}
-static HRESULT DP_IF_GetGroupName
- ( IDirectPlay2Impl* This, DPID idGroup, LPVOID lpData,
- LPDWORD lpdwDataSize, BOOL bAnsi )
+static HRESULT DP_IF_GetGroupName( IDirectPlayImpl *This, DPID idGroup, void *lpData,
+ DWORD *lpdwDataSize, BOOL bAnsi )
{
lpGroupData lpGData;
LPDPNAME lpName = lpData;
@@ -2108,9 +2088,8 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerData( IDirectPlay4 *iface, DPID
return DP_OK;
}
-static HRESULT DP_IF_GetPlayerName
- ( IDirectPlay2Impl* This, DPID idPlayer, LPVOID lpData,
- LPDWORD lpdwDataSize, BOOL bAnsi )
+static HRESULT DP_IF_GetPlayerName( IDirectPlayImpl *This, DPID idPlayer, void *lpData,
+ DWORD *lpdwDataSize, BOOL bAnsi )
{
lpPlayerList lpPList;
LPDPNAME lpName = lpData;
@@ -2189,9 +2168,8 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerName( IDirectPlay4 *iface, DPID
return DP_IF_GetPlayerName( This, idPlayer, lpData, lpdwDataSize, FALSE );
}
-static HRESULT DP_GetSessionDesc
- ( IDirectPlay2Impl* This, LPVOID lpData, LPDWORD lpdwDataSize,
- BOOL bAnsi )
+static HRESULT DP_GetSessionDesc( IDirectPlayImpl *This, void *lpData, DWORD *lpdwDataSize,
+ BOOL bAnsi )
{
DWORD dwRequiredSize;
@@ -2253,10 +2231,8 @@ static HRESULT WINAPI IDirectPlay4Impl_Initialize( IDirectPlay4 *iface, GUID *gu
}
-static HRESULT DP_SecureOpen
- ( IDirectPlay2Impl* This, LPCDPSESSIONDESC2 lpsd, DWORD dwFlags,
- LPCDPSECURITYDESC lpSecurity, LPCDPCREDENTIALS lpCredentials,
- BOOL bAnsi )
+static HRESULT DP_SecureOpen( IDirectPlayImpl *This, const DPSESSIONDESC2 *lpsd, DWORD dwFlags,
+ const DPSECURITYDESC *lpSecurity, const DPCREDENTIALS *lpCredentials, BOOL bAnsi )
{
HRESULT hr = DP_OK;
@@ -2377,9 +2353,8 @@ static HRESULT WINAPI IDirectPlay4Impl_Open( IDirectPlay4 *iface, DPSESSIONDESC2
return IDirectPlayX_SecureOpen( iface, sdesc, flags, NULL, NULL );
}
-static HRESULT DP_IF_Receive
- ( IDirectPlay2Impl* This, LPDPID lpidFrom, LPDPID lpidTo,
- DWORD dwFlags, LPVOID lpData, LPDWORD lpdwDataSize, BOOL bAnsi )
+static HRESULT DP_IF_Receive( IDirectPlayImpl *This, DPID *lpidFrom, DPID *lpidTo, DWORD dwFlags,
+ void *lpData, DWORD *lpdwDataSize, BOOL bAnsi )
{
LPDPMSG lpMsg = NULL;
@@ -2503,9 +2478,8 @@ static HRESULT WINAPI IDirectPlay4Impl_SetGroupData( IDirectPlay4 *iface, DPID g
return DP_OK;
}
-static HRESULT DP_IF_SetGroupName
- ( IDirectPlay2Impl* This, DPID idGroup, LPDPNAME lpGroupName,
- DWORD dwFlags, BOOL bAnsi )
+static HRESULT DP_IF_SetGroupName( IDirectPlayImpl *This, DPID idGroup, DPNAME *lpGroupName,
+ DWORD dwFlags, BOOL bAnsi )
{
lpGroupData lpGData;
@@ -2581,9 +2555,8 @@ static HRESULT WINAPI IDirectPlay4Impl_SetPlayerData( IDirectPlay4 *iface, DPID
return DP_OK;
}
-static HRESULT DP_IF_SetPlayerName
- ( IDirectPlay2Impl* This, DPID idPlayer, LPDPNAME lpPlayerName,
- DWORD dwFlags, BOOL bAnsi )
+static HRESULT DP_IF_SetPlayerName( IDirectPlayImpl *This, DPID idPlayer, DPNAME *lpPlayerName,
+ DWORD dwFlags, BOOL bAnsi )
{
lpPlayerList lpPList;
@@ -2622,9 +2595,8 @@ static HRESULT WINAPI IDirectPlay4Impl_SetPlayerName( IDirectPlay4 *iface, DPID
return DP_IF_SetPlayerName( This, idPlayer, lpPlayerName, dwFlags, FALSE );
}
-static HRESULT DP_SetSessionDesc
- ( IDirectPlay2Impl* This, LPCDPSESSIONDESC2 lpSessDesc,
- DWORD dwFlags, BOOL bInitial, BOOL bAnsi )
+static HRESULT DP_SetSessionDesc( IDirectPlayImpl *This, const DPSESSIONDESC2 *lpSessDesc,
+ DWORD dwFlags, BOOL bInitial, BOOL bAnsi )
{
DWORD dwRequiredSize;
LPDPSESSIONDESC2 lpTempSessDesc;
@@ -2835,10 +2807,9 @@ static HRESULT WINAPI IDirectPlay4Impl_AddGroupToGroup( IDirectPlay4 *iface, DPI
return DP_OK;
}
-static HRESULT DP_IF_CreateGroupInGroup
- ( IDirectPlay3Impl* This, LPVOID lpMsgHdr, DPID idParentGroup,
- LPDPID lpidGroup, LPDPNAME lpGroupName, LPVOID lpData,
- DWORD dwDataSize, DWORD dwFlags, BOOL bAnsi )
+static HRESULT DP_IF_CreateGroupInGroup( IDirectPlayImpl *This, void *lpMsgHdr, DPID idParentGroup,
+ DPID *lpidGroup, DPNAME *lpGroupName, void *lpData, DWORD dwDataSize, DWORD dwFlags,
+ BOOL bAnsi )
{
lpGroupData lpGParentData;
lpGroupList lpGList;
@@ -3483,8 +3454,7 @@ static HMODULE DP_LoadSP( LPCGUID lpcGuid, LPSPINITDATA lpSpData, LPBOOL lpbIsDp
return 0;
}
-static
-HRESULT DP_InitializeDPSP( IDirectPlay3Impl* This, HMODULE hServiceProvider )
+static HRESULT DP_InitializeDPSP( IDirectPlayImpl *This, HMODULE hServiceProvider )
{
HRESULT hr;
LPDPSP_SPINIT SPInit;
@@ -3523,8 +3493,7 @@ HRESULT DP_InitializeDPSP( IDirectPlay3Impl* This, HMODULE hServiceProvider )
return hr;
}
-static
-HRESULT DP_InitializeDPLSP( IDirectPlay3Impl* This, HMODULE hLobbyProvider )
+static HRESULT DP_InitializeDPLSP( IDirectPlayImpl *This, HMODULE hLobbyProvider )
{
HRESULT hr;
LPSP_INIT DPLSPInit;
@@ -3867,10 +3836,8 @@ static HRESULT WINAPI IDirectPlay4Impl_SendEx( IDirectPlay4 *iface, DPID from, D
return DP_OK;
}
-static HRESULT DP_SP_SendEx
- ( IDirectPlay2Impl* This, DWORD dwFlags,
- LPVOID lpData, DWORD dwDataSize, DWORD dwPriority, DWORD dwTimeout,
- LPVOID lpContext, LPDWORD lpdwMsgID )
+static HRESULT DP_SP_SendEx( IDirectPlayImpl *This, DWORD dwFlags, void *lpData, DWORD dwDataSize,
+ DWORD dwPriority, DWORD dwTimeout, void *lpContext, DWORD *lpdwMsgID )
{
LPDPMSG lpMElem;
@@ -4143,9 +4110,7 @@ HRESULT dplay_create( REFIID riid, void **ppv )
}
-HRESULT DP_GetSPPlayerData( IDirectPlay2Impl* lpDP,
- DPID idPlayer,
- LPVOID* lplpData )
+HRESULT DP_GetSPPlayerData( IDirectPlayImpl *lpDP, DPID idPlayer, void **lplpData )
{
lpPlayerList lpPlayer = DP_FindPlayer( lpDP, idPlayer );
@@ -4159,9 +4124,7 @@ HRESULT DP_GetSPPlayerData( IDirectPlay2Impl* lpDP,
return DP_OK;
}
-HRESULT DP_SetSPPlayerData( IDirectPlay2Impl* lpDP,
- DPID idPlayer,
- LPVOID lpData )
+HRESULT DP_SetSPPlayerData( IDirectPlayImpl *lpDP, DPID idPlayer, void *lpData )
{
lpPlayerList lpPlayer = DP_FindPlayer( lpDP, idPlayer );
diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h
index 0928c1a..2646d4f 100644
--- a/dlls/dplayx/dplay_global.h
+++ b/dlls/dplayx/dplay_global.h
@@ -190,21 +190,13 @@ typedef struct IDirectPlayImpl
DirectPlay2Data *dp2;
} IDirectPlayImpl;
-typedef struct IDirectPlayImpl IDirectPlay2Impl;
-typedef struct IDirectPlayImpl IDirectPlay2AImpl;
-typedef struct IDirectPlayImpl IDirectPlay3Impl;
-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;
+HRESULT DP_HandleMessage( IDirectPlayImpl *This, const void *lpMessageBody,
+ DWORD dwMessageBodySize, const void *lpMessageHeader, WORD wCommandId, WORD wVersion,
+ void **lplpReply, DWORD *lpdwMsgSize ) DECLSPEC_HIDDEN;
/* DP SP external interfaces into DirectPlay */
-extern HRESULT DP_GetSPPlayerData( IDirectPlay2Impl* lpDP, DPID idPlayer, LPVOID* lplpData ) DECLSPEC_HIDDEN;
-extern HRESULT DP_SetSPPlayerData( IDirectPlay2Impl* lpDP, DPID idPlayer, LPVOID lpData ) DECLSPEC_HIDDEN;
+extern HRESULT DP_GetSPPlayerData( IDirectPlayImpl *lpDP, DPID idPlayer, void **lplpData ) DECLSPEC_HIDDEN;
+extern HRESULT DP_SetSPPlayerData( IDirectPlayImpl *lpDP, DPID idPlayer, void *lpData ) DECLSPEC_HIDDEN;
/* DP external interfaces to call into DPSP interface */
extern LPVOID DPSP_CreateSPPlayerData(void) DECLSPEC_HIDDEN;
diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c
index 4a8c4a5..9a70901 100644
--- a/dlls/dplayx/dplaysp.c
+++ b/dlls/dplayx/dplaysp.c
@@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay);
/* Prototypes */
static BOOL DPSP_CreateIUnknown( 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 );
/* Predefine the interface */
@@ -56,7 +56,7 @@ typedef struct tagDirectPlaySPData
LPVOID 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;
@@ -85,7 +85,7 @@ typedef struct tagDP_SPPLAYERDATA
} DP_SPPLAYERDATA, *LPDP_SPPLAYERDATA;
/* 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 ) );
@@ -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;
diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c
index dc712fd..95cc15f 100644
--- a/dlls/dplayx/dplayx_messages.c
+++ b/dlls/dplayx/dplayx_messages.c
@@ -45,9 +45,8 @@ typedef struct tagMSGTHREADINFO
} MSGTHREADINFO, *LPMSGTHREADINFO;
static DWORD CALLBACK DPL_MSG_ThreadMain( LPVOID lpContext );
-static LPVOID DP_MSG_ExpectReply( IDirectPlay2AImpl* This, LPDPSP_SENDDATA data,
- DWORD dwWaitTime, WORD wReplyCommandId,
- LPVOID* lplpReplyMsg, LPDWORD lpdwMsgBodySize );
+static void *DP_MSG_ExpectReply( IDirectPlayImpl *This, DPSP_SENDDATA *data, DWORD dwWaitTime,
+ WORD wReplyCommandId, void **lplpReplyMsg, DWORD *lpdwMsgBodySize );
/* Create the message reception thread to allow the application to receive
@@ -154,9 +153,8 @@ end_of_thread:
}
/* DP messaging stuff */
-static
-HANDLE DP_MSG_BuildAndLinkReplyStruct( IDirectPlay2Impl* This,
- LPDP_MSG_REPLY_STRUCT_LIST lpReplyStructList, WORD wReplyCommandId )
+static HANDLE DP_MSG_BuildAndLinkReplyStruct( IDirectPlayImpl *This,
+ DP_MSG_REPLY_STRUCT_LIST *lpReplyStructList, WORD wReplyCommandId )
{
lpReplyStructList->replyExpected.hReceipt = CreateEventW( NULL, FALSE, FALSE, NULL );
lpReplyStructList->replyExpected.wExpectedReply = wReplyCommandId;
@@ -183,8 +181,7 @@ LPVOID DP_MSG_CleanReplyStruct( LPDP_MSG_REPLY_STRUCT_LIST lpReplyStructList,
return lpReplyStructList->replyExpected.lpReplyMsg;
}
-HRESULT DP_MSG_SendRequestPlayerId( IDirectPlay2AImpl* This, DWORD dwFlags,
- LPDPID lpdpidAllocatedId )
+HRESULT DP_MSG_SendRequestPlayerId( IDirectPlayImpl *This, DWORD dwFlags, DPID *lpdpidAllocatedId )
{
LPVOID lpMsg;
LPDPMSG_REQUESTNEWPLAYERID lpMsgBody;
@@ -250,7 +247,7 @@ HRESULT DP_MSG_SendRequestPlayerId( IDirectPlay2AImpl* This, DWORD dwFlags,
return hr;
}
-HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlay2AImpl* This, DPID dpidServer )
+HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlayImpl *This, DPID dpidServer )
{
LPVOID lpMsg;
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
* a networking company.
*/
-static
-LPVOID DP_MSG_ExpectReply( IDirectPlay2AImpl* This, LPDPSP_SENDDATA lpData,
- DWORD dwWaitTime, WORD wReplyCommandId,
- LPVOID* lplpReplyMsg, LPDWORD lpdwMsgBodySize )
+static void *DP_MSG_ExpectReply( IDirectPlayImpl *This, DPSP_SENDDATA *lpData, DWORD dwWaitTime,
+ WORD wReplyCommandId, void **lplpReplyMsg, DWORD *lpdwMsgBodySize )
{
HRESULT hr;
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
* indicate that a copy is taken. Silly really.
*/
-void DP_MSG_ReplyReceived( IDirectPlay2AImpl* This, WORD wCommandId,
- LPCVOID lpcMsgBody, DWORD dwMsgBodySize )
+void DP_MSG_ReplyReceived( IDirectPlayImpl *This, WORD wCommandId, const void *lpcMsgBody,
+ DWORD dwMsgBodySize )
{
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;
LPDPMSG_SENDENVELOPE lpMsgBody;
@@ -486,8 +481,8 @@ void DP_MSG_ToSelf( IDirectPlay2AImpl* This, DPID dpidSelf )
}
}
-void DP_MSG_ErrorReceived( IDirectPlay2AImpl* This, WORD wCommandId,
- LPCVOID lpMsgBody, DWORD dwMsgBodySize )
+void DP_MSG_ErrorReceived( IDirectPlayImpl *This, WORD wCommandId, const void *lpMsgBody,
+ DWORD dwMsgBodySize )
{
LPCDPMSG_FORWARDADDPLAYERNACK lpcErrorMsg;
diff --git a/dlls/dplayx/dplayx_messages.h b/dlls/dplayx/dplayx_messages.h
index ca27ecf..c6f7f8a 100644
--- a/dlls/dplayx/dplayx_messages.h
+++ b/dlls/dplayx/dplayx_messages.h
@@ -31,15 +31,15 @@
DWORD CreateLobbyMessageReceptionThread( HANDLE hNotifyEvent, HANDLE hStart,
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;
-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;
-void DP_MSG_ErrorReceived( IDirectPlay2AImpl* This, WORD wCommandId,
+void DP_MSG_ErrorReceived( IDirectPlayImpl *This, WORD wCommandId,
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 */
#define DPMSG_WAIT_5_SECS 5000
diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c
index 18d9d00..0235718 100644
--- a/dlls/dplayx/lobbysp.c
+++ b/dlls/dplayx/lobbysp.c
@@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay);
/* Prototypes */
static BOOL DPLSP_CreateIUnknown( 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 );
@@ -44,7 +44,7 @@ typedef struct tagDPLobbySPIUnknownData
typedef struct tagDPLobbySPData
{
- IDirectPlay2Impl* dplay;
+ IDirectPlayImpl *dplay;
} DPLobbySPData;
#define DPLSP_IMPL_FIELDS \
@@ -61,7 +61,7 @@ struct IDPLobbySPImpl
/* Forward declaration of virtual tables */
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 ) );
@@ -134,7 +134,7 @@ static BOOL DPLSP_DestroyIUnknown( LPVOID lpSP )
return TRUE;
}
-static BOOL DPLSP_CreateDPLobbySP( LPVOID lpSP, IDirectPlay2Impl* dp )
+static BOOL DPLSP_CreateDPLobbySP( void *lpSP, IDirectPlayImpl *dp )
{
IDPLobbySPImpl *This = lpSP;
diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c
index 258bdad..b3e4a4e 100644
--- a/dlls/dplayx/name_server.c
+++ b/dlls/dplayx/name_server.c
@@ -353,10 +353,8 @@ void NS_PruneSessionCache( LPVOID lpNSInfo )
}
/* NAME SERVER Message stuff */
-void NS_ReplyToEnumSessionsRequest( LPCVOID lpcMsg,
- LPVOID* lplpReplyData,
- LPDWORD lpdwReplySize,
- IDirectPlay2Impl* lpDP )
+void NS_ReplyToEnumSessionsRequest( const void *lpcMsg, void **lplpReplyData, DWORD *lpdwReplySize,
+ IDirectPlayImpl *lpDP )
{
LPDPMSG_ENUMSESSIONSREPLY rmsg;
DWORD dwVariableSize;
diff --git a/dlls/dplayx/name_server.h b/dlls/dplayx/name_server.h
index ef1c889..2ad012c 100644
--- a/dlls/dplayx/name_server.h
+++ b/dlls/dplayx/name_server.h
@@ -40,7 +40,7 @@ void NS_SetLocalAddr( LPVOID lpNSInfo, LPCVOID lpHdr, DWORD dwHdrSize ) DECLSPEC
void NS_ReplyToEnumSessionsRequest( LPCVOID lpcMsg,
LPVOID* lplpReplyData,
LPDWORD lpdwReplySize,
- IDirectPlay2Impl* lpDP ) DECLSPEC_HIDDEN;
+ IDirectPlayImpl *lpDP ) DECLSPEC_HIDDEN;
HRESULT NS_SendSessionRequestBroadcast( LPCGUID lpcGuid,
DWORD dwFlags,
--
1.7.11.7
More information about the wine-patches
mailing list