ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-01 04:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[QUARTZ]

Browse Source 
* Do not rely on RegDeleteTree{A,W} which shouldn't be exported.
* Move shlwapi.h inclusion to the PCH.
* We no longer need to define _WIN32_WINNT as 0x600.
CORE-8174

svn path=/trunk/; revision=63552
This commit is contained in:
Amine Khaldi
2014-06-08 12:14:06 +00:00
parent 60de098b28
commit bf89f9e6bb
5 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/directx/wine/quartz/CMakeLists.txt
-3
View File
@@ -1,7 +1,4 @@
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
add_definitions(
-D__WINESRC__
-DENTRY_PREFIX=QUARTZ_
reactos/dll/directx/wine/quartz/filesource.c
-2
View File
@@ -20,8 +20,6 @@
#include "quartz_private.h"
#include <shlwapi.h>
static const WCHAR wszOutputPinName[] = { 'O','u','t','p','u','t',0 };
typedef struct AsyncReader
reactos/dll/directx/wine/quartz/filtermapper.c
+2 -2
View File
@@ -1513,7 +1513,7 @@ static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper * iface, CLSID
if (lRet != ERROR_SUCCESS)
hr = HRESULT_FROM_WIN32(lRet);
lRet = RegDeleteTreeW(hKey, wszPins);
lRet = SHDeleteKeyW(hKey, wszPins);
if (lRet != ERROR_SUCCESS)
hr = HRESULT_FROM_WIN32(lRet);
@@ -1572,7 +1572,7 @@ static HRESULT WINAPI FilterMapper_UnregisterPin(IFilterMapper * iface, CLSID Fi
strcatW(wszPinNameKey, wszSlash);
strcatW(wszPinNameKey, Name);
lRet = RegDeleteTreeW(hKey, wszPinNameKey);
lRet = SHDeleteKeyW(hKey, wszPinNameKey);
hr = HRESULT_FROM_WIN32(lRet);
CoTaskMemFree(wszPinNameKey);
}
reactos/dll/directx/wine/quartz/quartz_private.h
+1
View File
@@ -41,6 +41,7 @@
#include <dvdmedia.h>
#include <vfw.h>
#include <aviriff.h>
#include <shlwapi.h>
#include <wine/strmbase.h>
#include <wine/unicode.h>
reactos/dll/directx/wine/quartz/regsvr.c
+6 -6
View File
@@ -240,7 +240,7 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list)
WCHAR buf[39];
StringFromGUID2(list->iid, buf, 39);
res = RegDeleteTreeW(interface_key, buf);
res = SHDeleteKeyW(interface_key, buf);
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
}
@@ -346,18 +346,18 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list)
WCHAR buf[39];
StringFromGUID2(list->clsid, buf, 39);
res = RegDeleteTreeW(coclass_key, buf);
res = SHDeleteKeyW(coclass_key, buf);
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
if (res != ERROR_SUCCESS) goto error_close_coclass_key;
if (list->progid) {
res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid);
res = SHDeleteKeyA(HKEY_CLASSES_ROOT, list->progid);
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
if (res != ERROR_SUCCESS) goto error_close_coclass_key;
}
if (list->viprogid) {
res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid);
res = SHDeleteKeyA(HKEY_CLASSES_ROOT, list->viprogid);
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
if (res != ERROR_SUCCESS) goto error_close_coclass_key;
}
@@ -500,7 +500,7 @@ static HRESULT unregister_mediatypes_parsing(struct regsvr_mediatype_parsing con
if (res != ERROR_SUCCESS) break;
StringFromGUID2(list->subtype, buf, 39);
res = RegDeleteTreeW(majortype_key, buf);
res = SHDeleteKeyW(majortype_key, buf);
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
/* Removed majortype key if there is no more subtype key */
@@ -535,7 +535,7 @@ static HRESULT unregister_mediatypes_extension(struct regsvr_mediatype_extension
res = ERROR_SUCCESS;
else if (res == ERROR_SUCCESS)
for (; res == ERROR_SUCCESS && list->majortype; ++list) {
res = RegDeleteTreeA(extensions_root_key, list->extension);
res = SHDeleteKeyA(extensions_root_key, list->extension);
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
}