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
1360357f
Commit
1360357f
authored
Apr 05, 2007
by
Rob Shearman
Committed by
Alexandre Julliard
Apr 06, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: Fix a hack which depended on the IID of the interface being marshaled
to determine whether we were marshaling the remote unknown for the apartment or not.
parent
fbe37d1b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
7 deletions
+5
-7
compobj_private.h
dlls/ole32/compobj_private.h
+3
-0
stubmanager.c
dlls/ole32/stubmanager.c
+2
-2
marshal.c
dlls/ole32/tests/marshal.c
+0
-5
No files found.
dlls/ole32/compobj_private.h
View file @
1360357f
...
...
@@ -45,6 +45,9 @@ DEFINE_OLEGUID( CLSID_DfMarshal, 0x0000030b, 0, 0 );
DEFINE_OLEGUID
(
CLSID_PSFactoryBuffer
,
0x00000320
,
0
,
0
);
DEFINE_OLEGUID
(
CLSID_InProcFreeMarshaler
,
0x0000033a
,
0
,
0
);
/* signal to stub manager that this is a rem unknown object */
#define MSHLFLAGSP_REMUNKNOWN 0x80000000
/* Thread-safety Annotation Legend:
*
* RO - The value is read only. It never changes after creation, so no
...
...
dlls/ole32/stubmanager.c
View file @
1360357f
...
...
@@ -471,7 +471,7 @@ struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *s
/* FIXME: find a cleaner way of identifying that we are creating an ifstub
* for the remunknown interface */
if
(
IsEqualIID
(
iid
,
&
IID_IRemUnknown
)
)
if
(
flags
&
MSHLFLAGSP_REMUNKNOWN
)
stub
->
ipid
=
m
->
oxid_info
.
ipidRemUnknown
;
else
generate_ipid
(
m
,
&
stub
->
ipid
);
...
...
@@ -763,7 +763,7 @@ HRESULT start_apartment_remote_unknown(void)
{
STDOBJREF
stdobjref
;
/* dummy - not used */
/* register it with the stub manager */
hr
=
marshal_object
(
apt
,
&
stdobjref
,
&
IID_IRemUnknown
,
(
IUnknown
*
)
pRemUnknown
,
MSHLFLAGS_NORMAL
);
hr
=
marshal_object
(
apt
,
&
stdobjref
,
&
IID_IRemUnknown
,
(
IUnknown
*
)
pRemUnknown
,
MSHLFLAGS_NORMAL
|
MSHLFLAGSP_REMUNKNOWN
);
/* release our reference to the object as the stub manager will manage the life cycle for us */
IRemUnknown_Release
(
pRemUnknown
);
if
(
hr
==
S_OK
)
...
...
dlls/ole32/tests/marshal.c
View file @
1360357f
...
...
@@ -2199,12 +2199,7 @@ static void test_client_security(void)
CoTaskMemFree
(
pServerPrincName
);
IClassFactory_Release
(
pProxy
);
#if 0
/* FIXME: fix stub manager to not depend on the IID of the interface to
* determine whether it is really the rem unknown for the object before
* re-enabling this line */
IUnknown_Release
(
pProxy2
);
#endif
IUnknown_Release
(
pUnknown1
);
IUnknown_Release
(
pUnknown2
);
IMarshal_Release
(
pMarshal
);
...
...
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