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
4e05e6d6
Commit
4e05e6d6
authored
Mar 24, 2021
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 24, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell32/tests: Use nameless unions.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
b9a8437d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
Makefile.in
dlls/shell32/tests/Makefile.in
+0
-1
shellole.c
dlls/shell32/tests/shellole.c
+6
-6
No files found.
dlls/shell32/tests/Makefile.in
View file @
4e05e6d6
TESTDLL
=
shell32.dll
TESTDLL
=
shell32.dll
IMPORTS
=
shell32 ole32 oleaut32 user32 gdi32 advapi32 shlwapi
IMPORTS
=
shell32 ole32 oleaut32 user32 gdi32 advapi32 shlwapi
EXTRADEFS
=
-DWINE_NO_NAMELESS_EXTENSION
C_SRCS
=
\
C_SRCS
=
\
appbar.c
\
appbar.c
\
...
...
dlls/shell32/tests/shellole.c
View file @
4e05e6d6
...
@@ -120,7 +120,7 @@ static HRESULT WINAPI PropertyStorage_ReadMultiple(IPropertyStorage *This, ULONG
...
@@ -120,7 +120,7 @@ static HRESULT WINAPI PropertyStorage_ReadMultiple(IPropertyStorage *This, ULONG
ok
(
rgpspec
[
0
].
u
.
propid
==
PID_CODEPAGE
,
"rgpspec[0].propid = %d
\n
"
,
rgpspec
[
0
].
u
.
propid
);
ok
(
rgpspec
[
0
].
u
.
propid
==
PID_CODEPAGE
,
"rgpspec[0].propid = %d
\n
"
,
rgpspec
[
0
].
u
.
propid
);
rgpropvar
[
0
].
vt
=
VT_I2
;
rgpropvar
[
0
].
vt
=
VT_I2
;
rgpropvar
[
0
].
u
.
iVal
=
1234
;
rgpropvar
[
0
].
iVal
=
1234
;
}
else
{
}
else
{
CHECK_EXPECT
(
ReadMultiple
);
CHECK_EXPECT
(
ReadMultiple
);
...
@@ -131,13 +131,13 @@ static HRESULT WINAPI PropertyStorage_ReadMultiple(IPropertyStorage *This, ULONG
...
@@ -131,13 +131,13 @@ static HRESULT WINAPI PropertyStorage_ReadMultiple(IPropertyStorage *This, ULONG
ok
(
rgpropvar
[
0
].
vt
==
0
||
broken
(
rgpropvar
[
0
].
vt
==
VT_BSTR
),
"rgpropvar[0].vt = %d
\n
"
,
rgpropvar
[
0
].
vt
);
ok
(
rgpropvar
[
0
].
vt
==
0
||
broken
(
rgpropvar
[
0
].
vt
==
VT_BSTR
),
"rgpropvar[0].vt = %d
\n
"
,
rgpropvar
[
0
].
vt
);
rgpropvar
[
0
].
vt
=
VT_BSTR
;
rgpropvar
[
0
].
vt
=
VT_BSTR
;
rgpropvar
[
0
].
u
.
bstrVal
=
(
void
*
)
0xdeadbeef
;
rgpropvar
[
0
].
bstrVal
=
(
void
*
)
0xdeadbeef
;
rgpropvar
[
1
].
vt
=
VT_LPSTR
;
rgpropvar
[
1
].
vt
=
VT_LPSTR
;
rgpropvar
[
1
].
u
.
pszVal
=
(
void
*
)
0xdeadbeef
;
rgpropvar
[
1
].
pszVal
=
(
void
*
)
0xdeadbeef
;
rgpropvar
[
2
].
vt
=
VT_BYREF
|
VT_I1
;
rgpropvar
[
2
].
vt
=
VT_BYREF
|
VT_I1
;
rgpropvar
[
2
].
u
.
pcVal
=
(
void
*
)
0xdeadbeef
;
rgpropvar
[
2
].
pcVal
=
(
void
*
)
0xdeadbeef
;
rgpropvar
[
3
].
vt
=
VT_BYREF
|
VT_VARIANT
;
rgpropvar
[
3
].
vt
=
VT_BYREF
|
VT_VARIANT
;
rgpropvar
[
3
].
u
.
pvarVal
=
(
void
*
)
0xdeadbeef
;
rgpropvar
[
3
].
pvarVal
=
(
void
*
)
0xdeadbeef
;
}
}
return
S_OK
;
return
S_OK
;
...
@@ -420,7 +420,7 @@ static void test_SHPropStg_functions(void)
...
@@ -420,7 +420,7 @@ static void test_SHPropStg_functions(void)
CHECK_CALLED
(
WriteMultiple
);
CHECK_CALLED
(
WriteMultiple
);
read
[
0
].
vt
=
VT_BSTR
;
read
[
0
].
vt
=
VT_BSTR
;
read
[
0
].
u
.
bstrVal
=
(
void
*
)
0xdeadbeef
;
read
[
0
].
bstrVal
=
(
void
*
)
0xdeadbeef
;
SET_EXPECT
(
ReadMultiple
);
SET_EXPECT
(
ReadMultiple
);
SET_EXPECT
(
ReadMultipleCodePage
);
SET_EXPECT
(
ReadMultipleCodePage
);
SET_EXPECT
(
Stat
);
SET_EXPECT
(
Stat
);
...
...
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