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
1d15103c
Commit
1d15103c
authored
Oct 14, 2018
by
Zebediah Figura
Committed by
Alexandre Julliard
Oct 16, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Handle VT_(U)I8 in get_type_size().
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
66700489
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
0 deletions
+33
-0
usrmarshal.c
dlls/oleaut32/tests/usrmarshal.c
+30
-0
usrmarshal.c
dlls/oleaut32/usrmarshal.c
+3
-0
No files found.
dlls/oleaut32/tests/usrmarshal.c
View file @
1d15103c
...
...
@@ -964,6 +964,36 @@ static void test_marshal_VARIANT(void)
VARIANT_UserFree
(
&
umcb
.
Flags
,
&
v2
);
HeapFree
(
GetProcessHeap
(),
0
,
oldbuffer
);
/*** I8 ***/
VariantInit
(
&
v
);
V_VT
(
&
v
)
=
VT_I8
;
V_I8
(
&
v
)
=
(
LONGLONG
)
1000000
*
1000000
;
rpcMsg
.
BufferLength
=
stubMsg
.
BufferLength
=
VARIANT_UserSize
(
&
umcb
.
Flags
,
0
,
&
v
);
ok
(
stubMsg
.
BufferLength
==
32
,
"size %d
\n
"
,
stubMsg
.
BufferLength
);
buffer
=
rpcMsg
.
Buffer
=
stubMsg
.
Buffer
=
stubMsg
.
BufferStart
=
alloc_aligned
(
stubMsg
.
BufferLength
,
&
oldbuffer
);
stubMsg
.
BufferEnd
=
stubMsg
.
Buffer
+
stubMsg
.
BufferLength
;
memset
(
buffer
,
0xcc
,
stubMsg
.
BufferLength
);
next
=
VARIANT_UserMarshal
(
&
umcb
.
Flags
,
buffer
,
&
v
);
ok
(
next
==
buffer
+
stubMsg
.
BufferLength
,
"got %p expect %p
\n
"
,
next
,
buffer
+
stubMsg
.
BufferLength
);
wirev
=
(
DWORD
*
)
buffer
;
wirev
=
check_variant_header
(
wirev
,
&
v
,
stubMsg
.
BufferLength
);
ok
(
*
wirev
==
0xcccccccc
,
"wv[5] %08x
\n
"
,
*
wirev
);
/* pad */
wirev
++
;
ok
(
*
(
LONGLONG
*
)
wirev
==
V_I8
(
&
v
),
"wv[6] %s
\n
"
,
wine_dbgstr_longlong
(
*
(
LONGLONG
*
)
wirev
));
VariantInit
(
&
v2
);
stubMsg
.
Buffer
=
buffer
;
next
=
VARIANT_UserUnmarshal
(
&
umcb
.
Flags
,
buffer
,
&
v2
);
ok
(
next
==
buffer
+
stubMsg
.
BufferLength
,
"got %p expect %p
\n
"
,
next
,
buffer
+
stubMsg
.
BufferLength
);
ok
(
V_VT
(
&
v
)
==
V_VT
(
&
v2
),
"got vt %d expect %d
\n
"
,
V_VT
(
&
v
),
V_VT
(
&
v2
));
ok
(
V_I8
(
&
v
)
==
V_I8
(
&
v2
),
"got i8 %s expect %s
\n
"
,
wine_dbgstr_longlong
(
V_I8
(
&
v
)),
wine_dbgstr_longlong
(
V_I8
(
&
v2
)));
VARIANT_UserFree
(
&
umcb
.
Flags
,
&
v2
);
HeapFree
(
GetProcessHeap
(),
0
,
oldbuffer
);
/*** R4 ***/
VariantInit
(
&
v
);
V_VT
(
&
v
)
=
VT_R4
;
...
...
dlls/oleaut32/usrmarshal.c
View file @
1d15103c
...
...
@@ -227,6 +227,9 @@ unsigned int get_type_size(ULONG *pFlags, VARTYPE vt)
case
VT_INT
:
case
VT_UINT
:
return
sizeof
(
INT
);
case
VT_I8
:
case
VT_UI8
:
return
sizeof
(
LONGLONG
);
case
VT_R4
:
return
sizeof
(
FLOAT
);
case
VT_R8
:
...
...
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