dplayx: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Mon Oct 9 18:07:17 CDT 2006
---
dlls/dplayx/Makefile.in | 2 -
dlls/dplayx/dplay.c | 162 +++++++++++++++++++++--------------------
dlls/dplayx/dplaysp.c | 34 ++++-----
dlls/dplayx/dplayx_global.c | 24 +++---
dlls/dplayx/dplayx_main.c | 4 +
dlls/dplayx/dplayx_messages.c | 18 ++---
dlls/dplayx/dplobby.c | 48 ++++++------
dlls/dplayx/lobbysp.c | 4 +
8 files changed, 148 insertions(+), 148 deletions(-)
diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in
index 20f2275..9e3461d 100644
--- a/dlls/dplayx/Makefile.in
+++ b/dlls/dplayx/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -DCOM_NO_WINDOWS_H -DWINE_NO_LONG_AS_INT
+EXTRADEFS = -DCOM_NO_WINDOWS_H
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index baafb8d..ecf2050 100644
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -620,7 +620,7 @@ static ULONG WINAPI DP_AddRef
ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef );
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 );
return ulObjRefCount;
@@ -636,7 +636,7 @@ ( LPDIRECTPLAY3 iface )
ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef );
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 );
/* Deallocate if this is the last reference to the object */
@@ -670,7 +670,7 @@ HRESULT DP_HandleMessage( IDirectPlay2Im
WORD wCommandId, WORD wVersion,
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,
wVersion );
@@ -707,7 +707,7 @@ HRESULT DP_HandleMessage( IDirectPlay2Im
*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 );
/* Setup the reply */
@@ -720,7 +720,7 @@ HRESULT DP_HandleMessage( IDirectPlay2Im
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 );
break;
@@ -742,7 +742,7 @@ #endif
#if 1
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 );
DP_MSG_ReplyReceived( This, wCommandId, lpcMessageBody, dwMessageBodySize );
}
@@ -788,7 +788,7 @@ static HRESULT WINAPI DP_IF_AddPlayerToG
lpPlayerList lpPList;
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 );
/* Find the group */
@@ -944,7 +944,7 @@ lpGroupData DP_CreateGroup( IDirectPlay2
/* FIXME: Should we validate the dwFlags? */
lpGData->dwFlags = dwFlags;
- TRACE( "Created group id 0x%08lx\n", *lpid );
+ TRACE( "Created group id 0x%08x\n", *lpid );
return lpGData;
}
@@ -955,13 +955,13 @@ DP_DeleteGroup( IDirectPlay2Impl* This,
{
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 );
if( lpGList == NULL )
{
- ERR( "DPID 0x%08lx not found\n", dpid );
+ ERR( "DPID 0x%08x not found\n", dpid );
return;
}
@@ -984,7 +984,7 @@ static lpGroupData DP_FindAnyGroup( IDir
{
lpGroupList lpGroups;
- TRACE( "(%p)->(0x%08lx)\n", This, dpid );
+ TRACE( "(%p)->(0x%08x)\n", This, dpid );
if( dpid == DPID_SYSTEM_GROUP )
{
@@ -1010,7 +1010,7 @@ static HRESULT WINAPI DP_IF_CreateGroup
{
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,
dwFlags, bAnsi );
@@ -1223,7 +1223,7 @@ lpPlayerData DP_CreatePlayer( IDirectPla
/* Initialize the SP data section */
lpPData->lpSPPlayerData = DPSP_CreateSPPlayerData();
- TRACE( "Created player id 0x%08lx\n", *lpid );
+ TRACE( "Created player id 0x%08x\n", *lpid );
return lpPData;
}
@@ -1242,13 +1242,13 @@ DP_DeletePlayer( IDirectPlay2Impl* This,
{
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 );
if( lpPList == NULL )
{
- ERR( "DPID 0x%08lx not found\n", dpid );
+ ERR( "DPID 0x%08x not found\n", dpid );
return;
}
@@ -1273,7 +1273,7 @@ static lpPlayerList DP_FindPlayer( IDire
{
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 );
@@ -1397,7 +1397,7 @@ ( IDirectPlay2Impl* This,
lpPlayerList lpPList;
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,
dwDataSize, dwFlags, bAnsi );
@@ -1447,7 +1447,7 @@ ( IDirectPlay2Impl* This,
)
{
/* 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 */
@@ -1512,7 +1512,7 @@ ( IDirectPlay2Impl* This,
data.lpSPMessageHeader = lpMsgHdr;
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 );
hr = (*This->dp2->spData.lpCB->CreatePlayer)( &data );
@@ -1647,7 +1647,7 @@ static HRESULT WINAPI DP_IF_DeletePlayer
lpGroupData lpGData;
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 );
/* Find the group */
@@ -1727,7 +1727,7 @@ cbRemoveGroupOrPlayer(
{
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 );
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 );
}
}
@@ -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 );
}
}
@@ -1763,7 +1763,7 @@ static HRESULT WINAPI DP_IF_DestroyGroup
lpGroupData lpGData;
DPRGOPContext context;
- FIXME( "(%p)->(%p,0x%08lx,%u): semi stub\n",
+ FIXME( "(%p)->(%p,0x%08x,%u): semi stub\n",
This, lpMsgHdr, idGroup, bAnsi );
/* Find the group */
@@ -1841,7 +1841,7 @@ static HRESULT WINAPI DP_IF_DestroyPlaye
{
DPFAGContext cbContext;
- FIXME( "(%p)->(%p,0x%08lx,%u): semi stub\n",
+ FIXME( "(%p)->(%p,0x%08x,%u): semi stub\n",
This, lpMsgHdr, idPlayer, bAnsi );
if( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -1914,7 +1914,7 @@ cbDeletePlayerFromAllGroups(
}
else
{
- ERR( "Group callback has dwPlayerType = 0x%08lx\n", dwPlayerType );
+ ERR( "Group callback has dwPlayerType = 0x%08x\n", dwPlayerType );
}
return TRUE;
@@ -1942,7 +1942,7 @@ static HRESULT WINAPI DP_IF_EnumGroupPla
lpGroupData lpGData;
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,
lpContext, dwFlags, bAnsi );
@@ -2122,7 +2122,7 @@ static DWORD CALLBACK DP_EnumSessionsSen
HANDLE hSuicideRequest = data->hSuicideRequest;
DWORD dwTimeout = data->dwTimeout;
- TRACE( "Thread started with timeout = 0x%08lx\n", dwTimeout );
+ TRACE( "Thread started with timeout = 0x%08x\n", dwTimeout );
for( ;; )
{
@@ -2190,7 +2190,7 @@ static HRESULT WINAPI DP_IF_EnumSessions
{
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,
bAnsi );
@@ -2366,7 +2366,7 @@ static HRESULT WINAPI DP_IF_GetPlayerCap
{
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 */
data.idPlayer = idPlayer;
@@ -2405,7 +2405,7 @@ static HRESULT WINAPI DP_IF_GetGroupData
DWORD dwRequiredBufferSize;
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 );
if( ( lpGData = DP_FindAnyGroup( This, idGroup ) ) == NULL )
@@ -2465,7 +2465,7 @@ static HRESULT WINAPI DP_IF_GetGroupName
LPDPNAME lpName = (LPDPNAME)lpData;
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 );
if( ( lpGData = DP_FindAnyGroup( This, idGroup ) ) == NULL )
@@ -2539,7 +2539,7 @@ static HRESULT WINAPI DP_IF_GetMessageCo
( IDirectPlay2Impl* This, DPID idPlayer,
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,
DPMESSAGEQUEUE_RECEIVE, lpdwCount, NULL,
bAnsi );
@@ -2563,7 +2563,7 @@ static HRESULT WINAPI DirectPlay2AImpl_G
( LPDIRECTPLAY2A iface, DPID idPlayer, LPVOID lpData, LPDWORD lpdwDataSize )
{
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;
}
@@ -2571,7 +2571,7 @@ static HRESULT WINAPI DirectPlay2WImpl_G
( LPDIRECTPLAY2 iface, DPID idPlayer, LPVOID lpData, LPDWORD lpdwDataSize )
{
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;
}
@@ -2599,7 +2599,7 @@ static HRESULT WINAPI DP_IF_GetPlayerDat
DWORD dwRequiredBufferSize;
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 );
if( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -2664,7 +2664,7 @@ static HRESULT WINAPI DP_IF_GetPlayerNam
LPDPNAME lpName = (LPDPNAME)lpData;
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 );
if( ( lpPList = DP_FindPlayer( This, idPlayer ) ) == NULL )
@@ -2808,7 +2808,7 @@ static HRESULT WINAPI DP_SecureOpen
{
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 );
if( This->dp2->bConnectionOpen )
@@ -2906,7 +2906,7 @@ static HRESULT WINAPI DirectPlay2AImpl_O
( LPDIRECTPLAY2A iface, LPDPSESSIONDESC2 lpsd, DWORD dwFlags )
{
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 );
}
@@ -2914,7 +2914,7 @@ static HRESULT WINAPI DirectPlay2WImpl_O
( LPDIRECTPLAY2 iface, LPDPSESSIONDESC2 lpsd, DWORD dwFlags )
{
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 );
}
@@ -2924,7 +2924,7 @@ static HRESULT WINAPI DP_IF_Receive
{
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 );
if( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -2958,11 +2958,11 @@ static HRESULT WINAPI DP_IF_Receive
( dwFlags & DPRECEIVE_FROMPLAYER )
)
{
- FIXME( "Find matching message 0x%08lx\n", dwFlags );
+ FIXME( "Find matching message 0x%08x\n", dwFlags );
}
else
{
- ERR( "Hmmm..dwFlags 0x%08lx\n", dwFlags );
+ ERR( "Hmmm..dwFlags 0x%08x\n", dwFlags );
}
if( lpMsg == NULL )
@@ -3016,7 +3016,7 @@ static HRESULT WINAPI DP_IF_SetGroupData
{
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 );
/* Parameter check */
@@ -3076,7 +3076,7 @@ static HRESULT WINAPI DP_IF_SetGroupName
{
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 );
if( ( lpGData = DP_FindAnyGroup( This, idGroup ) ) == NULL )
@@ -3114,7 +3114,7 @@ static HRESULT WINAPI DP_IF_SetPlayerDat
{
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 );
/* Parameter check */
@@ -3173,7 +3173,7 @@ static HRESULT WINAPI DP_IF_SetPlayerNam
{
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 );
if( ( lpPList = DP_FindPlayer( This, idPlayer ) ) == NULL )
@@ -3212,7 +3212,7 @@ static HRESULT WINAPI DP_SetSessionDesc
DWORD dwRequiredSize;
LPDPSESSIONDESC2 lpTempSessDesc;
- TRACE( "(%p)->(%p,0x%08lx,%u,%u)\n",
+ TRACE( "(%p)->(%p,0x%08x,%u,%u)\n",
This, lpSessDesc, dwFlags, bInitial, bAnsi );
if( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -3384,7 +3384,7 @@ static HRESULT WINAPI DP_IF_AddGroupToGr
lpGroupData lpGData;
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 )
{
@@ -3439,7 +3439,7 @@ static HRESULT WINAPI DP_IF_CreateGroupI
lpGroupList lpGList;
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,
dwDataSize, dwFlags, bAnsi );
@@ -3553,7 +3553,7 @@ static HRESULT WINAPI DP_IF_DeleteGroupF
lpGroupList lpGList;
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? */
if( ( lpGParentData = DP_FindAnyGroup( (IDirectPlay2AImpl*)This, idParentGroup ) ) == NULL )
@@ -3638,7 +3638,7 @@ static HRESULT WINAPI DirectPlay3AImpl_E
( LPDIRECTPLAY3A iface, LPCGUID lpguidApplication, LPDPENUMCONNECTIONSCALLBACK lpEnumCallback, LPVOID lpContext, DWORD dwFlags )
{
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 */
if( dwFlags == 0 )
@@ -3864,7 +3864,7 @@ static HRESULT WINAPI DirectPlay3WImpl_E
( LPDIRECTPLAY3 iface, LPCGUID lpguidApplication, LPDPENUMCONNECTIONSCALLBACK lpEnumCallback, LPVOID lpContext, DWORD dwFlags )
{
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;
}
@@ -3876,7 +3876,7 @@ static HRESULT WINAPI DP_IF_EnumGroupsIn
lpGroupList lpGList;
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,
lpContext, dwFlags, bAnsi );
@@ -3941,7 +3941,7 @@ static HRESULT WINAPI DirectPlay3AImpl_G
( LPDIRECTPLAY3A iface, DWORD dwFlags, DPID idGroup, LPVOID lpData, LPDWORD lpdwDataSize )
{
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;
}
@@ -3949,7 +3949,7 @@ static HRESULT WINAPI DirectPlay3WImpl_G
( LPDIRECTPLAY3 iface, DWORD dwFlags, DPID idGroup, LPVOID lpData, LPDWORD lpdwDataSize )
{
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;
}
@@ -3964,12 +3964,12 @@ static BOOL CALLBACK DP_GetSpLpGuidFromC
( 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 );
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 );
@@ -4103,7 +4103,7 @@ static HMODULE DP_LoadSP( LPCGUID lpcGui
NULL, NULL, (LPBYTE)returnBuffer,
&sizeOfReturnBuffer ) ) != ERROR_SUCCESS )
{
- ERR(": missing PATH registry data members: 0x%08lx\n", dwTemp );
+ ERR(": missing PATH registry data members: 0x%08x\n", dwTemp );
continue;
}
@@ -4205,7 +4205,7 @@ static HRESULT WINAPI DP_IF_InitializeCo
const DWORD dwAddrSize = 80; /* FIXME: Need to calculate it correctly */
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 )
{
@@ -4305,7 +4305,7 @@ static HRESULT WINAPI DirectPlay3AImpl_S
( LPDIRECTPLAY3A iface, DPID idFrom, DPID idTo, DWORD dwFlags, LPDPCHAT lpChatMessage )
{
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;
}
@@ -4313,7 +4313,7 @@ static HRESULT WINAPI DirectPlay3WImpl_S
( LPDIRECTPLAY3 iface, DPID idFrom, DPID idTo, DWORD dwFlags, LPDPCHAT lpChatMessage )
{
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;
}
@@ -4321,7 +4321,7 @@ static HRESULT WINAPI DirectPlay3AImpl_S
( LPDIRECTPLAY3A iface, DWORD dwFlags, DPID idGroup, LPDPLCONNECTION lpConnection )
{
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;
}
@@ -4329,7 +4329,7 @@ static HRESULT WINAPI DirectPlay3WImpl_S
( LPDIRECTPLAY3 iface, DWORD dwFlags, DPID idGroup, LPDPLCONNECTION lpConnection )
{
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;
}
@@ -4337,7 +4337,7 @@ static HRESULT WINAPI DirectPlay3AImpl_S
( LPDIRECTPLAY3A iface, DWORD dwFlags, DPID idGroup )
{
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;
}
@@ -4345,7 +4345,7 @@ static HRESULT WINAPI DirectPlay3WImpl_S
( LPDIRECTPLAY3 iface, DWORD dwFlags, DPID idGroup )
{
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;
}
@@ -4353,7 +4353,7 @@ static HRESULT WINAPI DirectPlay3AImpl_G
( LPDIRECTPLAY3A iface, DPID idGroup, LPDWORD lpdwFlags )
{
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;
}
@@ -4361,7 +4361,7 @@ static HRESULT WINAPI DirectPlay3WImpl_G
( LPDIRECTPLAY3 iface, DPID idGroup, LPDWORD lpdwFlags )
{
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;
}
@@ -4371,7 +4371,7 @@ static HRESULT WINAPI DP_IF_GetGroupPare
{
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 )
{
@@ -4400,7 +4400,7 @@ static HRESULT WINAPI DirectPlay3AImpl_G
( LPDIRECTPLAY3A iface, DPID idPlayer, DWORD dwFlags, LPVOID lpData, LPDWORD lpdwDataSize )
{
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;
}
@@ -4408,7 +4408,7 @@ static HRESULT WINAPI DirectPlay3WImpl_G
( LPDIRECTPLAY3 iface, DPID idPlayer, DWORD dwFlags, LPVOID lpData, LPDWORD lpdwDataSize )
{
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;
}
@@ -4416,7 +4416,7 @@ static HRESULT WINAPI DirectPlay3AImpl_G
( LPDIRECTPLAY3A iface, DPID idPlayer, LPDWORD lpdwFlags )
{
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;
}
@@ -4424,7 +4424,7 @@ static HRESULT WINAPI DirectPlay3WImpl_G
( LPDIRECTPLAY3 iface, DPID idPlayer, LPDWORD lpdwFlags )
{
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;
}
@@ -4432,7 +4432,7 @@ static HRESULT WINAPI DirectPlay4AImpl_G
( LPDIRECTPLAY4A iface, DPID idGroup, LPDPID lpidGroupOwner )
{
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;
}
@@ -4440,7 +4440,7 @@ static HRESULT WINAPI DirectPlay4WImpl_G
( LPDIRECTPLAY4 iface, DPID idGroup, LPDPID lpidGroupOwner )
{
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;
}
@@ -4448,7 +4448,7 @@ static HRESULT WINAPI DirectPlay4AImpl_S
( LPDIRECTPLAY4A iface, DPID idGroup , DPID idGroupOwner )
{
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;
}
@@ -4456,7 +4456,7 @@ static HRESULT WINAPI DirectPlay4WImpl_S
( LPDIRECTPLAY4 iface, DPID idGroup , DPID idGroupOwner )
{
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;
}
@@ -4469,7 +4469,7 @@ static HRESULT WINAPI DP_SendEx
lpGroupData lpGData;
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",
This, idFrom, idTo, dwFlags, lpData, dwDataSize, dwPriority,
dwTimeout, lpContext, lpdwMsgID, bAnsi );
@@ -4488,7 +4488,7 @@ static HRESULT WINAPI DP_SendEx
{
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;
}
}
@@ -4624,7 +4624,7 @@ static HRESULT WINAPI DP_IF_GetMessageQu
{
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 );
/* FIXME: Do we need to do idFrom and idTo sanity checking here? */
@@ -4679,7 +4679,7 @@ static HRESULT WINAPI DP_IF_CancelMessag
{
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 );
if( This->dp2->spData.lpCB->Cancel )
diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c
index 4139305..aa001d9 100644
--- a/dlls/dplayx/dplaysp.c
+++ b/dlls/dplayx/dplaysp.c
@@ -260,7 +260,7 @@ ( LPDIRECTPLAYSP iface )
ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef );
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 );
return ulObjRefCount;
@@ -275,7 +275,7 @@ ( LPDIRECTPLAYSP iface )
ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef );
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 );
/* Deallocate if this is the last reference to the object */
@@ -306,7 +306,7 @@ ( LPDIRECTPLAYSP iface,
/* Should be able to call the comctl32 undocumented MRU routines.
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 );
return DP_OK;
@@ -324,7 +324,7 @@ ( LPDIRECTPLAYSP 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),
lpData, dwDataSize, lpAddress, lpdwAddressSize );
@@ -341,7 +341,7 @@ ( LPDIRECTPLAYSP 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 );
DPL_EnumAddress( lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext );
@@ -375,7 +375,7 @@ ( LPDIRECTPLAYSP iface,
{
IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
- FIXME( "(%p)->(0x%08lx,%p): stub\n",
+ FIXME( "(%p)->(0x%08x,%p): stub\n",
This, idPlayer, lpdwPlayerFlags );
return DP_OK;
@@ -393,7 +393,7 @@ ( LPDIRECTPLAYSP iface,
LPDP_SPPLAYERDATA lpPlayerData;
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 );
hr = DP_GetSPPlayerData( This->sp->dplay, idPlayer, (LPVOID*)&lpPlayerData );
@@ -441,18 +441,18 @@ ( LPDIRECTPLAYSP 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 );
wCommandId = lpMsg->wCommandId;
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 );
if( lpMsg->dwMagic != DPMSGMAGIC_DPLAYMSG )
{
- ERR( "Unknown magic 0x%08lx!\n", lpMsg->dwMagic );
+ ERR( "Unknown magic 0x%08x!\n", lpMsg->dwMagic );
return DPERR_GENERIC;
}
@@ -755,7 +755,7 @@ ( LPDIRECTPLAYSP iface,
IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
/* 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 );
hr = DP_GetSPPlayerData( This->sp->dplay, idPlayer, (LPVOID*)&lpPlayerEntry );
@@ -794,7 +794,7 @@ ( LPDIRECTPLAYSP 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 );
return DP_OK;
@@ -811,7 +811,7 @@ ( LPDIRECTPLAYSP iface,
IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
/* 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 );
#if 0
@@ -827,7 +827,7 @@ #else
*/
if( dwFlags != DPSET_REMOTE )
{
- TRACE( "Undocumented dwFlags 0x%08lx used\n", dwFlags );
+ TRACE( "Undocumented dwFlags 0x%08x used\n", dwFlags );
}
#endif
@@ -870,7 +870,7 @@ ( LPDIRECTPLAYSP iface,
IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
/* 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 );
#if 0
@@ -886,7 +886,7 @@ #else
*/
if( dwFlags != DPSET_REMOTE )
{
- TRACE( "Undocumented dwFlags 0x%08lx used\n", dwFlags );
+ TRACE( "Undocumented dwFlags 0x%08x used\n", dwFlags );
}
#endif
@@ -918,7 +918,7 @@ ( LPDIRECTPLAYSP iface,
{
IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
- FIXME( "(%p)->(%p,0x%08lx): stub\n",
+ FIXME( "(%p)->(%p,0x%08x): stub\n",
This, unknownA, unknownB );
}
diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c
index 942578d..d58271d 100644
--- a/dlls/dplayx/dplayx_global.c
+++ b/dlls/dplayx/dplayx_global.c
@@ -116,7 +116,7 @@ LPVOID DPLAYX_PrivHeapAlloc( DWORD flags
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);
}
@@ -246,7 +246,7 @@ BOOL DPLAYX_ConstructData(void)
}
else
{
- ERR( ": semaphore error %ld\n", GetLastError() );
+ ERR( ": semaphore error %d\n", GetLastError() );
return FALSE;
}
@@ -269,7 +269,7 @@ BOOL DPLAYX_ConstructData(void)
}
else
{
- ERR( ": unable to create shared memory (%ld)\n", GetLastError() );
+ ERR( ": unable to create shared memory (%d)\n", GetLastError() );
DPLAYX_ReleaseSemaphore();
return FALSE;
}
@@ -280,7 +280,7 @@ BOOL DPLAYX_ConstructData(void)
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() );
DPLAYX_ReleaseSemaphore();
return FALSE;
@@ -414,7 +414,7 @@ BOOL DPLAYX_IsAppIdLobbied( DWORD dwAppI
if( dwAppID == 0 )
{
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++ )
@@ -422,7 +422,7 @@ BOOL DPLAYX_IsAppIdLobbied( DWORD dwAppI
if( lobbyData[ i ].dwAppID == dwAppID )
{
/* This process is lobbied */
- TRACE( "Found 0x%08lx @ %u\n", dwAppID, i );
+ TRACE( "Found 0x%08x @ %u\n", dwAppID, i );
*lplpDplData = &lobbyData[ i ];
return TRUE;
}
@@ -450,7 +450,7 @@ BOOL DPLAYX_CreateLobbyApplication( DWOR
if( lobbyData[ i ].dwAppID == 0 )
{
/* 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() );
lobbyData[ i ].dwAppID = dwAppID;
@@ -614,7 +614,7 @@ ( DWORD dwAppID,
{
DPLAYX_ReleaseSemaphore();
- TRACE( "Application 0x%08lx is not lobbied\n", dwAppID );
+ TRACE( "Application 0x%08x is not lobbied\n", dwAppID );
return DPERR_NOTLOBBIED;
}
@@ -867,7 +867,7 @@ ( DWORD dwFlags,
/* Store information */
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;
}
@@ -887,7 +887,7 @@ ( DWORD dwFlags,
{
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;
}
@@ -929,7 +929,7 @@ ( DWORD dwFlags,
/* Store information */
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;
}
@@ -1345,7 +1345,7 @@ LPCSTR DPLAYX_HresultToString(HRESULT hr
default:
/* For errors not in the list, return HRESULT as a string
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 );
return szTempStr;
}
diff --git a/dlls/dplayx/dplayx_main.c b/dlls/dplayx/dplayx_main.c
index 18b6811..c311f74 100644
--- a/dlls/dplayx/dplayx_main.c
+++ b/dlls/dplayx/dplayx_main.c
@@ -73,7 +73,7 @@ DWORD gdwDPlaySPRefCount = 0; /* FIXME:
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 )
{
@@ -105,7 +105,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
* as well
*/
- TRACE( ": returning 0x%08lx\n", hr );
+ TRACE( ": returning 0x%08x\n", hr );
return hr;
}
diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c
index 142f2ea..da91286 100644
--- a/dlls/dplayx/dplayx_messages.c
+++ b/dlls/dplayx/dplayx_messages.c
@@ -119,7 +119,7 @@ static DWORD CALLBACK DPL_MSG_ThreadMain
dwWaitResult = WaitForSingleObject( lpThreadInfo->hStart, 10000 /* 10 sec */ );
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;
}
@@ -131,7 +131,7 @@ static DWORD CALLBACK DPL_MSG_ThreadMain
dwWaitResult = WaitForSingleObject( lpThreadInfo->hSettingRead, INFINITE );
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 */
@@ -225,7 +225,7 @@ HRESULT DP_MSG_SendRequestPlayerId( IDir
data.bSystemMessage = TRUE; /* Allow reply to be sent */
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 );
DP_MSG_ExpectReply( This, &data, DPMSG_DEFAULT_WAIT_TIME, DPMSGCMD_NEWPLAYERIDREPLY,
@@ -241,7 +241,7 @@ HRESULT DP_MSG_SendRequestPlayerId( IDir
*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
* with remote data for the player that perhaps I need to setup.
@@ -323,7 +323,7 @@ #endif
lpMsgBody->unknown4[3] = NS_GetNsMagic( This->dp2->lpNameServerData ) -
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[5] = 0x0;
@@ -334,7 +334,7 @@ #if 0
#else
lpMsgBody->unknown4[7] = NS_GetNsMagic( This->dp2->lpNameServerData );
#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[9] = 0x0;
@@ -356,7 +356,7 @@ #endif
data.bSystemMessage = TRUE; /* Allow reply to be sent */
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,
DPMSG_WAIT_60_SECS,
@@ -393,7 +393,7 @@ LPVOID DP_MSG_ExpectReply( IDirectPlay2A
hMsgReceipt = DP_MSG_BuildAndLinkReplyStruct( This, &replyStructList,
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 );
hr = (*This->dp2->spData.lpCB->Send)( lpData );
@@ -409,7 +409,7 @@ LPVOID DP_MSG_ExpectReply( IDirectPlay2A
dwWaitReturn = WaitForSingleObject( hMsgReceipt, dwWaitTime );
if( dwWaitReturn != WAIT_OBJECT_0 )
{
- ERR( "Wait failed 0x%08lx\n", dwWaitReturn );
+ ERR( "Wait failed 0x%08x\n", dwWaitReturn );
return NULL;
}
diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c
index bc81803..73e3e6e 100644
--- a/dlls/dplayx/dplobby.c
+++ b/dlls/dplayx/dplobby.c
@@ -419,7 +419,7 @@ ( LPDIRECTPLAYLOBBY iface )
ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef );
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 );
return ulObjRefCount;
@@ -439,7 +439,7 @@ ( LPDIRECTPLAYLOBBYA iface )
ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef );
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 );
/* Deallocate if this is the last reference to the object */
@@ -480,7 +480,7 @@ ( IDirectPlayLobbyAImpl* This,
DWORD dwConnSize = 0;
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 )
{
@@ -622,7 +622,7 @@ HRESULT DPL_CreateAddress(
const DWORD dwNumAddElements = 2; /* Service Provide & address data type */
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 );
addressElements[ 0 ].guidDataType = DPAID_ServiceProvider;
@@ -656,7 +656,7 @@ ( LPDIRECTPLAYLOBBYA 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 );
return DPL_EnumAddress( lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext );
@@ -671,7 +671,7 @@ ( LPDIRECTPLAYLOBBY 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 );
return DPL_EnumAddress( lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext );
@@ -727,7 +727,7 @@ ( LPDIRECTPLAYLOBBYA iface,
char subKeyName[51];
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 )
{
@@ -863,7 +863,7 @@ ( LPDIRECTPLAYLOBBY 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;
}
@@ -883,7 +883,7 @@ ( LPDIRECTPLAYLOBBYA iface,
char subKeyName[51];
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 )
{
@@ -979,7 +979,7 @@ ( LPDIRECTPLAYLOBBYA iface,
IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface;
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 );
@@ -1002,7 +1002,7 @@ ( LPDIRECTPLAYLOBBY iface,
IDirectPlayLobbyWImpl *This = (IDirectPlayLobbyWImpl *)iface;
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 );
@@ -1031,7 +1031,7 @@ ( LPDIRECTPLAYLOBBYA iface,
LPDWORD lpdwDataSize )
{
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 );
return DPERR_OUTOFMEMORY;
}
@@ -1045,7 +1045,7 @@ ( LPDIRECTPLAYLOBBY iface,
LPDWORD lpdwDataSize )
{
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 );
return DPERR_OUTOFMEMORY;
}
@@ -1212,7 +1212,7 @@ ( LPDIRECTPLAYLOBBYA iface,
DWORD dwSuspendCount;
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 );
if( dwFlags != 0 )
@@ -1287,7 +1287,7 @@ ( LPDIRECTPLAYLOBBYA iface,
/* Reserve this global application id! */
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 );
}
@@ -1319,7 +1319,7 @@ ( LPDIRECTPLAYLOBBYA iface,
/* Unsuspend the process - should return the prev suspension count */
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;
@@ -1333,7 +1333,7 @@ ( LPDIRECTPLAYLOBBY iface,
HANDLE hReceiveEvent )
{
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;
}
@@ -1380,7 +1380,7 @@ ( LPDIRECTPLAYLOBBY iface,
IDirectPlayLobbyWImpl *This = (IDirectPlayLobbyWImpl *)iface;
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 );
@@ -1414,7 +1414,7 @@ ( LPDIRECTPLAYLOBBYA iface,
IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface;
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 );
@@ -1494,7 +1494,7 @@ ( LPCDPCOMPOUNDADDRESSELEMENT lpElements
DWORD dwElements;
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 */
if( ( lpElements == NULL ) ||
@@ -1714,7 +1714,7 @@ ( LPDIRECTPLAYLOBBY3 iface, DWORD dwFlag
HRESULT hr = DP_OK;
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 ) )
{
@@ -1731,7 +1731,7 @@ ( LPDIRECTPLAYLOBBY3A iface, DWORD dwFla
HRESULT hr = DP_OK;
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 ) )
{
@@ -1956,7 +1956,7 @@ HRESULT WINAPI DirectPlayLobbyCreateA( L
LPVOID lpData,
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);
/* Parameter Check: lpGUIDSP, lpUnk & lpData must be NULL. dwDataSize must
@@ -1988,7 +1988,7 @@ HRESULT WINAPI DirectPlayLobbyCreateW( L
LPVOID lpData,
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);
/* Parameter Check: lpGUIDSP, lpUnk & lpData must be NULL. dwDataSize must
diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c
index 830ad32..a1fd542 100644
--- a/dlls/dplayx/lobbysp.c
+++ b/dlls/dplayx/lobbysp.c
@@ -224,7 +224,7 @@ ( LPDPLOBBYSP iface )
ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef );
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 );
return ulObjRefCount;
@@ -240,7 +240,7 @@ ( LPDPLOBBYSP iface )
ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef );
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 );
/* Deallocate if this is the last reference to the object */
--
1.4.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061010/bf70fe0d/attachment-0001.pgp
More information about the wine-patches
mailing list