[DPLAYX] Sync with Wine Staging 1.7.55. CORE-10536
authorAmine Khaldi <amine.khaldi@reactos.org>
Tue, 24 Nov 2015 10:57:37 +0000 (10:57 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Tue, 24 Nov 2015 10:57:37 +0000 (10:57 +0000)
svn path=/trunk/; revision=70088

reactos/dll/directx/wine/dplayx/dplay.c
reactos/dll/directx/wine/dplayx/dplobby.c
reactos/media/doc/README.WINE

index babf99f..f37b868 100644 (file)
@@ -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;
index 4b39973..2458eef 100644 (file)
@@ -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 );
 
index b9b561d..99b6aa4 100644 (file)
@@ -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