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
cc68fc44
Commit
cc68fc44
authored
May 14, 2009
by
Huw Davies
Committed by
Alexandre Julliard
May 18, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: Add support for marshalling pUnkForRelease.
parent
4581af58
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
usrmarshal.c
dlls/ole32/tests/usrmarshal.c
+4
-4
usrmarshal.c
dlls/ole32/usrmarshal.c
+3
-3
No files found.
dlls/ole32/tests/usrmarshal.c
View file @
cc68fc44
...
...
@@ -623,15 +623,15 @@ static void test_marshal_STGMEDIUM(void)
init_user_marshal_cb
(
&
umcb
,
&
stub_msg
,
&
rpc_msg
,
NULL
,
0
,
MSHCTX_DIFFERENTMACHINE
);
size
=
STGMEDIUM_UserSize
(
&
umcb
.
Flags
,
0
,
&
med
);
todo_wine
ok
(
size
==
unk_size
+
2
*
sizeof
(
DWORD
),
"size %d should be %d bytes
\n
"
,
size
,
unk_size
+
8
);
ok
(
size
==
unk_size
+
2
*
sizeof
(
DWORD
),
"size %d should be %d bytes
\n
"
,
size
,
unk_size
+
8
);
buffer
=
HeapAlloc
(
GetProcessHeap
(),
0
,
size
*
2
);
init_user_marshal_cb
(
&
umcb
,
&
stub_msg
,
&
rpc_msg
,
buffer
,
size
,
MSHCTX_DIFFERENTMACHINE
);
buffer_end
=
STGMEDIUM_UserMarshal
(
&
umcb
.
Flags
,
buffer
,
&
med
);
todo_wine
ok
(
buffer_end
-
buffer
-
2
*
sizeof
(
DWORD
)
==
unk_buffer_end
-
unk_buffer
,
"buffer size mismatch
\n
"
);
ok
(
buffer_end
-
buffer
-
2
*
sizeof
(
DWORD
)
==
unk_buffer_end
-
unk_buffer
,
"buffer size mismatch
\n
"
);
ok
(
*
(
DWORD
*
)
buffer
==
TYMED_NULL
,
"got %08x
\n
"
,
*
(
DWORD
*
)
buffer
);
ok
(
*
((
DWORD
*
)
buffer
+
1
)
!=
0
,
"got %08x
\n
"
,
*
((
DWORD
*
)
buffer
+
1
));
todo_wine
ok
(
!
memcmp
(
buffer
+
8
,
unk_buffer
,
unk_buffer_end
-
unk_buffer
),
"buffer mismatch
\n
"
);
ok
(
!
memcmp
(
buffer
+
8
,
unk_buffer
,
unk_buffer_end
-
unk_buffer
),
"buffer mismatch
\n
"
);
init_user_marshal_cb
(
&
umcb
,
&
stub_msg
,
&
rpc_msg
,
buffer
,
size
,
MSHCTX_DIFFERENTMACHINE
);
...
...
@@ -642,7 +642,7 @@ static void test_marshal_STGMEDIUM(void)
STGMEDIUM_UserUnmarshal
(
&
umcb
.
Flags
,
buffer
,
&
med2
);
ok
(
med2
.
tymed
==
TYMED_NULL
,
"got tymed %x
\n
"
,
med2
.
tymed
);
todo_wine
ok
(
med2
.
pUnkForRelease
!=
NULL
,
"Incorrectly unmarshalled
\n
"
);
ok
(
med2
.
pUnkForRelease
!=
NULL
,
"Incorrectly unmarshalled
\n
"
);
HeapFree
(
GetProcessHeap
(),
0
,
buffer
);
init_user_marshal_cb
(
&
umcb
,
&
stub_msg
,
&
rpc_msg
,
NULL
,
0
,
MSHCTX_DIFFERENTMACHINE
);
...
...
dlls/ole32/usrmarshal.c
View file @
cc68fc44
...
...
@@ -1808,7 +1808,7 @@ ULONG __RPC_USER STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, STGMEDIUM
}
if
(
pStgMedium
->
pUnkForRelease
)
FIXME
(
"buffer size pUnkForRelease
\n
"
);
size
=
WdtpInterfacePointer_UserSize
(
pFlags
,
LOWORD
(
*
pFlags
),
size
,
pStgMedium
->
pUnkForRelease
,
&
IID_IUnknown
);
return
size
;
}
...
...
@@ -1914,7 +1914,7 @@ unsigned char * __RPC_USER STGMEDIUM_UserMarshal(ULONG *pFlags, unsigned char *p
}
if
(
pStgMedium
->
pUnkForRelease
)
FIXME
(
"marshal pUnkForRelease
\n
"
);
pBuffer
=
WdtpInterfacePointer_UserMarshal
(
pFlags
,
LOWORD
(
*
pFlags
),
pBuffer
,
pStgMedium
->
pUnkForRelease
,
&
IID_IUnknown
);
return
pBuffer
;
}
...
...
@@ -2053,7 +2053,7 @@ unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char
pStgMedium
->
pUnkForRelease
=
NULL
;
if
(
releaseunk
)
FIXME
(
"unmarshal pUnkForRelease
\n
"
);
pBuffer
=
WdtpInterfacePointer_UserUnmarshal
(
pFlags
,
pBuffer
,
&
pStgMedium
->
pUnkForRelease
,
&
IID_IUnknown
);
return
pBuffer
;
}
...
...
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