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
1431702f
Commit
1431702f
authored
Dec 16, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernel32/tests: Fix some test failures on Windows.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
b75caec1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
file.c
dlls/kernel32/tests/file.c
+7
-3
loader.c
dlls/kernel32/tests/loader.c
+2
-1
locale.c
dlls/kernel32/tests/locale.c
+2
-2
No files found.
dlls/kernel32/tests/file.c
View file @
1431702f
...
...
@@ -2709,7 +2709,7 @@ static void test_FindFirstFileA(void)
/* try FindFirstFileA on "C:\foo\" */
SetLastError
(
0xdeadbeaf
);
if
(
!
GetTempFileNameA
(
buffer
,
"foo"
,
0
,
nonexistent
)
&&
GetLastError
()
==
ERROR_ACCESS_DENIED
)
if
(
!
GetTempFileNameA
(
buffer
,
"foo"
,
0
,
nonexistent
))
{
char
tmp
[
MAX_PATH
];
GetTempPathA
(
sizeof
(
tmp
),
tmp
);
...
...
@@ -2825,8 +2825,12 @@ static void test_FindFirstFileA(void)
strcat
(
buffer2
,
"foo
\\
bar
\\
nul"
);
handle
=
FindFirstFileA
(
buffer2
,
&
data
);
err
=
GetLastError
();
ok
(
handle
==
INVALID_HANDLE_VALUE
,
"FindFirstFile on %s should fail
\n
"
,
buffer2
);
ok
(
err
==
ERROR_PATH_NOT_FOUND
,
"Bad Error number %d
\n
"
,
err
);
ok
(
handle
==
INVALID_HANDLE_VALUE
||
broken
(
1
),
/* win8 */
"FindFirstFile on %s should fail
\n
"
,
buffer2
);
if
(
handle
==
INVALID_HANDLE_VALUE
)
ok
(
err
==
ERROR_PATH_NOT_FOUND
,
"Bad Error number %d
\n
"
,
err
);
else
CloseHandle
(
handle
);
/* try FindFirstFileA on "c:\foo\nul\bar" */
SetLastError
(
0xdeadbeaf
);
...
...
dlls/kernel32/tests/loader.c
View file @
1431702f
...
...
@@ -718,7 +718,8 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG
else
{
ok
(
ldr_status
==
expect_status
||
broken
(
il_only
&&
!
expect_status
&&
ldr_status
==
STATUS_INVALID_IMAGE_FORMAT
),
broken
(
il_only
&&
!
expect_status
&&
ldr_status
==
STATUS_INVALID_IMAGE_FORMAT
)
||
broken
(
nt_header
->
Signature
==
IMAGE_OS2_SIGNATURE
&&
ldr_status
==
STATUS_INVALID_IMAGE_NE_FORMAT
),
"%u: wrong status %x/%x
\n
"
,
line
,
ldr_status
,
expect_status
);
ok
(
!
expect_fallback
||
broken
(
il_only
)
||
broken
(
wrong_machine
),
"%u: failed with %x expected fallback
\n
"
,
line
,
ldr_status
);
...
...
dlls/kernel32/tests/locale.c
View file @
1431702f
...
...
@@ -6774,13 +6774,13 @@ static void test_NLSVersion(void)
ok
(
!
ret
,
"IsValidNLSVersion succeeded
\n
"
);
ok
(
GetLastError
()
==
0
,
"wrong error %u
\n
"
,
GetLastError
()
);
info
.
dwNLSVersion
-=
0x
2
00
;
info
.
dwNLSVersion
-=
0x
8
00
;
SetLastError
(
0xdeadbeef
);
ret
=
pIsValidNLSVersion
(
COMPARE_STRING
,
L"en-US"
,
&
info
);
ok
(
!
ret
,
"IsValidNLSVersion succeeded
\n
"
);
ok
(
GetLastError
()
==
0
,
"wrong error %u
\n
"
,
GetLastError
()
);
info
.
dwNLSVersion
+=
0x
1
00
;
info
.
dwNLSVersion
+=
0x
7
00
;
info
.
dwDefinedVersion
+=
0x100
;
SetLastError
(
0xdeadbeef
);
ret
=
pIsValidNLSVersion
(
COMPARE_STRING
,
L"en-US"
,
&
info
);
...
...
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