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
5855196b
Commit
5855196b
authored
Sep 29, 2021
by
Nikolay Sivov
Committed by
Alexandre Julliard
Sep 29, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32/composite: Do not use antimoniker composition in BindToStorage().
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
0806f953
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
35 deletions
+23
-35
compositemoniker.c
dlls/ole32/compositemoniker.c
+23
-35
No files found.
dlls/ole32/compositemoniker.c
View file @
5855196b
...
...
@@ -372,52 +372,40 @@ static HRESULT WINAPI CompositeMonikerImpl_BindToObject(IMoniker *iface, IBindCt
return
hr
;
}
/******************************************************************************
* CompositeMoniker_BindToStorage
******************************************************************************/
static
HRESULT
WINAPI
CompositeMonikerImpl_BindToStorage
(
IMoniker
*
iface
,
IBindCtx
*
pbc
,
IMoniker
*
pmkToLeft
,
REFIID
riid
,
VOID
**
ppvResult
)
static
HRESULT
WINAPI
CompositeMonikerImpl_BindToStorage
(
IMoniker
*
iface
,
IBindCtx
*
pbc
,
IMoniker
*
toleft
,
REFIID
riid
,
void
**
result
)
{
HRESULT
res
;
IMoniker
*
tempMk
,
*
antiMk
,
*
rightMostMk
,
*
leftMk
;
IEnumMoniker
*
enumMonike
r
;
CompositeMonikerImpl
*
moniker
=
impl_from_IMoniker
(
iface
)
;
IMoniker
*
left
,
*
rightmost
,
*
composed_left
;
HRESULT
h
r
;
TRACE
(
"
(%p,%p,%p,%s,%p)
\n
"
,
iface
,
pbc
,
pmkToLeft
,
debugstr_guid
(
riid
),
ppvR
esult
);
TRACE
(
"
%p, %p, %p, %s, %p.
\n
"
,
iface
,
pbc
,
toleft
,
debugstr_guid
(
riid
),
r
esult
);
*
ppvResult
=
0
;
*
result
=
NULL
;
/* This method recursively calls BindToStorage on the rightmost component of the composite, */
/* passing the rest of the composite as the pmkToLeft parameter for that call. */
if
(
FAILED
(
hr
=
composite_get_rightmost
(
moniker
,
&
left
,
&
rightmost
)))
return
hr
;
if
(
pmkToL
eft
)
if
(
tol
eft
)
{
res
=
IMoniker_ComposeWith
(
pmkToLeft
,
iface
,
FALSE
,
&
leftMk
);
if
(
FAILED
(
res
))
return
res
;
hr
=
compose_with
(
toleft
,
left
,
&
composed_left
);
}
else
leftMk
=
iface
;
IMoniker_Enum
(
iface
,
FALSE
,
&
enumMoniker
);
IEnumMoniker_Next
(
enumMoniker
,
1
,
&
rightMostMk
,
NULL
);
IEnumMoniker_Release
(
enumMoniker
);
res
=
CreateAntiMoniker
(
&
antiMk
);
if
(
FAILED
(
res
))
return
res
;
res
=
IMoniker_ComposeWith
(
leftMk
,
antiMk
,
0
,
&
tempMk
);
if
(
FAILED
(
res
))
return
res
;
IMoniker_Release
(
antiMk
);
res
=
IMoniker_BindToStorage
(
rightMostMk
,
pbc
,
tempMk
,
riid
,
ppvResult
);
IMoniker_Release
(
tempMk
);
{
composed_left
=
left
;
IMoniker_AddRef
(
composed_left
);
}
IMoniker_Release
(
rightMostMk
);
if
(
SUCCEEDED
(
hr
))
{
hr
=
IMoniker_BindToStorage
(
rightmost
,
pbc
,
composed_left
,
riid
,
result
);
IMoniker_Release
(
composed_left
);
}
if
(
pmkToLeft
)
IMoniker_Release
(
leftMk
);
IMoniker_Release
(
rightmost
);
IMoniker_Release
(
left
);
return
res
;
return
hr
;
}
/******************************************************************************
...
...
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