From f1a877a69d5a843c3cd807c1da42f7b0a92be748 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Fri, 16 Jan 2009 09:53:59 +0100 Subject: [PATCH] dplayx: Remove superfluous pointer casts. --- dlls/dplayx/dpclassfactory.c | 2 +- dlls/dplayx/dplay.c | 53 ++++++++++++++--------------- dlls/dplayx/dplaysp.c | 48 +++++++++++++------------- dlls/dplayx/dplayx_global.c | 10 +++--- dlls/dplayx/dplayx_messages.c | 8 ++--- dlls/dplayx/dplobby.c | 64 ++++++++++++++++------------------- dlls/dplayx/lobbysp.c | 12 +++---- dlls/dplayx/name_server.c | 2 +- 8 files changed, 97 insertions(+), 102 deletions(-) diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c index b01b9846de9..3da134d4b7a 100644 --- a/dlls/dplayx/dpclassfactory.c +++ b/dlls/dplayx/dpclassfactory.c @@ -127,7 +127,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) if ( IsEqualCLSID( riid, &IID_IClassFactory ) ) { - *ppv = (LPVOID)&DP_and_DPL_CF; + *ppv = &DP_and_DPL_CF; IClassFactory_AddRef( (IClassFactory*)*ppv ); return S_OK; diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 360e22b0840..1d57dba7a62 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -234,7 +234,7 @@ static LONG kludgePlayerGroupId = 1000; static BOOL DP_CreateIUnknown( LPVOID lpDP ) { - IDirectPlay2AImpl *This = (IDirectPlay2AImpl *)lpDP; + IDirectPlay2AImpl *This = lpDP; This->unk = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->unk) ) ); if ( This->unk == NULL ) @@ -250,7 +250,7 @@ static BOOL DP_CreateIUnknown( LPVOID lpDP ) static BOOL DP_DestroyIUnknown( LPVOID lpDP ) { - IDirectPlay2AImpl *This = (IDirectPlay2AImpl *)lpDP; + IDirectPlay2AImpl *This = lpDP; This->unk->DP_lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &This->unk->DP_lock ); @@ -261,7 +261,7 @@ static BOOL DP_DestroyIUnknown( LPVOID lpDP ) static BOOL DP_CreateDirectPlay2( LPVOID lpDP ) { - IDirectPlay2AImpl *This = (IDirectPlay2AImpl *)lpDP; + IDirectPlay2AImpl *This = lpDP; This->dp2 = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dp2) ) ); if ( This->dp2 == NULL ) @@ -367,7 +367,7 @@ DPQ_DECL_DELETECB( cbDeletePlayerElem, lpPlayerList ) static BOOL DP_DestroyDirectPlay2( LPVOID lpDP ) { - IDirectPlay2AImpl *This = (IDirectPlay2AImpl *)lpDP; + IDirectPlay2AImpl *This = lpDP; if( This->dp2->hEnumSessionThread != INVALID_HANDLE_VALUE ) { @@ -425,7 +425,7 @@ static BOOL DP_DestroyDirectPlay2( LPVOID lpDP ) static BOOL DP_CreateDirectPlay3( LPVOID lpDP ) { - IDirectPlay3AImpl *This = (IDirectPlay3AImpl *)lpDP; + IDirectPlay3AImpl *This = lpDP; This->dp3 = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dp3) ) ); if ( This->dp3 == NULL ) @@ -438,7 +438,7 @@ static BOOL DP_CreateDirectPlay3( LPVOID lpDP ) static BOOL DP_DestroyDirectPlay3( LPVOID lpDP ) { - IDirectPlay3AImpl *This = (IDirectPlay3AImpl *)lpDP; + IDirectPlay3AImpl *This = lpDP; /* Delete the contents */ HeapFree( GetProcessHeap(), 0, This->dp3 ); @@ -448,7 +448,7 @@ static BOOL DP_DestroyDirectPlay3( LPVOID lpDP ) static BOOL DP_CreateDirectPlay4( LPVOID lpDP ) { - IDirectPlay4AImpl *This = (IDirectPlay4AImpl *)lpDP; + IDirectPlay4AImpl *This = lpDP; This->dp4 = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dp4) ) ); if ( This->dp4 == NULL ) @@ -461,7 +461,7 @@ static BOOL DP_CreateDirectPlay4( LPVOID lpDP ) static BOOL DP_DestroyDirectPlay4( LPVOID lpDP ) { - IDirectPlay3AImpl *This = (IDirectPlay3AImpl *)lpDP; + IDirectPlay3AImpl *This = lpDP; /* Delete the contents */ HeapFree( GetProcessHeap(), 0, This->dp4 ); @@ -486,32 +486,32 @@ HRESULT DP_CreateInterface if( IsEqualGUID( &IID_IDirectPlay2, riid ) ) { - IDirectPlay2Impl *This = (IDirectPlay2Impl *)*ppvObj; + IDirectPlay2Impl *This = *ppvObj; This->lpVtbl = &directPlay2WVT; } else if( IsEqualGUID( &IID_IDirectPlay2A, riid ) ) { - IDirectPlay2AImpl *This = (IDirectPlay2AImpl *)*ppvObj; + IDirectPlay2AImpl *This = *ppvObj; This->lpVtbl = &directPlay2AVT; } else if( IsEqualGUID( &IID_IDirectPlay3, riid ) ) { - IDirectPlay3Impl *This = (IDirectPlay3Impl *)*ppvObj; + IDirectPlay3Impl *This = *ppvObj; This->lpVtbl = &directPlay3WVT; } else if( IsEqualGUID( &IID_IDirectPlay3A, riid ) ) { - IDirectPlay3AImpl *This = (IDirectPlay3AImpl *)*ppvObj; + IDirectPlay3AImpl *This = *ppvObj; This->lpVtbl = &directPlay3AVT; } else if( IsEqualGUID( &IID_IDirectPlay4, riid ) ) { - IDirectPlay4Impl *This = (IDirectPlay4Impl *)*ppvObj; + IDirectPlay4Impl *This = *ppvObj; This->lpVtbl = &directPlay4WVT; } else if( IsEqualGUID( &IID_IDirectPlay4A, riid ) ) { - IDirectPlay4AImpl *This = (IDirectPlay4AImpl *)*ppvObj; + IDirectPlay4AImpl *This = *ppvObj; This->lpVtbl = &directPlay4AVT; } else @@ -570,32 +570,32 @@ static HRESULT WINAPI DP_QueryInterface if( IsEqualGUID( &IID_IDirectPlay2, riid ) ) { - IDirectPlay2Impl *This = (IDirectPlay2Impl *)*ppvObj; + IDirectPlay2Impl *This = *ppvObj; This->lpVtbl = &directPlay2WVT; } else if( IsEqualGUID( &IID_IDirectPlay2A, riid ) ) { - IDirectPlay2AImpl *This = (IDirectPlay2AImpl *)*ppvObj; + IDirectPlay2AImpl *This = *ppvObj; This->lpVtbl = &directPlay2AVT; } else if( IsEqualGUID( &IID_IDirectPlay3, riid ) ) { - IDirectPlay3Impl *This = (IDirectPlay3Impl *)*ppvObj; + IDirectPlay3Impl *This = *ppvObj; This->lpVtbl = &directPlay3WVT; } else if( IsEqualGUID( &IID_IDirectPlay3A, riid ) ) { - IDirectPlay3AImpl *This = (IDirectPlay3AImpl *)*ppvObj; + IDirectPlay3AImpl *This = *ppvObj; This->lpVtbl = &directPlay3AVT; } else if( IsEqualGUID( &IID_IDirectPlay4, riid ) ) { - IDirectPlay4Impl *This = (IDirectPlay4Impl *)*ppvObj; + IDirectPlay4Impl *This = *ppvObj; This->lpVtbl = &directPlay4WVT; } else if( IsEqualGUID( &IID_IDirectPlay4A, riid ) ) { - IDirectPlay4AImpl *This = (IDirectPlay4AImpl *)*ppvObj; + IDirectPlay4AImpl *This = *ppvObj; This->lpVtbl = &directPlay4AVT; } else @@ -700,8 +700,7 @@ HRESULT DP_HandleMessage( IDirectPlay2Impl* This, LPCVOID lpcMessageBody, case DPMSGCMD_REQUESTNEWPLAYERID: { - LPCDPMSG_REQUESTNEWPLAYERID lpcMsg = - (LPCDPMSG_REQUESTNEWPLAYERID)lpcMessageBody; + LPCDPMSG_REQUESTNEWPLAYERID lpcMsg = lpcMessageBody; LPDPMSG_NEWPLAYERIDREPLY lpReply; @@ -1811,7 +1810,7 @@ static HRESULT DP_IF_DestroyGroup /* Remove all players that this group has */ DP_IF_EnumGroupPlayers( This, idGroup, NULL, - cbRemoveGroupOrPlayer, (LPVOID)&context, 0, bAnsi ); + cbRemoveGroupOrPlayer, &context, 0, bAnsi ); /* Remove all links to groups that this group has since this is dp3 */ DP_IF_EnumGroupsInGroup( (IDirectPlay3Impl*)This, idGroup, NULL, @@ -1896,7 +1895,7 @@ static HRESULT DP_IF_DestroyPlayer /* Find each group and call DeletePlayerFromGroup if the player is a member of the group */ DP_IF_EnumGroups( This, NULL, cbDeletePlayerFromAllGroups, - (LPVOID)&cbContext, DPENUMGROUPS_ALL, bAnsi ); + &cbContext, DPENUMGROUPS_ALL, bAnsi ); /* Now delete player and player list from the sys group */ DP_DeletePlayer( This, idPlayer ); @@ -2151,7 +2150,7 @@ static void DP_InvokeEnumSessionCallbacks static DWORD CALLBACK DP_EnumSessionsSendAsyncRequestThread( LPVOID lpContext ) { - EnumSessionAsyncCallbackData* data = (EnumSessionAsyncCallbackData*)lpContext; + EnumSessionAsyncCallbackData* data = lpContext; HANDLE hSuicideRequest = data->hSuicideRequest; DWORD dwTimeout = data->dwTimeout; @@ -2507,7 +2506,7 @@ static HRESULT DP_IF_GetGroupName LPDWORD lpdwDataSize, BOOL bAnsi ) { lpGroupData lpGData; - LPDPNAME lpName = (LPDPNAME)lpData; + LPDPNAME lpName = lpData; DWORD dwRequiredDataSize; FIXME("(%p)->(0x%08x,%p,%p,%u) ANSI ignored\n", @@ -2706,7 +2705,7 @@ static HRESULT DP_IF_GetPlayerName LPDWORD lpdwDataSize, BOOL bAnsi ) { lpPlayerList lpPList; - LPDPNAME lpName = (LPDPNAME)lpData; + LPDPNAME lpName = lpData; DWORD dwRequiredDataSize; FIXME( "(%p)->(0x%08x,%p,%p,%u): ANSI\n", diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 5d2ba9f452f..bd3e2c18dc5 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -100,7 +100,7 @@ HRESULT DPSP_CreateInterface( REFIID riid, LPVOID* ppvObj, IDirectPlay2Impl* dp if( IsEqualGUID( &IID_IDirectPlaySP, riid ) ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)*ppvObj; + IDirectPlaySPImpl *This = *ppvObj; This->lpVtbl = &directPlaySPVT; } else @@ -133,7 +133,7 @@ HRESULT DPSP_CreateInterface( REFIID riid, LPVOID* ppvObj, IDirectPlay2Impl* dp static BOOL DPSP_CreateIUnknown( LPVOID lpSP ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)lpSP; + IDirectPlaySPImpl *This = lpSP; This->unk = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->unk) ) ); @@ -150,7 +150,7 @@ static BOOL DPSP_CreateIUnknown( LPVOID lpSP ) static BOOL DPSP_DestroyIUnknown( LPVOID lpSP ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)lpSP; + IDirectPlaySPImpl *This = lpSP; This->unk->DPSP_lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &This->unk->DPSP_lock ); @@ -162,7 +162,7 @@ static BOOL DPSP_DestroyIUnknown( LPVOID lpSP ) static BOOL DPSP_CreateDirectPlaySP( LPVOID lpSP, IDirectPlay2Impl* dp ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)lpSP; + IDirectPlaySPImpl *This = lpSP; This->sp = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->sp) ) ); @@ -193,7 +193,7 @@ static BOOL DPSP_CreateDirectPlaySP( LPVOID lpSP, IDirectPlay2Impl* dp ) static BOOL DPSP_DestroyDirectPlaySP( LPVOID lpSP ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)lpSP; + IDirectPlaySPImpl *This = lpSP; /* Normally we should be keeping a reference, but since only the dplay * interface that created us can destroy us, we do not keep a reference @@ -235,7 +235,7 @@ static HRESULT WINAPI DPSP_QueryInterface if( IsEqualGUID( &IID_IDirectPlaySP, riid ) ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)*ppvObj; + IDirectPlaySPImpl *This = *ppvObj; This->lpVtbl = &directPlaySPVT; } else @@ -434,7 +434,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage LPVOID lpMessageHeader ) { - LPDPMSG_SENDENVELOPE lpMsg = (LPDPMSG_SENDENVELOPE)lpMessageBody; + LPDPMSG_SENDENVELOPE lpMsg = lpMessageBody; HRESULT hr = DPERR_GENERIC; WORD wCommandId; WORD wVersion; @@ -459,7 +459,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage #if 0 { - const LPDWORD lpcHeader = (LPDWORD)lpMessageHeader; + const LPDWORD lpcHeader = lpMessageHeader; TRACE( "lpMessageHeader = [0x%08lx] [0x%08lx] [0x%08lx] [0x%08lx] [0x%08lx]\n", lpcHeader[0], lpcHeader[1], lpcHeader[2], lpcHeader[3], lpcHeader[4] ); @@ -509,7 +509,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage { case DPSYS_CREATEPLAYERORGROUP: { - LPDPMSG_CREATEPLAYERORGROUP msg = (LPDPMSG_CREATEPLAYERORGROUP)lpMsg; + LPDPMSG_CREATEPLAYERORGROUP msg = lpMsg; if( msg->dwPlayerType == DPPLAYERTYPE_PLAYER ) { @@ -544,7 +544,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage case DPSYS_DESTROYPLAYERORGROUP: { - LPDPMSG_DESTROYPLAYERORGROUP msg = (LPDPMSG_DESTROYPLAYERORGROUP)lpMsg; + LPDPMSG_DESTROYPLAYERORGROUP msg = lpMsg; if( msg->dwPlayerType == DPPLAYERTYPE_PLAYER ) { @@ -565,7 +565,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage case DPSYS_ADDPLAYERTOGROUP: { - LPDPMSG_ADDPLAYERTOGROUP msg = (LPDPMSG_ADDPLAYERTOGROUP)lpMsg; + LPDPMSG_ADDPLAYERTOGROUP msg = lpMsg; hr = DP_IF_AddPlayerToGroup( This, msg->dpIdGroup, msg->dpIdPlayer, ... ); break; @@ -573,7 +573,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage case DPSYS_DELETEPLAYERFROMGROUP: { - LPDPMSG_DELETEPLAYERFROMGROUP msg = (LPDPMSG_DELETEPLAYERFROMGROUP)lpMsg; + LPDPMSG_DELETEPLAYERFROMGROUP msg = lpMsg; hr = DP_IF_DeletePlayerFromGroup( This, msg->dpIdGroup, msg->dpIdPlayer, ... ); @@ -583,7 +583,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage case DPSYS_SESSIONLOST: { - LPDPMSG_SESSIONLOST msg = (LPDPMSG_SESSIONLOST)lpMsg; + LPDPMSG_SESSIONLOST msg = lpMsg; FIXME( "DPSYS_SESSIONLOST not handled\n" ); @@ -592,7 +592,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage case DPSYS_HOST: { - LPDPMSG_HOST msg = (LPDPMSG_HOST)lpMsg; + LPDPMSG_HOST msg = lpMsg; FIXME( "DPSYS_HOST not handled\n" ); @@ -601,7 +601,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage case DPSYS_SETPLAYERORGROUPDATA: { - LPDPMSG_SETPLAYERORGROUPDATA msg = (LPDPMSG_SETPLAYERORGROUPDATA)lpMsg; + LPDPMSG_SETPLAYERORGROUPDATA msg = lpMsg; if( msg->dwPlayerType == DPPLAYERTYPE_PLAYER ) { @@ -623,7 +623,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage case DPSYS_SETPLAYERORGROUPNAME: { - LPDPMSG_SETPLAYERORGROUPNAME msg = (LPDPMSG_SETPLAYERORGROUPNAME)lpMsg; + LPDPMSG_SETPLAYERORGROUPNAME msg = lpMsg; if( msg->dwPlayerType == DPPLAYERTYPE_PLAYER ) { @@ -644,7 +644,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage case DPSYS_SETSESSIONDESC; { - LPDPMSG_SETSESSIONDESC msg = (LPDPMSG_SETSESSIONDESC)lpMsg; + LPDPMSG_SETSESSIONDESC msg = lpMsg; hr = DP_IF_SetSessionDesc( This, &msg->dpDesc ); @@ -653,7 +653,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage case DPSYS_ADDGROUPTOGROUP: { - LPDPMSG_ADDGROUPTOGROUP msg = (LPDPMSG_ADDGROUPTOGROUP)lpMsg; + LPDPMSG_ADDGROUPTOGROUP msg = lpMsg; hr = DP_IF_AddGroupToGroup( This, msg->dpIdParentGroup, msg->dpIdGroup, ... ); @@ -663,7 +663,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage case DPSYS_DELETEGROUPFROMGROUP: { - LPDPMSG_DELETEGROUPFROMGROUP msg = (LPDPMSG_DELETEGROUPFROMGROUP)lpMsg; + LPDPMSG_DELETEGROUPFROMGROUP msg = lpMsg; hr = DP_IF_DeleteGroupFromGroup( This, msg->dpIdParentGroup, msg->dpIdGroup, ... ); @@ -673,7 +673,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage case DPSYS_SECUREMESSAGE: { - LPDPMSG_SECUREMESSAGE msg = (LPDPMSG_SECUREMESSAGE)lpMsg; + LPDPMSG_SECUREMESSAGE msg = lpMsg; FIXME( "DPSYS_SECUREMESSAGE not implemented\n" ); @@ -682,7 +682,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage case DPSYS_STARTSESSION: { - LPDPMSG_STARTSESSION msg = (LPDPMSG_STARTSESSION)lpMsg; + LPDPMSG_STARTSESSION msg = lpMsg; FIXME( "DPSYS_STARTSESSION not implemented\n" ); @@ -691,7 +691,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage case DPSYS_CHAT: { - LPDPMSG_CHAT msg = (LPDPMSG_CHAT)lpMsg; + LPDPMSG_CHAT msg = lpMsg; FIXME( "DPSYS_CHAT not implemeneted\n" ); @@ -700,7 +700,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage case DPSYS_SETGROUPOWNER: { - LPDPMSG_SETGROUPOWNER msg = (LPDPMSG_SETGROUPOWNER)lpMsg; + LPDPMSG_SETGROUPOWNER msg = lpMsg; FIXME( "DPSYS_SETGROUPOWNER not implemented\n" ); @@ -709,7 +709,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage case DPSYS_SENDCOMPLETE: { - LPDPMSG_SENDCOMPLETE msg = (LPDPMSG_SENDCOMPLETE)lpMsg; + LPDPMSG_SENDCOMPLETE msg = lpMsg; FIXME( "DPSYS_SENDCOMPLETE not implemented\n" ); diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 6bf9f3da084..7cafb59cca4 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -287,7 +287,7 @@ BOOL DPLAYX_ConstructData(void) lpMemArea = (LPVOID)((BYTE*)lpSharedStaticData + dwStaticSharedSize); /* FIXME: Crude hack */ - lobbyData = (DPLAYX_LOBBYDATA*)lpSharedStaticData; + lobbyData = lpSharedStaticData; sessionData = (DPSESSIONDESC2*)((BYTE*)lpSharedStaticData + (dwStaticSharedSize/2)); /* Initialize shared data segments. */ @@ -612,7 +612,7 @@ HRESULT DPLAYX_GetConnectionSettingsA return DPERR_BUFFERTOOSMALL; } - DPLAYX_CopyConnStructA( (LPDPLCONNECTION)lpData, lpDplData->lpConn ); + DPLAYX_CopyConnStructA( lpData, lpDplData->lpConn ); DPLAYX_ReleaseSemaphore(); @@ -695,7 +695,7 @@ void DPLAYX_CopyConnStructA( LPDPLCONNECTION dest, const DPLCONNECTION *src ) /* Copy address if it exists */ if( src->lpAddress ) { - dest->lpAddress = (LPVOID)lpStartOfFreeSpace; + dest->lpAddress = lpStartOfFreeSpace; CopyMemory( lpStartOfFreeSpace, src->lpAddress, src->dwAddressSize ); /* No need to advance lpStartOfFreeSpace as there is no more "dynamic" data */ } @@ -734,7 +734,7 @@ HRESULT DPLAYX_GetConnectionSettingsW return DPERR_BUFFERTOOSMALL; } - DPLAYX_CopyConnStructW( (LPDPLCONNECTION)lpData, lpDplData->lpConn ); + DPLAYX_CopyConnStructW( lpData, lpDplData->lpConn ); DPLAYX_ReleaseSemaphore(); @@ -817,7 +817,7 @@ void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, const DPLCONNECTION *src ) /* Copy address if it exists */ if( src->lpAddress ) { - dest->lpAddress = (LPVOID)lpStartOfFreeSpace; + dest->lpAddress = lpStartOfFreeSpace; CopyMemory( lpStartOfFreeSpace, src->lpAddress, src->dwAddressSize ); /* No need to advance lpStartOfFreeSpace as there is no more "dynamic" data */ } diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c index 217bf993031..181e6b08198 100644 --- a/dlls/dplayx/dplayx_messages.c +++ b/dlls/dplayx/dplayx_messages.c @@ -110,7 +110,7 @@ error: static DWORD CALLBACK DPL_MSG_ThreadMain( LPVOID lpContext ) { - LPMSGTHREADINFO lpThreadInfo = (LPMSGTHREADINFO)lpContext; + LPMSGTHREADINFO lpThreadInfo = lpContext; DWORD dwWaitResult; TRACE( "Msg thread created. Waiting on app startup\n" ); @@ -237,7 +237,7 @@ HRESULT DP_MSG_SendRequestPlayerId( IDirectPlay2AImpl* This, DWORD dwFlags, { LPCDPMSG_NEWPLAYERIDREPLY lpcReply; - lpcReply = (LPCDPMSG_NEWPLAYERIDREPLY)lpMsg; + lpcReply = lpMsg; *lpdpidAllocatedId = lpcReply->dpidNewPlayerId; @@ -282,7 +282,7 @@ HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlay2AImpl* This, DPID dpidServer ) DWORD dwDataSize; /* SP Player remote data needs to be propagated at some point - is this the point? */ - IDirectPlaySP_GetSPPlayerData( This->dp2->spData.lpISP, 0, (LPVOID*)&lpPData, &dwDataSize, DPSET_REMOTE ); + IDirectPlaySP_GetSPPlayerData( This->dp2->spData.lpISP, 0, &lpPData, &dwDataSize, DPSET_REMOTE ); ERR( "Player Data size is 0x%08lx\n" "[%02x%02x %02x%02x %02x%02x %02x%02x %02x%02x %02x%02x %02x%02x %02x%02x]\n" @@ -502,7 +502,7 @@ void DP_MSG_ErrorReceived( IDirectPlay2AImpl* This, WORD wCommandId, { LPCDPMSG_FORWARDADDPLAYERNACK lpcErrorMsg; - lpcErrorMsg = (LPCDPMSG_FORWARDADDPLAYERNACK)lpMsgBody; + lpcErrorMsg = lpMsgBody; ERR( "Received error message %u. Error is %s\n", wCommandId, DPLAYX_HresultToString( lpcErrorMsg->errorCode) ); diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index bd620a4e5d4..b3d3016944a 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -145,7 +145,7 @@ static const IDirectPlayLobby3Vtbl directPlayLobby3AVT; static BOOL DPL_CreateIUnknown( LPVOID lpDPL ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)lpDPL; + IDirectPlayLobbyAImpl *This = lpDPL; This->unk = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->unk) ) ); if ( This->unk == NULL ) @@ -161,7 +161,7 @@ static BOOL DPL_CreateIUnknown( LPVOID lpDPL ) static BOOL DPL_DestroyIUnknown( LPVOID lpDPL ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)lpDPL; + IDirectPlayLobbyAImpl *This = lpDPL; This->unk->DPL_lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &This->unk->DPL_lock ); @@ -172,7 +172,7 @@ static BOOL DPL_DestroyIUnknown( LPVOID lpDPL ) static BOOL DPL_CreateLobby1( LPVOID lpDPL ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)lpDPL; + IDirectPlayLobbyAImpl *This = lpDPL; This->dpl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dpl) ) ); if ( This->dpl == NULL ) @@ -187,7 +187,7 @@ static BOOL DPL_CreateLobby1( LPVOID lpDPL ) static BOOL DPL_DestroyLobby1( LPVOID lpDPL ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)lpDPL; + IDirectPlayLobbyAImpl *This = lpDPL; if( This->dpl->dwMsgThread ) { @@ -204,7 +204,7 @@ static BOOL DPL_DestroyLobby1( LPVOID lpDPL ) static BOOL DPL_CreateLobby2( LPVOID lpDPL ) { - IDirectPlayLobby2AImpl *This = (IDirectPlayLobby2AImpl *)lpDPL; + IDirectPlayLobby2AImpl *This = lpDPL; This->dpl2 = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dpl2) ) ); if ( This->dpl2 == NULL ) @@ -217,7 +217,7 @@ static BOOL DPL_CreateLobby2( LPVOID lpDPL ) static BOOL DPL_DestroyLobby2( LPVOID lpDPL ) { - IDirectPlayLobby2AImpl *This = (IDirectPlayLobby2AImpl *)lpDPL; + IDirectPlayLobby2AImpl *This = lpDPL; HeapFree( GetProcessHeap(), 0, This->dpl2 ); @@ -226,7 +226,7 @@ static BOOL DPL_DestroyLobby2( LPVOID lpDPL ) static BOOL DPL_CreateLobby3( LPVOID lpDPL ) { - IDirectPlayLobby3AImpl *This = (IDirectPlayLobby3AImpl *)lpDPL; + IDirectPlayLobby3AImpl *This = lpDPL; This->dpl3 = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dpl3) ) ); if ( This->dpl3 == NULL ) @@ -239,7 +239,7 @@ static BOOL DPL_CreateLobby3( LPVOID lpDPL ) static BOOL DPL_DestroyLobby3( LPVOID lpDPL ) { - IDirectPlayLobby3AImpl *This = (IDirectPlayLobby3AImpl *)lpDPL; + IDirectPlayLobby3AImpl *This = lpDPL; HeapFree( GetProcessHeap(), 0, This->dpl3 ); @@ -285,32 +285,32 @@ HRESULT DPL_CreateInterface if( IsEqualGUID( &IID_IDirectPlayLobby, riid ) ) { - IDirectPlayLobbyWImpl *This = (IDirectPlayLobbyWImpl *)*ppvObj; + IDirectPlayLobbyWImpl *This = *ppvObj; This->lpVtbl = &directPlayLobbyWVT; } else if( IsEqualGUID( &IID_IDirectPlayLobbyA, riid ) ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)*ppvObj; + IDirectPlayLobbyAImpl *This = *ppvObj; This->lpVtbl = &directPlayLobbyAVT; } else if( IsEqualGUID( &IID_IDirectPlayLobby2, riid ) ) { - IDirectPlayLobby2WImpl *This = (IDirectPlayLobby2WImpl *)*ppvObj; + IDirectPlayLobby2WImpl *This = *ppvObj; This->lpVtbl = &directPlayLobby2WVT; } else if( IsEqualGUID( &IID_IDirectPlayLobby2A, riid ) ) { - IDirectPlayLobby2AImpl *This = (IDirectPlayLobby2AImpl *)*ppvObj; + IDirectPlayLobby2AImpl *This = *ppvObj; This->lpVtbl = &directPlayLobby2AVT; } else if( IsEqualGUID( &IID_IDirectPlayLobby3, riid ) ) { - IDirectPlayLobby3WImpl *This = (IDirectPlayLobby3WImpl *)*ppvObj; + IDirectPlayLobby3WImpl *This = *ppvObj; This->lpVtbl = &directPlayLobby3WVT; } else if( IsEqualGUID( &IID_IDirectPlayLobby3A, riid ) ) { - IDirectPlayLobby3AImpl *This = (IDirectPlayLobby3AImpl *)*ppvObj; + IDirectPlayLobby3AImpl *This = *ppvObj; This->lpVtbl = &directPlayLobby3AVT; } else @@ -365,32 +365,32 @@ static HRESULT WINAPI DPL_QueryInterface if( IsEqualGUID( &IID_IDirectPlayLobby, riid ) ) { - IDirectPlayLobbyWImpl *This = (IDirectPlayLobbyWImpl *)*ppvObj; + IDirectPlayLobbyWImpl *This = *ppvObj; This->lpVtbl = &directPlayLobbyWVT; } else if( IsEqualGUID( &IID_IDirectPlayLobbyA, riid ) ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)*ppvObj; + IDirectPlayLobbyAImpl *This = *ppvObj; This->lpVtbl = &directPlayLobbyAVT; } else if( IsEqualGUID( &IID_IDirectPlayLobby2, riid ) ) { - IDirectPlayLobby2WImpl *This = (IDirectPlayLobby2WImpl *)*ppvObj; + IDirectPlayLobby2WImpl *This = *ppvObj; This->lpVtbl = &directPlayLobby2WVT; } else if( IsEqualGUID( &IID_IDirectPlayLobby2A, riid ) ) { - IDirectPlayLobby2AImpl *This = (IDirectPlayLobby2AImpl *)*ppvObj; + IDirectPlayLobby2AImpl *This = *ppvObj; This->lpVtbl = &directPlayLobby2AVT; } else if( IsEqualGUID( &IID_IDirectPlayLobby3, riid ) ) { - IDirectPlayLobby3WImpl *This = (IDirectPlayLobby3WImpl *)*ppvObj; + IDirectPlayLobby3WImpl *This = *ppvObj; This->lpVtbl = &directPlayLobby3WVT; } else if( IsEqualGUID( &IID_IDirectPlayLobby3A, riid ) ) { - IDirectPlayLobby3AImpl *This = (IDirectPlayLobby3AImpl *)*ppvObj; + IDirectPlayLobby3AImpl *This = *ppvObj; This->lpVtbl = &directPlayLobby3AVT; } else @@ -687,7 +687,7 @@ HRESULT DPL_EnumAddress( LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, LPCVOID while ( dwTotalSizeEnumerated < dwAddressSize ) { - const DPADDRESS* lpElements = (const DPADDRESS*)lpAddress; + const DPADDRESS* lpElements = lpAddress; DWORD dwSizeThisEnumeration; /* Invoke the enum method. If false is returned, stop enumeration */ @@ -1235,7 +1235,7 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_RunApplication /* Our callback function will fill up the enumData structure with all the information required to start a new process */ IDirectPlayLobby_EnumLocalApplications( iface, RunApplicationA_EnumLocalApplications, - (LPVOID)(&enumData), 0 ); + (&enumData), 0 ); /* First the application name */ strcpy( temp, enumData.lpszPath ); @@ -1571,7 +1571,7 @@ HRESULT DPL_CreateCompoundAddress /* Add the total size chunk */ { - LPDPADDRESS lpdpAddress = (LPDPADDRESS)lpAddress; + LPDPADDRESS lpdpAddress = lpAddress; lpdpAddress->guidDataType = DPAID_TotalSize; lpdpAddress->dwDataSize = sizeof( DWORD ); @@ -1590,7 +1590,7 @@ HRESULT DPL_CreateCompoundAddress ( IsEqualGUID( &lpElements->guidDataType, &DPAID_LobbyProvider ) ) ) { - LPDPADDRESS lpdpAddress = (LPDPADDRESS)lpAddress; + LPDPADDRESS lpdpAddress = lpAddress; lpdpAddress->guidDataType = lpElements->guidDataType; lpdpAddress->dwDataSize = sizeof( GUID ); @@ -1604,15 +1604,13 @@ HRESULT DPL_CreateCompoundAddress ( IsEqualGUID( &lpElements->guidDataType, &DPAID_INet ) ) ) { - LPDPADDRESS lpdpAddress = (LPDPADDRESS)lpAddress; + LPDPADDRESS lpdpAddress = lpAddress; lpdpAddress->guidDataType = lpElements->guidDataType; lpdpAddress->dwDataSize = lpElements->dwDataSize; lpAddress = (char *) lpAddress + sizeof( DPADDRESS ); - lstrcpynA( (LPSTR)lpAddress, - (LPCSTR)lpElements->lpData, - lpElements->dwDataSize ); + lstrcpynA( lpAddress, lpElements->lpData, lpElements->dwDataSize ); lpAddress = (char *) lpAddress + lpElements->dwDataSize; } else if ( ( IsEqualGUID( &lpElements->guidDataType, &DPAID_PhoneW ) ) || @@ -1620,20 +1618,18 @@ HRESULT DPL_CreateCompoundAddress ( IsEqualGUID( &lpElements->guidDataType, &DPAID_INetW ) ) ) { - LPDPADDRESS lpdpAddress = (LPDPADDRESS)lpAddress; + LPDPADDRESS lpdpAddress = lpAddress; lpdpAddress->guidDataType = lpElements->guidDataType; lpdpAddress->dwDataSize = lpElements->dwDataSize; lpAddress = (char *) lpAddress + sizeof( DPADDRESS ); - lstrcpynW( (LPWSTR)lpAddress, - (LPCWSTR)lpElements->lpData, - lpElements->dwDataSize ); + lstrcpynW( lpAddress, lpElements->lpData, lpElements->dwDataSize ); lpAddress = (char *) lpAddress + lpElements->dwDataSize * sizeof( WCHAR ); } else if ( IsEqualGUID( &lpElements->guidDataType, &DPAID_INetPort ) ) { - LPDPADDRESS lpdpAddress = (LPDPADDRESS)lpAddress; + LPDPADDRESS lpdpAddress = lpAddress; lpdpAddress->guidDataType = lpElements->guidDataType; lpdpAddress->dwDataSize = lpElements->dwDataSize; @@ -1644,7 +1640,7 @@ HRESULT DPL_CreateCompoundAddress } else if ( IsEqualGUID( &lpElements->guidDataType, &DPAID_ComPort ) ) { - LPDPADDRESS lpdpAddress = (LPDPADDRESS)lpAddress; + LPDPADDRESS lpdpAddress = lpAddress; lpdpAddress->guidDataType = lpElements->guidDataType; lpdpAddress->dwDataSize = lpElements->dwDataSize; diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index a141a644088..3f545c18a5d 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -76,7 +76,7 @@ HRESULT DPLSP_CreateInterface( REFIID riid, LPVOID* ppvObj, IDirectPlay2Impl* dp if( IsEqualGUID( &IID_IDPLobbySP, riid ) ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)*ppvObj; + IDPLobbySPImpl *This = *ppvObj; This->lpVtbl = &dpLobbySPVT; } else @@ -109,7 +109,7 @@ HRESULT DPLSP_CreateInterface( REFIID riid, LPVOID* ppvObj, IDirectPlay2Impl* dp static BOOL DPLSP_CreateIUnknown( LPVOID lpSP ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)lpSP; + IDPLobbySPImpl *This = lpSP; This->unk = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->unk) ) ); @@ -126,7 +126,7 @@ static BOOL DPLSP_CreateIUnknown( LPVOID lpSP ) static BOOL DPLSP_DestroyIUnknown( LPVOID lpSP ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)lpSP; + IDPLobbySPImpl *This = lpSP; This->unk->DPLSP_lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &This->unk->DPLSP_lock ); @@ -137,7 +137,7 @@ static BOOL DPLSP_DestroyIUnknown( LPVOID lpSP ) static BOOL DPLSP_CreateDPLobbySP( LPVOID lpSP, IDirectPlay2Impl* dp ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)lpSP; + IDPLobbySPImpl *This = lpSP; This->sp = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->sp) ) ); @@ -169,7 +169,7 @@ static BOOL DPLSP_CreateDPLobbySP( LPVOID lpSP, IDirectPlay2Impl* dp ) static BOOL DPLSP_DestroyDPLobbySP( LPVOID lpSP ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)lpSP; + IDPLobbySPImpl *This = lpSP; HeapFree( GetProcessHeap(), 0, This->sp ); @@ -199,7 +199,7 @@ HRESULT WINAPI DPLSP_QueryInterface if( IsEqualGUID( &IID_IDPLobbySP, riid ) ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)*ppvObj; + IDPLobbySPImpl *This = *ppvObj; This->lpVtbl = &dpLobbySPVT; } else diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index 928e082080c..7bb8e7ba789 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -185,7 +185,7 @@ LPVOID NS_GetNSAddr( LPVOID lpNSInfo ) /* Get the magic number associated with the Name Server */ DWORD NS_GetNsMagic( LPVOID lpNSInfo ) { - LPDWORD lpHdrInfo = (LPDWORD)NS_GetNSAddr( lpNSInfo ); + LPDWORD lpHdrInfo = NS_GetNSAddr( lpNSInfo ); return lpHdrInfo[1]; }