Skip to content

W
wine-winehq
Commit 2a74dc51 authored by Alistair Leslie-Hughes's avatar Alistair Leslie-Hughes Committed by Alexandre Julliard
Browse files
Options

dplayx: Build without -DWINE_NO_LONG_TYPES.

Signed-off-by: 's avatarAlistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 32deecbc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 42 deletions
dlls/dplayx/Makefile.in
View file @ 2a74dc51
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = dplayx.dll
IMPORTLIB = dplayx
IMPORTS = dxguid uuid winmm ole32 user32 advapi32
......
dlls/dplayx/dplaysp.c
View file @ 2a74dc51
......@@ -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 );
}
......
dlls/dplayx/dplayx_global.c
View file @ 2a74dc51
......@@ -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;
}
......
dlls/dplayx/dplayx_main.c
View file @ 2a74dc51
......@@ -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 )
{
......
dlls/dplayx/dplayx_messages.c
View file @ 2a74dc51
......@@ -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;
}
......
dlls/dplayx/lobbysp.c
View file @ 2a74dc51
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment