Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 01:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[QUARTZ]

Browse source 
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60606
This commit is contained in:
Amine Khaldi 2013-10-11 13:13:18 +00:00
parent e007f33d9a
commit 95e46327ba
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
reactos/dll/directx/wine/quartz/filtermapper.c
View 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;
}

2
reactos/media/doc/README.WINE
View 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?