[DPLAYX] Sync with Wine Staging 1.9.4. CORE-10912

svn path=/trunk/; revision=70832

diff --git a/reactos/dll/directx/wine/dplayx/dplay.c b/reactos/dll/directx/wine/dplayx/dplay.c
index f37b868..2ef857c 100644 (file)
--- a/reactos/dll/directx/wine/dplayx/dplay.c
+++ b/reactos/dll/directx/wine/dplayx/dplay.c
@@ -1569,17 +1569,12 @@ static HRESULT DP_IF_CreatePlayer( IDirectPlayImpl *This, void *lpMsgHdr, DPID *
      player total */
   lpPData = DP_CreatePlayer( This, lpidPlayer, lpPlayerName, dwCreateFlags,
                              hEvent, bAnsi );
-
-  if( lpPData == NULL )
-  {
-    return DPERR_CANTADDPLAYER;
-  }
-
   /* Create the list object and link it in */
   lpPList = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *lpPList ) );
-  if( lpPList == NULL )
+  if( !lpPData || !lpPList )
   {
-    FIXME( "Memory leak\n" );
+    HeapFree( GetProcessHeap(), 0, lpPData );
+    HeapFree( GetProcessHeap(), 0, lpPList );
     return DPERR_CANTADDPLAYER;
   }
 

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index bb4039e..bf9288b 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -34,7 +34,7 @@ reactos/dll/directx/wine/dinput         # Synced to WineStaging-1.9.4
 reactos/dll/directx/wine/dinput8        # Synced to WineStaging-1.7.55
 reactos/dll/directx/wine/dmusic         # Synced to WineStaging-1.7.55
 reactos/dll/directx/wine/dplay          # Synced to WineStaging-1.7.55
-reactos/dll/directx/wine/dplayx         # Synced to WineStaging-1.7.55
+reactos/dll/directx/wine/dplayx         # Synced to WineStaging-1.9.4
 reactos/dll/directx/wine/dsound         # Synced to Wine-1.3.29
 reactos/dll/directx/wine/dxdiagn        # Synced to WineStaging-1.7.55
 reactos/dll/directx/wine/msdmo          # Synced to WineStaging-1.7.55