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
f2dc25a5
Commit
f2dc25a5
authored
Jun 14, 2006
by
Robert Shearman
Committed by
Alexandre Julliard
Jun 15, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: Always rewind the stream in StdGlobalInterfaceTable_GetInterfaceFromGlobal
as CoUnmarshalInterface may have advanced the stream, even if it failed.
parent
fa757df8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
git.c
dlls/ole32/git.c
+5
-4
marshal.c
dlls/ole32/tests/marshal.c
+1
-1
No files found.
dlls/ole32/git.c
View file @
f2dc25a5
...
...
@@ -298,16 +298,17 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal(
/* unmarshal the interface */
hres
=
CoUnmarshalInterface
(
entry
->
stream
,
riid
,
ppv
);
if
(
hres
)
{
WARN
(
"Failed to unmarshal stream
\n
"
);
return
hres
;
}
/* rewind stream, in case it's used again */
move
.
u
.
LowPart
=
0
;
move
.
u
.
HighPart
=
0
;
IStream_Seek
(
entry
->
stream
,
move
,
STREAM_SEEK_SET
,
NULL
);
if
(
hres
)
{
WARN
(
"Failed to unmarshal stream
\n
"
);
return
hres
;
}
/* addref it */
lpUnk
=
*
ppv
;
IUnknown_AddRef
(
lpUnk
);
...
...
dlls/ole32/tests/marshal.c
View file @
f2dc25a5
...
...
@@ -1978,7 +1978,7 @@ static DWORD CALLBACK get_global_interface_proc(LPVOID pv)
CoInitialize
(
NULL
);
hr
=
IGlobalInterfaceTable_GetInterfaceFromGlobal
(
params
->
git
,
params
->
cookie
,
&
IID_IClassFactory
,
(
void
**
)
&
cf
);
todo_wine
ok_ole_success
(
hr
,
IGlobalInterfaceTable_GetInterfaceFromGlobal
);
ok_ole_success
(
hr
,
IGlobalInterfaceTable_GetInterfaceFromGlobal
);
CoUninitialize
();
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