[ros-diffs] [akhaldi] 74778: [DPLAYX] Sync with Wine Staging 2.9. CORE-13362 2bb3636 dplayx: Skip over unknown DataTypes guids in EnumAddressTypes.

Author: akhaldi
Date: Sat Jun  3 18:05:58 2017
New Revision: 74778

URL: http://svn.reactos.org/svn/reactos?rev=74778&view=rev
Log:
[DPLAYX] Sync with Wine Staging 2.9. CORE-13362

2bb3636 dplayx: Skip over unknown DataTypes guids in EnumAddressTypes.

Modified:
    trunk/reactos/dll/directx/wine/dplayx/dplay.c
    trunk/reactos/dll/directx/wine/dplayx/dplobby.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] Sat Jun  3 18:05:58 2017
@@ -221,6 +221,7 @@
 
   NS_DeleteSessionCache( This->dp2->lpNameServerData );
 
+  HeapFree( GetProcessHeap(), 0, This->dp2->dplspData.lpCB);
   HeapFree( GetProcessHeap(), 0, This->dp2->lpSessionDesc );
 
   IDirectPlaySP_Release( This->dp2->spData.lpISP );
@@ -2866,8 +2867,14 @@
 
     TRACE( "(%p)->(0x%08x,%p,0x%08x)\n", This, player, caps, flags);
 
+    if ( !caps )
+        return DPERR_INVALIDPARAMS;
+
     if ( This->dp2->connectionInitialized == NO_PROVIDER )
         return DPERR_UNINITIALIZED;
+
+    if( caps->dwSize != sizeof(DPCAPS) )
+        return DPERR_INVALIDPARAMS;
 
     /* Query the service provider */
     data.idPlayer = player;
@@ -4336,8 +4343,10 @@
       if( !lpEnumCallback( &serviceProviderGUID, lpAddressBuffer,
dwAddressBufferSize,
                            &dpName, dwFlags, lpContext ) )
       {
+         HeapFree( GetProcessHeap(), 0, lpAddressBuffer );
          return DP_OK;
       }
+      HeapFree( GetProcessHeap(), 0, lpAddressBuffer );
     }
   }
 

Modified: trunk/reactos/dll/directx/wine/dplayx/dplobby.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp…
==============================================================================
--- trunk/reactos/dll/directx/wine/dplayx/dplobby.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dplayx/dplobby.c	[iso-8859-1] Sat Jun  3 18:05:58 2017
@@ -1709,8 +1709,7 @@
     }
     else
     {
-      ERR( "Unknown GUID %s\n", debugstr_guid(&lpElements->guidDataType)
);
-      return DPERR_INVALIDFLAGS;
+      WARN( "Skipping Unknown GUID %s\n",
debugstr_guid(&lpElements->guidDataType) );
     }
   }
 

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] Sat Jun  3 18:05:58 2017
@@ -34,7 +34,7 @@
 reactos/dll/directx/wine/dinput8        # Synced to WineStaging-1.9.23
 reactos/dll/directx/wine/dmusic         # Synced to WineStaging-2.9
 reactos/dll/directx/wine/dplay          # Synced to WineStaging-1.9.23
-reactos/dll/directx/wine/dplayx         # Synced to WineStaging-2.2
+reactos/dll/directx/wine/dplayx         # Synced to WineStaging-2.9
 reactos/dll/directx/wine/dsound         # Synced to Wine-1.3.29
 reactos/dll/directx/wine/dxdiagn        # Synced to WineStaging-1.9.23
 reactos/dll/directx/wine/msdmo          # Synced to WineStaging-1.9.23