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
dee2fd11
Commit
dee2fd11
authored
Jan 23, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jan 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: Handle GetObject() failure in ParseDisplayName() for item moniker.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
7770e0bb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
8 deletions
+6
-8
itemmoniker.c
dlls/ole32/itemmoniker.c
+6
-4
moniker.c
dlls/ole32/tests/moniker.c
+0
-4
No files found.
dlls/ole32/itemmoniker.c
View file @
dee2fd11
...
...
@@ -790,13 +790,15 @@ static HRESULT WINAPI ItemMonikerImpl_ParseDisplayName(IMoniker *iface, IBindCtx
{
hr
=
IOleItemContainer_GetObject
(
container
,
This
->
itemName
,
get_bind_speed_from_bindctx
(
pbc
),
pbc
,
&
IID_IParseDisplayName
,
(
void
**
)
&
parser
);
if
(
SUCCEEDED
(
hr
))
{
hr
=
IMoniker_GetDisplayName
(
iface
,
pbc
,
NULL
,
&
displayName
);
hr
=
IMoniker_GetDisplayName
(
iface
,
pbc
,
NULL
,
&
displayName
);
hr
=
IParseDisplayName_ParseDisplayName
(
parser
,
pbc
,
displayName
,
eaten
,
ppmkOut
);
hr
=
IParseDisplayName_ParseDisplayName
(
parser
,
pbc
,
displayName
,
eaten
,
ppmkOut
);
IParseDisplayName_Release
(
parser
);
}
IOleItemContainer_Release
(
container
);
IParseDisplayName_Release
(
parser
);
}
return
hr
;
...
...
dlls/ole32/tests/moniker.c
View file @
dee2fd11
...
...
@@ -2141,28 +2141,24 @@ todo_wine
hr
=
IBindCtx_SetBindOptions
(
bindctx
,
&
bind_opts
);
ok
(
hr
==
S_OK
,
"Failed to set bind options, hr %#x.
\n
"
,
hr
);
hr
=
IMoniker_ParseDisplayName
(
moniker
,
bindctx
,
&
container_moniker
->
IMoniker_iface
,
displayname
,
&
eaten
,
&
moniker2
);
todo_wine
ok
(
hr
==
(
0x8bee0000
|
BINDSPEED_INDEFINITE
),
"Unexpected hr %#x.
\n
"
,
hr
);
bind_opts
.
dwTickCountDeadline
=
1
;
hr
=
IBindCtx_SetBindOptions
(
bindctx
,
&
bind_opts
);
ok
(
hr
==
S_OK
,
"Failed to set bind options, hr %#x.
\n
"
,
hr
);
hr
=
IMoniker_ParseDisplayName
(
moniker
,
bindctx
,
&
container_moniker
->
IMoniker_iface
,
displayname
,
&
eaten
,
&
moniker2
);
todo_wine
ok
(
hr
==
(
0x8bee0000
|
BINDSPEED_IMMEDIATE
),
"Unexpected hr %#x.
\n
"
,
hr
);
bind_opts
.
dwTickCountDeadline
=
2499
;
hr
=
IBindCtx_SetBindOptions
(
bindctx
,
&
bind_opts
);
ok
(
hr
==
S_OK
,
"Failed to set bind options, hr %#x.
\n
"
,
hr
);
hr
=
IMoniker_ParseDisplayName
(
moniker
,
bindctx
,
&
container_moniker
->
IMoniker_iface
,
displayname
,
&
eaten
,
&
moniker2
);
todo_wine
ok
(
hr
==
(
0x8bee0000
|
BINDSPEED_IMMEDIATE
),
"Unexpected hr %#x.
\n
"
,
hr
);
bind_opts
.
dwTickCountDeadline
=
2500
;
hr
=
IBindCtx_SetBindOptions
(
bindctx
,
&
bind_opts
);
ok
(
hr
==
S_OK
,
"Failed to set bind options, hr %#x.
\n
"
,
hr
);
hr
=
IMoniker_ParseDisplayName
(
moniker
,
bindctx
,
&
container_moniker
->
IMoniker_iface
,
displayname
,
&
eaten
,
&
moniker2
);
todo_wine
ok
(
hr
==
(
0x8bee0000
|
BINDSPEED_MODERATE
),
"Unexpected hr %#x.
\n
"
,
hr
);
IMoniker_Release
(
&
container_moniker
->
IMoniker_iface
);
...
...
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