[PATCH] dplayx: Build without -DWINE_NO_LONG_TYPES.

Alistair Leslie-Hughes leslie_alistair at hotmail.com
Thu Feb 3 03:43:50 CST 2022


Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
---
 dlls/dplayx/Makefile.in       |   1 -
 dlls/dplayx/dplay.c           | 198 +++++++++++++++++-----------------
 dlls/dplayx/dplaysp.c         |  34 +++---
 dlls/dplayx/dplayx_global.c   |  24 ++---
 dlls/dplayx/dplayx_main.c     |   2 +-
 dlls/dplayx/dplayx_messages.c |  18 ++--
 dlls/dplayx/dplobby.c         |  68 ++++++------
 dlls/dplayx/lobbysp.c         |   4 +-
 8 files changed, 174 insertions(+), 175 deletions(-)

diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in
index 1a8f6c0bd8f..8d41fdbad9e 100644
--- a/dlls/dplayx/Makefile.in
+++ b/dlls/dplayx/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = dplayx.dll
 IMPORTLIB = dplayx
 IMPORTS   = dxguid uuid winmm ole32 user32 advapi32
diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index 7a796735ce8..ae929a558b2 100644
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -271,7 +271,7 @@ HRESULT DP_HandleMessage( IDirectPlayImpl *This, const void *lpcMessageBody,
         DWORD dwMessageBodySize, const void *lpcMessageHeader, WORD wCommandId, WORD wVersion,
         void **lplpReply, DWORD *lpdwMsgSize )
 {
-  TRACE( "(%p)->(%p,0x%08x,%p,%u,%u)\n",
+  TRACE( "(%p)->(%p,0x%08lx,%p,%u,%u)\n",
          This, lpcMessageBody, dwMessageBodySize, lpcMessageHeader, wCommandId,
          wVersion );
 
@@ -302,7 +302,7 @@ HRESULT DP_HandleMessage( IDirectPlayImpl *This, const void *lpcMessageBody,
 
       *lplpReply = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, *lpdwMsgSize );
 
-      FIXME( "Ignoring dwFlags 0x%08x in request msg\n",
+      FIXME( "Ignoring dwFlags 0x%08lx in request msg\n",
              lpcMsg->dwFlags );
 
       /* Setup the reply */
@@ -315,7 +315,7 @@ HRESULT DP_HandleMessage( IDirectPlayImpl *This, const void *lpcMessageBody,
 
       lpReply->dpidNewPlayerId = DP_NextObjectId();
 
-      TRACE( "Allocating new playerid 0x%08x from remote request\n",
+      TRACE( "Allocating new playerid 0x%08lx from remote request\n",
              lpReply->dpidNewPlayerId );
       break;
     }
@@ -326,7 +326,7 @@ HRESULT DP_HandleMessage( IDirectPlayImpl *This, const void *lpcMessageBody,
       break;
 
     case DPMSGCMD_JUSTENVELOPE:
-      TRACE( "GOT THE SELF MESSAGE: %p -> 0x%08x\n", lpcMessageHeader, ((const DWORD *)lpcMessageHeader)[1] );
+      TRACE( "GOT THE SELF MESSAGE: %p -> 0x%08lx\n", lpcMessageHeader, ((const DWORD *)lpcMessageHeader)[1] );
       NS_SetLocalAddr( This->dp2->lpNameServerData, lpcMessageHeader, 20 );
       DP_MSG_ReplyReceived( This, wCommandId, lpcMessageBody, dwMessageBodySize );
 
@@ -362,7 +362,7 @@ static ULONG WINAPI IDirectPlayImpl_AddRef( IDirectPlay *iface )
     IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
     ULONG ref = InterlockedIncrement( &This->ref );
 
-    TRACE( "(%p) ref=%d\n", This, ref );
+    TRACE( "(%p) ref=%ld\n", This, ref );
 
     if ( ref == 1 )
         InterlockedIncrement( &This->numIfaces );
@@ -375,7 +375,7 @@ static ULONG WINAPI IDirectPlayImpl_Release( IDirectPlay *iface )
     IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
     ULONG ref = InterlockedDecrement( &This->ref );
 
-    TRACE( "(%p) ref=%d\n", This, ref );
+    TRACE( "(%p) ref=%ld\n", This, ref );
 
     if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
         dplay_destroy( This );
@@ -387,7 +387,7 @@ static HRESULT WINAPI IDirectPlayImpl_AddPlayerToGroup( IDirectPlay *iface, DPID
         DPID player )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
-    FIXME( "(%p)->(0x%08x,0x%08x): stub\n", This, group, player );
+    FIXME( "(%p)->(0x%08lx,0x%08lx): stub\n", This, group, player );
     return E_NOTIMPL;
 }
 
@@ -419,21 +419,21 @@ static HRESULT WINAPI IDirectPlayImpl_DeletePlayerFromGroup( IDirectPlay *iface,
         DPID player )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
-    FIXME( "(%p)->(0x%08x,0x%08x): stub\n", This, group, player );
+    FIXME( "(%p)->(0x%08lx,0x%08lx): stub\n", This, group, player );
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI IDirectPlayImpl_DestroyPlayer( IDirectPlay *iface, DPID player )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
-    FIXME( "(%p)->(0x%08x): stub\n", This, player );
+    FIXME( "(%p)->(0x%08lx): stub\n", This, player );
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI IDirectPlayImpl_DestroyGroup( IDirectPlay *iface, DPID group )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
-    FIXME( "(%p)->(0x%08x): stub\n", This, group );
+    FIXME( "(%p)->(0x%08lx): stub\n", This, group );
     return E_NOTIMPL;
 }
 
@@ -448,7 +448,7 @@ static HRESULT WINAPI IDirectPlayImpl_EnumGroupPlayers( IDirectPlay *iface, DPID
         LPDPENUMPLAYERSCALLBACK enumplayercb, void *context, DWORD flags )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
-    FIXME( "(%p)->(0x%08x,%p,%p,0x%08x): stub\n", This, group, enumplayercb, context, flags );
+    FIXME( "(%p)->(0x%08lx,%p,%p,0x%08lx): stub\n", This, group, enumplayercb, context, flags );
     return E_NOTIMPL;
 }
 
@@ -456,7 +456,7 @@ static HRESULT WINAPI IDirectPlayImpl_EnumGroups( IDirectPlay *iface, DWORD sess
         LPDPENUMPLAYERSCALLBACK enumplayercb, void *context, DWORD flags )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
-    FIXME( "(%p)->(0x%08x,%p,%p,0x%08x): stub\n", This, session, enumplayercb, context, flags );
+    FIXME( "(%p)->(0x%08lx,%p,%p,0x%08lx): stub\n", This, session, enumplayercb, context, flags );
     return E_NOTIMPL;
 }
 
@@ -464,7 +464,7 @@ static HRESULT WINAPI IDirectPlayImpl_EnumPlayers( IDirectPlay *iface, DWORD ses
         LPDPENUMPLAYERSCALLBACK enumplayercb, void *context, DWORD flags )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
-    FIXME( "(%p)->(0x%08x,%p,%p,0x%08x): stub\n", This, session, enumplayercb, context, flags );
+    FIXME( "(%p)->(0x%08lx,%p,%p,0x%08lx): stub\n", This, session, enumplayercb, context, flags );
     return E_NOTIMPL;
 }
 
@@ -472,7 +472,7 @@ static HRESULT WINAPI IDirectPlayImpl_EnumSessions( IDirectPlay *iface, DPSESSIO
         DWORD timeout, LPDPENUMSESSIONSCALLBACK enumsessioncb, void *context, DWORD flags )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
-    FIXME( "(%p)->(%p,%u,%p,%p,0x%08x): stub\n", This, sdesc, timeout, enumsessioncb, context,
+    FIXME( "(%p)->(%p,%lu,%p,%p,0x%08lx): stub\n", This, sdesc, timeout, enumsessioncb, context,
             flags );
     return E_NOTIMPL;
 }
@@ -488,14 +488,14 @@ static HRESULT WINAPI IDirectPlayImpl_GetMessageCount( IDirectPlay *iface, DPID
         DWORD *count )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
-    FIXME( "(%p)->(0x%08x,%p): stub\n", This, player, count );
+    FIXME( "(%p)->(0x%08lx,%p): stub\n", This, player, count );
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI IDirectPlayImpl_GetPlayerCaps( IDirectPlay *iface, DPID player, DPCAPS *caps )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
-    FIXME( "(%p)->(0x%08x,%p): stub\n", This, player, caps );
+    FIXME( "(%p)->(0x%08lx,%p): stub\n", This, player, caps );
     return E_NOTIMPL;
 }
 
@@ -503,7 +503,7 @@ static HRESULT WINAPI IDirectPlayImpl_GetPlayerName( IDirectPlay *iface, DPID pl
         DWORD *size_name, LPSTR fullname, DWORD *size_fullname )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
-    FIXME( "(%p)->(0x%08x,%p,%p,%p,%p): stub\n", This, player, name, size_name, fullname,
+    FIXME( "(%p)->(0x%08lx,%p,%p,%p,%p): stub\n", This, player, name, size_name, fullname,
             size_fullname );
     return E_NOTIMPL;
 }
@@ -526,7 +526,7 @@ static HRESULT WINAPI IDirectPlayImpl_Receive( IDirectPlay *iface, DPID *from, D
         DWORD flags, void *data, DWORD *size )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
-    FIXME( "(%p)->(%p,%p,0x%08x,%p,%p): stub\n", This, from, to, flags, data, size );
+    FIXME( "(%p)->(%p,%p,0x%08lx,%p,%p): stub\n", This, from, to, flags, data, size );
     return E_NOTIMPL;
 }
 
@@ -541,7 +541,7 @@ static HRESULT WINAPI IDirectPlayImpl_Send( IDirectPlay *iface, DPID from, DPID
         void *data, DWORD size )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
-    FIXME( "(%p)->(0x%08x,0x%08x,0x%08x,%p,%u): stub\n", This, from, to, flags, data, size );
+    FIXME( "(%p)->(0x%08lx,0x%08lx,0x%08lx,%p,%lu): stub\n", This, from, to, flags, data, size );
     return E_NOTIMPL;
 }
 
@@ -549,7 +549,7 @@ static HRESULT WINAPI IDirectPlayImpl_SetPlayerName( IDirectPlay *iface, DPID pl
         LPSTR fullname )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
