[ros-diffs] [akhaldi] 70088: [DPLAYX] Sync with Wine Staging 1.7.55. CORE-10536

Author: akhaldi
Date: Tue Nov 24 10:57:37 2015
New Revision: 70088

URL: http://svn.reactos.org/svn/reactos?rev=70088&view=rev
Log:
[DPLAYX] Sync with Wine Staging 1.7.55. CORE-10536

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] Tue Nov 24 10:57:37 2015
@@ -5797,7 +5797,7 @@
 	guid_cache = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID) * dwIndex);
 	if (!guid_cache)
 	{
-	    ERR(": failed to alloc required memory.\n");
+	    ERR(": failed to allocate required memory.\n");
 	    return DPERR_EXCEPTION;
 	}
 	cache_count = dwIndex;

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] Tue Nov 24 10:57:37 2015
@@ -745,8 +745,6 @@
       DWORD    dwAtIndex;
       LPCSTR   atKey = "Address Types";
       LPCSTR   guidDataSubKey   = "Guid";
-      FILETIME filetime;
-
 
       TRACE(" this time through: %s\n", subKeyName );
 

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 Nov 24 10:57:37 2015
@@ -34,7 +34,7 @@
 reactos/dll/directx/wine/dinput8        # Synced to WineStaging-1.7.47
 reactos/dll/directx/wine/dmusic         # Synced to WineStaging-1.7.47
 reactos/dll/directx/wine/dplay          # Synced to WineStaging-1.7.47
-reactos/dll/directx/wine/dplayx         # Synced to WineStaging-1.7.47
+reactos/dll/directx/wine/dplayx         # Synced to WineStaging-1.7.55
 reactos/dll/directx/wine/dsound         # Synced to Wine-1.3.29
 reactos/dll/directx/wine/dxdiagn        # Synced to WineStaging-1.7.47
 reactos/dll/directx/wine/msdmo          # Synced to WineStaging-1.7.47