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
fd0780cb
Commit
fd0780cb
authored
Feb 10, 2016
by
Sebastian Lackner
Committed by
Alexandre Julliard
Feb 10, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernel32/tests: Simplify activation context tests by using todo_wine_if.
Signed-off-by:
Sebastian Lackner
<
sebastian@fds-team.de
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
5b478f7c
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
26 deletions
+5
-26
actctx.c
dlls/kernel32/tests/actctx.c
+5
-26
No files found.
dlls/kernel32/tests/actctx.c
View file @
fd0780cb
...
...
@@ -776,12 +776,7 @@ static void test_create_and_fail(const char *manifest, const char *depmanifest,
create_manifest_file
(
"bad.manifest"
,
manifest
,
-
1
,
"testdep.manifest"
,
depmanifest
);
handle
=
pCreateActCtxW
(
&
actctx
);
if
(
todo
)
todo_wine
{
ok
(
handle
==
INVALID_HANDLE_VALUE
,
"handle != INVALID_HANDLE_VALUE
\n
"
);
ok
(
GetLastError
()
==
ERROR_SXS_CANT_GEN_ACTCTX
,
"GetLastError == %u
\n
"
,
GetLastError
());
}
else
todo_wine_if
(
todo
)
{
ok
(
handle
==
INVALID_HANDLE_VALUE
,
"handle != INVALID_HANDLE_VALUE
\n
"
);
ok
(
GetLastError
()
==
ERROR_SXS_CANT_GEN_ACTCTX
,
"GetLastError == %u
\n
"
,
GetLastError
());
...
...
@@ -2089,11 +2084,7 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should
err
=
GetLastError
();
ok_
(
__FILE__
,
line
)(
ret
==
should_find
,
"FindActCtxSectionStringA: expected ret = %u, got %u
\n
"
,
should_find
,
ret
);
if
(
todo
)
todo_wine
ok_
(
__FILE__
,
line
)(
err
==
(
should_find
?
ERROR_SUCCESS
:
ERROR_SXS_KEY_NOT_FOUND
),
"FindActCtxSectionStringA: unexpected error %u
\n
"
,
err
);
else
todo_wine_if
(
todo
)
ok_
(
__FILE__
,
line
)(
err
==
(
should_find
?
ERROR_SUCCESS
:
ERROR_SXS_KEY_NOT_FOUND
),
"FindActCtxSectionStringA: unexpected error %u
\n
"
,
err
);
...
...
@@ -2105,11 +2096,7 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should
err
=
GetLastError
();
ok_
(
__FILE__
,
line
)(
ret
==
should_find
,
"FindActCtxSectionStringW: expected ret = %u, got %u
\n
"
,
should_find
,
ret
);
if
(
todo
)
todo_wine
ok_
(
__FILE__
,
line
)(
err
==
(
should_find
?
ERROR_SUCCESS
:
ERROR_SXS_KEY_NOT_FOUND
),
"FindActCtxSectionStringW: unexpected error %u
\n
"
,
err
);
else
todo_wine_if
(
todo
)
ok_
(
__FILE__
,
line
)(
err
==
(
should_find
?
ERROR_SUCCESS
:
ERROR_SXS_KEY_NOT_FOUND
),
"FindActCtxSectionStringW: unexpected error %u
\n
"
,
err
);
...
...
@@ -2144,20 +2131,12 @@ static void ntdll_find(ULONG section, const char *string_to_find, BOOL should_fi
data
.
cbSize
=
sizeof
(
data
);
ret
=
pRtlFindActivationContextSectionString
(
0
,
NULL
,
section
,
&
string_to_findW
,
&
data
);
if
(
todo
)
todo_wine
ok_
(
__FILE__
,
line
)(
ret
==
(
should_find
?
STATUS_SUCCESS
:
STATUS_SXS_KEY_NOT_FOUND
),
"RtlFindActivationContextSectionString: unexpected status 0x%x
\n
"
,
ret
);
else
todo_wine_if
(
todo
)
ok_
(
__FILE__
,
line
)(
ret
==
(
should_find
?
STATUS_SUCCESS
:
STATUS_SXS_KEY_NOT_FOUND
),
"RtlFindActivationContextSectionString: unexpected status 0x%x
\n
"
,
ret
);
ret
=
pRtlFindActivationContextSectionString
(
0
,
NULL
,
section
,
&
string_to_findW
,
NULL
);
if
(
todo
)
todo_wine
ok_
(
__FILE__
,
line
)(
ret
==
(
should_find
?
STATUS_SUCCESS
:
STATUS_SXS_KEY_NOT_FOUND
),
"RtlFindActivationContextSectionString: unexpected status 0x%x
\n
"
,
ret
);
else
todo_wine_if
(
todo
)
ok_
(
__FILE__
,
line
)(
ret
==
(
should_find
?
STATUS_SUCCESS
:
STATUS_SXS_KEY_NOT_FOUND
),
"RtlFindActivationContextSectionString: unexpected status 0x%x
\n
"
,
ret
);
...
...
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