Hello, License: LGPL, X11 Changelog: Michael Stefaniuc <mstefani@redhat.com> - compile the dplayx dll with STRICT defined bye michael -- Michael Stefaniuc Tel.: +49-711-96437-199 System Administration Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani@redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart
Index: dlls/dplayx/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/dplayx/Makefile.in,v
retrieving revision 1.24
diff -u -r1.24 Makefile.in
--- dlls/dplayx/Makefile.in 18 Oct 2002 23:46:29 -0000 1.24
+++ dlls/dplayx/Makefile.in 23 Oct 2002 18:16:24 -0000
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
Index: dlls/dplayx/dplay.c
===================================================================
RCS file: /home/wine/wine/dlls/dplayx/dplay.c,v
retrieving revision 1.37
diff -u -r1.37 dplay.c
--- dlls/dplayx/dplay.c 31 May 2002 23:25:46 -0000 1.37
+++ dlls/dplayx/dplay.c 23 Oct 2002 18:16:26 -0000
@@ -1218,7 +1218,7 @@
)
{
/* 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 @@
DWORD dwFlags,
BOOL bAnsi )
{
- HANDLE hr = DP_OK;
+ HRESULT hr = DP_OK;
lpPlayerData lpPData;
lpPlayerList lpPList;
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,
dwDataSize, dwFlags, bAnsi );
@@ -2168,7 +2168,7 @@
/* Does a thread exist? If so we were doing an async enum session */
if( This->dp2->hEnumSessionThread != INVALID_HANDLE_VALUE )
{
- TRACE( "Killing EnumSession thread %u\n",
+ TRACE( "Killing EnumSession thread %p\n",
This->dp2->hEnumSessionThread );
/* Request that the thread kill itself nicely */
Index: dlls/dplayx/dplayx_global.c
===================================================================
RCS file: /home/wine/wine/dlls/dplayx/dplayx_global.c,v
retrieving revision 1.17
diff -u -r1.17 dplayx_global.c
--- dlls/dplayx/dplayx_global.c 3 Jul 2002 21:10:43 -0000 1.17
+++ dlls/dplayx/dplayx_global.c 23 Oct 2002 18:16:26 -0000
@@ -223,14 +223,14 @@
/* First instance creates the semaphore. Others just use it */
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 */
bInitializeSharedMemory = TRUE;
}
else if ( GetLastError() == ERROR_ALREADY_EXISTS )
{
- TRACE( "Found semaphore handle %u\n", hDplayxSema );
+ TRACE( "Found semaphore handle %p\n", hDplayxSema );
}
else
{
@@ -251,11 +251,11 @@
if( GetLastError() == ERROR_SUCCESS )
{
- TRACE( "File mapped %u created\n", hDplayxSharedMem );
+ TRACE( "File mapped %p created\n", hDplayxSharedMem );
}
else if ( GetLastError() == ERROR_ALREADY_EXISTS )
{
- TRACE( "Found FileMapping handle %u\n", hDplayxSharedMem );
+ TRACE( "Found FileMapping handle %p\n", hDplayxSharedMem );
}
else
{
@@ -337,7 +337,7 @@
{
BOOL bSuccess;
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" );
/* Close out handle */
@@ -364,7 +364,7 @@
{
BOOL bSuccess;
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" );
/* Close out handle */
@@ -633,7 +633,7 @@
{
BOOL bSuccess;
bSuccess = SetEvent( hInformOnSettingRead );
- TRACE( "Signalling setting read event %u %s\n",
+ TRACE( "Signalling setting read event %p %s\n",
hInformOnSettingRead, bSuccess ? "succeed" : "failed" );
/* Close out handle */
@@ -755,7 +755,7 @@
{
BOOL bSuccess;
bSuccess = SetEvent( hInformOnSettingRead );
- TRACE( "Signalling setting read event %u %s\n",
+ TRACE( "Signalling setting read event %p %s\n",
hInformOnSettingRead, bSuccess ? "succeed" : "failed" );
/* Close out handle */
Index: dlls/dplayx/dplayx_main.c
===================================================================
RCS file: /home/wine/wine/dlls/dplayx/dplayx_main.c,v
retrieving revision 1.12
diff -u -r1.12 dplayx_main.c
--- dlls/dplayx/dplayx_main.c 31 May 2002 23:25:46 -0000 1.12
+++ dlls/dplayx/dplayx_main.c 23 Oct 2002 18:16:26 -0000
@@ -33,7 +33,7 @@
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 )
{
Index: dlls/dplayx/dplobby.c
===================================================================
RCS file: /home/wine/wine/dlls/dplayx/dplobby.c,v
retrieving revision 1.21
diff -u -r1.21 dplobby.c
--- dlls/dplayx/dplobby.c 31 May 2002 23:25:46 -0000 1.21
+++ dlls/dplayx/dplobby.c 23 Oct 2002 18:16:27 -0000
@@ -1218,7 +1218,7 @@
DWORD dwSuspendCount;
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 );
if( dwFlags != 0 )
Attachment:
pgp00071.pgp
Description: PGP signature
