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

dplayx: Win64 printf format warning fixes.

This commit is contained in:
Michael Stefaniuc 2006-10-10 01:07:17 +02:00 committed by Alexandre Julliard
parent f041a2b056
commit 699d4413bf
8 changed files with 148 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/dplayx/Makefile.in
View File

@ -1,4 +1,4 @@
EXTRADEFS = -DCOM_NO_WINDOWS_H -DWINE_NO_LONG_AS_INT EXTRADEFS = -DCOM_NO_WINDOWS_H
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

162
dlls/dplayx/dplay.c
View File

@ -620,7 +620,7 @@ static ULONG WINAPI DP_AddRef
ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef ); ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef );
ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef );
TRACE( "ref count incremented to %lu:%lu for %p\n", TRACE( "ref count incremented to %u:%u for %p\n",
ulInterfaceRefCount, ulObjRefCount, This ); ulInterfaceRefCount, ulObjRefCount, This );
return ulObjRefCount; return ulObjRefCount;
@ -636,7 +636,7 @@ static ULONG WINAPI DP_Release
ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef ); ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef );
ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef );
TRACE( "ref count decremented to %lu:%lu for %p\n", TRACE( "ref count decremented to %u:%u for %p\n",
ulInterfaceRefCount, ulObjRefCount, This ); ulInterfaceRefCount, ulObjRefCount, This );
/* Deallocate if this is the last reference to the object */ /* Deallocate if this is the last reference to the object */
@ -670,7 +670,7 @@ HRESULT DP_HandleMessage( IDirectPlay2Impl* This, LPCVOID lpcMessageBody,
WORD wCommandId, WORD wVersion, WORD wCommandId, WORD wVersion,
LPVOID* lplpReply, LPDWORD lpdwMsgSize ) LPVOID* lplpReply, LPDWORD lpdwMsgSize )
{ {
TRACE( "(%p)->(%p,0x%08lx,%p,%u,%u)\n", TRACE( "(%p)->(%p,0x%08x,%p,%u,%u)\n",
This, lpcMessageBody, dwMessageBodySize, lpcMessageHeader, wCommandId, This, lpcMessageBody, dwMessageBodySize, lpcMessageHeader, wCommandId,
wVersion ); wVersion );
@ -707,7 +707,7 @@ HRESULT DP_HandleMessage( IDirectPlay2Impl* This, LPCVOID lpcMessageBody,
*lplpReply = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, *lpdwMsgSize ); *lplpReply = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, *lpdwMsgSize );
FIXME( "Ignoring dwFlags 0x%08lx in request msg\n", FIXME( "Ignoring dwFlags 0x%08x in request msg\n",
lpcMsg->dwFlags ); lpcMsg->dwFlags );
/* Setup the reply */ /* Setup the reply */
@ -720,7 +720,7 @@ HRESULT DP_HandleMessage( IDirectPlay2Impl* This, LPCVOID lpcMessageBody,
lpReply->dpidNewPlayerId = DP_NextObjectId(); lpReply->dpidNewPlayerId = DP_NextObjectId();
TRACE( "Allocating new playerid 0x%08lx from remote request\n", TRACE( "Allocating new playerid 0x%08x from remote request\n",
lpReply->dpidNewPlayerId ); lpReply->dpidNewPlayerId );
break; break;
@ -742,7 +742,7 @@ HRESULT DP_HandleMessage( IDirectPlay2Impl* This, LPCVOID lpcMessageBody,
#if 1 #if 1
case DPMSGCMD_JUSTENVELOPE: case DPMSGCMD_JUSTENVELOPE:
{ {
TRACE( "GOT THE SELF MESSAGE: %p -> 0x%08lx\n", lpcMessageHeader, ((const DWORD *)lpcMessageHeader)[1] ); TRACE( "GOT THE SELF MESSAGE: %p -> 0x%08x\n", lpcMessageHeader, ((const DWORD *)lpcMessageHeader)[1] );
NS_SetLocalAddr( This->dp2->lpNameServerData, lpcMessageHeader, 20 ); NS_SetLocalAddr( This->dp2->lpNameServerData, lpcMessageHeader, 20 );
DP_MSG_ReplyReceived( This, wCommandId, lpcMessageBody, dwMessageBodySize ); DP_MSG_ReplyReceived( This, wCommandId, lpcMessageBody, dwMessageBodySize );
} }
@ -788,7 +788,7 @@ static HRESULT WINAPI DP_IF_AddPlayerToGroup
lpPlayerList lpPList; lpPlayerList lpPList;
lpPlayerList lpNewPList; lpPlayerList lpNewPList;
TRACE( "(%p)->(%p,0x%08lx,0x%08lx,%u)\n", TRACE( "(%p)->(%p,0x%08x,0x%08x,%u)\n",
This, lpMsgHdr, idGroup, idPlayer, bAnsi ); This, lpMsgHdr, idGroup, idPlayer, bAnsi );
/* Find the group */ /* Find the group */
@ -944,7 +944,7 @@ lpGroupData DP_CreateGroup( IDirectPlay2AImpl* This, LPDPID lpid,
/* FIXME: Should we validate the dwFlags? */ /* FIXME: Should we validate the dwFlags? */
lpGData->dwFlags = dwFlags; lpGData->dwFlags = dwFlags;
TRACE( "Created group id 0x%08lx\n", *lpid ); TRACE( "Created group id 0x%08x\n", *lpid );
return lpGData; return lpGData;
} }
@ -955,13 +955,13 @@ DP_DeleteGroup( IDirectPlay2Impl* This, DPID dpid )
{ {
lpGroupList lpGList; lpGroupList lpGList;
TRACE( "(%p)->(0x%08lx)\n", This, dpid ); TRACE( "(%p)->(0x%08x)\n", This, dpid );
DPQ_REMOVE_ENTRY( This->dp2->lpSysGroup->groups, groups, lpGData->dpid, ==, dpid, lpGList ); DPQ_REMOVE_ENTRY( This->dp2->lpSysGroup->groups, groups, lpGData->dpid, ==, dpid, lpGList );
if( lpGList == NULL ) if( lpGList == NULL )
{ {
ERR( "DPID 0x%08lx not found\n", dpid ); ERR( "DPID 0x%08x not found\n", dpid );
return; return;
} }
@ -984,7 +984,7 @@ static lpGroupData DP_FindAnyGroup( IDirectPlay2AImpl* This, DPID dpid )
{ {
lpGroupList lpGroups; lpGroupList lpGroups;
TRACE( "(%p)->(0x%08lx)\n", This, dpid ); TRACE( "(%p)->(0x%08x)\n", This, dpid );
if( dpid == DPID_SYSTEM_GROUP ) if( dpid == DPID_SYSTEM_GROUP )
{ {
@ -1010,7 +1010,7 @@ static HRESULT WINAPI DP_IF_CreateGroup
{ {
lpGroupData lpGData; lpGroupData lpGData;
TRACE( "(%p)->(%p,%p,%p,%p,0x%08lx,0x%08lx,%u)\n", TRACE( "(%p)->(%p,%p,%p,%p,0x%08x,0x%08x,%u)\n",
This, lpMsgHdr, lpidGroup, lpGroupName, lpData, dwDataSize, This, lpMsgHdr, lpidGroup, lpGroupName, lpData, dwDataSize,
dwFlags, bAnsi ); dwFlags, bAnsi );
@ -1223,7 +1223,7 @@ lpPlayerData DP_CreatePlayer( IDirectPlay2Impl* This, LPDPID lpid,
/* Initialize the SP data section */ /* Initialize the SP data section */
lpPData->lpSPPlayerData = DPSP_CreateSPPlayerData(); lpPData->lpSPPlayerData = DPSP_CreateSPPlayerData();
TRACE( "Created player id 0x%08lx\n", *lpid ); TRACE( "Created player id 0x%08x\n", *lpid );
return lpPData; return lpPData;
} }
@ -1242,13 +1242,13 @@ DP_DeletePlayer( IDirectPlay2Impl* This, DPID dpid )
{ {
lpPlayerList lpPList; lpPlayerList lpPList;
TRACE( "(%p)->(0x%08lx)\n", This, dpid ); TRACE( "(%p)->(0x%08x)\n", This, dpid );
DPQ_REMOVE_ENTRY( This->dp2->lpSysGroup->players, players, lpPData->dpid, ==, dpid, lpPList ); DPQ_REMOVE_ENTRY( This->dp2->lpSysGroup->players, players, lpPData->dpid, ==, dpid, lpPList );
if( lpPList == NULL ) if( lpPList == NULL )
{ {
ERR( "DPID 0x%08lx not found\n", dpid ); ERR( "DPID 0x%08x not found\n", dpid );
return; return;
} }
@ -1273,7 +1273,7 @@ static lpPlayerList DP_FindPlayer( IDirectPlay2AImpl* This, DPID dpid )
{ {
lpPlayerList lpPlayers; lpPlayerList lpPlayers;
TRACE( "(%p)->(0x%08lx)\n", This, dpid ); TRACE( "(%p)->(0x%08x)\n", This, dpid );
DPQ_FIND_ENTRY( This->dp2->lpSysGroup->players, players, lpPData->dpid, ==, dpid, lpPlayers ); DPQ_FIND_ENTRY( This->dp2->lpSysGroup->players, players, lpPData->dpid, ==, dpid, lpPlayers );
@ -1397,7 +1397,7 @@ static HRESULT WINAPI DP_IF_CreatePlayer
lpPlayerList lpPList; lpPlayerList lpPList;
DWORD dwCreateFlags = 0; DWORD dwCreateFlags = 0;
TRACE( "(%p)->(%p,%p,%p,%p,0x%08lx,0x%08lx,%u)\n", TRACE( "(%p)->(%p,%p,%p,%p,0x%08x,0x%08x,%u)\n",
This, lpidPlayer, lpPlayerName, hEvent, lpData, This, lpidPlayer, lpPlayerName, hEvent, lpData,
dwDataSize, dwFlags, bAnsi ); dwDataSize, dwFlags, bAnsi );
@ -1447,7 +1447,7 @@ static HRESULT WINAPI DP_IF_CreatePlayer
) )
{ {
/* Assume non fatal failure */ /* Assume non fatal failure */
ERR( "unknown dwFlags = 0x%08lx\n", dwFlags ); ERR( "unknown dwFlags = 0x%08x\n", dwFlags );
} }
/* If the name is not specified, we must provide one */ /* If the name is not specified, we must provide one */
@ -1512,7 +1512,7 @@ static HRESULT WINAPI DP_IF_CreatePlayer
data.lpSPMessageHeader = lpMsgHdr; data.lpSPMessageHeader = lpMsgHdr;
data.lpISP = This->dp2->spData.lpISP; data.lpISP = This->dp2->spData.lpISP;
TRACE( "Calling SP CreatePlayer 0x%08lx: dwFlags: 0x%08lx lpMsgHdr: %p\n", TRACE( "Calling SP CreatePlayer 0x%08x: dwFlags: 0x%08x lpMsgHdr: %p\n",
*lpidPlayer, data.dwFlags, data.lpSPMessageHeader ); *lpidPlayer, data.dwFlags, data.lpSPMessageHeader );
hr = (*This->dp2->spData.lpCB->CreatePlayer)( &data ); hr = (*This->dp2->spData.lpCB->CreatePlayer)( &data );
@ -1647,7 +1647,7 @@ static HRESULT WINAPI DP_IF_DeletePlayerFromGroup
lpGroupData lpGData; lpGroupData lpGData;
lpPlayerList lpPList; lpPlayerList lpPList;
TRACE( "(%p)->(%p,0x%08lx,0x%08lx,%u)\n", TRACE( "(%p)->(%p,0x%08x,0x%08x,%u)\n",
This, lpMsgHdr, idGroup, idPlayer, bAnsi ); This, lpMsgHdr, idGroup, idPlayer, bAnsi );
/* Find the group */ /* Find the group */
@ -1727,7 +1727,7 @@ cbRemoveGroupOrPlayer(
{ {
lpDPRGOPContext lpCtxt = (lpDPRGOPContext)lpContext; lpDPRGOPContext lpCtxt = (lpDPRGOPContext)lpContext;
TRACE( "Removing element:0x%08lx (type:0x%08lx) from element:0x%08lx\n", TRACE( "Removing element:0x%08x (type:0x%08x) from element:0x%08x\n",
dpId, dwPlayerType, lpCtxt->idGroup ); dpId, dwPlayerType, lpCtxt->idGroup );
if( dwPlayerType == DPPLAYERTYPE_GROUP ) if( dwPlayerType == DPPLAYERTYPE_GROUP )
@ -1737,7 +1737,7 @@ cbRemoveGroupOrPlayer(
) )
) )
{ {
ERR( "Unable to delete group 0x%08lx from group 0x%08lx\n", ERR( "Unable to delete group 0x%08x from group 0x%08x\n",
dpId, lpCtxt->idGroup ); dpId, lpCtxt->idGroup );
} }
} }
@ -1749,7 +1749,7 @@ cbRemoveGroupOrPlayer(
) )
) )
{ {
ERR( "Unable to delete player 0x%08lx from grp 0x%08lx\n", ERR( "Unable to delete player 0x%08x from grp 0x%08x\n",
dpId, lpCtxt->idGroup ); dpId, lpCtxt->idGroup );
} }
} }
@ -1763,7 +1763,7 @@ static HRESULT WINAPI DP_IF_DestroyGroup
lpGroupData lpGData; lpGroupData lpGData;
DPRGOPContext context; DPRGOPContext context;
FIXME( "(%p)->(%p,0x%08lx,%u): semi stub\n", FIXME( "(%p)->(%p,0x%08x,%u): semi stub\n",
This, lpMsgHdr, idGroup, bAnsi ); This, lpMsgHdr, idGroup, bAnsi );
/* Find the group */ /* Find the group */
@ -1841,7 +1841,7 @@ static HRESULT WINAPI DP_IF_DestroyPlayer
{ {
DPFAGContext cbContext; DPFAGContext cbContext;
FIXME( "(%p)->(%p,0x%08lx,%u): semi stub\n", FIXME( "(%p)->(%p,0x%08x,%u): semi stub\n",
This, lpMsgHdr, idPlayer, bAnsi ); This, lpMsgHdr, idPlayer, bAnsi );
if( This->dp2->connectionInitialized == NO_PROVIDER ) if( This->dp2->connectionInitialized == NO_PROVIDER )
@ -1914,7 +1914,7 @@ cbDeletePlayerFromAllGroups(
} }
else else
{ {
ERR( "Group callback has dwPlayerType = 0x%08lx\n", dwPlayerType ); ERR( "Group callback has dwPlayerType = 0x%08x\n", dwPlayerType );
} }
return TRUE; return TRUE;
@ -1942,7 +1942,7 @@ static HRESULT WINAPI DP_IF_EnumGroupPlayers
lpGroupData lpGData; lpGroupData lpGData;
lpPlayerList lpPList; lpPlayerList lpPList;
FIXME("(%p)->(0x%08lx,%p,%p,%p,0x%08lx,%u): semi stub\n", FIXME("(%p)->(0x%08x,%p,%p,%p,0x%08x,%u): semi stub\n",
This, idGroup, lpguidInstance, lpEnumPlayersCallback2, This, idGroup, lpguidInstance, lpEnumPlayersCallback2,
lpContext, dwFlags, bAnsi ); lpContext, dwFlags, bAnsi );
@ -2122,7 +2122,7 @@ static DWORD CALLBACK DP_EnumSessionsSendAsyncRequestThread( LPVOID lpContext )
HANDLE hSuicideRequest = data->hSuicideRequest; HANDLE hSuicideRequest = data->hSuicideRequest;
DWORD dwTimeout = data->dwTimeout; DWORD dwTimeout = data->dwTimeout;
TRACE( "Thread started with timeout = 0x%08lx\n", dwTimeout ); TRACE( "Thread started with timeout = 0x%08x\n", dwTimeout );
for( ;; ) for( ;; )
{ {
@ -2190,7 +2190,7 @@ static HRESULT WINAPI DP_IF_EnumSessions
{ {
HRESULT hr = DP_OK; HRESULT hr = DP_OK;
TRACE( "(%p)->(%p,0x%08lx,%p,%p,0x%08lx,%u)\n", TRACE( "(%p)->(%p,0x%08x,%p,%p,0x%08x,%u)\n",
This, lpsd, dwTimeout, lpEnumSessionsCallback2, lpContext, dwFlags, This, lpsd, dwTimeout, lpEnumSessionsCallback2, lpContext, dwFlags,
bAnsi ); bAnsi );
@ -2366,7 +2366,7 @@ static HRESULT WINAPI DP_IF_GetPlayerCaps
{ {
DPSP_GETCAPSDATA data; DPSP_GETCAPSDATA data;
TRACE("(%p)->(0x%08lx,%p,0x%08lx)\n", This, idPlayer, lpDPCaps, dwFlags); TRACE("(%p)->(0x%08x,%p,0x%08x)\n", This, idPlayer, lpDPCaps, dwFlags);
/* Query the service provider */ /* Query the service provider */
data.idPlayer = idPlayer; data.idPlayer = idPlayer;
@ -2405,7 +2405,7 @@ static HRESULT WINAPI DP_IF_GetGroupData
DWORD dwRequiredBufferSize; DWORD dwRequiredBufferSize;
LPVOID lpCopyDataFrom; LPVOID lpCopyDataFrom;
TRACE( "(%p)->(0x%08lx,%p,%p,0x%08lx,%u)\n", TRACE( "(%p)->(0x%08x,%p,%p,0x%08x,%u)\n",
This, idGroup, lpData, lpdwDataSize, dwFlags, bAnsi ); This, idGroup, lpData, lpdwDataSize, dwFlags, bAnsi );
if( ( lpGData = DP_FindAnyGroup( This, idGroup ) ) == NULL ) if( ( lpGData = DP_FindAnyGroup( This, idGroup ) ) == NULL )
@ -2465,7 +2465,7 @@ static HRESULT WINAPI DP_IF_GetGroupName
LPDPNAME lpName = (LPDPNAME)lpData; LPDPNAME lpName = (LPDPNAME)lpData;
DWORD dwRequiredDataSize; DWORD dwRequiredDataSize;
FIXME("(%p)->(0x%08lx,%p,%p,%u) ANSI ignored\n", FIXME("(%p)->(0x%08x,%p,%p,%u) ANSI ignored\n",
This, idGroup, lpData, lpdwDataSize, bAnsi ); This, idGroup, lpData, lpdwDataSize, bAnsi );
if( ( lpGData = DP_FindAnyGroup( This, idGroup ) ) == NULL ) if( ( lpGData = DP_FindAnyGroup( This, idGroup ) ) == NULL )
@ -2539,7 +2539,7 @@ static HRESULT WINAPI DP_IF_GetMessageCount
( IDirectPlay2Impl* This, DPID idPlayer, ( IDirectPlay2Impl* This, DPID idPlayer,
LPDWORD lpdwCount, BOOL bAnsi ) LPDWORD lpdwCount, BOOL bAnsi )
{ {
FIXME("(%p)->(0x%08lx,%p,%u): stub\n", This, idPlayer, lpdwCount, bAnsi ); FIXME("(%p)->(0x%08x,%p,%u): stub\n", This, idPlayer, lpdwCount, bAnsi );
return DP_IF_GetMessageQueue( (IDirectPlay4Impl*)This, 0, idPlayer, return DP_IF_GetMessageQueue( (IDirectPlay4Impl*)This, 0, idPlayer,
DPMESSAGEQUEUE_RECEIVE, lpdwCount, NULL, DPMESSAGEQUEUE_RECEIVE, lpdwCount, NULL,
bAnsi ); bAnsi );
@ -2563,7 +2563,7 @@ static HRESULT WINAPI DirectPlay2AImpl_GetPlayerAddress
( LPDIRECTPLAY2A iface, DPID idPlayer, LPVOID lpData, LPDWORD lpdwDataSize ) ( LPDIRECTPLAY2A iface, DPID idPlayer, LPVOID lpData, LPDWORD lpdwDataSize )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
FIXME("(%p)->(0x%08lx,%p,%p): stub\n", This, idPlayer, lpData, lpdwDataSize ); FIXME("(%p)->(0x%08x,%p,%p): stub\n", This, idPlayer, lpData, lpdwDataSize );
return DP_OK; return DP_OK;
} }
@ -2571,7 +2571,7 @@ static HRESULT WINAPI DirectPlay2WImpl_GetPlayerAddress
( LPDIRECTPLAY2 iface, DPID idPlayer, LPVOID lpData, LPDWORD lpdwDataSize ) ( LPDIRECTPLAY2 iface, DPID idPlayer, LPVOID lpData, LPDWORD lpdwDataSize )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
FIXME("(%p)->(0x%08lx,%p,%p): stub\n", This, idPlayer, lpData, lpdwDataSize ); FIXME("(%p)->(0x%08x,%p,%p): stub\n", This, idPlayer, lpData, lpdwDataSize );
return DP_OK; return DP_OK;
} }
@ -2599,7 +2599,7 @@ static HRESULT WINAPI DP_IF_GetPlayerData
DWORD dwRequiredBufferSize; DWORD dwRequiredBufferSize;
LPVOID lpCopyDataFrom; LPVOID lpCopyDataFrom;
TRACE( "(%p)->(0x%08lx,%p,%p,0x%08lx,%u)\n", TRACE( "(%p)->(0x%08x,%p,%p,0x%08x,%u)\n",
This, idPlayer, lpData, lpdwDataSize, dwFlags, bAnsi ); This, idPlayer, lpData, lpdwDataSize, dwFlags, bAnsi );
if( This->dp2->connectionInitialized == NO_PROVIDER ) if( This->dp2->connectionInitialized == NO_PROVIDER )
@ -2664,7 +2664,7 @@ static HRESULT WINAPI DP_IF_GetPlayerName
LPDPNAME lpName = (LPDPNAME)lpData; LPDPNAME lpName = (LPDPNAME)lpData;
DWORD dwRequiredDataSize; DWORD dwRequiredDataSize;
FIXME( "(%p)->(0x%08lx,%p,%p,%u): ANSI\n", FIXME( "(%p)->(0x%08x,%p,%p,%u): ANSI\n",
This, idPlayer, lpData, lpdwDataSize, bAnsi ); This, idPlayer, lpData, lpdwDataSize, bAnsi );
if( ( lpPList = DP_FindPlayer( This, idPlayer ) ) == NULL ) if( ( lpPList = DP_FindPlayer( This, idPlayer ) ) == NULL )
@ -2808,7 +2808,7 @@ static HRESULT WINAPI DP_SecureOpen
{ {
HRESULT hr = DP_OK; HRESULT hr = DP_OK;
FIXME( "(%p)->(%p,0x%08lx,%p,%p): partial stub\n", FIXME( "(%p)->(%p,0x%08x,%p,%p): partial stub\n",
This, lpsd, dwFlags, lpSecurity, lpCredentials ); This, lpsd, dwFlags, lpSecurity, lpCredentials );
if( This->dp2->bConnectionOpen ) if( This->dp2->bConnectionOpen )
@ -2906,7 +2906,7 @@ static HRESULT WINAPI DirectPlay2AImpl_Open
( LPDIRECTPLAY2A iface, LPDPSESSIONDESC2 lpsd, DWORD dwFlags ) ( LPDIRECTPLAY2A iface, LPDPSESSIONDESC2 lpsd, DWORD dwFlags )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
TRACE("(%p)->(%p,0x%08lx)\n", This, lpsd, dwFlags ); TRACE("(%p)->(%p,0x%08x)\n", This, lpsd, dwFlags );
return DP_SecureOpen( This, lpsd, dwFlags, NULL, NULL, TRUE ); return DP_SecureOpen( This, lpsd, dwFlags, NULL, NULL, TRUE );
} }
@ -2914,7 +2914,7 @@ static HRESULT WINAPI DirectPlay2WImpl_Open
( LPDIRECTPLAY2 iface, LPDPSESSIONDESC2 lpsd, DWORD dwFlags ) ( LPDIRECTPLAY2 iface, LPDPSESSIONDESC2 lpsd, DWORD dwFlags )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
TRACE("(%p)->(%p,0x%08lx)\n", This, lpsd, dwFlags ); TRACE("(%p)->(%p,0x%08x)\n", This, lpsd, dwFlags );
return DP_SecureOpen( This, lpsd, dwFlags, NULL, NULL, FALSE ); return DP_SecureOpen( This, lpsd, dwFlags, NULL, NULL, FALSE );
} }
@ -2924,7 +2924,7 @@ static HRESULT WINAPI DP_IF_Receive
{ {
LPDPMSG lpMsg = NULL; LPDPMSG lpMsg = NULL;
FIXME( "(%p)->(%p,%p,0x%08lx,%p,%p,%u): stub\n", FIXME( "(%p)->(%p,%p,0x%08x,%p,%p,%u): stub\n",
This, lpidFrom, lpidTo, dwFlags, lpData, lpdwDataSize, bAnsi ); This, lpidFrom, lpidTo, dwFlags, lpData, lpdwDataSize, bAnsi );
if( This->dp2->connectionInitialized == NO_PROVIDER ) if( This->dp2->connectionInitialized == NO_PROVIDER )
@ -2958,11 +2958,11 @@ static HRESULT WINAPI DP_IF_Receive
( dwFlags & DPRECEIVE_FROMPLAYER ) ( dwFlags & DPRECEIVE_FROMPLAYER )
) )
{ {
FIXME( "Find matching message 0x%08lx\n", dwFlags ); FIXME( "Find matching message 0x%08x\n", dwFlags );
} }
else else
{ {
ERR( "Hmmm..dwFlags 0x%08lx\n", dwFlags ); ERR( "Hmmm..dwFlags 0x%08x\n", dwFlags );
} }
if( lpMsg == NULL ) if( lpMsg == NULL )
@ -3016,7 +3016,7 @@ static HRESULT WINAPI DP_IF_SetGroupData
{ {
lpGroupData lpGData; lpGroupData lpGData;
TRACE( "(%p)->(0x%08lx,%p,0x%08lx,0x%08lx,%u)\n", TRACE( "(%p)->(0x%08x,%p,0x%08x,0x%08x,%u)\n",
This, idGroup, lpData, dwDataSize, dwFlags, bAnsi ); This, idGroup, lpData, dwDataSize, dwFlags, bAnsi );
/* Parameter check */ /* Parameter check */
@ -3076,7 +3076,7 @@ static HRESULT WINAPI DP_IF_SetGroupName
{ {
lpGroupData lpGData; lpGroupData lpGData;
TRACE( "(%p)->(0x%08lx,%p,0x%08lx,%u)\n", This, idGroup, TRACE( "(%p)->(0x%08x,%p,0x%08x,%u)\n", This, idGroup,
lpGroupName, dwFlags, bAnsi ); lpGroupName, dwFlags, bAnsi );
if( ( lpGData = DP_FindAnyGroup( This, idGroup ) ) == NULL ) if( ( lpGData = DP_FindAnyGroup( This, idGroup ) ) == NULL )
@ -3114,7 +3114,7 @@ static HRESULT WINAPI DP_IF_SetPlayerData
{ {
lpPlayerList lpPList; lpPlayerList lpPList;
TRACE( "(%p)->(0x%08lx,%p,0x%08lx,0x%08lx,%u)\n", TRACE( "(%p)->(0x%08x,%p,0x%08x,0x%08x,%u)\n",
This, idPlayer, lpData, dwDataSize, dwFlags, bAnsi ); This, idPlayer, lpData, dwDataSize, dwFlags, bAnsi );
/* Parameter check */ /* Parameter check */
@ -3173,7 +3173,7 @@ static HRESULT WINAPI DP_IF_SetPlayerName
{ {
lpPlayerList lpPList; lpPlayerList lpPList;
TRACE( "(%p)->(0x%08lx,%p,0x%08lx,%u)\n", TRACE( "(%p)->(0x%08x,%p,0x%08x,%u)\n",
This, idPlayer, lpPlayerName, dwFlags, bAnsi ); This, idPlayer, lpPlayerName, dwFlags, bAnsi );
if( ( lpPList = DP_FindPlayer( This, idPlayer ) ) == NULL ) if( ( lpPList = DP_FindPlayer( This, idPlayer ) ) == NULL )
@ -3212,7 +3212,7 @@ static HRESULT WINAPI DP_SetSessionDesc
DWORD dwRequiredSize; DWORD dwRequiredSize;
LPDPSESSIONDESC2 lpTempSessDesc; LPDPSESSIONDESC2 lpTempSessDesc;
TRACE( "(%p)->(%p,0x%08lx,%u,%u)\n", TRACE( "(%p)->(%p,0x%08x,%u,%u)\n",
This, lpSessDesc, dwFlags, bInitial, bAnsi ); This, lpSessDesc, dwFlags, bInitial, bAnsi );
if( This->dp2->connectionInitialized == NO_PROVIDER ) if( This->dp2->connectionInitialized == NO_PROVIDER )
@ -3384,7 +3384,7 @@ static HRESULT WINAPI DP_IF_AddGroupToGroup
lpGroupData lpGData; lpGroupData lpGData;
lpGroupList lpNewGList; lpGroupList lpNewGList;
TRACE( "(%p)->(0x%08lx,0x%08lx)\n", This, idParentGroup, idGroup ); TRACE( "(%p)->(0x%08x,0x%08x)\n", This, idParentGroup, idGroup );
if( ( lpGParentData = DP_FindAnyGroup( (IDirectPlay2AImpl*)This, idParentGroup ) ) == NULL ) if( ( lpGParentData = DP_FindAnyGroup( (IDirectPlay2AImpl*)This, idParentGroup ) ) == NULL )
{ {
@ -3439,7 +3439,7 @@ static HRESULT WINAPI DP_IF_CreateGroupInGroup
lpGroupList lpGList; lpGroupList lpGList;
lpGroupData lpGData; lpGroupData lpGData;
TRACE( "(%p)->(0x%08lx,%p,%p,%p,0x%08lx,0x%08lx,%u)\n", TRACE( "(%p)->(0x%08x,%p,%p,%p,0x%08x,0x%08x,%u)\n",
This, idParentGroup, lpidGroup, lpGroupName, lpData, This, idParentGroup, lpidGroup, lpGroupName, lpData,
dwDataSize, dwFlags, bAnsi ); dwDataSize, dwFlags, bAnsi );
@ -3553,7 +3553,7 @@ static HRESULT WINAPI DP_IF_DeleteGroupFromGroup
lpGroupList lpGList; lpGroupList lpGList;
lpGroupData lpGParentData; lpGroupData lpGParentData;
TRACE("(%p)->(0x%08lx,0x%08lx)\n", This, idParentGroup, idGroup ); TRACE("(%p)->(0x%08x,0x%08x)\n", This, idParentGroup, idGroup );
/* Is the parent group valid? */ /* Is the parent group valid? */
if( ( lpGParentData = DP_FindAnyGroup( (IDirectPlay2AImpl*)This, idParentGroup ) ) == NULL ) if( ( lpGParentData = DP_FindAnyGroup( (IDirectPlay2AImpl*)This, idParentGroup ) ) == NULL )
@ -3638,7 +3638,7 @@ static HRESULT WINAPI DirectPlay3AImpl_EnumConnections
( LPDIRECTPLAY3A iface, LPCGUID lpguidApplication, LPDPENUMCONNECTIONSCALLBACK lpEnumCallback, LPVOID lpContext, DWORD dwFlags ) ( LPDIRECTPLAY3A iface, LPCGUID lpguidApplication, LPDPENUMCONNECTIONSCALLBACK lpEnumCallback, LPVOID lpContext, DWORD dwFlags )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
TRACE("(%p)->(%p,%p,%p,0x%08lx)\n", This, lpguidApplication, lpEnumCallback, lpContext, dwFlags ); TRACE("(%p)->(%p,%p,%p,0x%08x)\n", This, lpguidApplication, lpEnumCallback, lpContext, dwFlags );
/* A default dwFlags (0) is backwards compatible -- DPCONNECTION_DIRECTPLAY */ /* A default dwFlags (0) is backwards compatible -- DPCONNECTION_DIRECTPLAY */
if( dwFlags == 0 ) if( dwFlags == 0 )
@ -3864,7 +3864,7 @@ static HRESULT WINAPI DirectPlay3WImpl_EnumConnections
( LPDIRECTPLAY3 iface, LPCGUID lpguidApplication, LPDPENUMCONNECTIONSCALLBACK lpEnumCallback, LPVOID lpContext, DWORD dwFlags ) ( LPDIRECTPLAY3 iface, LPCGUID lpguidApplication, LPDPENUMCONNECTIONSCALLBACK lpEnumCallback, LPVOID lpContext, DWORD dwFlags )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(%p,%p,%p,0x%08lx): stub\n", This, lpguidApplication, lpEnumCallback, lpContext, dwFlags ); FIXME("(%p)->(%p,%p,%p,0x%08x): stub\n", This, lpguidApplication, lpEnumCallback, lpContext, dwFlags );
return DP_OK; return DP_OK;
} }
@ -3876,7 +3876,7 @@ static HRESULT WINAPI DP_IF_EnumGroupsInGroup
lpGroupList lpGList; lpGroupList lpGList;
lpGroupData lpGData; lpGroupData lpGData;
FIXME( "(%p)->(0x%08lx,%p,%p,%p,0x%08lx,%u): semi stub\n", FIXME( "(%p)->(0x%08x,%p,%p,%p,0x%08x,%u): semi stub\n",
This, idGroup, lpguidInstance, lpEnumPlayersCallback2, This, idGroup, lpguidInstance, lpEnumPlayersCallback2,
lpContext, dwFlags, bAnsi ); lpContext, dwFlags, bAnsi );
@ -3941,7 +3941,7 @@ static HRESULT WINAPI DirectPlay3AImpl_GetGroupConnectionSettings
( LPDIRECTPLAY3A iface, DWORD dwFlags, DPID idGroup, LPVOID lpData, LPDWORD lpdwDataSize ) ( LPDIRECTPLAY3A iface, DWORD dwFlags, DPID idGroup, LPVOID lpData, LPDWORD lpdwDataSize )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08lx,0x%08lx,%p,%p): stub\n", This, dwFlags, idGroup, lpData, lpdwDataSize ); FIXME("(%p)->(0x%08x,0x%08x,%p,%p): stub\n", This, dwFlags, idGroup, lpData, lpdwDataSize );
return DP_OK; return DP_OK;
} }
@ -3949,7 +3949,7 @@ static HRESULT WINAPI DirectPlay3WImpl_GetGroupConnectionSettings
( LPDIRECTPLAY3 iface, DWORD dwFlags, DPID idGroup, LPVOID lpData, LPDWORD lpdwDataSize ) ( LPDIRECTPLAY3 iface, DWORD dwFlags, DPID idGroup, LPVOID lpData, LPDWORD lpdwDataSize )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08lx,0x%08lx,%p,%p): stub\n", This, dwFlags, idGroup, lpData, lpdwDataSize ); FIXME("(%p)->(0x%08x,0x%08x,%p,%p): stub\n", This, dwFlags, idGroup, lpData, lpdwDataSize );
return DP_OK; return DP_OK;
} }
@ -3964,12 +3964,12 @@ static BOOL CALLBACK DP_GetSpLpGuidFromCompoundAddress(
( IsEqualGUID( guidDataType, &DPAID_LobbyProvider ) ) ( IsEqualGUID( guidDataType, &DPAID_LobbyProvider ) )
) )
{ {
TRACE( "Found SP/LP (%s) %s (data size = 0x%08lx)\n", TRACE( "Found SP/LP (%s) %s (data size = 0x%08x)\n",
debugstr_guid( guidDataType ), debugstr_guid( lpData ), dwDataSize ); debugstr_guid( guidDataType ), debugstr_guid( lpData ), dwDataSize );
if( dwDataSize != sizeof( GUID ) ) if( dwDataSize != sizeof( GUID ) )
{ {
ERR( "Invalid sp/lp guid size 0x%08lx\n", dwDataSize ); ERR( "Invalid sp/lp guid size 0x%08x\n", dwDataSize );
} }
memcpy( lpContext, lpData, dwDataSize ); memcpy( lpContext, lpData, dwDataSize );
@ -4103,7 +4103,7 @@ static HMODULE DP_LoadSP( LPCGUID lpcGuid, LPSPINITDATA lpSpData, LPBOOL lpbIsDp
NULL, NULL, (LPBYTE)returnBuffer, NULL, NULL, (LPBYTE)returnBuffer,
&sizeOfReturnBuffer ) ) != ERROR_SUCCESS ) &sizeOfReturnBuffer ) ) != ERROR_SUCCESS )
{ {
ERR(": missing PATH registry data members: 0x%08lx\n", dwTemp ); ERR(": missing PATH registry data members: 0x%08x\n", dwTemp );
continue; continue;
} }
@ -4205,7 +4205,7 @@ static HRESULT WINAPI DP_IF_InitializeConnection
const DWORD dwAddrSize = 80; /* FIXME: Need to calculate it correctly */ const DWORD dwAddrSize = 80; /* FIXME: Need to calculate it correctly */
BOOL bIsDpSp; /* TRUE if Direct Play SP, FALSE if Direct Play Lobby SP */ BOOL bIsDpSp; /* TRUE if Direct Play SP, FALSE if Direct Play Lobby SP */
TRACE("(%p)->(%p,0x%08lx,%u)\n", This, lpConnection, dwFlags, bAnsi ); TRACE("(%p)->(%p,0x%08x,%u)\n", This, lpConnection, dwFlags, bAnsi );
if( dwFlags != 0 ) if( dwFlags != 0 )
{ {
@ -4305,7 +4305,7 @@ static HRESULT WINAPI DirectPlay3AImpl_SendChatMessage
( LPDIRECTPLAY3A iface, DPID idFrom, DPID idTo, DWORD dwFlags, LPDPCHAT lpChatMessage ) ( LPDIRECTPLAY3A iface, DPID idFrom, DPID idTo, DWORD dwFlags, LPDPCHAT lpChatMessage )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08lx,0x%08lx,0x%08lx,%p): stub\n", This, idFrom, idTo, dwFlags, lpChatMessage ); FIXME("(%p)->(0x%08x,0x%08x,0x%08x,%p): stub\n", This, idFrom, idTo, dwFlags, lpChatMessage );
return DP_OK; return DP_OK;
} }
@ -4313,7 +4313,7 @@ static HRESULT WINAPI DirectPlay3WImpl_SendChatMessage
( LPDIRECTPLAY3 iface, DPID idFrom, DPID idTo, DWORD dwFlags, LPDPCHAT lpChatMessage ) ( LPDIRECTPLAY3 iface, DPID idFrom, DPID idTo, DWORD dwFlags, LPDPCHAT lpChatMessage )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08lx,0x%08lx,0x%08lx,%p): stub\n", This, idFrom, idTo, dwFlags, lpChatMessage ); FIXME("(%p)->(0x%08x,0x%08x,0x%08x,%p): stub\n", This, idFrom, idTo, dwFlags, lpChatMessage );
return DP_OK; return DP_OK;
} }
@ -4321,7 +4321,7 @@ static HRESULT WINAPI DirectPlay3AImpl_SetGroupConnectionSettings
( LPDIRECTPLAY3A iface, DWORD dwFlags, DPID idGroup, LPDPLCONNECTION lpConnection ) ( LPDIRECTPLAY3A iface, DWORD dwFlags, DPID idGroup, LPDPLCONNECTION lpConnection )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08lx,0x%08lx,%p): stub\n", This, dwFlags, idGroup, lpConnection ); FIXME("(%p)->(0x%08x,0x%08x,%p): stub\n", This, dwFlags, idGroup, lpConnection );
return DP_OK; return DP_OK;
} }
@ -4329,7 +4329,7 @@ static HRESULT WINAPI DirectPlay3WImpl_SetGroupConnectionSettings
( LPDIRECTPLAY3 iface, DWORD dwFlags, DPID idGroup, LPDPLCONNECTION lpConnection ) ( LPDIRECTPLAY3 iface, DWORD dwFlags, DPID idGroup, LPDPLCONNECTION lpConnection )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08lx,0x%08lx,%p): stub\n", This, dwFlags, idGroup, lpConnection ); FIXME("(%p)->(0x%08x,0x%08x,%p): stub\n", This, dwFlags, idGroup, lpConnection );
return DP_OK; return DP_OK;
} }
@ -4337,7 +4337,7 @@ static HRESULT WINAPI DirectPlay3AImpl_StartSession
( LPDIRECTPLAY3A iface, DWORD dwFlags, DPID idGroup ) ( LPDIRECTPLAY3A iface, DWORD dwFlags, DPID idGroup )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08lx,0x%08lx): stub\n", This, dwFlags, idGroup ); FIXME("(%p)->(0x%08x,0x%08x): stub\n", This, dwFlags, idGroup );
return DP_OK; return DP_OK;
} }
@ -4345,7 +4345,7 @@ static HRESULT WINAPI DirectPlay3WImpl_StartSession
( LPDIRECTPLAY3 iface, DWORD dwFlags, DPID idGroup ) ( LPDIRECTPLAY3 iface, DWORD dwFlags, DPID idGroup )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08lx,0x%08lx): stub\n", This, dwFlags, idGroup ); FIXME("(%p)->(0x%08x,0x%08x): stub\n", This, dwFlags, idGroup );
return DP_OK; return DP_OK;
} }
@ -4353,7 +4353,7 @@ static HRESULT WINAPI DirectPlay3AImpl_GetGroupFlags
( LPDIRECTPLAY3A iface, DPID idGroup, LPDWORD lpdwFlags ) ( LPDIRECTPLAY3A iface, DPID idGroup, LPDWORD lpdwFlags )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08lx,%p): stub\n", This, idGroup, lpdwFlags ); FIXME("(%p)->(0x%08x,%p): stub\n", This, idGroup, lpdwFlags );
return DP_OK; return DP_OK;
} }
@ -4361,7 +4361,7 @@ static HRESULT WINAPI DirectPlay3WImpl_GetGroupFlags
( LPDIRECTPLAY3 iface, DPID idGroup, LPDWORD lpdwFlags ) ( LPDIRECTPLAY3 iface, DPID idGroup, LPDWORD lpdwFlags )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08lx,%p): stub\n", This, idGroup, lpdwFlags ); FIXME("(%p)->(0x%08x,%p): stub\n", This, idGroup, lpdwFlags );
return DP_OK; return DP_OK;
} }
@ -4371,7 +4371,7 @@ static HRESULT WINAPI DP_IF_GetGroupParent
{ {
lpGroupData lpGData; lpGroupData lpGData;
TRACE("(%p)->(0x%08lx,%p,%u)\n", This, idGroup, lpidGroup, bAnsi ); TRACE("(%p)->(0x%08x,%p,%u)\n", This, idGroup, lpidGroup, bAnsi );
if( ( lpGData = DP_FindAnyGroup( (IDirectPlay2AImpl*)This, idGroup ) ) == NULL ) if( ( lpGData = DP_FindAnyGroup( (IDirectPlay2AImpl*)This, idGroup ) ) == NULL )
{ {
@ -4400,7 +4400,7 @@ static HRESULT WINAPI DirectPlay3AImpl_GetPlayerAccount
( LPDIRECTPLAY3A iface, DPID idPlayer, DWORD dwFlags, LPVOID lpData, LPDWORD lpdwDataSize ) ( LPDIRECTPLAY3A iface, DPID idPlayer, DWORD dwFlags, LPVOID lpData, LPDWORD lpdwDataSize )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08lx,0x%08lx,%p,%p): stub\n", This, idPlayer, dwFlags, lpData, lpdwDataSize ); FIXME("(%p)->(0x%08x,0x%08x,%p,%p): stub\n", This, idPlayer, dwFlags, lpData, lpdwDataSize );
return DP_OK; return DP_OK;
} }
@ -4408,7 +4408,7 @@ static HRESULT WINAPI DirectPlay3WImpl_GetPlayerAccount
( LPDIRECTPLAY3 iface, DPID idPlayer, DWORD dwFlags, LPVOID lpData, LPDWORD lpdwDataSize ) ( LPDIRECTPLAY3 iface, DPID idPlayer, DWORD dwFlags, LPVOID lpData, LPDWORD lpdwDataSize )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08lx,0x%08lx,%p,%p): stub\n", This, idPlayer, dwFlags, lpData, lpdwDataSize ); FIXME("(%p)->(0x%08x,0x%08x,%p,%p): stub\n", This, idPlayer, dwFlags, lpData, lpdwDataSize );
return DP_OK; return DP_OK;
} }
@ -4416,7 +4416,7 @@ static HRESULT WINAPI DirectPlay3AImpl_GetPlayerFlags
( LPDIRECTPLAY3A iface, DPID idPlayer, LPDWORD lpdwFlags ) ( LPDIRECTPLAY3A iface, DPID idPlayer, LPDWORD lpdwFlags )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08lx,%p): stub\n", This, idPlayer, lpdwFlags ); FIXME("(%p)->(0x%08x,%p): stub\n", This, idPlayer, lpdwFlags );
return DP_OK; return DP_OK;
} }
@ -4424,7 +4424,7 @@ static HRESULT WINAPI DirectPlay3WImpl_GetPlayerFlags
( LPDIRECTPLAY3 iface, DPID idPlayer, LPDWORD lpdwFlags ) ( LPDIRECTPLAY3 iface, DPID idPlayer, LPDWORD lpdwFlags )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08lx,%p): stub\n", This, idPlayer, lpdwFlags ); FIXME("(%p)->(0x%08x,%p): stub\n", This, idPlayer, lpdwFlags );
return DP_OK; return DP_OK;
} }
@ -4432,7 +4432,7 @@ static HRESULT WINAPI DirectPlay4AImpl_GetGroupOwner
( LPDIRECTPLAY4A iface, DPID idGroup, LPDPID lpidGroupOwner ) ( LPDIRECTPLAY4A iface, DPID idGroup, LPDPID lpidGroupOwner )
{ {
IDirectPlay4Impl *This = (IDirectPlay4Impl *)iface; IDirectPlay4Impl *This = (IDirectPlay4Impl *)iface;
FIXME("(%p)->(0x%08lx,%p): stub\n", This, idGroup, lpidGroupOwner ); FIXME("(%p)->(0x%08x,%p): stub\n", This, idGroup, lpidGroupOwner );
return DP_OK; return DP_OK;
} }
@ -4440,7 +4440,7 @@ static HRESULT WINAPI DirectPlay4WImpl_GetGroupOwner
( LPDIRECTPLAY4 iface, DPID idGroup, LPDPID lpidGroupOwner ) ( LPDIRECTPLAY4 iface, DPID idGroup, LPDPID lpidGroupOwner )
{ {
IDirectPlay4Impl *This = (IDirectPlay4Impl *)iface; IDirectPlay4Impl *This = (IDirectPlay4Impl *)iface;
FIXME("(%p)->(0x%08lx,%p): stub\n", This, idGroup, lpidGroupOwner ); FIXME("(%p)->(0x%08x,%p): stub\n", This, idGroup, lpidGroupOwner );
return DP_OK; return DP_OK;
} }
@ -4448,7 +4448,7 @@ static HRESULT WINAPI DirectPlay4AImpl_SetGroupOwner
( LPDIRECTPLAY4A iface, DPID idGroup , DPID idGroupOwner ) ( LPDIRECTPLAY4A iface, DPID idGroup , DPID idGroupOwner )
{ {
IDirectPlay4Impl *This = (IDirectPlay4Impl *)iface; IDirectPlay4Impl *This = (IDirectPlay4Impl *)iface;
FIXME("(%p)->(0x%08lx,0x%08lx): stub\n", This, idGroup, idGroupOwner ); FIXME("(%p)->(0x%08x,0x%08x): stub\n", This, idGroup, idGroupOwner );
return DP_OK; return DP_OK;
} }
@ -4456,7 +4456,7 @@ static HRESULT WINAPI DirectPlay4WImpl_SetGroupOwner
( LPDIRECTPLAY4 iface, DPID idGroup , DPID idGroupOwner ) ( LPDIRECTPLAY4 iface, DPID idGroup , DPID idGroupOwner )
{ {
IDirectPlay4Impl *This = (IDirectPlay4Impl *)iface; IDirectPlay4Impl *This = (IDirectPlay4Impl *)iface;
FIXME("(%p)->(0x%08lx,0x%08lx): stub\n", This, idGroup, idGroupOwner ); FIXME("(%p)->(0x%08x,0x%08x): stub\n", This, idGroup, idGroupOwner );
return DP_OK; return DP_OK;
} }
@ -4469,7 +4469,7 @@ static HRESULT WINAPI DP_SendEx
lpGroupData lpGData; lpGroupData lpGData;
BOOL bValidDestination = FALSE; BOOL bValidDestination = FALSE;
FIXME( "(%p)->(0x%08lx,0x%08lx,0x%08lx,%p,0x%08lx,0x%08lx,0x%08lx,%p,%p,%u)" FIXME( "(%p)->(0x%08x,0x%08x,0x%08x,%p,0x%08x,0x%08x,0x%08x,%p,%p,%u)"
": stub\n", ": stub\n",
This, idFrom, idTo, dwFlags, lpData, dwDataSize, dwPriority, This, idFrom, idTo, dwFlags, lpData, dwDataSize, dwPriority,
dwTimeout, lpContext, lpdwMsgID, bAnsi ); dwTimeout, lpContext, lpdwMsgID, bAnsi );
@ -4488,7 +4488,7 @@ static HRESULT WINAPI DP_SendEx
{ {
if( ( lpPList = DP_FindPlayer( This, idFrom ) ) == NULL ) if( ( lpPList = DP_FindPlayer( This, idFrom ) ) == NULL )
{ {
WARN( "INFO: Invalid from player 0x%08lx\n", idFrom ); WARN( "INFO: Invalid from player 0x%08x\n", idFrom );
return DPERR_INVALIDPLAYER; return DPERR_INVALIDPLAYER;
} }
} }
@ -4624,7 +4624,7 @@ static HRESULT WINAPI DP_IF_GetMessageQueue
{ {
HRESULT hr = DP_OK; HRESULT hr = DP_OK;
FIXME( "(%p)->(0x%08lx,0x%08lx,0x%08lx,%p,%p,%u): semi stub\n", FIXME( "(%p)->(0x%08x,0x%08x,0x%08x,%p,%p,%u): semi stub\n",
This, idFrom, idTo, dwFlags, lpdwNumMsgs, lpdwNumBytes, bAnsi ); This, idFrom, idTo, dwFlags, lpdwNumMsgs, lpdwNumBytes, bAnsi );
/* FIXME: Do we need to do idFrom and idTo sanity checking here? */ /* FIXME: Do we need to do idFrom and idTo sanity checking here? */
@ -4679,7 +4679,7 @@ static HRESULT WINAPI DP_IF_CancelMessage
{ {
HRESULT hr = DP_OK; HRESULT hr = DP_OK;
FIXME( "(%p)->(0x%08lx,0x%08lx,%u): semi stub\n", FIXME( "(%p)->(0x%08x,0x%08x,%u): semi stub\n",
This, dwMsgID, dwFlags, bAnsi ); This, dwMsgID, dwFlags, bAnsi );
if( This->dp2->spData.lpCB->Cancel ) if( This->dp2->spData.lpCB->Cancel )

34
dlls/dplayx/dplaysp.c
View File

@ -260,7 +260,7 @@ static ULONG WINAPI DPSP_AddRef
ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef ); ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef );
ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef );
TRACE( "ref count incremented to %lu:%lu for %p\n", TRACE( "ref count incremented to %u:%u for %p\n",
ulInterfaceRefCount, ulObjRefCount, This ); ulInterfaceRefCount, ulObjRefCount, This );
return ulObjRefCount; return ulObjRefCount;
@ -275,7 +275,7 @@ static ULONG WINAPI DPSP_Release
ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef ); ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef );
ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef );
TRACE( "ref count decremented to %lu:%lu for %p\n", TRACE( "ref count decremented to %u:%u for %p\n",
ulInterfaceRefCount, ulObjRefCount, This ); ulInterfaceRefCount, ulObjRefCount, This );
/* Deallocate if this is the last reference to the object */ /* Deallocate if this is the last reference to the object */
@ -306,7 +306,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_AddMRUEntry
/* Should be able to call the comctl32 undocumented MRU routines. /* Should be able to call the comctl32 undocumented MRU routines.
I suspect that the interface works appropriately */ I suspect that the interface works appropriately */
FIXME( "(%p)->(%p,%p%p,0x%08lx,0x%08lx): stub\n", FIXME( "(%p)->(%p,%p%p,0x%08x,0x%08x): stub\n",
This, lpSection, lpKey, lpData, dwDataSize, dwMaxEntries ); This, lpSection, lpKey, lpData, dwDataSize, dwMaxEntries );
return DP_OK; return DP_OK;
@ -324,7 +324,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_CreateAddress
{ {
IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
FIXME( "(%p)->(%s,%s,%p,0x%08lx,%p,%p): stub\n", FIXME( "(%p)->(%s,%s,%p,0x%08x,%p,%p): stub\n",
This, debugstr_guid(guidSP), debugstr_guid(guidDataType), This, debugstr_guid(guidSP), debugstr_guid(guidDataType),
lpData, dwDataSize, lpAddress, lpdwAddressSize ); lpData, dwDataSize, lpAddress, lpdwAddressSize );
@ -341,7 +341,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_EnumAddress
{ {
IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
TRACE( "(%p)->(%p,%p,0x%08lx,%p)\n", TRACE( "(%p)->(%p,%p,0x%08x,%p)\n",
This, lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext ); This, lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext );
DPL_EnumAddress( lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext ); DPL_EnumAddress( lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext );
@ -375,7 +375,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetPlayerFlags
{ {
IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
FIXME( "(%p)->(0x%08lx,%p): stub\n", FIXME( "(%p)->(0x%08x,%p): stub\n",
This, idPlayer, lpdwPlayerFlags ); This, idPlayer, lpdwPlayerFlags );
return DP_OK; return DP_OK;
@ -393,7 +393,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPPlayerData
LPDP_SPPLAYERDATA lpPlayerData; LPDP_SPPLAYERDATA lpPlayerData;
IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
TRACE( "(%p)->(0x%08lx,%p,%p,0x%08lx)\n", TRACE( "(%p)->(0x%08x,%p,%p,0x%08x)\n",
This, idPlayer, lplpData, lpdwDataSize, dwFlags ); This, idPlayer, lplpData, lpdwDataSize, dwFlags );
hr = DP_GetSPPlayerData( This->sp->dplay, idPlayer, (LPVOID*)&lpPlayerData ); hr = DP_GetSPPlayerData( This->sp->dplay, idPlayer, (LPVOID*)&lpPlayerData );
@ -441,18 +441,18 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage
IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
FIXME( "(%p)->(%p,0x%08lx,%p): mostly stub\n", FIXME( "(%p)->(%p,0x%08x,%p): mostly stub\n",
This, lpMessageBody, dwMessageBodySize, lpMessageHeader ); This, lpMessageBody, dwMessageBodySize, lpMessageHeader );
wCommandId = lpMsg->wCommandId; wCommandId = lpMsg->wCommandId;
wVersion = lpMsg->wVersion; wVersion = lpMsg->wVersion;
TRACE( "Incoming message has envelope of 0x%08lx, %u, %u\n", TRACE( "Incoming message has envelope of 0x%08x, %u, %u\n",
lpMsg->dwMagic, wCommandId, wVersion ); lpMsg->dwMagic, wCommandId, wVersion );
if( lpMsg->dwMagic != DPMSGMAGIC_DPLAYMSG ) if( lpMsg->dwMagic != DPMSGMAGIC_DPLAYMSG )
{ {
ERR( "Unknown magic 0x%08lx!\n", lpMsg->dwMagic ); ERR( "Unknown magic 0x%08x!\n", lpMsg->dwMagic );
return DPERR_GENERIC; return DPERR_GENERIC;
} }
@ -755,7 +755,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPPlayerData
IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
/* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */ /* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */
TRACE( "(%p)->(0x%08lx,%p,0x%08lx,0x%08lx)\n", TRACE( "(%p)->(0x%08x,%p,0x%08x,0x%08x)\n",
This, idPlayer, lpData, dwDataSize, dwFlags ); This, idPlayer, lpData, dwDataSize, dwFlags );
hr = DP_GetSPPlayerData( This->sp->dplay, idPlayer, (LPVOID*)&lpPlayerEntry ); hr = DP_GetSPPlayerData( This->sp->dplay, idPlayer, (LPVOID*)&lpPlayerEntry );
@ -794,7 +794,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_CreateCompoundAddress
{ {
IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
FIXME( "(%p)->(%p,0x%08lx,%p,%p): stub\n", FIXME( "(%p)->(%p,0x%08x,%p,%p): stub\n",
This, lpElements, dwElementCount, lpAddress, lpdwAddressSize ); This, lpElements, dwElementCount, lpAddress, lpdwAddressSize );
return DP_OK; return DP_OK;
@ -811,7 +811,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPData
IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
/* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */ /* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */
TRACE( "(%p)->(%p,%p,0x%08lx)\n", TRACE( "(%p)->(%p,%p,0x%08x)\n",
This, lplpData, lpdwDataSize, dwFlags ); This, lplpData, lpdwDataSize, dwFlags );
#if 0 #if 0
@ -827,7 +827,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPData
*/ */
if( dwFlags != DPSET_REMOTE ) if( dwFlags != DPSET_REMOTE )
{ {
TRACE( "Undocumented dwFlags 0x%08lx used\n", dwFlags ); TRACE( "Undocumented dwFlags 0x%08x used\n", dwFlags );
} }
#endif #endif
@ -870,7 +870,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPData
IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
/* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */ /* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */
TRACE( "(%p)->(%p,0x%08lx,0x%08lx)\n", TRACE( "(%p)->(%p,0x%08x,0x%08x)\n",
This, lpData, dwDataSize, dwFlags ); This, lpData, dwDataSize, dwFlags );
#if 0 #if 0
@ -886,7 +886,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPData
*/ */
if( dwFlags != DPSET_REMOTE ) if( dwFlags != DPSET_REMOTE )
{ {
TRACE( "Undocumented dwFlags 0x%08lx used\n", dwFlags ); TRACE( "Undocumented dwFlags 0x%08x used\n", dwFlags );
} }
#endif #endif
@ -918,7 +918,7 @@ static VOID WINAPI IDirectPlaySPImpl_SendComplete
{ {
IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
FIXME( "(%p)->(%p,0x%08lx): stub\n", FIXME( "(%p)->(%p,0x%08x): stub\n",
This, unknownA, unknownB ); This, unknownA, unknownB );
} }

24
dlls/dplayx/dplayx_global.c
View File

@ -116,7 +116,7 @@ LPVOID DPLAYX_PrivHeapAlloc( DWORD flags, DWORD size )
if( size > (dwBlockSize - sizeof(DWORD)) ) if( size > (dwBlockSize - sizeof(DWORD)) )
{ {
FIXME( "Size exceeded. Request of 0x%08lx\n", size ); FIXME( "Size exceeded. Request of 0x%08x\n", size );
size = dwBlockSize - sizeof(DWORD); size = dwBlockSize - sizeof(DWORD);
} }
@ -246,7 +246,7 @@ BOOL DPLAYX_ConstructData(void)
} }
else else
{ {
ERR( ": semaphore error %ld\n", GetLastError() ); ERR( ": semaphore error %d\n", GetLastError() );
return FALSE; return FALSE;
} }
@ -269,7 +269,7 @@ BOOL DPLAYX_ConstructData(void)
} }
else else
{ {
ERR( ": unable to create shared memory (%ld)\n", GetLastError() ); ERR( ": unable to create shared memory (%d)\n", GetLastError() );
DPLAYX_ReleaseSemaphore(); DPLAYX_ReleaseSemaphore();
return FALSE; return FALSE;
} }
@ -280,7 +280,7 @@ BOOL DPLAYX_ConstructData(void)
if( lpSharedStaticData == NULL ) if( lpSharedStaticData == NULL )
{ {
ERR( ": unable to map static data into process memory space (%ld)\n", ERR( ": unable to map static data into process memory space (%d)\n",
GetLastError() ); GetLastError() );
DPLAYX_ReleaseSemaphore(); DPLAYX_ReleaseSemaphore();
return FALSE; return FALSE;
@ -414,7 +414,7 @@ BOOL DPLAYX_IsAppIdLobbied( DWORD dwAppID, LPDPLAYX_LOBBYDATA* lplpDplData )
if( dwAppID == 0 ) if( dwAppID == 0 )
{ {
dwAppID = GetCurrentProcessId(); dwAppID = GetCurrentProcessId();
TRACE( "Translated dwAppID == 0 into 0x%08lx\n", dwAppID ); TRACE( "Translated dwAppID == 0 into 0x%08x\n", dwAppID );
} }
for( i=0; i < numSupportedLobbies; i++ ) for( i=0; i < numSupportedLobbies; i++ )
@ -422,7 +422,7 @@ BOOL DPLAYX_IsAppIdLobbied( DWORD dwAppID, LPDPLAYX_LOBBYDATA* lplpDplData )
if( lobbyData[ i ].dwAppID == dwAppID ) if( lobbyData[ i ].dwAppID == dwAppID )
{ {
/* This process is lobbied */ /* This process is lobbied */
TRACE( "Found 0x%08lx @ %u\n", dwAppID, i ); TRACE( "Found 0x%08x @ %u\n", dwAppID, i );
*lplpDplData = &lobbyData[ i ]; *lplpDplData = &lobbyData[ i ];
return TRUE; return TRUE;
} }
@ -450,7 +450,7 @@ BOOL DPLAYX_CreateLobbyApplication( DWORD dwAppID )
if( lobbyData[ i ].dwAppID == 0 ) if( lobbyData[ i ].dwAppID == 0 )
{ {
/* This process is now lobbied */ /* This process is now lobbied */
TRACE( "Setting lobbyData[%u] for (0x%08lx,0x%08lx)\n", TRACE( "Setting lobbyData[%u] for (0x%08x,0x%08x)\n",
i, dwAppID, GetCurrentProcessId() ); i, dwAppID, GetCurrentProcessId() );
lobbyData[ i ].dwAppID = dwAppID; lobbyData[ i ].dwAppID = dwAppID;
@ -614,7 +614,7 @@ HRESULT DPLAYX_GetConnectionSettingsA
{ {
DPLAYX_ReleaseSemaphore(); DPLAYX_ReleaseSemaphore();
TRACE( "Application 0x%08lx is not lobbied\n", dwAppID ); TRACE( "Application 0x%08x is not lobbied\n", dwAppID );
return DPERR_NOTLOBBIED; return DPERR_NOTLOBBIED;
} }
@ -867,7 +867,7 @@ HRESULT DPLAYX_SetConnectionSettingsA
/* Store information */ /* Store information */
if( lpConn->dwSize != sizeof(DPLCONNECTION) ) if( lpConn->dwSize != sizeof(DPLCONNECTION) )
{ {
ERR(": old/new DPLCONNECTION type? Size=%08lx\n", lpConn->dwSize ); ERR(": old/new DPLCONNECTION type? Size=%08x\n", lpConn->dwSize );
return DPERR_INVALIDPARAMS; return DPERR_INVALIDPARAMS;
} }
@ -887,7 +887,7 @@ HRESULT DPLAYX_SetConnectionSettingsA
{ {
DPLAYX_ReleaseSemaphore(); DPLAYX_ReleaseSemaphore();
ERR("DPSESSIONDESC passed in? Size=%lu\n", lpConn->lpSessionDesc->dwSize ); ERR("DPSESSIONDESC passed in? Size=%u\n", lpConn->lpSessionDesc->dwSize );
return DPERR_INVALIDPARAMS; return DPERR_INVALIDPARAMS;
} }
@ -929,7 +929,7 @@ HRESULT DPLAYX_SetConnectionSettingsW
/* Store information */ /* Store information */
if( lpConn->dwSize != sizeof(DPLCONNECTION) ) if( lpConn->dwSize != sizeof(DPLCONNECTION) )
{ {
ERR(": old/new DPLCONNECTION type? Size=%lu\n", lpConn->dwSize ); ERR(": old/new DPLCONNECTION type? Size=%u\n", lpConn->dwSize );
return DPERR_INVALIDPARAMS; return DPERR_INVALIDPARAMS;
} }
@ -1345,7 +1345,7 @@ LPCSTR DPLAYX_HresultToString(HRESULT hr)
default: default:
/* For errors not in the list, return HRESULT as a string /* For errors not in the list, return HRESULT as a string
This part is not thread safe */ This part is not thread safe */
WARN( "Unknown error 0x%08lx\n", hr ); WARN( "Unknown error 0x%08x\n", hr );
wsprintfA( szTempStr, "0x%08lx", hr ); wsprintfA( szTempStr, "0x%08lx", hr );
return szTempStr; return szTempStr;
} }

4
dlls/dplayx/dplayx_main.c
View File

@ -73,7 +73,7 @@ DWORD gdwDPlaySPRefCount = 0; /* FIXME: Should it be initialized here? */
BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
{ {
TRACE( "(%p,%ld,%p)\n", hinstDLL, fdwReason, lpvReserved ); TRACE( "(%p,%d,%p)\n", hinstDLL, fdwReason, lpvReserved );
switch ( fdwReason ) switch ( fdwReason )
{ {
@ -105,7 +105,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
* as well * as well
*/ */
TRACE( ": returning 0x%08lx\n", hr ); TRACE( ": returning 0x%08x\n", hr );
return hr; return hr;
} }

18
dlls/dplayx/dplayx_messages.c
View File

@ -119,7 +119,7 @@ static DWORD CALLBACK DPL_MSG_ThreadMain( LPVOID lpContext )
dwWaitResult = WaitForSingleObject( lpThreadInfo->hStart, 10000 /* 10 sec */ ); dwWaitResult = WaitForSingleObject( lpThreadInfo->hStart, 10000 /* 10 sec */ );
if( dwWaitResult == WAIT_TIMEOUT ) if( dwWaitResult == WAIT_TIMEOUT )
{ {
FIXME( "Should signal app/wait creation failure (0x%08lx)\n", dwWaitResult ); FIXME( "Should signal app/wait creation failure (0x%08x)\n", dwWaitResult );
goto end_of_thread; goto end_of_thread;
} }
@ -131,7 +131,7 @@ static DWORD CALLBACK DPL_MSG_ThreadMain( LPVOID lpContext )
dwWaitResult = WaitForSingleObject( lpThreadInfo->hSettingRead, INFINITE ); dwWaitResult = WaitForSingleObject( lpThreadInfo->hSettingRead, INFINITE );
if( dwWaitResult == WAIT_TIMEOUT ) if( dwWaitResult == WAIT_TIMEOUT )
{ {
ERR( "App Read connection setting timeout fail (0x%08lx)\n", dwWaitResult ); ERR( "App Read connection setting timeout fail (0x%08x)\n", dwWaitResult );
} }
/* Close this handle as it's not needed anymore */ /* Close this handle as it's not needed anymore */
@ -225,7 +225,7 @@ HRESULT DP_MSG_SendRequestPlayerId( IDirectPlay2AImpl* This, DWORD dwFlags,
data.bSystemMessage = TRUE; /* Allow reply to be sent */ data.bSystemMessage = TRUE; /* Allow reply to be sent */
data.lpISP = This->dp2->spData.lpISP; data.lpISP = This->dp2->spData.lpISP;
TRACE( "Asking for player id w/ dwFlags 0x%08lx\n", TRACE( "Asking for player id w/ dwFlags 0x%08x\n",
lpMsgBody->dwFlags ); lpMsgBody->dwFlags );
DP_MSG_ExpectReply( This, &data, DPMSG_DEFAULT_WAIT_TIME, DPMSGCMD_NEWPLAYERIDREPLY, DP_MSG_ExpectReply( This, &data, DPMSG_DEFAULT_WAIT_TIME, DPMSGCMD_NEWPLAYERIDREPLY,
@ -241,7 +241,7 @@ HRESULT DP_MSG_SendRequestPlayerId( IDirectPlay2AImpl* This, DWORD dwFlags,
*lpdpidAllocatedId = lpcReply->dpidNewPlayerId; *lpdpidAllocatedId = lpcReply->dpidNewPlayerId;
TRACE( "Received reply for id = 0x%08lx\n", lpcReply->dpidNewPlayerId ); TRACE( "Received reply for id = 0x%08x\n", lpcReply->dpidNewPlayerId );
/* FIXME: I think that the rest of the message has something to do /* FIXME: I think that the rest of the message has something to do
* with remote data for the player that perhaps I need to setup. * with remote data for the player that perhaps I need to setup.
@ -323,7 +323,7 @@ HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlay2AImpl* This, DPID dpidServer )
lpMsgBody->unknown4[3] = NS_GetNsMagic( This->dp2->lpNameServerData ) - lpMsgBody->unknown4[3] = NS_GetNsMagic( This->dp2->lpNameServerData ) -
0x02000000; 0x02000000;
TRACE( "Setting first magic to 0x%08lx\n", lpMsgBody->unknown4[3] ); TRACE( "Setting first magic to 0x%08x\n", lpMsgBody->unknown4[3] );
lpMsgBody->unknown4[4] = 0x0; lpMsgBody->unknown4[4] = 0x0;
lpMsgBody->unknown4[5] = 0x0; lpMsgBody->unknown4[5] = 0x0;
@ -334,7 +334,7 @@ HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlay2AImpl* This, DPID dpidServer )
#else #else
lpMsgBody->unknown4[7] = NS_GetNsMagic( This->dp2->lpNameServerData ); lpMsgBody->unknown4[7] = NS_GetNsMagic( This->dp2->lpNameServerData );
#endif #endif
TRACE( "Setting second magic to 0x%08lx\n", lpMsgBody->unknown4[7] ); TRACE( "Setting second magic to 0x%08x\n", lpMsgBody->unknown4[7] );
lpMsgBody->unknown4[8] = 0x0; lpMsgBody->unknown4[8] = 0x0;
lpMsgBody->unknown4[9] = 0x0; lpMsgBody->unknown4[9] = 0x0;
@ -356,7 +356,7 @@ HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlay2AImpl* This, DPID dpidServer )
data.bSystemMessage = TRUE; /* Allow reply to be sent */ data.bSystemMessage = TRUE; /* Allow reply to be sent */
data.lpISP = This->dp2->spData.lpISP; data.lpISP = This->dp2->spData.lpISP;
TRACE( "Sending forward player request with 0x%08lx\n", dpidServer ); TRACE( "Sending forward player request with 0x%08x\n", dpidServer );
lpMsg = DP_MSG_ExpectReply( This, &data, lpMsg = DP_MSG_ExpectReply( This, &data,
DPMSG_WAIT_60_SECS, DPMSG_WAIT_60_SECS,
@ -393,7 +393,7 @@ LPVOID DP_MSG_ExpectReply( IDirectPlay2AImpl* This, LPDPSP_SENDDATA lpData,
hMsgReceipt = DP_MSG_BuildAndLinkReplyStruct( This, &replyStructList, hMsgReceipt = DP_MSG_BuildAndLinkReplyStruct( This, &replyStructList,
wReplyCommandId ); wReplyCommandId );
TRACE( "Sending msg and expecting cmd %u in reply within %lu ticks\n", TRACE( "Sending msg and expecting cmd %u in reply within %u ticks\n",
wReplyCommandId, dwWaitTime ); wReplyCommandId, dwWaitTime );
hr = (*This->dp2->spData.lpCB->Send)( lpData ); hr = (*This->dp2->spData.lpCB->Send)( lpData );
@ -409,7 +409,7 @@ LPVOID DP_MSG_ExpectReply( IDirectPlay2AImpl* This, LPDPSP_SENDDATA lpData,
dwWaitReturn = WaitForSingleObject( hMsgReceipt, dwWaitTime ); dwWaitReturn = WaitForSingleObject( hMsgReceipt, dwWaitTime );
if( dwWaitReturn != WAIT_OBJECT_0 ) if( dwWaitReturn != WAIT_OBJECT_0 )
{ {
ERR( "Wait failed 0x%08lx\n", dwWaitReturn ); ERR( "Wait failed 0x%08x\n", dwWaitReturn );
return NULL; return NULL;
} }

48
dlls/dplayx/dplobby.c
View File

@ -419,7 +419,7 @@ static ULONG WINAPI DPL_AddRef
ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef ); ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef );
ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef );
TRACE( "ref count incremented to %lu:%lu for %p\n", TRACE( "ref count incremented to %u:%u for %p\n",
ulInterfaceRefCount, ulObjRefCount, This ); ulInterfaceRefCount, ulObjRefCount, This );
return ulObjRefCount; return ulObjRefCount;
@ -439,7 +439,7 @@ static ULONG WINAPI DPL_Release
ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef ); ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef );
ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef );
TRACE( "ref count decremented to %lu:%lu for %p\n", TRACE( "ref count decremented to %u:%u for %p\n",
ulInterfaceRefCount, ulObjRefCount, This ); ulInterfaceRefCount, ulObjRefCount, This );
/* Deallocate if this is the last reference to the object */ /* Deallocate if this is the last reference to the object */
@ -480,7 +480,7 @@ static HRESULT WINAPI DPL_ConnectEx
DWORD dwConnSize = 0; DWORD dwConnSize = 0;
LPDPLCONNECTION lpConn; LPDPLCONNECTION lpConn;
FIXME("(%p)->(0x%08lx,%p,%p): semi stub\n", This, dwFlags, lplpDP, pUnk ); FIXME("(%p)->(0x%08x,%p,%p): semi stub\n", This, dwFlags, lplpDP, pUnk );
if( pUnk ) if( pUnk )
{ {
@ -622,7 +622,7 @@ HRESULT DPL_CreateAddress(
const DWORD dwNumAddElements = 2; /* Service Provide & address data type */ const DWORD dwNumAddElements = 2; /* Service Provide & address data type */
DPCOMPOUNDADDRESSELEMENT addressElements[ 2 /* dwNumAddElements */ ]; DPCOMPOUNDADDRESSELEMENT addressElements[ 2 /* dwNumAddElements */ ];
TRACE( "(%p)->(%p,%p,0x%08lx,%p,%p,%d)\n", guidSP, guidDataType, lpData, dwDataSize, TRACE( "(%p)->(%p,%p,0x%08x,%p,%p,%d)\n", guidSP, guidDataType, lpData, dwDataSize,
lpAddress, lpdwAddressSize, bAnsiInterface ); lpAddress, lpdwAddressSize, bAnsiInterface );
addressElements[ 0 ].guidDataType = DPAID_ServiceProvider; addressElements[ 0 ].guidDataType = DPAID_ServiceProvider;
@ -656,7 +656,7 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_EnumAddress
{ {
IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface;
TRACE("(%p)->(%p,%p,0x%08lx,%p)\n", This, lpEnumAddressCallback, lpAddress, TRACE("(%p)->(%p,%p,0x%08x,%p)\n", This, lpEnumAddressCallback, lpAddress,
dwAddressSize, lpContext ); dwAddressSize, lpContext );
return DPL_EnumAddress( lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext ); return DPL_EnumAddress( lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext );
@ -671,7 +671,7 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_EnumAddress
{ {
IDirectPlayLobbyWImpl *This = (IDirectPlayLobbyWImpl *)iface; IDirectPlayLobbyWImpl *This = (IDirectPlayLobbyWImpl *)iface;
TRACE("(%p)->(%p,%p,0x%08lx,%p)\n", This, lpEnumAddressCallback, lpAddress, TRACE("(%p)->(%p,%p,0x%08x,%p)\n", This, lpEnumAddressCallback, lpAddress,
dwAddressSize, lpContext ); dwAddressSize, lpContext );
return DPL_EnumAddress( lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext ); return DPL_EnumAddress( lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext );
@ -727,7 +727,7 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_EnumAddressTypes
char subKeyName[51]; char subKeyName[51];
FILETIME filetime; FILETIME filetime;
TRACE(" (%p)->(%p,%p,%p,0x%08lx)\n", This, lpEnumAddressTypeCallback, guidSP, lpContext, dwFlags ); TRACE(" (%p)->(%p,%p,%p,0x%08x)\n", This, lpEnumAddressTypeCallback, guidSP, lpContext, dwFlags );
if( dwFlags != 0 ) if( dwFlags != 0 )
{ {
@ -863,7 +863,7 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_EnumLocalApplications
{ {
IDirectPlayLobbyWImpl *This = (IDirectPlayLobbyWImpl *)iface; IDirectPlayLobbyWImpl *This = (IDirectPlayLobbyWImpl *)iface;
FIXME("(%p)->(%p,%p,0x%08lx):stub\n", This, lpEnumLocalAppCallback, lpContext, dwFlags ); FIXME("(%p)->(%p,%p,0x%08x):stub\n", This, lpEnumLocalAppCallback, lpContext, dwFlags );
return DPERR_OUTOFMEMORY; return DPERR_OUTOFMEMORY;
} }
@ -883,7 +883,7 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_EnumLocalApplications
char subKeyName[51]; char subKeyName[51];
FILETIME filetime; FILETIME filetime;
TRACE("(%p)->(%p,%p,0x%08lx)\n", This, lpEnumLocalAppCallback, lpContext, dwFlags ); TRACE("(%p)->(%p,%p,0x%08x)\n", This, lpEnumLocalAppCallback, lpContext, dwFlags );
if( dwFlags != 0 ) if( dwFlags != 0 )
{ {
@ -979,7 +979,7 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_GetConnectionSettings
IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(0x%08lx,%p,%p)\n", This, dwAppID, lpData, lpdwDataSize ); TRACE("(%p)->(0x%08x,%p,%p)\n", This, dwAppID, lpData, lpdwDataSize );
EnterCriticalSection( &This->unk->DPL_lock ); EnterCriticalSection( &This->unk->DPL_lock );
@ -1002,7 +1002,7 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_GetConnectionSettings
IDirectPlayLobbyWImpl *This = (IDirectPlayLobbyWImpl *)iface; IDirectPlayLobbyWImpl *This = (IDirectPlayLobbyWImpl *)iface;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(0x%08lx,%p,%p)\n", This, dwAppID, lpData, lpdwDataSize ); TRACE("(%p)->(0x%08x,%p,%p)\n", This, dwAppID, lpData, lpdwDataSize );
EnterCriticalSection( &This->unk->DPL_lock ); EnterCriticalSection( &This->unk->DPL_lock );
@ -1031,7 +1031,7 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_ReceiveLobbyMessage
LPDWORD lpdwDataSize ) LPDWORD lpdwDataSize )
{ {
IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface;
FIXME(":stub %p %08lx %08lx %p %p %p\n", This, dwFlags, dwAppID, lpdwMessageFlags, lpData, FIXME(":stub %p %08x %08x %p %p %p\n", This, dwFlags, dwAppID, lpdwMessageFlags, lpData,
lpdwDataSize ); lpdwDataSize );
return DPERR_OUTOFMEMORY; return DPERR_OUTOFMEMORY;
} }
@ -1045,7 +1045,7 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_ReceiveLobbyMessage
LPDWORD lpdwDataSize ) LPDWORD lpdwDataSize )
{ {
IDirectPlayLobbyWImpl *This = (IDirectPlayLobbyWImpl *)iface; IDirectPlayLobbyWImpl *This = (IDirectPlayLobbyWImpl *)iface;
FIXME(":stub %p %08lx %08lx %p %p %p\n", This, dwFlags, dwAppID, lpdwMessageFlags, lpData, FIXME(":stub %p %08x %08x %p %p %p\n", This, dwFlags, dwAppID, lpdwMessageFlags, lpData,
lpdwDataSize ); lpdwDataSize );
return DPERR_OUTOFMEMORY; return DPERR_OUTOFMEMORY;
} }
@ -1212,7 +1212,7 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_RunApplication
DWORD dwSuspendCount; DWORD dwSuspendCount;
HANDLE hStart, hDeath, hSettingRead; HANDLE hStart, hDeath, hSettingRead;
TRACE( "(%p)->(0x%08lx,%p,%p,%p)\n", TRACE( "(%p)->(0x%08x,%p,%p,%p)\n",
This, dwFlags, lpdwAppID, lpConn, hReceiveEvent ); This, dwFlags, lpdwAppID, lpConn, hReceiveEvent );
if( dwFlags != 0 ) if( dwFlags != 0 )
@ -1287,7 +1287,7 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_RunApplication
/* Reserve this global application id! */ /* Reserve this global application id! */
if( !DPLAYX_CreateLobbyApplication( newProcessInfo.dwProcessId ) ) if( !DPLAYX_CreateLobbyApplication( newProcessInfo.dwProcessId ) )
{ {
ERR( "Unable to create global application data for 0x%08lx\n", ERR( "Unable to create global application data for 0x%08x\n",
newProcessInfo.dwProcessId ); newProcessInfo.dwProcessId );
} }
@ -1319,7 +1319,7 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_RunApplication
/* Unsuspend the process - should return the prev suspension count */ /* Unsuspend the process - should return the prev suspension count */
if( ( dwSuspendCount = ResumeThread( newProcessInfo.hThread ) ) != 1 ) if( ( dwSuspendCount = ResumeThread( newProcessInfo.hThread ) ) != 1 )
{ {
ERR( "ResumeThread failed with 0x%08lx\n", dwSuspendCount ); ERR( "ResumeThread failed with 0x%08x\n", dwSuspendCount );
} }
return DP_OK; return DP_OK;
@ -1333,7 +1333,7 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_RunApplication
HANDLE hReceiveEvent ) HANDLE hReceiveEvent )
{ {
IDirectPlayLobbyWImpl *This = (IDirectPlayLobbyWImpl *)iface; IDirectPlayLobbyWImpl *This = (IDirectPlayLobbyWImpl *)iface;
FIXME( "(%p)->(0x%08lx,%p,%p,%p):stub\n", This, dwFlags, lpdwAppID, lpConn, (void *)hReceiveEvent ); FIXME( "(%p)->(0x%08x,%p,%p,%p):stub\n", This, dwFlags, lpdwAppID, lpConn, (void *)hReceiveEvent );
return DPERR_OUTOFMEMORY; return DPERR_OUTOFMEMORY;
} }
@ -1380,7 +1380,7 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_SetConnectionSettings
IDirectPlayLobbyWImpl *This = (IDirectPlayLobbyWImpl *)iface; IDirectPlayLobbyWImpl *This = (IDirectPlayLobbyWImpl *)iface;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(0x%08lx,0x%08lx,%p)\n", This, dwFlags, dwAppID, lpConn ); TRACE("(%p)->(0x%08x,0x%08x,%p)\n", This, dwFlags, dwAppID, lpConn );
EnterCriticalSection( &This->unk->DPL_lock ); EnterCriticalSection( &This->unk->DPL_lock );
@ -1414,7 +1414,7 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_SetConnectionSettings
IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(0x%08lx,0x%08lx,%p)\n", This, dwFlags, dwAppID, lpConn ); TRACE("(%p)->(0x%08x,0x%08x,%p)\n", This, dwFlags, dwAppID, lpConn );
EnterCriticalSection( &This->unk->DPL_lock ); EnterCriticalSection( &This->unk->DPL_lock );
@ -1494,7 +1494,7 @@ HRESULT DPL_CreateCompoundAddress
DWORD dwElements; DWORD dwElements;
LPCDPCOMPOUNDADDRESSELEMENT lpOrigElements = lpElements; LPCDPCOMPOUNDADDRESSELEMENT lpOrigElements = lpElements;
TRACE("(%p,0x%08lx,%p,%p)\n", lpElements, dwElementCount, lpAddress, lpdwAddressSize ); TRACE("(%p,0x%08x,%p,%p)\n", lpElements, dwElementCount, lpAddress, lpdwAddressSize );
/* Parameter check */ /* Parameter check */
if( ( lpElements == NULL ) || if( ( lpElements == NULL ) ||
@ -1714,7 +1714,7 @@ static HRESULT WINAPI IDirectPlayLobby3WImpl_WaitForConnectionSettings
HRESULT hr = DP_OK; HRESULT hr = DP_OK;
BOOL bStartWait = (dwFlags & DPLWAIT_CANCEL) ? FALSE : TRUE; BOOL bStartWait = (dwFlags & DPLWAIT_CANCEL) ? FALSE : TRUE;
TRACE( "(%p)->(0x%08lx)\n", iface, dwFlags ); TRACE( "(%p)->(0x%08x)\n", iface, dwFlags );
if( DPLAYX_WaitForConnectionSettings( bStartWait ) ) if( DPLAYX_WaitForConnectionSettings( bStartWait ) )
{ {
@ -1731,7 +1731,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_WaitForConnectionSettings
HRESULT hr = DP_OK; HRESULT hr = DP_OK;
BOOL bStartWait = (dwFlags & DPLWAIT_CANCEL) ? FALSE : TRUE; BOOL bStartWait = (dwFlags & DPLWAIT_CANCEL) ? FALSE : TRUE;
TRACE( "(%p)->(0x%08lx)\n", iface, dwFlags ); TRACE( "(%p)->(0x%08x)\n", iface, dwFlags );
if( DPLAYX_WaitForConnectionSettings( bStartWait ) ) if( DPLAYX_WaitForConnectionSettings( bStartWait ) )
{ {
@ -1956,7 +1956,7 @@ HRESULT WINAPI DirectPlayLobbyCreateA( LPGUID lpGUIDDSP,
LPVOID lpData, LPVOID lpData,
DWORD dwDataSize ) DWORD dwDataSize )
{ {
TRACE("lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08lx\n", TRACE("lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08x\n",
lpGUIDDSP,lplpDPL,lpUnk,lpData,dwDataSize); lpGUIDDSP,lplpDPL,lpUnk,lpData,dwDataSize);
/* Parameter Check: lpGUIDSP, lpUnk & lpData must be NULL. dwDataSize must /* Parameter Check: lpGUIDSP, lpUnk & lpData must be NULL. dwDataSize must
@ -1988,7 +1988,7 @@ HRESULT WINAPI DirectPlayLobbyCreateW( LPGUID lpGUIDDSP,
LPVOID lpData, LPVOID lpData,
DWORD dwDataSize ) DWORD dwDataSize )
{ {
TRACE("lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08lx\n", TRACE("lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08x\n",
lpGUIDDSP,lplpDPL,lpUnk,lpData,dwDataSize); lpGUIDDSP,lplpDPL,lpUnk,lpData,dwDataSize);
/* Parameter Check: lpGUIDSP, lpUnk & lpData must be NULL. dwDataSize must /* Parameter Check: lpGUIDSP, lpUnk & lpData must be NULL. dwDataSize must

4
dlls/dplayx/lobbysp.c
View File

@ -224,7 +224,7 @@ ULONG WINAPI DPLSP_AddRef
ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef ); ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef );
ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef );
TRACE( "ref count incremented to %lu:%lu for %p\n", TRACE( "ref count incremented to %u:%u for %p\n",
ulInterfaceRefCount, ulObjRefCount, This ); ulInterfaceRefCount, ulObjRefCount, This );
return ulObjRefCount; return ulObjRefCount;
@ -240,7 +240,7 @@ ULONG WINAPI DPLSP_Release
ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef ); ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef );
ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef );
TRACE( "ref count decremented to %lu:%lu for %p\n", TRACE( "ref count decremented to %u:%u for %p\n",
ulInterfaceRefCount, ulObjRefCount, This ); ulInterfaceRefCount, ulObjRefCount, This );
/* Deallocate if this is the last reference to the object */ /* Deallocate if this is the last reference to the object */