[PATCH 1/4] ole32: Remove unused helper.

Nikolay Sivov nsivov at codeweavers.com
Fri Aug 28 03:05:17 CDT 2020


Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
 dlls/ole32/compobj.c         | 37 ------------------------------------
 dlls/ole32/compobj_private.h |  1 -
 2 files changed, 38 deletions(-)

diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index dfd81a8d0f5..18580e9b235 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -772,43 +772,6 @@ HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY
     return S_OK;
 }
 
-/* open HKCR\\AppId\\{string form of appid clsid} key */
-HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey)
-{
-    static const WCHAR szAppId[] = { 'A','p','p','I','d',0 };
-    static const WCHAR szAppIdKey[] = { 'A','p','p','I','d','\\',0 };
-    DWORD res;
-    WCHAR buf[CHARS_IN_GUID];
-    WCHAR keyname[ARRAY_SIZE(szAppIdKey) + CHARS_IN_GUID];
-    DWORD size;
-    HKEY hkey;
-    DWORD type;
-    HRESULT hr;
-
-    /* read the AppID value under the class's key */
-    hr = COM_OpenKeyForCLSID(clsid, NULL, KEY_READ, &hkey);
-    if (FAILED(hr))
-        return hr;
-
-    size = sizeof(buf);
-    res = RegQueryValueExW(hkey, szAppId, NULL, &type, (LPBYTE)buf, &size);
-    RegCloseKey(hkey);
-    if (res == ERROR_FILE_NOT_FOUND)
-        return REGDB_E_KEYMISSING;
-    else if (res != ERROR_SUCCESS || type!=REG_SZ)
-        return REGDB_E_READREGDB;
-
-    lstrcpyW(keyname, szAppIdKey);
-    lstrcatW(keyname, buf);
-    res = open_classes_key(HKEY_CLASSES_ROOT, keyname, access, subkey);
-    if (res == ERROR_FILE_NOT_FOUND)
-        return REGDB_E_KEYMISSING;
-    else if (res != ERROR_SUCCESS)
-        return REGDB_E_READREGDB;
-
-    return S_OK;
-}
-
 /***
  * This internal method is used to scan the registered class list to
  * find a class object.
diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h
index 6e14d69e424..7a571352d32 100644
--- a/dlls/ole32/compobj_private.h
+++ b/dlls/ole32/compobj_private.h
@@ -189,7 +189,6 @@ extern void release_std_git(void) DECLSPEC_HIDDEN;
 extern HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv) DECLSPEC_HIDDEN;
 
 HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *key) DECLSPEC_HIDDEN;
-HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey) DECLSPEC_HIDDEN;
 HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv) DECLSPEC_HIDDEN;
 HRESULT FTMarshalCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN;
 
-- 
2.28.0




More information about the wine-devel mailing list