Compile the dplayx dll with STRICT defined.
This commit is contained in:
parent
353529b2c8
commit
5a1ede3345
|
@ -1,4 +1,3 @@
|
||||||
EXTRADEFS = -DWINE_NO_STRICT
|
|
||||||
TOPSRCDIR = @top_srcdir@
|
TOPSRCDIR = @top_srcdir@
|
||||||
TOPOBJDIR = ../..
|
TOPOBJDIR = ../..
|
||||||
SRCDIR = @srcdir@
|
SRCDIR = @srcdir@
|
||||||
|
@ -26,4 +25,3 @@ RC_SRCS = version.rc
|
||||||
@MAKE_DLL_RULES@
|
@MAKE_DLL_RULES@
|
||||||
|
|
||||||
### Dependencies:
|
### Dependencies:
|
||||||
|
|
||||||
|
|
|
@ -1218,7 +1218,7 @@ lpPlayerData DP_CreatePlayer( IDirectPlay2Impl* This, LPDPID lpid,
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
/* FIXME: Memory leak */
|
/* FIXME: Memory leak */
|
||||||
ERR( "Can't duplicate player msg handle %x\n", hEvent );
|
ERR( "Can't duplicate player msg handle %p\n", hEvent );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1400,12 +1400,12 @@ static HRESULT WINAPI DP_IF_CreatePlayer
|
||||||
DWORD dwFlags,
|
DWORD dwFlags,
|
||||||
BOOL bAnsi )
|
BOOL bAnsi )
|
||||||
{
|
{
|
||||||
HANDLE hr = DP_OK;
|
HRESULT hr = DP_OK;
|
||||||
lpPlayerData lpPData;
|
lpPlayerData lpPData;
|
||||||
lpPlayerList lpPList;
|
lpPlayerList lpPList;
|
||||||
DWORD dwCreateFlags = 0;
|
DWORD dwCreateFlags = 0;
|
||||||
|
|
||||||
TRACE( "(%p)->(%p,%p,%d,%p,0x%08lx,0x%08lx,%u)\n",
|
TRACE( "(%p)->(%p,%p,%p,%p,0x%08lx,0x%08lx,%u)\n",
|
||||||
This, lpidPlayer, lpPlayerName, hEvent, lpData,
|
This, lpidPlayer, lpPlayerName, hEvent, lpData,
|
||||||
dwDataSize, dwFlags, bAnsi );
|
dwDataSize, dwFlags, bAnsi );
|
||||||
|
|
||||||
|
@ -2168,7 +2168,7 @@ static void DP_KillEnumSessionThread( IDirectPlay2Impl* This )
|
||||||
/* Does a thread exist? If so we were doing an async enum session */
|
/* Does a thread exist? If so we were doing an async enum session */
|
||||||
if( This->dp2->hEnumSessionThread != INVALID_HANDLE_VALUE )
|
if( This->dp2->hEnumSessionThread != INVALID_HANDLE_VALUE )
|
||||||
{
|
{
|
||||||
TRACE( "Killing EnumSession thread %u\n",
|
TRACE( "Killing EnumSession thread %p\n",
|
||||||
This->dp2->hEnumSessionThread );
|
This->dp2->hEnumSessionThread );
|
||||||
|
|
||||||
/* Request that the thread kill itself nicely */
|
/* Request that the thread kill itself nicely */
|
||||||
|
|
|
@ -223,14 +223,14 @@ BOOL DPLAYX_ConstructData(void)
|
||||||
/* First instance creates the semaphore. Others just use it */
|
/* First instance creates the semaphore. Others just use it */
|
||||||
if( GetLastError() == ERROR_SUCCESS )
|
if( GetLastError() == ERROR_SUCCESS )
|
||||||
{
|
{
|
||||||
TRACE( "Semaphore %u created\n", hDplayxSema );
|
TRACE( "Semaphore %p created\n", hDplayxSema );
|
||||||
|
|
||||||
/* The semaphore creator will also build the shared memory */
|
/* The semaphore creator will also build the shared memory */
|
||||||
bInitializeSharedMemory = TRUE;
|
bInitializeSharedMemory = TRUE;
|
||||||
}
|
}
|
||||||
else if ( GetLastError() == ERROR_ALREADY_EXISTS )
|
else if ( GetLastError() == ERROR_ALREADY_EXISTS )
|
||||||
{
|
{
|
||||||
TRACE( "Found semaphore handle %u\n", hDplayxSema );
|
TRACE( "Found semaphore handle %p\n", hDplayxSema );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -251,11 +251,11 @@ BOOL DPLAYX_ConstructData(void)
|
||||||
|
|
||||||
if( GetLastError() == ERROR_SUCCESS )
|
if( GetLastError() == ERROR_SUCCESS )
|
||||||
{
|
{
|
||||||
TRACE( "File mapped %u created\n", hDplayxSharedMem );
|
TRACE( "File mapped %p created\n", hDplayxSharedMem );
|
||||||
}
|
}
|
||||||
else if ( GetLastError() == ERROR_ALREADY_EXISTS )
|
else if ( GetLastError() == ERROR_ALREADY_EXISTS )
|
||||||
{
|
{
|
||||||
TRACE( "Found FileMapping handle %u\n", hDplayxSharedMem );
|
TRACE( "Found FileMapping handle %p\n", hDplayxSharedMem );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -337,7 +337,7 @@ BOOL DPLAYX_ConstructData(void)
|
||||||
{
|
{
|
||||||
BOOL bSuccess;
|
BOOL bSuccess;
|
||||||
bSuccess = SetEvent( hInformOnStart );
|
bSuccess = SetEvent( hInformOnStart );
|
||||||
TRACE( "Signalling lobby app start event %u %s\n",
|
TRACE( "Signalling lobby app start event %p %s\n",
|
||||||
hInformOnStart, bSuccess ? "succeed" : "failed" );
|
hInformOnStart, bSuccess ? "succeed" : "failed" );
|
||||||
|
|
||||||
/* Close out handle */
|
/* Close out handle */
|
||||||
|
@ -364,7 +364,7 @@ BOOL DPLAYX_DestructData(void)
|
||||||
{
|
{
|
||||||
BOOL bSuccess;
|
BOOL bSuccess;
|
||||||
bSuccess = SetEvent( hInformOnDeath );
|
bSuccess = SetEvent( hInformOnDeath );
|
||||||
TRACE( "Signalling lobby app death event %u %s\n",
|
TRACE( "Signalling lobby app death event %p %s\n",
|
||||||
hInformOnDeath, bSuccess ? "succeed" : "failed" );
|
hInformOnDeath, bSuccess ? "succeed" : "failed" );
|
||||||
|
|
||||||
/* Close out handle */
|
/* Close out handle */
|
||||||
|
@ -633,7 +633,7 @@ HRESULT DPLAYX_GetConnectionSettingsA
|
||||||
{
|
{
|
||||||
BOOL bSuccess;
|
BOOL bSuccess;
|
||||||
bSuccess = SetEvent( hInformOnSettingRead );
|
bSuccess = SetEvent( hInformOnSettingRead );
|
||||||
TRACE( "Signalling setting read event %u %s\n",
|
TRACE( "Signalling setting read event %p %s\n",
|
||||||
hInformOnSettingRead, bSuccess ? "succeed" : "failed" );
|
hInformOnSettingRead, bSuccess ? "succeed" : "failed" );
|
||||||
|
|
||||||
/* Close out handle */
|
/* Close out handle */
|
||||||
|
@ -755,7 +755,7 @@ HRESULT DPLAYX_GetConnectionSettingsW
|
||||||
{
|
{
|
||||||
BOOL bSuccess;
|
BOOL bSuccess;
|
||||||
bSuccess = SetEvent( hInformOnSettingRead );
|
bSuccess = SetEvent( hInformOnSettingRead );
|
||||||
TRACE( "Signalling setting read event %u %s\n",
|
TRACE( "Signalling setting read event %p %s\n",
|
||||||
hInformOnSettingRead, bSuccess ? "succeed" : "failed" );
|
hInformOnSettingRead, bSuccess ? "succeed" : "failed" );
|
||||||
|
|
||||||
/* Close out handle */
|
/* Close out handle */
|
||||||
|
|
|
@ -33,7 +33,7 @@ DWORD gdwDPlaySPRefCount = 0; /* FIXME: Should it be initialized here? */
|
||||||
BOOL WINAPI DPLAYX_LibMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
|
BOOL WINAPI DPLAYX_LibMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
|
||||||
{
|
{
|
||||||
|
|
||||||
TRACE( "(%u,0x%08lx,%p)\n", hinstDLL, fdwReason, lpvReserved );
|
TRACE( "(%p,0x%08lx,%p)\n", hinstDLL, fdwReason, lpvReserved );
|
||||||
|
|
||||||
switch ( fdwReason )
|
switch ( fdwReason )
|
||||||
{
|
{
|
||||||
|
@ -71,4 +71,3 @@ HRESULT WINAPI DPLAYX_DllCanUnloadNow(void)
|
||||||
|
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1218,7 +1218,7 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_RunApplication
|
||||||
DWORD dwSuspendCount;
|
DWORD dwSuspendCount;
|
||||||
HANDLE hStart, hDeath, hSettingRead;
|
HANDLE hStart, hDeath, hSettingRead;
|
||||||
|
|
||||||
TRACE( "(%p)->(0x%08lx,%p,%p,%x)\n",
|
TRACE( "(%p)->(0x%08lx,%p,%p,%p)\n",
|
||||||
This, dwFlags, lpdwAppID, lpConn, hReceiveEvent );
|
This, dwFlags, lpdwAppID, lpConn, hReceiveEvent );
|
||||||
|
|
||||||
if( dwFlags != 0 )
|
if( dwFlags != 0 )
|
||||||
|
|
Loading…
Reference in New Issue