Ge van Geldorp : comdlg32/tests: Fix test on Win7.
Alexandre Julliard
julliard at winehq.org
Mon Aug 31 10:47:26 CDT 2009
Module: wine
Branch: master
Commit: 5d38ddc208854db6981635c6aaeb66160ea5940d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d38ddc208854db6981635c6aaeb66160ea5940d
Author: Ge van Geldorp <ggeldorp at vmware.com>
Date: Mon Aug 31 09:15:35 2009 +0200
comdlg32/tests: Fix test on Win7.
---
dlls/comdlg32/tests/filedlg.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c
index ade7f8d..be3cf8c 100644
--- a/dlls/comdlg32/tests/filedlg.c
+++ b/dlls/comdlg32/tests/filedlg.c
@@ -634,9 +634,11 @@ static void test_ok(void)
OPENFILENAME ofn = { sizeof(OPENFILENAME)};
char filename[1024] = {0};
char tmpfilename[ MAX_PATH];
+ char curdir[MAX_PATH];
int i;
DWORD ret;
+ ok(GetCurrentDirectoryA(sizeof(curdir), curdir) != 0, "Failed to get current dir err %d\n", GetLastError());
if (!GetTempFileNameA(".", "txt", 0, tmpfilename)) {
skip("Failed to create a temporary file name\n");
return;
@@ -659,6 +661,7 @@ static void test_ok(void)
ok(ret == ok_testcases[i].expclose, "testid %d: GetOpenFileName returned %#x\n", i, ret);
ret = CommDlgExtendedError();
ok(!ret, "CommDlgExtendedError returned %#x\n", ret);
+ ok(SetCurrentDirectoryA(curdir), "Failed to restore current dir err %d\n", GetLastError());
}
ret = DeleteFileA( tmpfilename);
ok( ret, "Failed to delete temporary file %s err %d\n", tmpfilename, GetLastError());
More information about the wine-cvs
mailing list