Module: wine Branch: master Commit: 7750e36be5dcdadbd4b814f2f750d8b0606ccd53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7750e36be5dcdadbd4b814f2f7...
Author: Paul Vriens Paul.Vriens.Wine@gmail.com Date: Tue May 26 18:47:51 2009 +0200
kernel32/tests: Fix some test failures on Vista.
---
dlls/kernel32/tests/volume.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index dab59bc..2c25465 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -129,9 +129,10 @@ static void test_GetVolumeNameForVolumeMountPointA(void) ok(reti < MAX_PATH, "temp path should fit into MAX_PATH\n");
ret = pGetVolumeNameForVolumeMountPointA(path, volume, 0); - ok(ret == FALSE && GetLastError() == ERROR_FILENAME_EXCED_RANGE, - "GetVolumeNameForVolumeMountPointA succeeded or wrong error, last=%d\n", - GetLastError()); + ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n"); + ok(GetLastError() == ERROR_FILENAME_EXCED_RANGE || + GetLastError() == ERROR_INVALID_PARAMETER, /* Vista */ + "wrong error, last=%d\n", GetLastError());
if (0) { /* these crash on XP */ ret = pGetVolumeNameForVolumeMountPointA(path, NULL, len); @@ -195,9 +196,10 @@ static void test_GetVolumeNameForVolumeMountPointW(void) }
ret = pGetVolumeNameForVolumeMountPointW(path, volume, 0); - ok(ret == FALSE && GetLastError() == ERROR_FILENAME_EXCED_RANGE, - "GetVolumeNameForVolumeMountPointA succeeded or wrong error, last=%d\n", - GetLastError()); + ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n"); + ok(GetLastError() == ERROR_FILENAME_EXCED_RANGE || + GetLastError() == ERROR_INVALID_PARAMETER, /* Vista */ + "wrong error, last=%d\n", GetLastError());
if (0) { /* these crash on XP */ ret = pGetVolumeNameForVolumeMountPointW(path, NULL, len);