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
e32b30c3
Commit
e32b30c3
authored
Jan 30, 2019
by
Sven Baars
Committed by
Alexandre Julliard
Feb 05, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: Fix some memory leaks (Valgrind).
Signed-off-by:
Sven Baars
<
sven.wine@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
2401d86f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
4 deletions
+12
-4
compositemoniker.c
dlls/ole32/compositemoniker.c
+12
-4
No files found.
dlls/ole32/compositemoniker.c
View file @
e32b30c3
...
@@ -433,6 +433,7 @@ static HRESULT WINAPI
...
@@ -433,6 +433,7 @@ static HRESULT WINAPI
CompositeMonikerImpl_Reduce
(
IMoniker
*
iface
,
IBindCtx
*
pbc
,
DWORD
dwReduceHowFar
,
CompositeMonikerImpl_Reduce
(
IMoniker
*
iface
,
IBindCtx
*
pbc
,
DWORD
dwReduceHowFar
,
IMoniker
**
ppmkToLeft
,
IMoniker
**
ppmkReduced
)
IMoniker
**
ppmkToLeft
,
IMoniker
**
ppmkReduced
)
{
{
HRESULT
res
;
IMoniker
*
tempMk
,
*
antiMk
,
*
rightMostMk
,
*
leftReducedComposedMk
,
*
rightMostReducedMk
;
IMoniker
*
tempMk
,
*
antiMk
,
*
rightMostMk
,
*
leftReducedComposedMk
,
*
rightMostReducedMk
;
IEnumMoniker
*
enumMoniker
;
IEnumMoniker
*
enumMoniker
;
...
@@ -453,7 +454,11 @@ CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar
...
@@ -453,7 +454,11 @@ CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar
IMoniker_ComposeWith
(
iface
,
antiMk
,
0
,
&
tempMk
);
IMoniker_ComposeWith
(
iface
,
antiMk
,
0
,
&
tempMk
);
IMoniker_Release
(
antiMk
);
IMoniker_Release
(
antiMk
);
return
IMoniker_Reduce
(
rightMostMk
,
pbc
,
dwReduceHowFar
,
&
tempMk
,
ppmkReduced
);
res
=
IMoniker_Reduce
(
rightMostMk
,
pbc
,
dwReduceHowFar
,
&
tempMk
,
ppmkReduced
);
IMoniker_Release
(
tempMk
);
IMoniker_Release
(
rightMostMk
);
return
res
;
}
}
else
if
(
*
ppmkToLeft
==
NULL
)
else
if
(
*
ppmkToLeft
==
NULL
)
...
@@ -473,13 +478,16 @@ CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar
...
@@ -473,13 +478,16 @@ CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar
/* If any of the components reduces itself, the method returns S_OK and passes back a composite */
/* If any of the components reduces itself, the method returns S_OK and passes back a composite */
/* of the reduced components */
/* of the reduced components */
if
(
IMoniker_Reduce
(
rightMostMk
,
pbc
,
dwReduceHowFar
,
NULL
,
&
rightMostReducedMk
)
&&
if
(
IMoniker_Reduce
(
rightMostMk
,
pbc
,
dwReduceHowFar
,
NULL
,
&
rightMostReducedMk
)
&&
IMoniker_Reduce
(
rightMostMk
,
pbc
,
dwReduceHowFar
,
&
tempMk
,
&
leftReducedComposedMk
)
IMoniker_Reduce
(
rightMostMk
,
pbc
,
dwReduceHowFar
,
&
tempMk
,
&
leftReducedComposedMk
)
){
)
IMoniker_Release
(
tempMk
);
IMoniker_Release
(
rightMostMk
);
return
CreateGenericComposite
(
leftReducedComposedMk
,
rightMostReducedMk
,
ppmkReduced
);
return
CreateGenericComposite
(
leftReducedComposedMk
,
rightMostReducedMk
,
ppmkReduced
);
}
else
{
else
{
/* If no reduction occurred, the method passes back the same moniker and returns MK_S_REDUCED_TO_SELF.*/
/* If no reduction occurred, the method passes back the same moniker and returns MK_S_REDUCED_TO_SELF.*/
IMoniker_Release
(
tempMk
);
IMoniker_Release
(
rightMostMk
);
IMoniker_AddRef
(
iface
);
IMoniker_AddRef
(
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