From db110c2bfe9636b672e7971b976aa1aa5bb08da8 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 18 Aug 2016 09:42:25 +0000 Subject: [PATCH] [DEVENUM] Sync with Wine Staging 1.9.16. CORE-11866 svn path=/trunk/; revision=72263 --- reactos/dll/directx/wine/devenum/createdevenum.c | 6 +++--- reactos/media/doc/README.WINE | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reactos/dll/directx/wine/devenum/createdevenum.c b/reactos/dll/directx/wine/devenum/createdevenum.c index b752860a3b3..a4d0df5a34b 100644 --- a/reactos/dll/directx/wine/devenum/createdevenum.c +++ b/reactos/dll/directx/wine/devenum/createdevenum.c @@ -257,8 +257,8 @@ static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey, REGFILTERPINS *rgPin) error_cleanup_types: - if (clsMajorType) CoTaskMemFree(clsMajorType); - if (clsMinorType) CoTaskMemFree(clsMinorType); + CoTaskMemFree(clsMajorType); + CoTaskMemFree(clsMinorType); } RegCloseKey(hkeyMajorType); @@ -353,7 +353,7 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2) error_cleanup: RegCloseKey(hkeyPinKey); - if (rgPin->strName) CoTaskMemFree(rgPin->strName); + CoTaskMemFree(rgPin->strName); } RegCloseKey(hkeyPins); diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index e4bf030fe23..2e32a6ab646 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -29,7 +29,7 @@ reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.9.16 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.16 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.11 +reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.16 reactos/dll/directx/wine/dinput # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.11