-    FIXME( "(%p)->(0x%08x,%s,%s): stub\n", This, player, debugstr_a( name ),
+    FIXME( "(%p)->(0x%08lx,%s,%s): stub\n", This, player, debugstr_a( name ),
             debugstr_a ( fullname ) );
     return E_NOTIMPL;
 }
@@ -680,7 +680,7 @@ static ULONG WINAPI IDirectPlay2AImpl_AddRef( IDirectPlay2A *iface )
     IDirectPlayImpl *This = impl_from_IDirectPlay2A( iface );
     ULONG ref = InterlockedIncrement( &This->ref2A );
 
-    TRACE( "(%p) ref2A=%d\n", This, ref );
+    TRACE( "(%p) ref2A=%ld\n", This, ref );
 
     if ( ref == 1 )
         InterlockedIncrement( &This->numIfaces );
@@ -693,7 +693,7 @@ static ULONG WINAPI IDirectPlay2Impl_AddRef( IDirectPlay2 *iface )
     IDirectPlayImpl *This = impl_from_IDirectPlay2( iface );
     ULONG ref = InterlockedIncrement( &This->ref2 );
 
-    TRACE( "(%p) ref2=%d\n", This, ref );
+    TRACE( "(%p) ref2=%ld\n", This, ref );
 
     if ( ref == 1 )
         InterlockedIncrement( &This->numIfaces );
@@ -706,7 +706,7 @@ static ULONG WINAPI IDirectPlay3AImpl_AddRef( IDirectPlay3A *iface )
     IDirectPlayImpl *This = impl_from_IDirectPlay3A( iface );
     ULONG ref = InterlockedIncrement( &This->ref3A );
 
-    TRACE( "(%p) ref3A=%d\n", This, ref );
+    TRACE( "(%p) ref3A=%ld\n", This, ref );
 
     if ( ref == 1 )
         InterlockedIncrement( &This->numIfaces );
@@ -719,7 +719,7 @@ static ULONG WINAPI IDirectPlay3Impl_AddRef( IDirectPlay3 *iface )
     IDirectPlayImpl *This = impl_from_IDirectPlay3( iface );
     ULONG ref = InterlockedIncrement( &This->ref3 );
 
-    TRACE( "(%p) ref3=%d\n", This, ref );
+    TRACE( "(%p) ref3=%ld\n", This, ref );
 
     if ( ref == 1 )
         InterlockedIncrement( &This->numIfaces );
@@ -732,7 +732,7 @@ static ULONG WINAPI IDirectPlay4AImpl_AddRef(IDirectPlay4A *iface)
     IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
     ULONG ref = InterlockedIncrement( &This->ref4A );
 
-    TRACE( "(%p) ref4A=%d\n", This, ref );
+    TRACE( "(%p) ref4A=%ld\n", This, ref );
 
     if ( ref == 1 )
         InterlockedIncrement( &This->numIfaces );
@@ -745,7 +745,7 @@ static ULONG WINAPI IDirectPlay4Impl_AddRef(IDirectPlay4 *iface)
     IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
     ULONG ref = InterlockedIncrement( &This->ref4 );
 
-    TRACE( "(%p) ref4=%d\n", This, ref );
+    TRACE( "(%p) ref4=%ld\n", This, ref );
 
     if ( ref == 1 )
         InterlockedIncrement( &This->numIfaces );
@@ -758,7 +758,7 @@ static ULONG WINAPI IDirectPlay2AImpl_Release( IDirectPlay2A *iface )
     IDirectPlayImpl *This = impl_from_IDirectPlay2A( iface );
     ULONG ref = InterlockedDecrement( &This->ref2A );
 
-    TRACE( "(%p) ref2A=%d\n", This, ref );
+    TRACE( "(%p) ref2A=%ld\n", This, ref );
 
     if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
         dplay_destroy( This );
@@ -771,7 +771,7 @@ static ULONG WINAPI IDirectPlay2Impl_Release( IDirectPlay2 *iface )
     IDirectPlayImpl *This = impl_from_IDirectPlay2( iface );
     ULONG ref = InterlockedDecrement( &This->ref2 );
 
-    TRACE( "(%p) ref2=%d\n", This, ref );
+    TRACE( "(%p) ref2=%ld\n", This, ref );
 
     if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
         dplay_destroy( This );
@@ -784,7 +784,7 @@ static ULONG WINAPI IDirectPlay3AImpl_Release( IDirectPlay3A *iface )
     IDirectPlayImpl *This = impl_from_IDirectPlay3A( iface );
     ULONG ref = InterlockedDecrement( &This->ref3A );
 
-    TRACE( "(%p) ref3A=%d\n", This, ref );
+    TRACE( "(%p) ref3A=%ld\n", This, ref );
 
     if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
         dplay_destroy( This );
@@ -797,7 +797,7 @@ static ULONG WINAPI IDirectPlay3Impl_Release( IDirectPlay3 *iface )
     IDirectPlayImpl *This = impl_from_IDirectPlay3( iface );
     ULONG ref = InterlockedDecrement( &This->ref3 );
 
-    TRACE( "(%p) ref3=%d\n", This, ref );
+    TRACE( "(%p) ref3=%ld\n", This, ref );
 
     if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
         dplay_destroy( This );
@@ -810,7 +810,7 @@ static ULONG WINAPI IDirectPlay4AImpl_Release(IDirectPlay4A *iface)
     IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
     ULONG ref = InterlockedDecrement( &This->ref4A );
 
-    TRACE( "(%p) ref4A=%d\n", This, ref );
+    TRACE( "(%p) ref4A=%ld\n", This, ref );
 
     if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
         dplay_destroy( This );
@@ -823,7 +823,7 @@ static ULONG WINAPI IDirectPlay4Impl_Release(IDirectPlay4 *iface)
     IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
     ULONG ref = InterlockedDecrement( &This->ref4 );
 
-    TRACE( "(%p) ref4=%d\n", This, ref );
+    TRACE( "(%p) ref4=%ld\n", This, ref );
 
     if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
         dplay_destroy( This );
