system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 05:44:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

comsvcs: Accept progid's when creating "new" monikers.

Browse source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2019-11-05 13:09:30 +03:00 committed by Alexandre Julliard
parent 239055cfc7
commit eab97b2068
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/comsvcs/main.c
View file

@ -790,7 +790,7 @@ static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG
if (wcsnicmp(name, L"new:", 4))
return MK_E_SYNTAX;
if (!guid_from_string(name + 4, &guid))
if (!guid_from_string(name + 4, &guid) && FAILED(CLSIDFromProgID(name + 4, &guid)))
return MK_E_SYNTAX;
moniker = heap_alloc_zero(sizeof(*moniker));

13
dlls/comsvcs/tests/comsvcs.c
View file

@ -271,6 +271,7 @@ static void test_new_moniker(void)
{
IMoniker *moniker, *moniker2, *inverse, *class_moniker;
IUnknown *obj, *obj2;
BIND_OPTS2 bind_opts;
ULARGE_INTEGER size;
DWORD moniker_type;
IBindCtx *bindctx;
@ -415,6 +416,18 @@ todo_wine
ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr);
IMoniker_Release(moniker);
/* Full path to create new object, using progid. */
memset(&bind_opts, 0, sizeof(bind_opts));
bind_opts.cbStruct = sizeof(bind_opts);
bind_opts.dwClassContext = CLSCTX_INPROC_SERVER;
hr = CoGetObject(L"new:msxml2.domdocument", (BIND_OPTS *)&bind_opts, &IID_IXMLDOMDocument, (void **)&obj);
todo_wine
ok(hr == S_OK, "Failed to create object, hr %#x.\n", hr);
if (SUCCEEDED(hr))
IUnknown_Release(obj);
IBindCtx_Release(bindctx);
}