Skip to content

W
wine-cw
Commit 7750e36b authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard
Browse files
Options

kernel32/tests: Fix some test failures on Vista.

parent bf353f18
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
dlls/kernel32/tests/volume.c
View file @ 7750e36b
...@@ -129,9 +129,10 @@ static void test_GetVolumeNameForVolumeMountPointA(void) ...@@ -129,9 +129,10 @@ static void test_GetVolumeNameForVolumeMountPointA(void)
ok(reti < MAX_PATH, "temp path should fit into MAX_PATH\n"); ok(reti < MAX_PATH, "temp path should fit into MAX_PATH\n");
ret = pGetVolumeNameForVolumeMountPointA(path, volume, 0); ret = pGetVolumeNameForVolumeMountPointA(path, volume, 0);
ok(ret == FALSE && GetLastError() == ERROR_FILENAME_EXCED_RANGE, ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n");
"GetVolumeNameForVolumeMountPointA succeeded or wrong error, last=%d\n", ok(GetLastError() == ERROR_FILENAME_EXCED_RANGE ||
GetLastError()); GetLastError() == ERROR_INVALID_PARAMETER, /* Vista */
"wrong error, last=%d\n", GetLastError());
if (0) { /* these crash on XP */ if (0) { /* these crash on XP */
ret = pGetVolumeNameForVolumeMountPointA(path, NULL, len); ret = pGetVolumeNameForVolumeMountPointA(path, NULL, len);
...@@ -195,9 +196,10 @@ static void test_GetVolumeNameForVolumeMountPointW(void) ...@@ -195,9 +196,10 @@ static void test_GetVolumeNameForVolumeMountPointW(void)
} }
ret = pGetVolumeNameForVolumeMountPointW(path, volume, 0); ret = pGetVolumeNameForVolumeMountPointW(path, volume, 0);
ok(ret == FALSE && GetLastError() == ERROR_FILENAME_EXCED_RANGE, ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n");
"GetVolumeNameForVolumeMountPointA succeeded or wrong error, last=%d\n", ok(GetLastError() == ERROR_FILENAME_EXCED_RANGE ||
GetLastError()); GetLastError() == ERROR_INVALID_PARAMETER, /* Vista */
"wrong error, last=%d\n", GetLastError());
if (0) { /* these crash on XP */ if (0) { /* these crash on XP */
ret = pGetVolumeNameForVolumeMountPointW(path, NULL, len); ret = pGetVolumeNameForVolumeMountPointW(path, NULL, len);
......
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