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

Author: akhaldi
Date: Tue Mar  1 12:30:17 2016
New Revision: 70832

URL: http://svn.reactos.org/svn/reactos?rev=70832&view=rev
Log:
[DPLAYX] Sync with Wine Staging 1.9.4. CORE-10912

Modified:
    trunk/reactos/dll/directx/wine/dplayx/dplay.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/directx/wine/dplayx/dplay.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp…
==============================================================================
--- trunk/reactos/dll/directx/wine/dplayx/dplay.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dplayx/dplay.c	[iso-8859-1] Tue Mar  1 12:30:17 2016
@@ -1569,17 +1569,12 @@
      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 )
-  {
-    FIXME( "Memory leak\n" );
+  if( !lpPData || !lpPList )
+  {
+    HeapFree( GetProcessHeap(), 0, lpPData );
+    HeapFree( GetProcessHeap(), 0, lpPList );
     return DPERR_CANTADDPLAYER;
   }
 

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Tue Mar  1 12:30:17 2016
@@ -34,7 +34,7 @@
 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