reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-01-31 17:23:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ole32: Support activation context in ProgIDFromCLSID().

Browse Source
This commit is contained in:
Nikolay Sivov 2013-09-27 23:11:46 +04:00 committed by Alexandre Julliard
parent e02b1687aa
commit 03dbbe2103
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/ole32/compobj.c
View File

@ -2227,6 +2227,7 @@ HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey
HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID)
{
static const WCHAR wszProgID[] = {'P','r','o','g','I','D',0};
ACTCTX_SECTION_KEYED_DATA data;
HKEY hkey;
HRESULT ret;
LONG progidlen = 0;
@ -2238,6 +2239,27 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID)
}
*ppszProgID = NULL;
data.cbSize = sizeof(data);
if (FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION,
clsid, &data))
{
struct comclassredirect_data *comclass = (struct comclassredirect_data*)data.lpData;
if (comclass->progid_len)
{
WCHAR *ptrW;
*ppszProgID = CoTaskMemAlloc(comclass->progid_len + sizeof(WCHAR));
if (!*ppszProgID) return E_OUTOFMEMORY;
ptrW = (WCHAR*)((BYTE*)comclass + comclass->progid_offset);
memcpy(*ppszProgID, ptrW, comclass->progid_len + sizeof(WCHAR));
return S_OK;
}
else
return REGDB_E_CLASSNOTREG;
}
ret = COM_OpenKeyForCLSID(clsid, wszProgID, KEY_READ, &hkey);
if (FAILED(ret))
return ret;

9
dlls/ole32/tests/compobj.c
View File

@ -309,19 +309,14 @@ static void test_ProgIDFromCLSID(void)
static const WCHAR customfontW[] = {'C','u','s','t','o','m','F','o','n','t',0};
hr = ProgIDFromCLSID(&CLSID_non_existent, &progid);
todo_wine
ok(hr == S_OK, "got 0x%08x\n", hr);
if (hr == S_OK)
{
ok(!lstrcmpiW(progid, progidW), "got %s\n", wine_dbgstr_w(progid));
CoTaskMemFree(progid);
}
ok(!lstrcmpiW(progid, progidW), "got %s\n", wine_dbgstr_w(progid));
CoTaskMemFree(progid);
/* try something registered and redirected */
progid = NULL;
hr = ProgIDFromCLSID(&CLSID_StdFont, &progid);
ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine
ok(!lstrcmpiW(progid, customfontW), "got wrong progid %s\n", wine_dbgstr_w(progid));
CoTaskMemFree(progid);