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
19d96f99
Commit
19d96f99
authored
Aug 01, 2019
by
André Hentschel
Committed by
Alexandre Julliard
Aug 02, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernel32/tests: Don't test functions directly when reporting GetLastError().
Signed-off-by:
André Hentschel
<
nerv@dawncrow.de
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
2e53f8bc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
32 additions
and
8 deletions
+32
-8
actctx.c
dlls/kernel32/tests/actctx.c
+32
-8
No files found.
dlls/kernel32/tests/actctx.c
View file @
19d96f99
...
...
@@ -3271,13 +3271,25 @@ static void clean_sxs_info(sxs_info *info)
if
(
info
->
handle_context
)
ReleaseActCtx
(
info
->
handle_context
);
if
(
*
info
->
path_dll
)
ok
(
DeleteFileA
(
info
->
path_dll
),
"DeleteFileA failed for %s: %d
\n
"
,
info
->
path_dll
,
GetLastError
());
{
BOOL
ret
=
DeleteFileA
(
info
->
path_dll
);
ok
(
ret
,
"DeleteFileA failed for %s: %d
\n
"
,
info
->
path_dll
,
GetLastError
());
}
if
(
*
info
->
path_manifest_exe
)
ok
(
DeleteFileA
(
info
->
path_manifest_exe
),
"DeleteFileA failed for %s: %d
\n
"
,
info
->
path_manifest_exe
,
GetLastError
());
{
BOOL
ret
=
DeleteFileA
(
info
->
path_manifest_exe
);
ok
(
ret
,
"DeleteFileA failed for %s: %d
\n
"
,
info
->
path_manifest_exe
,
GetLastError
());
}
if
(
*
info
->
path_manifest_dll
)
ok
(
DeleteFileA
(
info
->
path_manifest_dll
),
"DeleteFileA failed for %s: %d
\n
"
,
info
->
path_manifest_dll
,
GetLastError
());
{
BOOL
ret
=
DeleteFileA
(
info
->
path_manifest_dll
);
ok
(
ret
,
"DeleteFileA failed for %s: %d
\n
"
,
info
->
path_manifest_dll
,
GetLastError
());
}
if
(
*
info
->
path_tmp
)
ok
(
RemoveDirectoryA
(
info
->
path_tmp
),
"RemoveDirectoryA failed for %s: %d
\n
"
,
info
->
path_tmp
,
GetLastError
());
{
BOOL
ret
=
RemoveDirectoryA
(
info
->
path_tmp
);
ok
(
ret
,
"RemoveDirectoryA failed for %s: %d
\n
"
,
info
->
path_tmp
,
GetLastError
());
}
}
static
void
get_application_directory
(
char
*
buffer
,
int
buffer_size
)
...
...
@@ -3348,7 +3360,10 @@ cleanup:
if
(
dll
.
module
)
FreeLibrary
(
dll
.
module
);
if
(
*
path_dll_local
)
ok
(
DeleteFileA
(
path_dll_local
),
"DeleteFileA failed for %s: %d
\n
"
,
path_dll_local
,
GetLastError
());
{
BOOL
success
=
DeleteFileA
(
path_dll_local
);
ok
(
success
,
"DeleteFileA failed for %s: %d
\n
"
,
path_dll_local
,
GetLastError
());
}
clean_sxs_info
(
&
dll
);
}
...
...
@@ -3385,7 +3400,10 @@ cleanup:
if
(
dll
.
module
)
FreeLibrary
(
dll
.
module
);
if
(
*
path_dll_local
)
ok
(
DeleteFileA
(
path_dll_local
),
"DeleteFileA failed for %s: %d
\n
"
,
path_dll_local
,
GetLastError
());
{
BOOL
success
=
DeleteFileA
(
path_dll_local
);
ok
(
success
,
"DeleteFileA failed for %s: %d
\n
"
,
path_dll_local
,
GetLastError
());
}
clean_sxs_info
(
&
dll
);
}
...
...
@@ -3423,7 +3441,10 @@ cleanup:
if
(
dll
.
module
)
FreeLibrary
(
dll
.
module
);
if
(
*
path_dll_local
)
ok
(
DeleteFileA
(
path_dll_local
),
"DeleteFileA failed for %s: %d
\n
"
,
path_dll_local
,
GetLastError
());
{
success
=
DeleteFileA
(
path_dll_local
);
ok
(
success
,
"DeleteFileA failed for %s: %d
\n
"
,
path_dll_local
,
GetLastError
());
}
clean_sxs_info
(
&
dll
);
}
...
...
@@ -3486,7 +3507,10 @@ cleanup:
if
(
module_msvcr
)
FreeLibrary
(
module_msvcr
);
if
(
*
path_manifest
)
ok
(
DeleteFileA
(
path_manifest
),
"DeleteFileA failed for %s: %d
\n
"
,
path_manifest
,
GetLastError
());
{
success
=
DeleteFileA
(
path_manifest
);
ok
(
success
,
"DeleteFileA failed for %s: %d
\n
"
,
path_manifest
,
GetLastError
());
}
}
static
void
run_sxs_test
(
int
run
)
...
...
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