Nikolay Sivov : ole32: Remove unused helper.
Alexandre Julliard
julliard at winehq.org
Fri Aug 28 15:17:58 CDT 2020
Module: wine
Branch: master
Commit: d1b67b228caba0967086e5d61b072f435434b40e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1b67b228caba0967086e5d61b072f435434b40e
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri Aug 28 11:05:17 2020 +0300
ole32: Remove unused helper.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 dfd81a8d0f..18580e9b23 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 6e14d69e42..7a571352d3 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;
More information about the wine-cvs
mailing list