Module: wine Branch: master Commit: e7800f2a529aa51198431b2b75746fc4983d6c7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7800f2a529aa51198431b2b75...
Author: Francois Gouget fgouget@free.fr Date: Thu Feb 26 09:45:25 2009 +0100
comctl32/tests: Use win_skip() to skip over unimplemented functionality.
---
dlls/comctl32/tests/comboex.c | 4 ++-- dlls/comdlg32/tests/filedlg.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index f59d1d1..1e74192 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -187,7 +187,7 @@ static void test_WM_LBUTTONDOWN(void)
pGetComboBoxInfo = (void*)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); if (!pGetComboBoxInfo){ - skip("GetComboBoxInfo is not available\n"); + win_skip("GetComboBoxInfo is not available\n"); return; }
@@ -314,7 +314,7 @@ static int init(void) pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); if (!pInitCommonControlsEx) { - skip("InitCommonControlsEx() is missing. Skipping the tests\n"); + win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); return 0; } iccex.dwSize = sizeof(iccex); diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index cff103e..9714dda 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -111,7 +111,7 @@ static void test_DialogCancel(void) SetLastError(0xdeadbeef); result = GetOpenFileNameW((LPOPENFILENAMEW) &ofn); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - skip("GetOpenFileNameW is not implemented\n"); + win_skip("GetOpenFileNameW is not implemented\n"); else { ok(0 == result, "expected %d, got %d\n", 0, result); @@ -124,7 +124,7 @@ static void test_DialogCancel(void) SetLastError(0xdeadbeef); result = GetSaveFileNameW((LPOPENFILENAMEW) &ofn); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - skip("GetSaveFileNameW is not implemented\n"); + win_skip("GetSaveFileNameW is not implemented\n"); else { ok(0 == result, "expected %d, got %d\n", 0, result); @@ -156,7 +156,7 @@ static UINT_PTR CALLBACK create_view_window2_hook(HWND dlg, UINT msg, WPARAM wPa hr = IShellView_QueryInterface(shell_view, &IID_IShellView2, (void **)&shell_view2); if (hr == E_NOINTERFACE) { - skip("IShellView2 not supported\n"); + win_skip("IShellView2 not supported\n"); goto cleanup; } ok(SUCCEEDED(hr), "QueryInterface returned %#x\n", hr);