[PATCH] Fix tests

[Alistair Leslie-Hughes]

---
 dlls/comdlg32/tests/filedlg.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c
index 09a2428..2782470 100644
--- a/dlls/comdlg32/tests/filedlg.c
+++ b/dlls/comdlg32/tests/filedlg.c
@@ -189,7 +189,9 @@ static UINT CALLBACK create_view_window2_hook(HWND dlg, UINT msg, WPARAM wParam,
 
             view_params.pvid = &VID_Details;
             hr = IShellView2_CreateViewWindow2(shell_view2, &view_params);
-            ok(SUCCEEDED(hr), "CreateViewWindow2 returned %#x\n", hr);
+            ok(SUCCEEDED(hr) ||
+               hr == E_UNEXPECTED /* win XP*/ || 
+               hr == E_INVALIDARG /* Vista */, "CreateViewWindow2 returned %#x\n", hr);
             if (FAILED(hr)) goto cleanup;
 
             hr = IShellView2_GetCurrentInfo(shell_view2, &folder_settings);
@@ -254,7 +256,7 @@ static void test_create_view_template(void)
     ofn.nMaxFile = 1042;
     ofn.lpfnHook = (LPOFNHOOKPROC)template_hook;
     ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER| OFN_ENABLETEMPLATE;
-    ofn.hInstance = GetModuleHandleW(NULL);
+    ofn.hInstance = GetModuleHandleA(NULL);
     ofn.lpTemplateName = "template1";
     ofn.lpstrFilter="text\0*.txt\0All\0*\0\0";
     ret = GetOpenFileNameA(&ofn);
-- 
1.5.4.3


--------------010503000304050506000503--