comdlg32/tests: Fix some test failures on Win7.

This commit is contained in:
Paul Vriens 2009-11-20 14:20:40 +01:00 committed by Alexandre Julliard
parent 9cec74f300
commit 50592566d3
1 changed files with 8 additions and 5 deletions

View File

@ -876,7 +876,7 @@ static void test_arrange(void)
} }
} }
static CHAR WINDIR[MAX_PATH]; static CHAR SYSDIR[MAX_PATH];
static UINT_PTR CALLBACK path_hook_proc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) static UINT_PTR CALLBACK path_hook_proc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
@ -896,8 +896,8 @@ static UINT_PTR CALLBACK path_hook_proc( HWND hDlg, UINT msg, WPARAM wParam, LPA
memset(buf, 0x66, sizeof(buf)); memset(buf, 0x66, sizeof(buf));
ret = SendMessageA( GetParent(hDlg), CDM_GETFOLDERPATH, sizeof(buf), (LPARAM)buf); ret = SendMessageA( GetParent(hDlg), CDM_GETFOLDERPATH, sizeof(buf), (LPARAM)buf);
ok(!lstrcmpA(WINDIR, buf), "Expected '%s', got '%s'\n", WINDIR, buf); ok(!lstrcmpiA(SYSDIR, buf), "Expected '%s', got '%s'\n", SYSDIR, buf);
ok(lstrlenA(WINDIR) + 1 == ret, "Expected %d, got %d\n", lstrlenA(WINDIR) + 1, ret); ok(lstrlenA(SYSDIR) + 1 == ret, "Expected %d, got %d\n", lstrlenA(SYSDIR) + 1, ret);
} }
} }
@ -911,8 +911,11 @@ static void test_getfolderpath(void)
char szFileName[MAX_PATH] = ""; char szFileName[MAX_PATH] = "";
char szInitialDir[MAX_PATH]; char szInitialDir[MAX_PATH];
GetWindowsDirectory(szInitialDir, MAX_PATH); /* We need to pick a different directory as the other tests because of new
lstrcpyA(WINDIR, szInitialDir); * Windows 7 behavior.
*/
GetSystemDirectory(szInitialDir, MAX_PATH);
lstrcpyA(SYSDIR, szInitialDir);
ZeroMemory(&ofn, sizeof(ofn)); ZeroMemory(&ofn, sizeof(ofn));