@@ -874,7 +874,7 @@ static HRESULT WINAPI IDirectPlay4Impl_AddPlayerToGroup( IDirectPlay4 *iface, DP
     lpPlayerList plist;
     lpPlayerList newplist;
 
-    TRACE( "(%p)->(0x%08x,0x%08x)\n", This, group, player );
+    TRACE( "(%p)->(0x%08lx,0x%08lx)\n", This, group, player );
 
     if ( This->dp2->connectionInitialized == NO_PROVIDER )
         return DPERR_UNINITIALIZED;
@@ -1023,7 +1023,7 @@ static lpGroupData DP_CreateGroup( IDirectPlayImpl *This, const DPID *lpid, cons
   /* FIXME: Should we validate the dwFlags? */
   lpGData->dwFlags = dwFlags;
 
-  TRACE( "Created group id 0x%08x\n", *lpid );
+  TRACE( "Created group id 0x%08lx\n", *lpid );
 
   return lpGData;
 }
@@ -1033,13 +1033,13 @@ static void DP_DeleteGroup( IDirectPlayImpl *This, DPID dpid )
 {
   lpGroupList lpGList;
 
-  TRACE( "(%p)->(0x%08x)\n", This, dpid );
+  TRACE( "(%p)->(0x%08lx)\n", This, dpid );
 
   DPQ_REMOVE_ENTRY( This->dp2->lpSysGroup->groups, groups, lpGData->dpid, ==, dpid, lpGList );
 
   if( lpGList == NULL )
   {
-    ERR( "DPID 0x%08x not found\n", dpid );
+    ERR( "DPID 0x%08lx not found\n", dpid );
     return;
   }
 
@@ -1062,7 +1062,7 @@ static lpGroupData DP_FindAnyGroup( IDirectPlayImpl *This, DPID dpid )
 {
   lpGroupList lpGroups;
 
-  TRACE( "(%p)->(0x%08x)\n", This, dpid );
+  TRACE( "(%p)->(0x%08lx)\n", This, dpid );
 
   if( dpid == DPID_SYSTEM_GROUP )
   {
@@ -1086,7 +1086,7 @@ static HRESULT DP_IF_CreateGroup( IDirectPlayImpl *This, void *lpMsgHdr, DPID *l
 {
   lpGroupData lpGData;
 
-  TRACE( "(%p)->(%p,%p,%p,%p,0x%08x,0x%08x,%u)\n",
+  TRACE( "(%p)->(%p,%p,%p,%p,0x%08lx,0x%08lx,%u)\n",
          This, lpMsgHdr, lpidGroup, lpGroupName, lpData, dwDataSize,
          dwFlags, bAnsi );
 
@@ -1333,7 +1333,7 @@ static lpPlayerData DP_CreatePlayer( IDirectPlayImpl *This, DPID *lpid, DPNAME *
   /* Initialize the SP data section */
   lpPData->lpSPPlayerData = DPSP_CreateSPPlayerData();
 
-  TRACE( "Created player id 0x%08x\n", *lpid );
+  TRACE( "Created player id 0x%08lx\n", *lpid );
 
   if( ~dwFlags & DPLAYI_PLAYER_SYSPLAYER )
     This->dp2->lpSessionDesc->dwCurrentPlayers++;
@@ -1354,13 +1354,13 @@ static void DP_DeletePlayer( IDirectPlayImpl *This, DPID dpid )
 {
   lpPlayerList lpPList;
 
-  TRACE( "(%p)->(0x%08x)\n", This, dpid );
+  TRACE( "(%p)->(0x%08lx)\n", This, dpid );
 
   DPQ_REMOVE_ENTRY( This->dp2->lpSysGroup->players, players, lpPData->dpid, ==, dpid, lpPList );
 
   if( lpPList == NULL )
   {
-    ERR( "DPID 0x%08x not found\n", dpid );
+    ERR( "DPID 0x%08lx not found\n", dpid );
     return;
   }
 
@@ -1385,7 +1385,7 @@ static lpPlayerList DP_FindPlayer( IDirectPlayImpl *This, DPID dpid )
 {
   lpPlayerList lpPlayers;
 
-  TRACE( "(%p)->(0x%08x)\n", This, dpid );
+  TRACE( "(%p)->(0x%08lx)\n", This, dpid );
 
   if(This->dp2->lpSysGroup == NULL)
     return NULL;
@@ -1504,7 +1504,7 @@ static HRESULT DP_IF_CreatePlayer( IDirectPlayImpl *This, void *lpMsgHdr, DPID *
   lpPlayerList lpPList;
   DWORD dwCreateFlags = 0;
 
-  TRACE( "(%p)->(%p,%p,%p,%p,0x%08x,0x%08x,%u)\n",
+  TRACE( "(%p)->(%p,%p,%p,%p,0x%08lx,0x%08lx,%u)\n",
          This, lpidPlayer, lpPlayerName, hEvent, lpData,
          dwDataSize, dwFlags, bAnsi );
   if( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -1558,7 +1558,7 @@ static HRESULT DP_IF_CreatePlayer( IDirectPlayImpl *This, void *lpMsgHdr, DPID *
     )
   {
     /* Assume non fatal failure */
-    ERR( "unknown dwFlags = 0x%08x\n", dwFlags );
+    ERR( "unknown dwFlags = 0x%08lx\n", dwFlags );
   }
 
   /* If the name is not specified, we must provide one */
@@ -1619,7 +1619,7 @@ static HRESULT DP_IF_CreatePlayer( IDirectPlayImpl *This, void *lpMsgHdr, DPID *
     data.lpSPMessageHeader = lpMsgHdr;
     data.lpISP             = This->dp2->spData.lpISP;
 
-    TRACE( "Calling SP CreatePlayer 0x%08x: dwFlags: 0x%08x lpMsgHdr: %p\n",
+    TRACE( "Calling SP CreatePlayer 0x%08lx: dwFlags: 0x%08lx lpMsgHdr: %p\n",
            *lpidPlayer, data.dwFlags, data.lpSPMessageHeader );
 
     hr = (*This->dp2->spData.lpCB->CreatePlayer)( &data );
@@ -1829,7 +1829,7 @@ static HRESULT WINAPI IDirectPlay4Impl_DeletePlayerFromGroup( IDirectPlay4 *ifac
     lpGroupData  gdata;
     lpPlayerList plist;
 
-    TRACE( "(%p)->(0x%08x,0x%08x)\n", This, group, player );
+    TRACE( "(%p)->(0x%08lx,0x%08lx)\n", This, group, player );
 
     /* Find the group */
     if ( ( gdata = DP_FindAnyGroup( This, group ) ) == NULL )
@@ -1886,18 +1886,18 @@ cbRemoveGroupOrPlayer(
 {
   lpDPRGOPContext lpCtxt = (lpDPRGOPContext)lpContext;
 
-  TRACE( "Removing element:0x%08x (type:0x%08x) from element:0x%08x\n",
+  TRACE( "Removing element:0x%08lx (type:0x%08lx) from element:0x%08lx\n",
            dpId, dwPlayerType, lpCtxt->idGroup );
 
   if( dwPlayerType == DPPLAYERTYPE_GROUP )
   {
     if ( FAILED( IDirectPlayX_DeleteGroupFromGroup( &lpCtxt->This->IDirectPlay4_iface,
                     lpCtxt->idGroup, dpId ) ) )
-      ERR( "Unable to delete group 0x%08x from group 0x%08x\n", dpId, lpCtxt->idGroup );
+      ERR( "Unable to delete group 0x%08lx from group 0x%08lx\n", dpId, lpCtxt->idGroup );
   }
   else if ( FAILED( IDirectPlayX_DeletePlayerFromGroup( &lpCtxt->This->IDirectPlay4_iface,
                                                         lpCtxt->idGroup, dpId ) ) )
-      ERR( "Unable to delete player 0x%08x from grp 0x%08x\n", dpId, lpCtxt->idGroup );
+      ERR( "Unable to delete player 0x%08lx from grp 0x%08lx\n", dpId, lpCtxt->idGroup );
 
   return TRUE; /* Continue enumeration */
 }
@@ -1907,7 +1907,7 @@ static HRESULT DP_IF_DestroyGroup( IDirectPlayImpl *This, void *lpMsgHdr, DPID i
   lpGroupData lpGData;
   DPRGOPContext context;
 
-  FIXME( "(%p)->(%p,0x%08x,%u): semi stub\n",
+  FIXME( "(%p)->(%p,0x%08lx,%u): semi stub\n",
          This, lpMsgHdr, idGroup, bAnsi );
 
   /* Find the group */
@@ -2002,7 +2002,7 @@ static HRESULT DP_IF_DestroyPlayer( IDirectPlayImpl *This, void *lpMsgHdr, DPID
 {
   DPFAGContext cbContext;
 
-  FIXME( "(%p)->(%p,0x%08x,%u): semi stub\n",
+  FIXME( "(%p)->(%p,0x%08lx,%u): semi stub\n",
          This, lpMsgHdr, idPlayer, bAnsi );
 
   if( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -2071,7 +2071,7 @@ cbDeletePlayerFromAllGroups(
   }
   else
   {
-    ERR( "Group callback has dwPlayerType = 0x%08x\n", dwPlayerType );
+    ERR( "Group callback has dwPlayerType = 0x%08lx\n", dwPlayerType );
   }
 
   return TRUE;
@@ -2160,7 +2160,7 @@ static HRESULT WINAPI IDirectPlay4Impl_EnumGroupPlayers( IDirectPlay4 *iface, DP
     lpGroupData  gdata;
     lpPlayerList plist;
 
-    FIXME( "(%p)->(0x%08x,%p,%p,%p,0x%08x): semi stub\n", This, group, instance, enumplayercb,
+    FIXME( "(%p)->(0x%08lx,%p,%p,%p,0x%08lx): semi stub\n", This, group, instance, enumplayercb,
            context, flags );
 
     if ( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -2327,7 +2327,7 @@ static DWORD CALLBACK DP_EnumSessionsSendAsyncRequestThread( LPVOID lpContext )
   HANDLE hSuicideRequest = data->hSuicideRequest;
   DWORD dwTimeout = data->dwTimeout;
 
-  TRACE( "Thread started with timeout = 0x%08x\n", dwTimeout );
+  TRACE( "Thread started with timeout = 0x%08lx\n", dwTimeout );
 
   for( ;; )
   {
@@ -2436,7 +2436,7 @@ static HRESULT WINAPI IDirectPlay4Impl_EnumSessions( IDirectPlay4 *iface, DPSESS
     DWORD  size;
     HRESULT hr = DP_OK;
 
-    TRACE( "(%p)->(%p,0x%08x,%p,%p,0x%08x)\n", This, sdesc, timeout, enumsessioncb,
+    TRACE( "(%p)->(%p,0x%08lx,%p,%p,0x%08lx)\n", This, sdesc, timeout, enumsessioncb,
             context, flags );
 
     if ( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -2629,7 +2629,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetGroupData( IDirectPlay4 *iface, DPID g
     DWORD bufsize;
     void *src;
 
-    TRACE( "(%p)->(0x%08x,%p,%p,0x%08x)\n", This, group, data, size, flags );
+    TRACE( "(%p)->(0x%08lx,%p,%p,0x%08lx)\n", This, group, data, size, flags );
 
     if ( ( gdata = DP_FindAnyGroup( This, group ) ) == NULL )
         return DPERR_INVALIDGROUP;
@@ -2665,7 +2665,7 @@ static HRESULT DP_IF_GetGroupName( IDirectPlayImpl *This, DPID idGroup, void *lp
   LPDPNAME    lpName = lpData;
   DWORD       dwRequiredDataSize;
 
-  FIXME("(%p)->(0x%08x,%p,%p,%u) ANSI ignored\n",
+  FIXME("(%p)->(0x%08lx,%p,%p,%u) ANSI ignored\n",
           This, idGroup, lpData, lpdwDataSize, bAnsi );
 
   if( ( lpGData = DP_FindAnyGroup( This, idGroup ) ) == NULL )
@@ -2833,7 +2833,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_GetPlayerAddress( IDirectPlay4A *iface,
         void *data, DWORD *size )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
-    FIXME("(%p)->(0x%08x,%p,%p): stub\n", This, player, data, size );
+    FIXME("(%p)->(0x%08lx,%p,%p): stub\n", This, player, data, size );
     return DP_OK;
 }
 
@@ -2841,7 +2841,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerAddress( IDirectPlay4 *iface, DP
         void *data, DWORD *size )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
-    FIXME( "(%p)->(0x%08x,%p,%p): stub\n", This, player, data, size );
+    FIXME( "(%p)->(0x%08lx,%p,%p): stub\n", This, player, data, size );
     return DP_OK;
 }
 
@@ -2886,7 +2886,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerCaps( IDirectPlay4 *iface, DPID
     IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
     DPSP_GETCAPSDATA data;
 
-    TRACE( "(%p)->(0x%08x,%p,0x%08x)\n", This, player, caps, flags);
+    TRACE( "(%p)->(0x%08lx,%p,0x%08lx)\n", This, player, caps, flags);
 
     if ( !caps )
         return DPERR_INVALIDPARAMS;
@@ -2949,7 +2949,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerData( IDirectPlay4 *iface, DPID
     DWORD bufsize;
     void *src;
 
-    TRACE( "(%p)->(0x%08x,%p,%p,0x%08x)\n", This, player, data, size, flags );
+    TRACE( "(%p)->(0x%08lx,%p,%p,0x%08lx)\n", This, player, data, size, flags );
 
     if ( This->dp2->connectionInitialized == NO_PROVIDER )
         return DPERR_UNINITIALIZED;
@@ -2987,7 +2987,7 @@ static HRESULT DP_IF_GetPlayerName( IDirectPlayImpl *This, DPID idPlayer, void *
   LPDPNAME    lpName = lpData;
   DWORD       dwRequiredDataSize;
 
-  FIXME( "(%p)->(0x%08x,%p,%p,%u): ANSI\n",
+  FIXME( "(%p)->(0x%08lx,%p,%p,%u): ANSI\n",
          This, idPlayer, lpData, lpdwDataSize, bAnsi );
 
   if( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -3208,7 +3208,7 @@ static HRESULT DP_SecureOpen( IDirectPlayImpl *This, const DPSESSIONDESC2 *lpsd,
 {
   HRESULT hr = DP_OK;
 
-  FIXME( "(%p)->(%p,0x%08x,%p,%p): partial stub\n",
+  FIXME( "(%p)->(%p,0x%08lx,%p,%p): partial stub\n",
          This, lpsd, dwFlags, lpSecurity, lpCredentials );
 
   if( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -3218,7 +3218,7 @@ static HRESULT DP_SecureOpen( IDirectPlayImpl *This, const DPSESSIONDESC2 *lpsd,
 
   if( lpsd->dwSize != sizeof(DPSESSIONDESC2) )
   {
-    TRACE( ": rejecting invalid dpsd size (%d).\n", lpsd->dwSize );
+    TRACE( ": rejecting invalid dpsd size (%ld).\n", lpsd->dwSize );
     return DPERR_INVALIDPARAMS;
   }
 
@@ -3358,7 +3358,7 @@ static HRESULT DP_IF_Receive( IDirectPlayImpl *This, DPID *lpidFrom, DPID *lpidT
 {
   LPDPMSG lpMsg = NULL;
 
-  FIXME( "(%p)->(%p,%p,0x%08x,%p,%p,%u): stub\n",
+  FIXME( "(%p)->(%p,%p,0x%08lx,%p,%p,%u): stub\n",
          This, lpidFrom, lpidTo, dwFlags, lpData, lpdwDataSize, bAnsi );
 
   if( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -3392,11 +3392,11 @@ static HRESULT DP_IF_Receive( IDirectPlayImpl *This, DPID *lpidFrom, DPID *lpidT
            ( dwFlags & DPRECEIVE_FROMPLAYER )
          )
   {
-    FIXME( "Find matching message 0x%08x\n", dwFlags );
+    FIXME( "Find matching message 0x%08lx\n", dwFlags );
   }
   else
   {
-    ERR( "Hmmm..dwFlags 0x%08x\n", dwFlags );
+    ERR( "Hmmm..dwFlags 0x%08lx\n", dwFlags );
   }
 
   if( lpMsg == NULL )
@@ -3533,7 +3533,7 @@ static HRESULT WINAPI IDirectPlay4Impl_SetGroupData( IDirectPlay4 *iface, DPID g
     IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
     lpGroupData gdata;
 
-    TRACE( "(%p)->(0x%08x,%p,0x%08x,0x%08x)\n", This, group, data, size, flags );
+    TRACE( "(%p)->(0x%08lx,%p,0x%08lx,0x%08lx)\n", This, group, data, size, flags );
 
     /* Parameter check */
     if ( !data && size )
@@ -3567,7 +3567,7 @@ static HRESULT DP_IF_SetGroupName( IDirectPlayImpl *This, DPID idGroup, DPNAME *
 {
   lpGroupData lpGData;
 
-  TRACE( "(%p)->(0x%08x,%p,0x%08x,%u)\n", This, idGroup,
+  TRACE( "(%p)->(0x%08lx,%p,0x%08lx,%u)\n", This, idGroup,
          lpGroupName, dwFlags, bAnsi );
 
   if( ( lpGData = DP_FindAnyGroup( This, idGroup ) ) == NULL )
@@ -3666,7 +3666,7 @@ static HRESULT WINAPI IDirectPlay4Impl_SetPlayerData( IDirectPlay4 *iface, DPID
     IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
     lpPlayerList plist;
 
-    TRACE( "(%p)->(0x%08x,%p,0x%08x,0x%08x)\n", This, player, data, size, flags );
+    TRACE( "(%p)->(0x%08lx,%p,0x%08lx,0x%08lx)\n", This, player, data, size, flags );
 
     if ( This->dp2->connectionInitialized == NO_PROVIDER )
         return DPERR_UNINITIALIZED;
@@ -3700,7 +3700,7 @@ static HRESULT DP_IF_SetPlayerName( IDirectPlayImpl *This, DPID idPlayer, DPNAME
 {
   lpPlayerList lpPList;
 
-  TRACE( "(%p)->(0x%08x,%p,0x%08x,%u)\n",
+  TRACE( "(%p)->(0x%08lx,%p,0x%08lx,%u)\n",
          This, idPlayer, lpPlayerName, dwFlags, bAnsi );
 
   if( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -3769,7 +3769,7 @@ static HRESULT DP_SetSessionDesc( IDirectPlayImpl *This, const DPSESSIONDESC2 *l
   DWORD            dwRequiredSize;
   LPDPSESSIONDESC2 lpTempSessDesc;
 
-  TRACE( "(%p)->(%p,0x%08x,%u,%u)\n",
+  TRACE( "(%p)->(%p,0x%08lx,%u,%u)\n",
          This, lpSessDesc, dwFlags, bInitial, bAnsi );
 
   if( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -3988,7 +3988,7 @@ static HRESULT WINAPI IDirectPlay4Impl_AddGroupToGroup( IDirectPlay4 *iface, DPI
     lpGroupData gdata;
     lpGroupList glist;
 
-    TRACE( "(%p)->(0x%08x,0x%08x)\n", This, parent, group );
+    TRACE( "(%p)->(0x%08lx,0x%08lx)\n", This, parent, group );
 
     if ( This->dp2->connectionInitialized == NO_PROVIDER )
         return DPERR_UNINITIALIZED;
@@ -4025,7 +4025,7 @@ static HRESULT DP_IF_CreateGroupInGroup( IDirectPlayImpl *This, void *lpMsgHdr,
   lpGroupList lpGList;
   lpGroupData lpGData;
 
-  TRACE( "(%p)->(0x%08x,%p,%p,%p,0x%08x,0x%08x,%u)\n",
+  TRACE( "(%p)->(0x%08lx,%p,%p,%p,0x%08lx,0x%08lx,%u)\n",
          This, idParentGroup, lpidGroup, lpGroupName, lpData,
          dwDataSize, dwFlags, bAnsi );
 
@@ -4171,7 +4171,7 @@ static HRESULT WINAPI IDirectPlay4Impl_DeleteGroupFromGroup( IDirectPlay4 *iface
     lpGroupList glist;
     lpGroupData parentdata;
 
-    TRACE("(%p)->(0x%08x,0x%08x)\n", This, parent, group );
+    TRACE("(%p)->(0x%08lx,0x%08lx)\n", This, parent, group );
 
     /* Is the parent group valid? */
     if ( ( parentdata = DP_FindAnyGroup(This, parent ) ) == NULL )
@@ -4253,7 +4253,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_EnumConnections( IDirectPlay4A *iface,
         DWORD dwFlags )
 {
   IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
-  TRACE("(%p)->(%p,%p,%p,0x%08x)\n", This, lpguidApplication, lpEnumCallback, lpContext, dwFlags );
+  TRACE("(%p)->(%p,%p,%p,0x%08lx)\n", This, lpguidApplication, lpEnumCallback, lpContext, dwFlags );
 
   /* A default dwFlags (0) is backwards compatible -- DPCONNECTION_DIRECTPLAY */
   if( dwFlags == 0 )
@@ -4522,7 +4522,7 @@ static HRESULT WINAPI IDirectPlay4Impl_EnumGroupsInGroup( IDirectPlay4 *iface, D
     lpGroupList glist;
     lpGroupData gdata;
 
-    FIXME( "(%p)->(0x%08x,%p,%p,%p,0x%08x): semi stub\n", This, group, instance, enumplayercb,
+    FIXME( "(%p)->(0x%08lx,%p,%p,%p,0x%08lx): semi stub\n", This, group, instance, enumplayercb,
             context, flags );
 
     if ( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -4569,7 +4569,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_GetGroupConnectionSettings( IDirectPlay4
         DWORD flags, DPID group, void *data, DWORD *size )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
-    FIXME("(%p)->(0x%08x,0x%08x,%p,%p): stub\n", This, flags, group, data, size );
+    FIXME("(%p)->(0x%08lx,0x%08lx,%p,%p): stub\n", This, flags, group, data, size );
     return DP_OK;
 }
 
@@ -4577,7 +4577,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetGroupConnectionSettings( IDirectPlay4
         DPID group, void *data, DWORD *size )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
-    FIXME( "(%p)->(0x%08x,0x%08x,%p,%p): stub\n", This, flags, group, data, size );
+    FIXME( "(%p)->(0x%08lx,0x%08lx,%p,%p): stub\n", This, flags, group, data, size );
     return DP_OK;
 }
 
@@ -4592,12 +4592,12 @@ static BOOL CALLBACK DP_GetSpLpGuidFromCompoundAddress(
       ( IsEqualGUID( guidDataType, &DPAID_LobbyProvider ) )
     )
   {
-    TRACE( "Found SP/LP (%s) %s (data size = 0x%08x)\n",
+    TRACE( "Found SP/LP (%s) %s (data size = 0x%08lx)\n",
            debugstr_guid( guidDataType ), debugstr_guid( lpData ), dwDataSize );
 
     if( dwDataSize != sizeof( GUID ) )
     {
-      ERR( "Invalid sp/lp guid size 0x%08x\n", dwDataSize );
+      ERR( "Invalid sp/lp guid size 0x%08lx\n", dwDataSize );
     }
 
     memcpy( lpContext, lpData, dwDataSize );
@@ -4731,7 +4731,7 @@ static HMODULE DP_LoadSP( LPCGUID lpcGuid, LPSPINITDATA lpSpData, LPBOOL lpbIsDp
                             NULL, NULL, (LPBYTE)returnBuffer,
                             &sizeOfReturnBuffer ) ) != ERROR_SUCCESS )
       {
-        ERR(": missing PATH registry data members: 0x%08x\n", dwTemp );
+        ERR(": missing PATH registry data members: 0x%08lx\n", dwTemp );
         continue;
       }
 
@@ -4853,7 +4853,7 @@ static HRESULT WINAPI IDirectPlay4Impl_InitializeConnection( IDirectPlay4 *iface
     BOOL is_dp_sp; /* TRUE if Direct Play SP, FALSE if Direct Play Lobby SP */
     HRESULT hr;
 
-    TRACE( "(%p)->(%p,0x%08x)\n", This, connection, flags );
+    TRACE( "(%p)->(%p,0x%08lx)\n", This, connection, flags );
 
     if ( !connection )
         return DPERR_INVALIDPARAMS;
@@ -4956,7 +4956,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_SendChatMessage( IDirectPlay4A *iface, D
         DPID to, DWORD flags, DPCHAT *chatmsg )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
-    FIXME("(%p)->(0x%08x,0x%08x,0x%08x,%p): stub\n", This, from, to, flags, chatmsg );
+    FIXME("(%p)->(0x%08lx,0x%08lx,0x%08lx,%p): stub\n", This, from, to, flags, chatmsg );
     return DP_OK;
 }
 
@@ -4964,7 +4964,7 @@ static HRESULT WINAPI IDirectPlay4Impl_SendChatMessage( IDirectPlay4 *iface, DPI
         DWORD flags, DPCHAT *chatmsg )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
-    FIXME( "(%p)->(0x%08x,0x%08x,0x%08x,%p): stub\n", This, from, to, flags, chatmsg );
+    FIXME( "(%p)->(0x%08lx,0x%08lx,0x%08lx,%p): stub\n", This, from, to, flags, chatmsg );
     return DP_OK;
 }
 
@@ -4988,7 +4988,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_SetGroupConnectionSettings( IDirectPlay4
         DWORD flags, DPID group, DPLCONNECTION *connection )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
-    FIXME("(%p)->(0x%08x,0x%08x,%p): stub\n", This, flags, group, connection );
+    FIXME("(%p)->(0x%08lx,0x%08lx,%p): stub\n", This, flags, group, connection );
     return DP_OK;
 }
 
@@ -4996,7 +4996,7 @@ static HRESULT WINAPI IDirectPlay4Impl_SetGroupConnectionSettings( IDirectPlay4
         DPID group, DPLCONNECTION *connection )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
-    FIXME( "(%p)->(0x%08x,0x%08x,%p): stub\n", This, flags, group, connection );
+    FIXME( "(%p)->(0x%08lx,0x%08lx,%p): stub\n", This, flags, group, connection );
     return DP_OK;
 }
 
@@ -5024,7 +5024,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_StartSession( IDirectPlay4A *iface, DWOR
 static HRESULT WINAPI IDirectPlay4Impl_StartSession( IDirectPlay4 *iface, DWORD flags, DPID group )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
-    FIXME( "(%p)->(0x%08x,0x%08x): stub\n", This, flags, group );
+    FIXME( "(%p)->(0x%08lx,0x%08lx): stub\n", This, flags, group );
     return DP_OK;
 }
 
@@ -5053,7 +5053,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetGroupFlags( IDirectPlay4 *iface, DPID
         DWORD *flags )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
-    FIXME( "(%p)->(0x%08x,%p): stub\n", This, group, flags );
+    FIXME( "(%p)->(0x%08lx,%p): stub\n", This, group, flags );
     return DP_OK;
 }
 
@@ -5084,7 +5084,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetGroupParent( IDirectPlay4 *iface, DPID
     IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
     lpGroupData gdata;
 
-    TRACE( "(%p)->(0x%08x,%p)\n", This, group, parent );
+    TRACE( "(%p)->(0x%08lx,%p)\n", This, group, parent );
 
     if ( ( gdata = DP_FindAnyGroup( This, group ) ) == NULL )
         return DPERR_INVALIDGROUP;
@@ -5112,7 +5112,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_GetPlayerAccount( IDirectPlay4A *iface,
         DWORD flags, void *data, DWORD *size )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
-    FIXME("(%p)->(0x%08x,0x%08x,%p,%p): stub\n", This, player, flags, data, size );
+    FIXME("(%p)->(0x%08lx,0x%08lx,%p,%p): stub\n", This, player, flags, data, size );
     return DP_OK;
 }
 
@@ -5120,7 +5120,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerAccount( IDirectPlay4 *iface, DP
         DWORD flags, void *data, DWORD *size )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
-    FIXME( "(%p)->(0x%08x,0x%08x,%p,%p): stub\n", This, player, flags, data, size );
+    FIXME( "(%p)->(0x%08lx,0x%08lx,%p,%p): stub\n", This, player, flags, data, size );
     return DP_OK;
 }
 
@@ -5149,7 +5149,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerFlags( IDirectPlay4 *iface, DPID
         DWORD *flags )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
-    FIXME( "(%p)->(0x%08x,%p): stub\n", This, player, flags );
+    FIXME( "(%p)->(0x%08lx,%p): stub\n", This, player, flags );
     return DP_OK;
 }
 
@@ -5164,7 +5164,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetGroupOwner( IDirectPlay4 *iface, DPID
         DPID *owner )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
-    FIXME( "(%p)->(0x%08x,%p): stub\n", This, group, owner );
+    FIXME( "(%p)->(0x%08lx,%p): stub\n", This, group, owner );
     return DP_OK;
 }
 
@@ -5179,7 +5179,7 @@ static HRESULT WINAPI IDirectPlay4Impl_SetGroupOwner( IDirectPlay4 *iface, DPID
         DPID owner )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
-    FIXME( "(%p)->(0x%08x,0x%08x): stub\n", This, group, owner );
+    FIXME( "(%p)->(0x%08lx,0x%08lx): stub\n", This, group, owner );
     return DP_OK;
 }
 
@@ -5198,7 +5198,7 @@ static HRESULT WINAPI IDirectPlay4Impl_SendEx( IDirectPlay4 *iface, DPID from, D
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
 
-    FIXME( "(%p)->(0x%08x,0x%08x,0x%08x,%p,0x%08x,0x%08x,0x%08x,%p,%p): semi-stub\n",
+    FIXME( "(%p)->(0x%08lx,0x%08lx,0x%08lx,%p,0x%08lx,0x%08lx,0x%08lx,%p,%p): semi-stub\n",
             This, from, to, flags, data, size, priority, timeout, context, msgid );
 
     if ( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -5216,7 +5216,7 @@ static HRESULT WINAPI IDirectPlay4Impl_SendEx( IDirectPlay4 *iface, DPID from, D
      */
     if ( from != DPID_UNKNOWN && !DP_FindPlayer( This, from ) )
     {
-        WARN( "INFO: Invalid from player 0x%08x\n", from );
+        WARN( "INFO: Invalid from player 0x%08lx\n", from );
         return DPERR_INVALIDPLAYER;
     }
 
@@ -5290,7 +5290,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetMessageQueue( IDirectPlay4 *iface, DPI
     IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
     HRESULT hr = DP_OK;
 
-    FIXME( "(%p)->(0x%08x,0x%08x,0x%08x,%p,%p): semi-stub\n", This, from, to, flags, msgs, bytes );
+    FIXME( "(%p)->(0x%08lx,0x%08lx,0x%08lx,%p,%p): semi-stub\n", This, from, to, flags, msgs, bytes );
 
     /* FIXME: Do we need to do from and to sanity checking here? */
     /* FIXME: What about sends which are not immediate? */
@@ -5322,7 +5322,7 @@ static HRESULT dplay_cancelmsg ( IDirectPlayImpl* This, DWORD msgid, DWORD flags
 {
     HRESULT hr = DP_OK;
 
-    FIXME( "(%p)->(0x%08x,0x%08x): semi stub\n", This, msgid, flags );
+    FIXME( "(%p)->(0x%08lx,0x%08lx): semi stub\n", This, msgid, flags );
 
     if ( This->dp2->spData.lpCB->Cancel )
     {
diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c
index 53be88e0648..b3bdc04d153 100644
--- a/dlls/dplayx/dplaysp.c
+++ b/dlls/dplayx/dplaysp.c
@@ -82,7 +82,7 @@ static ULONG WINAPI IDirectPlaySPImpl_AddRef( IDirectPlaySP *iface )
   IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface );
   ULONG ref = InterlockedIncrement( &This->ref );
 
-  TRACE( "(%p) ref=%d\n", This, ref );
+  TRACE( "(%p) ref=%ld\n", This, ref );
 
   return ref;
 }
@@ -92,7 +92,7 @@ static ULONG WINAPI IDirectPlaySPImpl_Release( IDirectPlaySP *iface )
   IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface );
   ULONG ref = InterlockedDecrement( &This->ref );
 
-  TRACE( "(%p) ref=%d\n", This, ref );
+  TRACE( "(%p) ref=%ld\n", This, ref );
 
   if( !ref )
   {
@@ -111,7 +111,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_AddMRUEntry( IDirectPlaySP *iface, LPCWS
 
   /* Should be able to call the comctl32 undocumented MRU routines.
      I suspect that the interface works appropriately */
-  FIXME( "(%p)->(%p,%p%p,0x%08x,0x%08x): stub\n",
+  FIXME( "(%p)->(%p,%p%p,0x%08lx,0x%08lx): stub\n",
          This, lpSection, lpKey, lpData, dwDataSize, dwMaxEntries );
 
   return DP_OK;
@@ -123,7 +123,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_CreateAddress( IDirectPlaySP *iface, REF
 {
   IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface );
 
-  FIXME( "(%p)->(%s,%s,%p,0x%08x,%p,%p): stub\n",
+  FIXME( "(%p)->(%s,%s,%p,0x%08lx,%p,%p): stub\n",
          This, debugstr_guid(guidSP), debugstr_guid(guidDataType),
          lpData, dwDataSize, lpAddress, lpdwAddressSize );
 
@@ -136,7 +136,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_EnumAddress( IDirectPlaySP *iface,
 {
   IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface );
 
-  TRACE( "(%p)->(%p,%p,0x%08x,%p)\n",
+  TRACE( "(%p)->(%p,%p,0x%08lx,%p)\n",
          This, lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext );
 
   DPL_EnumAddress( lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext );
@@ -162,7 +162,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetPlayerFlags( IDirectPlaySP *iface, DP
 {
   IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface );
 
-  FIXME( "(%p)->(0x%08x,%p): stub\n",
+  FIXME( "(%p)->(0x%08lx,%p): stub\n",
          This, idPlayer, lpdwPlayerFlags );
 
   return DP_OK;
@@ -175,7 +175,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPPlayerData( IDirectPlaySP *iface, D
   HRESULT hr;
   LPDP_SPPLAYERDATA lpPlayerData;
 
-  TRACE( "(%p)->(0x%08x,%p,%p,0x%08x)\n",
+  TRACE( "(%p)->(0x%08lx,%p,%p,0x%08lx)\n",
          This, idPlayer, lplpData, lpdwDataSize, dwFlags );
 
   hr = DP_GetSPPlayerData( This->dplay, idPlayer, (void**)&lpPlayerData );
@@ -216,18 +216,18 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage( IDirectPlaySP *iface, voi
   WORD wVersion;
   DPSP_REPLYDATA data;
 
-  FIXME( "(%p)->(%p,0x%08x,%p): mostly stub\n",
+  FIXME( "(%p)->(%p,0x%08lx,%p): mostly stub\n",
          This, lpMessageBody, dwMessageBodySize, lpMessageHeader );
 
   wCommandId = lpMsg->wCommandId;
   wVersion   = lpMsg->wVersion;
 
-  TRACE( "Incoming message has envelope of 0x%08x, %u, %u\n",
+  TRACE( "Incoming message has envelope of 0x%08lx, %u, %u\n",
          lpMsg->dwMagic, wCommandId, wVersion );
 
   if( lpMsg->dwMagic != DPMSGMAGIC_DPLAYMSG )
   {
-    ERR( "Unknown magic 0x%08x!\n", lpMsg->dwMagic );
+    ERR( "Unknown magic 0x%08lx!\n", lpMsg->dwMagic );
     return DPERR_GENERIC;
   }
 
@@ -522,7 +522,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPPlayerData( IDirectPlaySP *iface, D
   LPDP_SPPLAYERDATA lpPlayerEntry;
   LPVOID            lpPlayerData;
 
-  TRACE( "(%p)->(0x%08x,%p,0x%08x,0x%08x)\n", This, idPlayer, lpData, dwDataSize, dwFlags );
+  TRACE( "(%p)->(0x%08lx,%p,0x%08lx,0x%08lx)\n", This, idPlayer, lpData, dwDataSize, dwFlags );
 
   hr = DP_GetSPPlayerData( This->dplay, idPlayer, (void**)&lpPlayerEntry );
   if( FAILED(hr) )
@@ -556,7 +556,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_CreateCompoundAddress( IDirectPlaySP *if
 {
   IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface );
 
-  FIXME( "(%p)->(%p,0x%08x,%p,%p): stub\n",
+  FIXME( "(%p)->(%p,0x%08lx,%p,%p): stub\n",
          This, lpElements, dwElementCount, lpAddress, lpdwAddressSize );
 
   return DP_OK;
@@ -568,7 +568,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPData( IDirectPlaySP *iface, void **
   IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface );
   HRESULT hr = DP_OK;
 
-  TRACE( "(%p)->(%p,%p,0x%08x)\n", This, lplpData, lpdwDataSize, dwFlags );
+  TRACE( "(%p)->(%p,%p,0x%08lx)\n", This, lplpData, lpdwDataSize, dwFlags );
 
 #if 0
   /* This is what the documentation says... */
@@ -583,7 +583,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPData( IDirectPlaySP *iface, void **
    */
   if( dwFlags != DPSET_REMOTE )
   {
-    TRACE( "Undocumented dwFlags 0x%08x used\n", dwFlags );
+    TRACE( "Undocumented dwFlags 0x%08lx used\n", dwFlags );
   }
 #endif
 
@@ -616,7 +616,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPData( IDirectPlaySP *iface, void *l
   IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface );
   LPVOID lpSpData;
 
-  TRACE( "(%p)->(%p,0x%08x,0x%08x)\n", This, lpData, dwDataSize, dwFlags );
+  TRACE( "(%p)->(%p,0x%08lx,0x%08lx)\n", This, lpData, dwDataSize, dwFlags );
 
 #if 0
   /* This is what the documentation says... */
@@ -631,7 +631,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPData( IDirectPlaySP *iface, void *l
    */
   if( dwFlags != DPSET_REMOTE )
   {
-    TRACE( "Undocumented dwFlags 0x%08x used\n", dwFlags );
+    TRACE( "Undocumented dwFlags 0x%08lx used\n", dwFlags );
   }
 #endif
 
@@ -660,7 +660,7 @@ static void WINAPI IDirectPlaySPImpl_SendComplete( IDirectPlaySP *iface, void *u
 {
   IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface );
 
-  FIXME( "(%p)->(%p,0x%08x): stub\n",
+  FIXME( "(%p)->(%p,0x%08lx): stub\n",
          This, unknownA, unknownB );
 }
 
diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c
index 957f7cf46f5..ec62d273cb4 100644
--- a/dlls/dplayx/dplayx_global.c
+++ b/dlls/dplayx/dplayx_global.c
@@ -113,7 +113,7 @@ static LPVOID DPLAYX_PrivHeapAlloc( DWORD flags, DWORD size )
 
   if( size > (dwBlockSize - sizeof(BOOL)) )
   {
-    FIXME( "Size exceeded. Request of 0x%08x\n", size );
+    FIXME( "Size exceeded. Request of 0x%08lx\n", size );
     size = dwBlockSize - sizeof(BOOL);
   }
 
@@ -193,7 +193,7 @@ static BOOL DPLAYX_IsAppIdLobbied( DWORD dwAppID, LPDPLAYX_LOBBYDATA* lplpDplDat
   if( dwAppID == 0 )
   {
     dwAppID = GetCurrentProcessId();
-    TRACE( "Translated dwAppID == 0 into 0x%08x\n", dwAppID );
+    TRACE( "Translated dwAppID == 0 into 0x%08lx\n", dwAppID );
   }
 
   for( i=0; i < numSupportedLobbies; i++ )
@@ -201,7 +201,7 @@ static BOOL DPLAYX_IsAppIdLobbied( DWORD dwAppID, LPDPLAYX_LOBBYDATA* lplpDplDat
     if( lobbyData[ i ].dwAppID == dwAppID )
     {
       /* This process is lobbied */
-      TRACE( "Found 0x%08x @ %u\n", dwAppID, i );
+      TRACE( "Found 0x%08lx @ %u\n", dwAppID, i );
       *lplpDplData = &lobbyData[ i ];
       return TRUE;
     }
@@ -229,7 +229,7 @@ BOOL DPLAYX_CreateLobbyApplication( DWORD dwAppID )
     if( lobbyData[ i ].dwAppID == 0 )
     {
       /* This process is now lobbied */
-      TRACE( "Setting lobbyData[%u] for (0x%08x,0x%08x)\n",
+      TRACE( "Setting lobbyData[%u] for (0x%08lx,0x%08lx)\n",
               i, dwAppID, GetCurrentProcessId() );
 
       lobbyData[ i ].dwAppID              = dwAppID;
@@ -386,7 +386,7 @@ BOOL DPLAYX_ConstructData(void)
   }
   else
   {
-    ERR( ": semaphore error %d\n", GetLastError() );
+    ERR( ": semaphore error %ld\n", GetLastError() );
     return FALSE;
   }
 
@@ -409,7 +409,7 @@ BOOL DPLAYX_ConstructData(void)
   }
   else
   {
-    ERR( ": unable to create shared memory (%d)\n", GetLastError() );
+    ERR( ": unable to create shared memory (%ld)\n", GetLastError() );
     DPLAYX_ReleaseSemaphore();
     return FALSE;
   }
@@ -429,7 +429,7 @@ BOOL DPLAYX_ConstructData(void)
 
   if( lpSharedStaticData == NULL )
   {
-    ERR( ": unable to map static data into process memory space (%d)\n",
+    ERR( ": unable to map static data into process memory space (%ld)\n",
          GetLastError() );
     DPLAYX_ReleaseSemaphore();
     return FALSE;
@@ -795,7 +795,7 @@ HRESULT DPLAYX_GetConnectionSettingsA
   {
     DPLAYX_ReleaseSemaphore();
 
-    TRACE( "Application 0x%08x is not lobbied\n", dwAppID );
+    TRACE( "Application 0x%08lx is not lobbied\n", dwAppID );
     return DPERR_NOTLOBBIED;
   }
 
@@ -911,7 +911,7 @@ HRESULT DPLAYX_SetConnectionSettingsA
   /* Store information */
   if(  lpConn->dwSize != sizeof(DPLCONNECTION) )
   {
-    ERR(": old/new DPLCONNECTION type? Size=%08x\n", lpConn->dwSize );
+    ERR(": old/new DPLCONNECTION type? Size=%08lx\n", lpConn->dwSize );
 
     return DPERR_INVALIDPARAMS;
   }
@@ -931,7 +931,7 @@ HRESULT DPLAYX_SetConnectionSettingsA
   {
     DPLAYX_ReleaseSemaphore();
 
-    ERR("DPSESSIONDESC passed in? Size=%u\n",
+    ERR("DPSESSIONDESC passed in? Size=%lu\n",
         lpConn->lpSessionDesc?lpConn->lpSessionDesc->dwSize:0 );
 
     return DPERR_INVALIDPARAMS;
@@ -974,7 +974,7 @@ HRESULT DPLAYX_SetConnectionSettingsW
   /* Store information */
   if(  lpConn->dwSize != sizeof(DPLCONNECTION) )
   {
-    ERR(": old/new DPLCONNECTION type? Size=%u\n", lpConn->dwSize );
+    ERR(": old/new DPLCONNECTION type? Size=%lu\n", lpConn->dwSize );
 
     return DPERR_INVALIDPARAMS;
   }
@@ -1208,7 +1208,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%08x\n", hr );
+      WARN( "Unknown error 0x%08lx\n", hr );
       wsprintfA( szTempStr, "0x%08x", hr );
       return szTempStr;
   }
diff --git a/dlls/dplayx/dplayx_main.c b/dlls/dplayx/dplayx_main.c
index 768294c5e21..c8c2778501a 100644
--- a/dlls/dplayx/dplayx_main.c
+++ b/dlls/dplayx/dplayx_main.c
@@ -75,7 +75,7 @@ DWORD gdwDPlaySPRefCount = 0;
 BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
 {
 
-  TRACE( "(%p,%d,%p)\n", hinstDLL, fdwReason, lpvReserved );
+  TRACE( "(%p,%ld,%p)\n", hinstDLL, fdwReason, lpvReserved );
 
   switch ( fdwReason )
   {
diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c
index 6f6636c4b95..e30c5e644df 100644
--- a/dlls/dplayx/dplayx_messages.c
+++ b/dlls/dplayx/dplayx_messages.c
@@ -118,7 +118,7 @@ static DWORD CALLBACK DPL_MSG_ThreadMain( LPVOID lpContext )
   dwWaitResult = WaitForSingleObject( lpThreadInfo->hStart, 10000 /* 10 sec */ );
   if( dwWaitResult == WAIT_TIMEOUT )
   {
-    FIXME( "Should signal app/wait creation failure (0x%08x)\n", dwWaitResult );
+    FIXME( "Should signal app/wait creation failure (0x%08lx)\n", dwWaitResult );
     goto end_of_thread;
   }
 
@@ -130,7 +130,7 @@ static DWORD CALLBACK DPL_MSG_ThreadMain( LPVOID lpContext )
   dwWaitResult = WaitForSingleObject( lpThreadInfo->hSettingRead, INFINITE );
   if( dwWaitResult == WAIT_TIMEOUT )
   {
-    ERR( "App Read connection setting timeout fail (0x%08x)\n", dwWaitResult );
+    ERR( "App Read connection setting timeout fail (0x%08lx)\n", dwWaitResult );
   }
 
   /* Close this handle as it's not needed anymore */
@@ -215,7 +215,7 @@ HRESULT DP_MSG_SendRequestPlayerId( IDirectPlayImpl *This, DWORD dwFlags, DPID *
     data.bSystemMessage = TRUE; /* Allow reply to be sent */
     data.lpISP          = This->dp2->spData.lpISP;
 
-    TRACE( "Asking for player id w/ dwFlags 0x%08x\n",
+    TRACE( "Asking for player id w/ dwFlags 0x%08lx\n",
            lpMsgBody->dwFlags );
 
     DP_MSG_ExpectReply( This, &data, DPMSG_DEFAULT_WAIT_TIME, DPMSGCMD_NEWPLAYERIDREPLY,
@@ -231,7 +231,7 @@ HRESULT DP_MSG_SendRequestPlayerId( IDirectPlayImpl *This, DWORD dwFlags, DPID *
 
     *lpdpidAllocatedId = lpcReply->dpidNewPlayerId;
 
-    TRACE( "Received reply for id = 0x%08x\n", lpcReply->dpidNewPlayerId );
+    TRACE( "Received reply for id = 0x%08lx\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.
@@ -313,14 +313,14 @@ HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlayImpl *This, DPID dpidServer )
 
   lpMsgBody->unknown4[3] =  NS_GetNsMagic( This->dp2->lpNameServerData ) -
                             0x02000000;
-  TRACE( "Setting first magic to 0x%08x\n", lpMsgBody->unknown4[3] );
+  TRACE( "Setting first magic to 0x%08lx\n", lpMsgBody->unknown4[3] );
 
   lpMsgBody->unknown4[4] =  0x0;
   lpMsgBody->unknown4[5] =  0x0;
   lpMsgBody->unknown4[6] =  0x0;
 
   lpMsgBody->unknown4[7] =  NS_GetNsMagic( This->dp2->lpNameServerData );
-  TRACE( "Setting second magic to 0x%08x\n", lpMsgBody->unknown4[7] );
+  TRACE( "Setting second magic to 0x%08lx\n", lpMsgBody->unknown4[7] );
 
   lpMsgBody->unknown4[8] =  0x0;
   lpMsgBody->unknown4[9] =  0x0;
@@ -342,7 +342,7 @@ HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlayImpl *This, DPID dpidServer )
     data.bSystemMessage = TRUE; /* Allow reply to be sent */
     data.lpISP          = This->dp2->spData.lpISP;
 
-    TRACE( "Sending forward player request with 0x%08x\n", dpidServer );
+    TRACE( "Sending forward player request with 0x%08lx\n", dpidServer );
 
     lpMsg = DP_MSG_ExpectReply( This, &data,
                                 DPMSG_WAIT_60_SECS,
@@ -377,7 +377,7 @@ static void *DP_MSG_ExpectReply( IDirectPlayImpl *This, DPSP_SENDDATA *lpData, D
   hMsgReceipt = DP_MSG_BuildAndLinkReplyStruct( This, &replyStructList,
                                                 wReplyCommandId );
 
-  TRACE( "Sending msg and expecting cmd %u in reply within %u ticks\n",
+  TRACE( "Sending msg and expecting cmd %u in reply within %lu ticks\n",
          wReplyCommandId, dwWaitTime );
   hr = (*This->dp2->spData.lpCB->Send)( lpData );
 
@@ -393,7 +393,7 @@ static void *DP_MSG_ExpectReply( IDirectPlayImpl *This, DPSP_SENDDATA *lpData, D
   dwWaitReturn = WaitForSingleObject( hMsgReceipt, dwWaitTime );
   if( dwWaitReturn != WAIT_OBJECT_0 )
   {
-    ERR( "Wait failed 0x%08x\n", dwWaitReturn );
+    ERR( "Wait failed 0x%08lx\n", dwWaitReturn );
     return NULL;
   }
 
diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c
index 30d76aa16d1..52b5618b98f 100644
--- a/dlls/dplayx/dplobby.c
+++ b/dlls/dplayx/dplobby.c
@@ -211,7 +211,7 @@ static ULONG WINAPI IDirectPlayLobbyAImpl_AddRef( IDirectPlayLobbyA *iface )
     IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobbyA( iface );
     ULONG ref = InterlockedIncrement( &This->refA );
 
-    TRACE( "(%p) refA=%d\n", This, ref );
+    TRACE( "(%p) refA=%ld\n", This, ref );
 
     if ( ref == 1 )
         InterlockedIncrement( &This->numIfaces );
@@ -224,7 +224,7 @@ static ULONG WINAPI IDirectPlayLobbyImpl_AddRef( IDirectPlayLobby *iface )
     IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby( iface );
     ULONG ref = InterlockedIncrement( &This->ref );
 
-    TRACE( "(%p) ref=%d\n", This, ref );
+    TRACE( "(%p) ref=%ld\n", This, ref );
 
     if ( ref == 1 )
         InterlockedIncrement( &This->numIfaces );
@@ -237,7 +237,7 @@ static ULONG WINAPI IDirectPlayLobby2AImpl_AddRef(IDirectPlayLobby2A *iface)
     IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby2A( iface );
     ULONG ref = InterlockedIncrement( &This->ref2A );
 
-    TRACE( "(%p) ref2A=%d\n", This, ref );
+    TRACE( "(%p) ref2A=%ld\n", This, ref );
 
     if ( ref == 1 )
         InterlockedIncrement( &This->numIfaces );
@@ -250,7 +250,7 @@ static ULONG WINAPI IDirectPlayLobby2Impl_AddRef(IDirectPlayLobby2 *iface)
     IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby2( iface );
     ULONG ref = InterlockedIncrement( &This->ref2 );
 
-    TRACE( "(%p) ref2=%d\n", This, ref );
+    TRACE( "(%p) ref2=%ld\n", This, ref );
 
     if ( ref == 1 )
         InterlockedIncrement( &This->numIfaces );
@@ -263,7 +263,7 @@ static ULONG WINAPI IDirectPlayLobby3AImpl_AddRef(IDirectPlayLobby3A *iface)
     IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface );
     ULONG ref = InterlockedIncrement( &This->ref3A );
 
-    TRACE( "(%p) ref3A=%d\n", This, ref );
+    TRACE( "(%p) ref3A=%ld\n", This, ref );
 
     if ( ref == 1 )
         InterlockedIncrement( &This->numIfaces );
@@ -276,7 +276,7 @@ static ULONG WINAPI IDirectPlayLobby3Impl_AddRef(IDirectPlayLobby3 *iface)
     IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface );
     ULONG ref = InterlockedIncrement( &This->ref3 );
 
-    TRACE( "(%p) ref3=%d\n", This, ref );
+    TRACE( "(%p) ref3=%ld\n", This, ref );
 
     if ( ref == 1 )
         InterlockedIncrement( &This->numIfaces );
@@ -289,7 +289,7 @@ static ULONG WINAPI IDirectPlayLobbyAImpl_Release( IDirectPlayLobbyA *iface )
     IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobbyA( iface );
     ULONG ref = InterlockedDecrement( &This->refA );
 
-    TRACE( "(%p) refA=%d\n", This, ref );
+    TRACE( "(%p) refA=%ld\n", This, ref );
 
     if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
         dplobby_destroy( This );
@@ -302,7 +302,7 @@ static ULONG WINAPI IDirectPlayLobbyImpl_Release( IDirectPlayLobby *iface )
     IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby( iface );
     ULONG ref = InterlockedDecrement( &This->ref );
 
-    TRACE( "(%p) ref=%d\n", This, ref );
+    TRACE( "(%p) ref=%ld\n", This, ref );
 
     if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
         dplobby_destroy( This );
@@ -315,7 +315,7 @@ static ULONG WINAPI IDirectPlayLobby2AImpl_Release(IDirectPlayLobby2A *iface)
     IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby2A( iface );
     ULONG ref = InterlockedDecrement( &This->ref2A );
 
-    TRACE( "(%p) ref2A=%d\n", This, ref );
+    TRACE( "(%p) ref2A=%ld\n", This, ref );
 
     if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
         dplobby_destroy( This );
@@ -328,7 +328,7 @@ static ULONG WINAPI IDirectPlayLobby2Impl_Release(IDirectPlayLobby2 *iface)
     IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby2( iface );
     ULONG ref = InterlockedDecrement( &This->ref2 );
 
-    TRACE( "(%p) ref2=%d\n", This, ref );
+    TRACE( "(%p) ref2=%ld\n", This, ref );
 
     if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
         dplobby_destroy( This );
@@ -341,7 +341,7 @@ static ULONG WINAPI IDirectPlayLobby3AImpl_Release(IDirectPlayLobby3A *iface)
     IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface );
     ULONG ref = InterlockedDecrement( &This->ref3A );
 
-    TRACE( "(%p) ref3A=%d\n", This, ref );
+    TRACE( "(%p) ref3A=%ld\n", This, ref );
 
     if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
         dplobby_destroy( This );
@@ -354,7 +354,7 @@ static ULONG WINAPI IDirectPlayLobby3Impl_Release(IDirectPlayLobby3 *iface)
     IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface );
     ULONG ref = InterlockedDecrement( &This->ref3 );
 
-    TRACE( "(%p) ref3=%d\n", This, ref );
+    TRACE( "(%p) ref3=%ld\n", This, ref );
 
     if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
         dplobby_destroy( This );
@@ -379,7 +379,7 @@ static HRESULT DPL_ConnectEx( IDirectPlayLobbyImpl *This, DWORD dwFlags, REFIID
   DWORD           dwConnSize = 0;
   LPDPLCONNECTION lpConn;
 
-  FIXME("(%p)->(0x%08x,%p,%p): semi stub\n", This, dwFlags, lplpDP, pUnk );
+  FIXME("(%p)->(0x%08lx,%p,%p): semi stub\n", This, dwFlags, lplpDP, pUnk );
 
   if( pUnk )
   {
@@ -560,7 +560,7 @@ static HRESULT DPL_CreateAddress(
   const DWORD dwNumAddElements = 2; /* Service Provide & address data type */
   DPCOMPOUNDADDRESSELEMENT addressElements[ 2 /* dwNumAddElements */ ];
 
-  TRACE( "(%p)->(%p,%p,0x%08x,%p,%p,%d)\n", guidSP, guidDataType, lpData, dwDataSize,
+  TRACE( "(%p)->(%p,%p,0x%08lx,%p,%p,%d)\n", guidSP, guidDataType, lpData, dwDataSize,
                                              lpAddress, lpdwAddressSize, bAnsiInterface );
 
   addressElements[ 0 ].guidDataType = DPAID_ServiceProvider;
@@ -623,7 +623,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddress( IDirectPlayLobby3A *if
 {
   IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface );
 
-  TRACE("(%p)->(%p,%p,0x%08x,%p)\n", This, lpEnumAddressCallback, lpAddress,
+  TRACE("(%p)->(%p,%p,0x%08lx,%p)\n", This, lpEnumAddressCallback, lpAddress,
                                       dwAddressSize, lpContext );
 
   return DPL_EnumAddress( lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext );
@@ -635,7 +635,7 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_EnumAddress( IDirectPlayLobby3 *ifac
 {
   IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface );
 
-  TRACE("(%p)->(%p,%p,0x%08x,%p)\n", This, lpEnumAddressCallback, lpAddress,
+  TRACE("(%p)->(%p,%p,0x%08lx,%p)\n", This, lpEnumAddressCallback, lpAddress,
                                       dwAddressSize, lpContext );
 
   return DPL_EnumAddress( lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext );
@@ -720,7 +720,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3
   char   subKeyName[51];
   FILETIME filetime;
 
-  TRACE(" (%p)->(%p,%p,%p,0x%08x)\n", This, lpEnumAddressTypeCallback, guidSP, lpContext, dwFlags );
+  TRACE(" (%p)->(%p,%p,%p,0x%08lx)\n", This, lpEnumAddressTypeCallback, guidSP, lpContext, dwFlags );
 
   if( dwFlags != 0 )
   {
@@ -848,7 +848,7 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_EnumLocalApplications( IDirectPlayLo
 {
   IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface );
 
-  FIXME("(%p)->(%p,%p,0x%08x):stub\n", This, lpEnumLocalAppCallback, lpContext, dwFlags );
+  FIXME("(%p)->(%p,%p,0x%08lx):stub\n", This, lpEnumLocalAppCallback, lpContext, dwFlags );
 
   return DPERR_OUTOFMEMORY;
 }
@@ -897,7 +897,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumLocalApplications( IDirectPlayL
   char subKeyName[51];
   FILETIME filetime;
 
-  TRACE("(%p)->(%p,%p,0x%08x)\n", This, lpEnumLocalAppCallback, lpContext, dwFlags );
+  TRACE("(%p)->(%p,%p,0x%08lx)\n", This, lpEnumLocalAppCallback, lpContext, dwFlags );
 
   if( dwFlags != 0 )
   {
@@ -1022,7 +1022,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_GetConnectionSettings( IDirectPlayL
   IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface );
   HRESULT hr;
 
-  TRACE("(%p)->(0x%08x,%p,%p)\n", This, dwAppID, lpData, lpdwDataSize );
+  TRACE("(%p)->(0x%08lx,%p,%p)\n", This, dwAppID, lpData, lpdwDataSize );
 
   EnterCriticalSection( &This->lock );
 
@@ -1042,7 +1042,7 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_GetConnectionSettings( IDirectPlayLo
   IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface );
   HRESULT hr;
 
-  TRACE("(%p)->(0x%08x,%p,%p)\n", This, dwAppID, lpData, lpdwDataSize );
+  TRACE("(%p)->(0x%08lx,%p,%p)\n", This, dwAppID, lpData, lpdwDataSize );
 
   EnterCriticalSection( &This->lock );
 
@@ -1099,7 +1099,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_ReceiveLobbyMessage( IDirectPlayLob
         DWORD *lpdwDataSize )
 {
   IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface );
-  FIXME(":stub %p %08x %08x %p %p %p\n", This, dwFlags, dwAppID, lpdwMessageFlags, lpData,
+  FIXME(":stub %p %08lx %08lx %p %p %p\n", This, dwFlags, dwAppID, lpdwMessageFlags, lpData,
          lpdwDataSize );
   return DPERR_OUTOFMEMORY;
 }
@@ -1109,7 +1109,7 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_ReceiveLobbyMessage( IDirectPlayLobb
         DWORD *lpdwDataSize )
 {
   IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface );
-  FIXME(":stub %p %08x %08x %p %p %p\n", This, dwFlags, dwAppID, lpdwMessageFlags, lpData,
+  FIXME(":stub %p %08lx %08lx %p %p %p\n", This, dwFlags, dwAppID, lpdwMessageFlags, lpData,
          lpdwDataSize );
   return DPERR_OUTOFMEMORY;
 }
@@ -1304,7 +1304,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_RunApplication( IDirectPlayLobby3A
   DWORD dwSuspendCount;
   HANDLE hStart, hDeath, hSettingRead;
 
-  TRACE( "(%p)->(0x%08x,%p,%p,%p)\n",
+  TRACE( "(%p)->(0x%08lx,%p,%p,%p)\n",
          This, dwFlags, lpdwAppID, lpConn, hReceiveEvent );
 
   if( dwFlags != 0 )
@@ -1379,7 +1379,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_RunApplication( IDirectPlayLobby3A
   /* Reserve this global application id! */
   if( !DPLAYX_CreateLobbyApplication( newProcessInfo.dwProcessId ) )
   {
-    ERR( "Unable to create global application data for 0x%08x\n",
+    ERR( "Unable to create global application data for 0x%08lx\n",
            newProcessInfo.dwProcessId );
   }
 
@@ -1410,7 +1410,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_RunApplication( IDirectPlayLobby3A
   /* Unsuspend the process - should return the prev suspension count */
   if( ( dwSuspendCount = ResumeThread( newProcessInfo.hThread ) ) != 1 )
   {
-    ERR( "ResumeThread failed with 0x%08x\n", dwSuspendCount );
+    ERR( "ResumeThread failed with 0x%08lx\n", dwSuspendCount );
   }
 
   return DP_OK;
@@ -1420,7 +1420,7 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_RunApplication( IDirectPlayLobby3 *i
         DWORD *lpdwAppID, DPLCONNECTION *lpConn, HANDLE hReceiveEvent )
 {
   IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface );
-  FIXME( "(%p)->(0x%08x,%p,%p,%p):stub\n", This, dwFlags, lpdwAppID, lpConn, hReceiveEvent );
+  FIXME( "(%p)->(0x%08lx,%p,%p,%p):stub\n", This, dwFlags, lpdwAppID, lpConn, hReceiveEvent );
   return DPERR_OUTOFMEMORY;
 }
 
@@ -1488,7 +1488,7 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_SetConnectionSettings( IDirectPlayLo
   IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface );
   HRESULT hr;
 
-  TRACE("(%p)->(0x%08x,0x%08x,%p)\n", This, dwFlags, dwAppID, lpConn );
+  TRACE("(%p)->(0x%08lx,0x%08lx,%p)\n", This, dwFlags, dwAppID, lpConn );
 
   EnterCriticalSection( &This->lock );
 
@@ -1551,7 +1551,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_SetConnectionSettings( IDirectPlayL
   IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface );
   HRESULT hr;
 
-  TRACE("(%p)->(0x%08x,0x%08x,%p)\n", This, dwFlags, dwAppID, lpConn );
+  TRACE("(%p)->(0x%08lx,0x%08lx,%p)\n", This, dwFlags, dwAppID, lpConn );
 
   EnterCriticalSection( &This->lock );
 
@@ -1667,7 +1667,7 @@ HRESULT DPL_CreateCompoundAddress
   DWORD dwElements;
   LPCDPCOMPOUNDADDRESSELEMENT lpOrigElements = lpElements;
 
-  TRACE("(%p,0x%08x,%p,%p)\n", lpElements, dwElementCount, lpAddress, lpdwAddressSize );
+  TRACE("(%p,0x%08lx,%p,%p)\n", lpElements, dwElementCount, lpAddress, lpdwAddressSize );
 
   /* Parameter check */
   if( ( lpElements == NULL ) ||
@@ -1875,7 +1875,7 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_WaitForConnectionSettings( IDirectPl
   HRESULT hr         = DP_OK;
   BOOL    bStartWait = !(dwFlags & DPLWAIT_CANCEL);
 
-  TRACE( "(%p)->(0x%08x)\n", iface, dwFlags );
+  TRACE( "(%p)->(0x%08lx)\n", iface, dwFlags );
 
   if( DPLAYX_WaitForConnectionSettings( bStartWait ) )
   {
@@ -1892,7 +1892,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_WaitForConnectionSettings( IDirectP
   HRESULT hr         = DP_OK;
   BOOL    bStartWait = !(dwFlags & DPLWAIT_CANCEL);
 
-  TRACE( "(%p)->(0x%08x)\n", iface, dwFlags );
+  TRACE( "(%p)->(0x%08lx)\n", iface, dwFlags );
 
   if( DPLAYX_WaitForConnectionSettings( bStartWait ) )
   {
@@ -2069,7 +2069,7 @@ HRESULT dplobby_create( REFIID riid, void **ppv )
 HRESULT WINAPI DirectPlayLobbyCreateA( GUID *lpGUIDDSP, IDirectPlayLobbyA **lplpDPL,
         IUnknown *lpUnk, void *lpData, DWORD dwDataSize )
 {
-  TRACE("lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08x\n",
+  TRACE("lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08lx\n",
         lpGUIDDSP,lplpDPL,lpUnk,lpData,dwDataSize);
 
   /* Parameter Check: lpGUIDSP, lpUnk & lpData must be NULL. dwDataSize must
@@ -2098,7 +2098,7 @@ HRESULT WINAPI DirectPlayLobbyCreateA( GUID *lpGUIDDSP, IDirectPlayLobbyA **lplp
 HRESULT WINAPI DirectPlayLobbyCreateW( GUID *lpGUIDDSP, IDirectPlayLobby **lplpDPL,
         IUnknown *lpUnk, void *lpData, DWORD dwDataSize )
 {
-  TRACE("lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08x\n",
+  TRACE("lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08lx\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 3528f94e345..ad4ca891587 100644
--- a/dlls/dplayx/lobbysp.c
+++ b/dlls/dplayx/lobbysp.c
@@ -60,7 +60,7 @@ static ULONG WINAPI IDPLobbySPImpl_AddRef( IDPLobbySP *iface )
   IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface );
   ULONG ref = InterlockedIncrement( &This->ref );
 
-  TRACE( "(%p) ref=%d\n", This, ref );
+  TRACE( "(%p) ref=%ld\n", This, ref );
 
   return ref;
 }
@@ -70,7 +70,7 @@ static ULONG WINAPI IDPLobbySPImpl_Release( IDPLobbySP *iface )
   IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface );
   ULONG ref = InterlockedDecrement( &This->ref );
 
-  TRACE( "(%p) ref=%d\n", This, ref );
+  TRACE( "(%p) ref=%ld\n", This, ref );
 
   if( !ref )
     HeapFree( GetProcessHeap(), 0, This );
-- 
2.34.1




More information about the wine-devel mailing list