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
2891bc53
Commit
2891bc53
authored
Jan 12, 2005
by
Robert Shearman
Committed by
Alexandre Julliard
Jan 12, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove wine_marshal_data: it is unneeded and there is no equivalent in
STDOBJREF.
parent
a1e304a2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
18 deletions
+1
-18
marshal.c
dlls/ole32/marshal.c
+1
-18
No files found.
dlls/ole32/marshal.c
View file @
2891bc53
...
...
@@ -76,11 +76,6 @@ get_facbuf_for_iid(REFIID riid,IPSFactoryBuffer **facbuf) {
return
CoGetClassObject
(
&
pxclsid
,
CLSCTX_INPROC_SERVER
,
NULL
,
&
IID_IPSFactoryBuffer
,(
LPVOID
*
)
facbuf
);
}
typedef
struct
_wine_marshal_data
{
DWORD
dwDestContext
;
DWORD
mshlflags
;
}
wine_marshal_data
;
IRpcStubBuffer
*
mid_to_stubbuffer
(
wine_marshal_id
*
mid
)
{
IRpcStubBuffer
*
ret
;
...
...
@@ -477,7 +472,7 @@ StdMarshalImpl_GetMarshalSizeMax(
LPMARSHAL
iface
,
REFIID
riid
,
void
*
pv
,
DWORD
dwDestContext
,
void
*
pvDestContext
,
DWORD
mshlflags
,
DWORD
*
pSize
)
{
*
pSize
=
sizeof
(
wine_marshal_id
)
+
sizeof
(
wine_marshal_data
)
;
*
pSize
=
sizeof
(
wine_marshal_id
);
return
S_OK
;
}
...
...
@@ -487,7 +482,6 @@ StdMarshalImpl_MarshalInterface(
void
*
pvDestContext
,
DWORD
mshlflags
)
{
wine_marshal_id
mid
;
wine_marshal_data
md
;
IUnknown
*
pUnk
;
ULONG
res
;
HRESULT
hres
;
...
...
@@ -541,12 +535,6 @@ StdMarshalImpl_MarshalInterface(
hres
=
IStream_Write
(
pStm
,
&
mid
,
sizeof
(
mid
),
&
res
);
if
(
hres
)
return
hres
;
/* and then the marshal data */
md
.
dwDestContext
=
dwDestContext
;
md
.
mshlflags
=
mshlflags
;
hres
=
IStream_Write
(
pStm
,
&
md
,
sizeof
(
md
),
&
res
);
if
(
hres
)
return
hres
;
return
S_OK
;
}
...
...
@@ -555,7 +543,6 @@ StdMarshalImpl_UnmarshalInterface(LPMARSHAL iface, IStream *pStm, REFIID riid, v
{
struct
stub_manager
*
stubmgr
;
wine_marshal_id
mid
;
wine_marshal_data
md
;
ULONG
res
;
HRESULT
hres
;
IRpcChannelBuffer
*
chanbuf
;
...
...
@@ -568,8 +555,6 @@ StdMarshalImpl_UnmarshalInterface(LPMARSHAL iface, IStream *pStm, REFIID riid, v
hres
=
IStream_Read
(
pStm
,
&
mid
,
sizeof
(
mid
),
&
res
);
if
(
hres
)
return
hres
;
hres
=
IStream_Read
(
pStm
,
&
md
,
sizeof
(
md
),
&
res
);
if
(
hres
)
return
hres
;
/* check if we're marshalling back to ourselves */
/* FIXME: commented out until we can get the tests passing with it uncommented. */
...
...
@@ -578,8 +563,6 @@ StdMarshalImpl_UnmarshalInterface(LPMARSHAL iface, IStream *pStm, REFIID riid, v
TRACE
(
"Unmarshalling object marshalled in same apartment for iid %s, returning original object %p
\n
"
,
debugstr_guid
(
riid
),
stubmgr
->
object
);
hres
=
IUnknown_QueryInterface
(
stubmgr
->
object
,
riid
,
ppv
);
if
((
md
.
mshlflags
&
MSHLFLAGS_TABLESTRONG
)
||
(
md
.
mshlflags
&
MSHLFLAGS_TABLEWEAK
))
FIXME
(
"table marshalling unimplemented
\n
"
);
/* unref the ifstub. FIXME: only do this on success? */
stub_manager_ext_release
(
stubmgr
,
1
);
...
...
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