Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
f9b5280d
Commit
f9b5280d
authored
May 24, 2006
by
Robert Shearman
Committed by
Alexandre Julliard
May 25, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: Implement table-weak marshaling for the free-threaded marshaler.
parent
b795631d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
ftmarshal.c
dlls/ole32/ftmarshal.c
+6
-1
marshal.c
dlls/ole32/tests/marshal.c
+1
-1
No files found.
dlls/ole32/ftmarshal.c
View file @
f9b5280d
...
...
@@ -191,6 +191,10 @@ FTMarshalImpl_MarshalInterface (LPMARSHAL iface, IStream * pStm, REFIID riid, vo
if
(
FAILED
(
hres
))
return
hres
;
/* don't hold a reference to table-weak marshaled interfaces */
if
(
mshlflags
&
MSHLFLAGS_TABLEWEAK
)
IUnknown_Release
((
IUnknown
*
)
object
);
hres
=
IStream_Write
(
pStm
,
&
mshlflags
,
sizeof
(
mshlflags
),
NULL
);
if
(
hres
!=
S_OK
)
return
STG_E_MEDIUMFULL
;
...
...
@@ -258,7 +262,8 @@ FTMarshalImpl_UnmarshalInterface (LPMARSHAL iface, IStream * pStm, REFIID riid,
if
(
hres
!=
S_OK
)
return
STG_E_READFAULT
;
hres
=
IUnknown_QueryInterface
(
object
,
riid
,
ppv
);
IUnknown_Release
(
object
);
if
(
!
(
mshlflags
&
MSHLFLAGS_TABLEWEAK
))
IUnknown_Release
(
object
);
return
hres
;
}
}
...
...
dlls/ole32/tests/marshal.c
View file @
f9b5280d
...
...
@@ -1734,7 +1734,7 @@ static void test_freethreadedmarshaler(void)
MSHLFLAGS_TABLEWEAK
);
ok_ole_success
(
hr
,
IMarshal_MarshalInterface
);
todo_wine
ok_no_locks
();
ok_no_locks
();
test_freethreadedmarshaldata
(
pStream
,
MSHCTX_INPROC
,
&
Test_ClassFactory
,
MSHLFLAGS_TABLEWEAK
);
...
...
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