Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
eab97b20
Commit
eab97b20
authored
Nov 05, 2019
by
Nikolay Sivov
Committed by
Alexandre Julliard
Nov 05, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
comsvcs: Accept progid's when creating "new" monikers.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
239055cf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
main.c
dlls/comsvcs/main.c
+1
-1
comsvcs.c
dlls/comsvcs/tests/comsvcs.c
+13
-0
No files found.
dlls/comsvcs/main.c
View file @
eab97b20
...
...
@@ -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
));
...
...
dlls/comsvcs/tests/comsvcs.c
View file @
eab97b20
...
...
@@ -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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment