[ros-diffs] [akhaldi] 60606: [QUARTZ] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Fri Oct 11 13:13:18 2013
New Revision: 60606

URL: http://svn.reactos.org/svn/reactos?rev=60606&view=rev
Log:
[QUARTZ]
* Sync with Wine 1.7.1.
CORE-7469

Modified:
    trunk/reactos/dll/directx/wine/quartz/filtermapper.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/directx/wine/quartz/filtermapper.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fil...
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/filtermapper.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/filtermapper.c	[iso-8859-1] Fri Oct 11 13:13:18 2013
@@ -305,7 +305,7 @@
         hr = HRESULT_FROM_WIN32(lRet);
     }

-    CloseHandle(hKey);
+    RegCloseKey(hKey);
     CoTaskMemFree(wClsidCategory);
     CoTaskMemFree(wClsidAMCat);

@@ -1285,7 +1285,7 @@
     {
         lRet = RegSetValueExW(hKey, NULL, 0, REG_SZ, (const BYTE*)szName, (strlenW(szName) + 1) * sizeof(WCHAR));
         hr = HRESULT_FROM_WIN32(lRet);
-        CloseHandle(hKey);
+        RegCloseKey(hKey);
     }

if (SUCCEEDED(hr))
@@ -1301,7 +1301,7 @@
     {
         lRet = RegSetValueExW(hKey, wszMeritName, 0, REG_DWORD, (LPBYTE)&dwMerit, sizeof(dwMerit));
         hr = HRESULT_FROM_WIN32(lRet);
-        CloseHandle(hKey);
+        RegCloseKey(hKey);
     }

CoTaskMemFree(wszClsid);
@@ -1405,9 +1405,9 @@

CoTaskMemFree(wszClsid);
     if (hKey)
-        CloseHandle(hKey);
+        RegCloseKey(hKey);
     if (hPinsKey)
-        CloseHandle(hPinsKey);
+        RegCloseKey(hPinsKey);

return hr;
 }
@@ -1478,7 +1478,7 @@

lRet = RegCreateKeyExW(hKey, wszKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkeyDummy, NULL);
         hr = HRESULT_FROM_WIN32(lRet);
-        CloseHandle(hKey);
+        RegCloseKey(hKey);

if (hkeyDummy) RegCloseKey(hkeyDummy);
     }
@@ -1512,7 +1512,7 @@
     {
         lRet = RegDeleteKeyW(hKey, wszClsid);
         hr = HRESULT_FROM_WIN32(lRet);
-        CloseHandle(hKey);
+        RegCloseKey(hKey);
     }

if (SUCCEEDED(hr))
@@ -1534,7 +1534,7 @@
         if (lRet != ERROR_SUCCESS)
             hr = HRESULT_FROM_WIN32(lRet);

-        CloseHandle(hKey);
+        RegCloseKey(hKey);
     }

CoTaskMemFree(wszClsid);
@@ -1596,7 +1596,7 @@

CoTaskMemFree(wszClsid);
     if (hKey)
-        CloseHandle(hKey);
+        RegCloseKey(hKey);

return hr;
 }

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Fri Oct 11 13:13:18 2013
@@ -45,7 +45,7 @@
 reactos/dll/directx/wine/dxgi           # Synced to Wine-1.7.1
 reactos/dll/directx/wine/msdmo          # Synced to Wine-1.7.1
 reactos/dll/directx/wine/qedit          # Synced to Wine-1.7.1
-reactos/dll/directx/wine/quartz         # Synced to Wine-1.5.26
+reactos/dll/directx/wine/quartz         # Synced to Wine-1.7.1
 reactos/dll/directx/wine/wined3d        # Synced to Wine-1.7.1

reactos/dll/win32/activeds        # Synced to Wine-1.1.43?