[QUARTZ]
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 11 Oct 2013 13:13:18 +0000 (13:13 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 11 Oct 2013 13:13:18 +0000 (13:13 +0000)
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60606

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

index f86c88e..634fcc5 100644 (file)
@@ -305,7 +305,7 @@ static HRESULT WINAPI FilterMapper3_CreateCategory(
         hr = HRESULT_FROM_WIN32(lRet);
     }
 
-    CloseHandle(hKey);
+    RegCloseKey(hKey);
     CoTaskMemFree(wClsidCategory);
     CoTaskMemFree(wClsidAMCat);
 
@@ -1285,7 +1285,7 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface, CLSID c
     {
         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 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface, CLSID c
     {
         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 @@ static HRESULT WINAPI FilterMapper_RegisterPin(
 
     CoTaskMemFree(wszClsid);
     if (hKey)
-        CloseHandle(hKey);
+        RegCloseKey(hKey);
     if (hPinsKey)
-        CloseHandle(hPinsKey);
+        RegCloseKey(hPinsKey);
 
     return hr;
 }
@@ -1478,7 +1478,7 @@ static HRESULT WINAPI FilterMapper_RegisterPinType(
 
         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 @@ static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper * iface, CLSID
     {
         lRet = RegDeleteKeyW(hKey, wszClsid);
         hr = HRESULT_FROM_WIN32(lRet);
-        CloseHandle(hKey);
+        RegCloseKey(hKey);
     }
 
     if (SUCCEEDED(hr))
@@ -1534,7 +1534,7 @@ static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper * iface, CLSID
         if (lRet != ERROR_SUCCESS)
             hr = HRESULT_FROM_WIN32(lRet);
 
-        CloseHandle(hKey);
+        RegCloseKey(hKey);
     }
 
     CoTaskMemFree(wszClsid);
@@ -1596,7 +1596,7 @@ static HRESULT WINAPI FilterMapper_UnregisterPin(IFilterMapper * iface, CLSID Fi
 
     CoTaskMemFree(wszClsid);
     if (hKey)
-        CloseHandle(hKey);
+        RegCloseKey(hKey);
 
     return hr;
 }
index 5660957..454fe52 100644 (file)
@@ -45,7 +45,7 @@ reactos/dll/directx/wine/dxdiagn        # Synced to Wine-1.7.1
 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?