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
f42ab60a
Commit
f42ab60a
authored
Mar 08, 2022
by
Eric Pouech
Committed by
Alexandre Julliard
Mar 08, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wer/tests: Enable compilation with long types.
Signed-off-by:
Eric Pouech
<
eric.pouech@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
2fec470a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
42 deletions
+41
-42
Makefile.in
dlls/wer/tests/Makefile.in
+0
-1
main.c
dlls/wer/tests/main.c
+41
-41
No files found.
dlls/wer/tests/Makefile.in
View file @
f42ab60a
EXTRADEFS
=
-DWINE_NO_LONG_TYPES
TESTDLL
=
wer.dll
IMPORTS
=
wer
...
...
dlls/wer/tests/main.c
View file @
f42ab60a
...
...
@@ -42,43 +42,43 @@ static void test_WerAddExcludedApplication(void)
/* clean state */
hr
=
WerRemoveExcludedApplication
(
winetest_wer
,
FALSE
);
ok
((
hr
==
S_OK
)
||
(
hr
==
E_FAIL
)
||
(
hr
==
__HRESULT_FROM_WIN32
(
ERROR_ENVVAR_NOT_FOUND
)),
"got 0x%x (expected S_OK, E_FAIL or HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND))
\n
"
,
hr
);
"got 0x%
l
x (expected S_OK, E_FAIL or HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND))
\n
"
,
hr
);
hr
=
WerAddExcludedApplication
(
NULL
,
FALSE
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%x (expected E_INVALIDARG)
\n
"
,
hr
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%
l
x (expected E_INVALIDARG)
\n
"
,
hr
);
hr
=
WerAddExcludedApplication
(
L""
,
FALSE
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%x (expected E_INVALIDARG)
\n
"
,
hr
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%
l
x (expected E_INVALIDARG)
\n
"
,
hr
);
hr
=
WerAddExcludedApplication
(
winetest_wer
,
FALSE
);
ok
(
hr
==
S_OK
,
"got 0x%x (expected S_OK)
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got 0x%
l
x (expected S_OK)
\n
"
,
hr
);
/* app already in the list */
hr
=
WerAddExcludedApplication
(
winetest_wer
,
FALSE
);
ok
(
hr
==
S_OK
,
"got 0x%x (expected S_OK)
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got 0x%
l
x (expected S_OK)
\n
"
,
hr
);
/* cleanup */
hr
=
WerRemoveExcludedApplication
(
winetest_wer
,
FALSE
);
ok
(
hr
==
S_OK
,
"got 0x%x (expected S_OK)
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got 0x%
l
x (expected S_OK)
\n
"
,
hr
);
/* appname has a path */
res
=
GetWindowsDirectoryW
(
buffer
,
ARRAY_SIZE
(
buffer
));
if
(
res
>
0
)
{
/* the last part from the path is added to the inclusion list */
hr
=
WerAddExcludedApplication
(
buffer
,
FALSE
);
ok
(
hr
==
S_OK
,
"got 0x%x (expected S_OK)
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got 0x%
l
x (expected S_OK)
\n
"
,
hr
);
hr
=
WerRemoveExcludedApplication
(
buffer
,
FALSE
);
ok
(
hr
==
S_OK
,
"got 0x%x (expected S_OK)
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got 0x%
l
x (expected S_OK)
\n
"
,
hr
);
lstrcatW
(
buffer
,
L"
\\
"
);
hr
=
WerAddExcludedApplication
(
buffer
,
FALSE
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%x (expected E_INVALIDARG)
\n
"
,
hr
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%
l
x (expected E_INVALIDARG)
\n
"
,
hr
);
lstrcatW
(
buffer
,
winetest_wer
);
hr
=
WerAddExcludedApplication
(
buffer
,
FALSE
);
ok
(
hr
==
S_OK
,
"got 0x%x (expected S_OK)
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got 0x%
l
x (expected S_OK)
\n
"
,
hr
);
hr
=
WerRemoveExcludedApplication
(
buffer
,
FALSE
);
ok
(
hr
==
S_OK
,
"got 0x%x (expected S_OK)
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got 0x%
l
x (expected S_OK)
\n
"
,
hr
);
}
}
...
...
@@ -94,49 +94,49 @@ static void test_WerRemoveExcludedApplication(void)
/* clean state */
hr
=
WerRemoveExcludedApplication
(
winetest_wer
,
FALSE
);
ok
((
hr
==
S_OK
)
||
(
hr
==
E_FAIL
)
||
(
hr
==
__HRESULT_FROM_WIN32
(
ERROR_ENVVAR_NOT_FOUND
)),
"got 0x%x (expected S_OK, E_FAIL or HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND))
\n
"
,
hr
);
"got 0x%
l
x (expected S_OK, E_FAIL or HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND))
\n
"
,
hr
);
hr
=
WerAddExcludedApplication
(
winetest_wer
,
FALSE
);
ok
(
hr
==
S_OK
,
"got 0x%x (expected S_OK)
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got 0x%
l
x (expected S_OK)
\n
"
,
hr
);
hr
=
WerRemoveExcludedApplication
(
NULL
,
FALSE
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%x (expected E_INVALIDARG)
\n
"
,
hr
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%
l
x (expected E_INVALIDARG)
\n
"
,
hr
);
hr
=
WerRemoveExcludedApplication
(
L""
,
FALSE
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%x (expected E_INVALIDARG)
\n
"
,
hr
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%
l
x (expected E_INVALIDARG)
\n
"
,
hr
);
hr
=
WerRemoveExcludedApplication
(
winetest_wer
,
FALSE
);
ok
(
hr
==
S_OK
,
"got 0x%x (expected S_OK)
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got 0x%
l
x (expected S_OK)
\n
"
,
hr
);
/* app not in the list */
hr
=
WerRemoveExcludedApplication
(
winetest_wer
,
FALSE
);
ok
((
hr
==
E_FAIL
)
||
(
hr
==
__HRESULT_FROM_WIN32
(
ERROR_ENVVAR_NOT_FOUND
)),
"got 0x%x (expected E_FAIL or HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND))
\n
"
,
hr
);
"got 0x%
l
x (expected E_FAIL or HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND))
\n
"
,
hr
);
/* appname has a path */
res
=
GetWindowsDirectoryW
(
buffer
,
ARRAY_SIZE
(
buffer
));
if
(
res
>
0
)
{
hr
=
WerRemoveExcludedApplication
(
buffer
,
FALSE
);
ok
((
hr
==
E_FAIL
)
||
(
hr
==
__HRESULT_FROM_WIN32
(
ERROR_ENVVAR_NOT_FOUND
)),
"got 0x%x (expected E_FAIL or HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND))
\n
"
,
hr
);
"got 0x%
l
x (expected E_FAIL or HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND))
\n
"
,
hr
);
/* the last part from the path is added to the inclusion list */
hr
=
WerAddExcludedApplication
(
buffer
,
FALSE
);
ok
(
hr
==
S_OK
,
"got 0x%x (expected S_OK)
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got 0x%
l
x (expected S_OK)
\n
"
,
hr
);
hr
=
WerRemoveExcludedApplication
(
buffer
,
FALSE
);
ok
(
hr
==
S_OK
,
"got 0x%x (expected S_OK)
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got 0x%
l
x (expected S_OK)
\n
"
,
hr
);
lstrcatW
(
buffer
,
L"
\\
"
);
hr
=
WerAddExcludedApplication
(
buffer
,
FALSE
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%x (expected E_INVALIDARG)
\n
"
,
hr
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%
l
x (expected E_INVALIDARG)
\n
"
,
hr
);
hr
=
WerRemoveExcludedApplication
(
buffer
,
FALSE
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%x (expected E_INVALIDARG)
\n
"
,
hr
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%
l
x (expected E_INVALIDARG)
\n
"
,
hr
);
lstrcatW
(
buffer
,
winetest_wer
);
hr
=
WerAddExcludedApplication
(
buffer
,
FALSE
);
ok
(
hr
==
S_OK
,
"got 0x%x (expected S_OK)
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got 0x%
l
x (expected S_OK)
\n
"
,
hr
);
hr
=
WerRemoveExcludedApplication
(
buffer
,
FALSE
);
ok
(
hr
==
S_OK
,
"got 0x%x (expected S_OK)
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got 0x%
l
x (expected S_OK)
\n
"
,
hr
);
}
}
...
...
@@ -149,7 +149,7 @@ static void test_WerReportCloseHandle(void)
report
=
(
void
*
)
0xdeadbeef
;
hr
=
WerReportCreate
(
L"APPCRASH"
,
WerReportCritical
,
NULL
,
&
report
);
ok
(
hr
==
S_OK
,
"got 0x%x and %p (expected S_OK)
\n
"
,
hr
,
report
);
ok
(
hr
==
S_OK
,
"got 0x%
l
x and %p (expected S_OK)
\n
"
,
hr
,
report
);
if
(
!
report
)
{
skip
(
"Nothing left to test
\n
"
);
...
...
@@ -158,14 +158,14 @@ static void test_WerReportCloseHandle(void)
/* close the handle */
hr
=
WerReportCloseHandle
(
report
);
ok
(
hr
==
S_OK
,
"got 0x%x for %p (expected S_OK)
\n
"
,
hr
,
report
);
ok
(
hr
==
S_OK
,
"got 0x%
l
x for %p (expected S_OK)
\n
"
,
hr
,
report
);
/* close the handle again */
hr
=
WerReportCloseHandle
(
report
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%x for %p again (expected E_INVALIDARG)
\n
"
,
hr
,
report
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%
l
x for %p again (expected E_INVALIDARG)
\n
"
,
hr
,
report
);
hr
=
WerReportCloseHandle
(
NULL
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%x for NULL(expected E_INVALIDARG)
\n
"
,
hr
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%
l
x for NULL(expected E_INVALIDARG)
\n
"
,
hr
);
}
/* #### */
...
...
@@ -180,7 +180,7 @@ static void test_WerReportCreate(void)
report
=
(
void
*
)
0xdeadbeef
;
/* test a simple valid case */
hr
=
WerReportCreate
(
L"APPCRASH"
,
WerReportCritical
,
NULL
,
&
report
);
ok
(
hr
==
S_OK
,
"got 0x%x and %p (expected S_OK)
\n
"
,
hr
,
report
);
ok
(
hr
==
S_OK
,
"got 0x%
l
x and %p (expected S_OK)
\n
"
,
hr
,
report
);
if
(
!
report
)
{
skip
(
"Nothing left to test
\n
"
);
...
...
@@ -188,29 +188,29 @@ static void test_WerReportCreate(void)
}
hr
=
WerReportCloseHandle
(
report
);
ok
(
hr
==
S_OK
,
"got 0x%x for %p (expected S_OK)
\n
"
,
hr
,
report
);
ok
(
hr
==
S_OK
,
"got 0x%
l
x for %p (expected S_OK)
\n
"
,
hr
,
report
);
/* the ptr to store the created handle is always needed */
hr
=
WerReportCreate
(
L"APPCRASH"
,
WerReportCritical
,
NULL
,
NULL
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%x (expected E_INVALIDARG)
\n
"
,
hr
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%
l
x (expected E_INVALIDARG)
\n
"
,
hr
);
/* the event type must be a valid string */
report
=
(
void
*
)
0xdeadbeef
;
hr
=
WerReportCreate
(
NULL
,
WerReportCritical
,
NULL
,
&
report
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%x and %p(expected E_INVALIDARG)
\n
"
,
hr
,
report
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%
l
x and %p(expected E_INVALIDARG)
\n
"
,
hr
,
report
);
report
=
(
void
*
)
0xdeadbeef
;
hr
=
WerReportCreate
(
L""
,
WerReportCritical
,
NULL
,
&
report
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%x and %p(expected E_INVALIDARG)
\n
"
,
hr
,
report
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%
l
x and %p(expected E_INVALIDARG)
\n
"
,
hr
,
report
);
/* a valid WER_REPORT_TYPE works */
for
(
i
=
0
;
i
<
WerReportInvalid
;
i
++
)
{
report
=
(
void
*
)
0xdeadbeef
;
hr
=
WerReportCreate
(
L"APPCRASH"
,
i
,
NULL
,
&
report
);
ok
(
hr
==
S_OK
,
"%d: got 0x%x and %p (expected S_OK)
\n
"
,
i
,
hr
,
report
);
ok
(
hr
==
S_OK
,
"%d: got 0x%
l
x and %p (expected S_OK)
\n
"
,
i
,
hr
,
report
);
hr
=
WerReportCloseHandle
(
report
);
ok
(
hr
==
S_OK
,
"%d: got 0x%x for %p (expected S_OK)
\n
"
,
i
,
hr
,
report
);
ok
(
hr
==
S_OK
,
"%d: got 0x%
l
x for %p (expected S_OK)
\n
"
,
i
,
hr
,
report
);
}
...
...
@@ -220,19 +220,19 @@ static void test_WerReportCreate(void)
report
=
(
void
*
)
0xdeadbeef
;
hr
=
WerReportCreate
(
L"APPCRASH"
,
WerReportInvalid
,
NULL
,
&
report
);
ok
((
hr
==
E_INVALIDARG
)
|
broken
(
hr
==
S_OK
),
"%d: got 0x%x and %p (expected E_INVALIDARG or a broken S_OK)
\n
"
,
i
,
hr
,
report
);
"%d: got 0x%
l
x and %p (expected E_INVALIDARG or a broken S_OK)
\n
"
,
i
,
hr
,
report
);
if
(
hr
==
S_OK
)
{
hr
=
WerReportCloseHandle
(
report
);
ok
(
hr
==
S_OK
,
"%d: got 0x%x for %p (expected S_OK)
\n
"
,
i
,
hr
,
report
);
ok
(
hr
==
S_OK
,
"%d: got 0x%
l
x for %p (expected S_OK)
\n
"
,
i
,
hr
,
report
);
}
report
=
(
void
*
)
0xdeadbeef
;
hr
=
WerReportCreate
(
L"APPCRASH"
,
42
,
NULL
,
&
report
);
ok
((
hr
==
E_INVALIDARG
)
|
broken
(
hr
==
S_OK
),
"%d: got 0x%x and %p (expected E_INVALIDARG or a broken S_OK)
\n
"
,
i
,
hr
,
report
);
"%d: got 0x%
l
x and %p (expected E_INVALIDARG or a broken S_OK)
\n
"
,
i
,
hr
,
report
);
if
(
hr
==
S_OK
)
{
hr
=
WerReportCloseHandle
(
report
);
ok
(
hr
==
S_OK
,
"%d: got 0x%x for %p (expected S_OK)
\n
"
,
i
,
hr
,
report
);
ok
(
hr
==
S_OK
,
"%d: got 0x%
l
x for %p (expected S_OK)
\n
"
,
i
,
hr
,
report
);
}
/* multiple active reports are possible */
...
...
@@ -240,13 +240,13 @@ static void test_WerReportCreate(void)
for
(
i
=
0
;
i
<
(
ARRAY_SIZE
(
table
)
-
1
);
i
++
)
{
report
=
(
void
*
)
0xdeadbeef
;
hr
=
WerReportCreate
(
L"APPCRASH"
,
WerReportCritical
,
NULL
,
&
table
[
i
]);
ok
(
hr
==
S_OK
,
"%02d: got 0x%x and %p (expected S_OK)
\n
"
,
i
,
hr
,
table
[
i
]);
ok
(
hr
==
S_OK
,
"%02d: got 0x%
l
x and %p (expected S_OK)
\n
"
,
i
,
hr
,
table
[
i
]);
}
while
(
i
>
0
)
{
i
--
;
hr
=
WerReportCloseHandle
(
table
[
i
]);
ok
(
hr
==
S_OK
,
"got 0x%x for %p (expected S_OK)
\n
"
,
hr
,
table
[
i
]);
ok
(
hr
==
S_OK
,
"got 0x%
l
x for %p (expected S_OK)
\n
"
,
hr
,
table
[
i
]);
}
}
...
...
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