ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-03 12:23:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Autosyncing with Wine HEAD

Browse Source 
svn path=/trunk/; revision=30860
This commit is contained in:
The Wine Synchronizer
2007-11-29 10:11:45 +00:00
parent 8d185659a8
commit 4ba3681eb1
3 changed files with 11 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/win32/comcat/comcat.rbuild
+4 -5
View File
@@ -1,14 +1,13 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="comcat" type="win32dll" baseaddress="${BASEADDRESS_COMCAT}" installbase="system32" entrypoint="0" installname="comcat.dll" allowwarnings="true">
<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
<importlibrary definition="comcat.spec.def" />
<include base="comcat">.</include>
<include base="ReactOS">include/reactos/wine</include>
<define name="__REACTOS__" />
<define name="__WINESRC__" />
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x600</define>
<define name="_WIN32_WINNT">0x501</define>
<define name="WINVER">0x501</define>
<define name="WINVER">0x600</define>
<define name="_WIN32_WINNT">0x600</define>
<library>wine</library>
<library>ole32</library>
<library>user32</library>
reactos/dll/win32/comcat/information.c
+3 -3
View File
@@ -163,11 +163,11 @@ static HRESULT WINAPI COMCAT_ICatInformation_EnumClassesOfCategories(
TRACE("\n");
if (cImplemented == (ULONG)-1)
if (cImplemented == (ULONG)-1)
cImplemented = 0;
if (cRequired == (ULONG)-1)
if (cRequired == (ULONG)-1)
cRequired = 0;
if (iface == NULL || ppenumCLSID == NULL ||
(cImplemented && rgcatidImpl == NULL) ||
(cRequired && rgcatidReq == NULL)) return E_POINTER;
reactos/dll/win32/comcat/regsvr.c
+4 -59
View File
@@ -101,8 +101,6 @@ static LONG register_key_defvalueW(HKEY base, WCHAR const *name,
WCHAR const *value);
static LONG register_key_defvalueA(HKEY base, WCHAR const *name,
char const *value);
static LONG recursive_delete_key(HKEY key);
/***********************************************************************
* register_interfaces
@@ -189,22 +187,12 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list)
for (; res == ERROR_SUCCESS && list->iid; ++list) {
WCHAR buf[39];
HKEY iid_key;
StringFromGUID2(list->iid, buf, 39);
res = RegOpenKeyExW(interface_key, buf, 0,
KEY_READ | KEY_WRITE, &iid_key);
if (res == ERROR_FILE_NOT_FOUND) {
res = ERROR_SUCCESS;
continue;
}
if (res != ERROR_SUCCESS) goto error_close_interface_key;
res = recursive_delete_key(iid_key);
RegCloseKey(iid_key);
if (res != ERROR_SUCCESS) goto error_close_interface_key;
res = RegDeleteTreeW(interface_key, buf);
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
}
error_close_interface_key:
RegCloseKey(interface_key);
error_return:
return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
@@ -287,23 +275,12 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list)
for (; res == ERROR_SUCCESS && list->clsid; ++list) {
WCHAR buf[39];
HKEY clsid_key;
StringFromGUID2(list->clsid, buf, 39);
res = RegOpenKeyExW(coclass_key, buf, 0,
KEY_READ | KEY_WRITE, &clsid_key);
if (res == ERROR_FILE_NOT_FOUND) {
res = ERROR_SUCCESS;
continue;
}
if (res != ERROR_SUCCESS) goto error_close_coclass_key;
res = recursive_delete_key(clsid_key);
RegCloseKey(clsid_key);
if (res != ERROR_SUCCESS) goto error_close_coclass_key;
res = RegDeleteTreeW(coclass_key, buf);
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
}
error_close_coclass_key:
RegCloseKey(coclass_key);
error_return:
return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
}
@@ -359,38 +336,6 @@ static LONG register_key_defvalueA(
return res;
}
/***********************************************************************
* recursive_delete_key
*/
static LONG recursive_delete_key(HKEY key)
{
LONG res;
WCHAR subkey_name[MAX_PATH];
DWORD cName;
HKEY subkey;
for (;;) {
cName = sizeof(subkey_name) / sizeof(WCHAR);
res = RegEnumKeyExW(key, 0, subkey_name, &cName,
NULL, NULL, NULL, NULL);
if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) {
res = ERROR_SUCCESS; /* presumably we're done enumerating */
break;
}
res = RegOpenKeyExW(key, subkey_name, 0,
KEY_READ | KEY_WRITE, &subkey);
if (res == ERROR_FILE_NOT_FOUND) continue;
if (res != ERROR_SUCCESS) break;
res = recursive_delete_key(subkey);
RegCloseKey(subkey);
if (res != ERROR_SUCCESS) break;
}
if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0);
return res;
}
/***********************************************************************
* coclass list
*/