Skip to content

W
wine-cw
Commit c90d7258 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msvcp140: Fix _Winerror_map test failures.

Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent afc0d31d
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
dlls/msvcp140/tests/msvcp140.c
View file @ c90d7258
...@@ -1270,6 +1270,7 @@ static void test__Winerror_map(void) ...@@ -1270,6 +1270,7 @@ static void test__Winerror_map(void)
static struct { static struct {
int winerr, doserr; int winerr, doserr;
BOOL broken; BOOL broken;
int broken_doserr;
} tests[] = { } tests[] = {
{ERROR_INVALID_FUNCTION, ENOSYS}, {ERROR_FILE_NOT_FOUND, ENOENT}, {ERROR_INVALID_FUNCTION, ENOSYS}, {ERROR_FILE_NOT_FOUND, ENOENT},
{ERROR_PATH_NOT_FOUND, ENOENT}, {ERROR_TOO_MANY_OPEN_FILES, EMFILE}, {ERROR_PATH_NOT_FOUND, ENOENT}, {ERROR_TOO_MANY_OPEN_FILES, EMFILE},
...@@ -1285,7 +1286,7 @@ static void test__Winerror_map(void) ...@@ -1285,7 +1286,7 @@ static void test__Winerror_map(void)
{ERROR_FILE_EXISTS, EEXIST}, {ERROR_CANNOT_MAKE, EACCES}, {ERROR_FILE_EXISTS, EEXIST}, {ERROR_CANNOT_MAKE, EACCES},
{ERROR_INVALID_PARAMETER, EINVAL, TRUE}, {ERROR_OPEN_FAILED, EIO}, {ERROR_INVALID_PARAMETER, EINVAL, TRUE}, {ERROR_OPEN_FAILED, EIO},
{ERROR_BUFFER_OVERFLOW, ENAMETOOLONG}, {ERROR_DISK_FULL, ENOSPC}, {ERROR_BUFFER_OVERFLOW, ENAMETOOLONG}, {ERROR_DISK_FULL, ENOSPC},
{ERROR_INVALID_NAME, EINVAL}, {ERROR_NEGATIVE_SEEK, EINVAL}, {ERROR_INVALID_NAME, ENOENT, TRUE, EINVAL}, {ERROR_NEGATIVE_SEEK, EINVAL},
{ERROR_BUSY_DRIVE, EBUSY}, {ERROR_DIR_NOT_EMPTY, ENOTEMPTY}, {ERROR_BUSY_DRIVE, EBUSY}, {ERROR_DIR_NOT_EMPTY, ENOTEMPTY},
{ERROR_BUSY, EBUSY}, {ERROR_ALREADY_EXISTS, EEXIST}, {ERROR_BUSY, EBUSY}, {ERROR_ALREADY_EXISTS, EEXIST},
{ERROR_LOCKED, ENOLCK}, {ERROR_DIRECTORY, EINVAL}, {ERROR_LOCKED, ENOLCK}, {ERROR_DIRECTORY, EINVAL},
...@@ -1313,7 +1314,7 @@ static void test__Winerror_map(void) ...@@ -1313,7 +1314,7 @@ static void test__Winerror_map(void)
for(i=0; i<ARRAY_SIZE(tests); i++) for(i=0; i<ARRAY_SIZE(tests); i++)
{ {
ret = p__Winerror_map(tests[i].winerr); ret = p__Winerror_map(tests[i].winerr);
ok(ret == tests[i].doserr || broken(tests[i].broken && !ret), ok(ret == tests[i].doserr || broken(tests[i].broken && ret == tests[i].broken_doserr),
"_Winerror_map(%d) returned %d, expected %d\n", "_Winerror_map(%d) returned %d, expected %d\n",
tests[i].winerr, ret, tests[i].doserr); tests[i].winerr, ret, tests[i].doserr);
} }
......
dlls/msvcp90/misc.c
View file @ c90d7258
...@@ -216,7 +216,7 @@ static const struct { ...@@ -216,7 +216,7 @@ static const struct {
{ERROR_FILE_EXISTS, EEXIST}, {ERROR_CANNOT_MAKE, EACCES}, {ERROR_FILE_EXISTS, EEXIST}, {ERROR_CANNOT_MAKE, EACCES},
{ERROR_INVALID_PARAMETER, EINVAL}, {ERROR_OPEN_FAILED, EIO}, {ERROR_INVALID_PARAMETER, EINVAL}, {ERROR_OPEN_FAILED, EIO},
{ERROR_BUFFER_OVERFLOW, ENAMETOOLONG}, {ERROR_DISK_FULL, ENOSPC}, {ERROR_BUFFER_OVERFLOW, ENAMETOOLONG}, {ERROR_DISK_FULL, ENOSPC},
{ERROR_INVALID_NAME, EINVAL}, {ERROR_NEGATIVE_SEEK, EINVAL}, {ERROR_INVALID_NAME, ENOENT}, {ERROR_NEGATIVE_SEEK, EINVAL},
{ERROR_BUSY_DRIVE, EBUSY}, {ERROR_DIR_NOT_EMPTY, ENOTEMPTY}, {ERROR_BUSY_DRIVE, EBUSY}, {ERROR_DIR_NOT_EMPTY, ENOTEMPTY},
{ERROR_BUSY, EBUSY}, {ERROR_ALREADY_EXISTS, EEXIST}, {ERROR_BUSY, EBUSY}, {ERROR_ALREADY_EXISTS, EEXIST},
{ERROR_LOCKED, ENOLCK}, {ERROR_DIRECTORY, EINVAL}, {ERROR_LOCKED, ENOLCK}, {ERROR_DIRECTORY, EINVAL},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment