From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Tue, 24 Nov 2015 10:57:37 +0000 (+0000)
Subject: [DPLAYX] Sync with Wine Staging 1.7.55. CORE-10536
X-Git-Tag: ReactOS-0.4.0~60^2~19
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=8c7e291c0e0ae4412de019a922ed2d4232028fd5

[DPLAYX] Sync with Wine Staging 1.7.55. CORE-10536

svn path=/trunk/; revision=70088
---

diff --git a/reactos/dll/directx/wine/dplayx/dplay.c b/reactos/dll/directx/wine/dplayx/dplay.c
index babf99fbf84..f37b8683d5d 100644
--- a/reactos/dll/directx/wine/dplayx/dplay.c
+++ b/reactos/dll/directx/wine/dplayx/dplay.c
@@ -5797,7 +5797,7 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA,
 	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;
diff --git a/reactos/dll/directx/wine/dplayx/dplobby.c b/reactos/dll/directx/wine/dplayx/dplobby.c
index 4b399739861..2458eef2216 100644
--- a/reactos/dll/directx/wine/dplayx/dplobby.c
+++ b/reactos/dll/directx/wine/dplayx/dplobby.c
@@ -745,8 +745,6 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3
       DWORD    dwAtIndex;
       LPCSTR   atKey = "Address Types";
       LPCSTR   guidDataSubKey   = "Guid";
-      FILETIME filetime;
-
 
       TRACE(" this time through: %s\n", subKeyName );
 
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index b9b561d9d6e..99b6aa476bd 100644
--- 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.7.55
 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