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
e68d6c16
Commit
e68d6c16
authored
Jul 06, 2023
by
Jacek Caban
Committed by
Alexandre Julliard
Jul 06, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
include: Don't force named VARIANT members when __STDC__ is defined.
parent
28f3128d
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
24 deletions
+18
-24
usrmarshal.c
dlls/oleaut32/tests/usrmarshal.c
+9
-15
usrmarshal.c
dlls/oleaut32/usrmarshal.c
+6
-6
oaidl.idl
include/oaidl.idl
+1
-1
oleauto.h
include/oleauto.h
+2
-2
No files found.
dlls/oleaut32/tests/usrmarshal.c
View file @
e68d6c16
...
...
@@ -30,12 +30,6 @@
#include "wine/test.h"
#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION)
# define V_U2(A) ((A)->n1.n2)
#else
# define V_U2(A) (*(A))
#endif
typedef
struct
{
IUnknown
IUnknown_iface
;
...
...
@@ -870,9 +864,9 @@ static DWORD *check_variant_header(DWORD *wirev, VARIANT *v, ULONG size)
ok
(
header
->
clSize
==
(
size
+
7
)
>>
3
,
"wv[0] %08lx, expected %08lx
\n
"
,
header
->
clSize
,
(
size
+
7
)
>>
3
);
ok
(
header
->
rpcReserved
==
0
,
"wv[1] %08lx
\n
"
,
header
->
rpcReserved
);
ok
(
header
->
vt
==
V_VT
(
v
),
"vt %04x expected %04x
\n
"
,
header
->
vt
,
V_VT
(
v
));
ok
(
header
->
wReserved1
==
V_U2
(
v
).
wReserved1
,
"res1 %04x expected %04x
\n
"
,
header
->
wReserved1
,
V_U2
(
v
).
wReserved1
);
ok
(
header
->
wReserved2
==
V_U2
(
v
).
wReserved2
,
"res2 %04x expected %04x
\n
"
,
header
->
wReserved2
,
V_U2
(
v
).
wReserved2
);
ok
(
header
->
wReserved3
==
V_U2
(
v
).
wReserved3
,
"res3 %04x expected %04x
\n
"
,
header
->
wReserved3
,
V_U2
(
v
).
wReserved3
);
ok
(
header
->
wReserved1
==
v
->
wReserved1
,
"res1 %04x expected %04x
\n
"
,
header
->
wReserved1
,
v
->
wReserved1
);
ok
(
header
->
wReserved2
==
v
->
wReserved2
,
"res2 %04x expected %04x
\n
"
,
header
->
wReserved2
,
v
->
wReserved2
);
ok
(
header
->
wReserved3
==
v
->
wReserved3
,
"res3 %04x expected %04x
\n
"
,
header
->
wReserved3
,
v
->
wReserved3
);
switch_is
=
V_VT
(
v
);
if
(
switch_is
&
VT_ARRAY
)
...
...
@@ -938,9 +932,9 @@ static void test_marshal_VARIANT(void)
/* check_variant_header tests wReserved[123], so initialize to unique values.
* (Could probably also do this by setting the variant to a known DECIMAL.)
*/
V_U2
(
&
v
)
.
wReserved1
=
0x1234
;
V_U2
(
&
v
)
.
wReserved2
=
0x5678
;
V_U2
(
&
v
)
.
wReserved3
=
0x9abc
;
v
.
wReserved1
=
0x1234
;
v
.
wReserved2
=
0x5678
;
v
.
wReserved3
=
0x9abc
;
/* Variants have an alignment of 8 */
rpcMsg
.
BufferLength
=
stubMsg
.
BufferLength
=
VARIANT_UserSize
(
&
umcb
.
Flags
,
1
,
&
v
);
...
...
@@ -1306,9 +1300,9 @@ static void test_marshal_VARIANT(void)
/* check_variant_header tests wReserved[123], so initialize to unique values.
* (Could probably also do this by setting the variant to a known DECIMAL.)
*/
V_U2
(
&
v2
)
.
wReserved1
=
0x0123
;
V_U2
(
&
v2
)
.
wReserved2
=
0x4567
;
V_U2
(
&
v2
)
.
wReserved3
=
0x89ab
;
v2
.
wReserved1
=
0x0123
;
v2
.
wReserved2
=
0x4567
;
v2
.
wReserved3
=
0x89ab
;
stubMsg
.
Buffer
=
buffer
;
next
=
VARIANT_UserUnmarshal
(
&
umcb
.
Flags
,
buffer
,
&
v2
);
...
...
dlls/oleaut32/usrmarshal.c
View file @
e68d6c16
...
...
@@ -400,9 +400,9 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer,
header
->
clSize
=
0
;
/* fixed up at the end */
header
->
rpcReserved
=
0
;
header
->
vt
=
V_VT
(
pvar
);
header
->
wReserved1
=
pvar
->
n1
.
n2
.
wReserved1
;
header
->
wReserved2
=
pvar
->
n1
.
n2
.
wReserved2
;
header
->
wReserved3
=
pvar
->
n1
.
n2
.
wReserved3
;
header
->
wReserved1
=
pvar
->
wReserved1
;
header
->
wReserved2
=
pvar
->
wReserved2
;
header
->
wReserved3
=
pvar
->
wReserved3
;
header
->
switch_is
=
V_VT
(
pvar
);
if
(
header
->
switch_is
&
VT_ARRAY
)
header
->
switch_is
&=
~
VT_TYPEMASK
;
...
...
@@ -566,9 +566,9 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe
}
V_VT
(
pvar
)
=
header
->
vt
;
pvar
->
n1
.
n2
.
wReserved1
=
header
->
wReserved1
;
pvar
->
n1
.
n2
.
wReserved2
=
header
->
wReserved2
;
pvar
->
n1
.
n2
.
wReserved3
=
header
->
wReserved3
;
pvar
->
wReserved1
=
header
->
wReserved1
;
pvar
->
wReserved2
=
header
->
wReserved2
;
pvar
->
wReserved3
=
header
->
wReserved3
;
if
(
header
->
vt
&
VT_ARRAY
)
{
...
...
include/oaidl.idl
View file @
e68d6c16
...
...
@@ -142,7 +142,7 @@ const USHORT FADF_CREATEVECTOR = 0x2000; /* This array is a vector */
/*
Variant
*/
cpp_quote
(
"#if
(__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION)
"
)
cpp_quote
(
"#if
def NONAMELESSUNION
"
)
cpp_quote
(
"#define __VARIANT_NAME_1 n1"
)
cpp_quote
(
"#define __VARIANT_NAME_2 n2"
)
cpp_quote
(
"#define __VARIANT_NAME_3 n3"
)
...
...
include/oleauto.h
View file @
e68d6c16
...
...
@@ -112,7 +112,7 @@ WINOLEAUTAPI HRESULT WINAPI GetRecordInfoFromGuids(REFGUID,ULONG,ULONG,LCID,REFG
*/
/* Macros for accessing the fields of the VARIANT type */
#if
(__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION)
#if
def NONAMELESSUNION
#define V_VT(A) ((A)->n1.n2.vt)
#define V_UNION(A,B) ((A)->n1.n2.n3.B)
#define V_RECORD(A) (V_UNION(A,brecVal).pvRecord)
...
...
@@ -140,7 +140,7 @@ WINOLEAUTAPI HRESULT WINAPI GetRecordInfoFromGuids(REFGUID,ULONG,ULONG,LCID,REFG
#define V_CYREF(A) V_UNION(A,pcyVal)
#define V_DATE(A) V_UNION(A,date)
#define V_DATEREF(A) V_UNION(A,pdate)
#if
(__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION)
#if
def NONAMELESSUNION
#define V_DECIMAL(A) ((A)->n1.decVal)
#else
#define V_DECIMAL(A) ((A)->decVal)
...
...
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