February 2009 - Wine-Commits

Francois Gouget : ntdll/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard Feb. 23, 2009

Feb. 23, 2009

Module: wine Branch: master Commit: 630d92b9473352bd85019a69bc2102ab1d148796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=630d92b9473352bd85019a69b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 23 10:42:00 2009 +0100 ntdll/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/ntdll/tests/change.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/change.c b/dlls/ntdll/tests/change.c index d3ba58f..f395962 100644 --- a/dlls/ntdll/tests/change.c +++ b/dlls/ntdll/tests/change.c @@ -318,7 +318,7 @@ START_TEST(change) HMODULE hntdll = GetModuleHandle("ntdll"); if (!hntdll) { - skip("not running on NT, skipping test\n"); + win_skip("not running on NT, skipping test\n"); return; } @@ -329,7 +329,7 @@ START_TEST(change) if (!pNtNotifyChangeDirectoryFile || !pNtCancelIoFile) { - skip("missing functions, skipping test\n"); + win_skip("missing functions, skipping test\n"); return; }

1 0

Francois Gouget : oleaut32/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard Feb. 23, 2009

Feb. 23, 2009

Module: wine Branch: master Commit: 3b072fb772a1cde59d576b163c58dd18094bce3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b072fb772a1cde59d576b163… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 23 10:41:51 2009 +0100 oleaut32/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/oleaut32/tests/olefont.c | 2 +- dlls/oleaut32/tests/olepicture.c | 4 ++-- dlls/oleaut32/tests/varformat.c | 2 +- dlls/oleaut32/tests/vartype.c | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index cce1777..8e26a0f 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -808,7 +808,7 @@ START_TEST(olefont) pOleCreateFontIndirect = (void*)GetProcAddress(hOleaut32, "OleCreateFontIndirect"); if (!pOleCreateFontIndirect) { - skip("OleCreateFontIndirect not available\n"); + win_skip("OleCreateFontIndirect not available\n"); return; } diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 1130410..2dc1b05 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -477,7 +477,7 @@ static void test_OleCreatePictureIndirect(void) if(!pOleCreatePictureIndirect) { - skip("Skipping OleCreatePictureIndirect tests\n"); + win_skip("Skipping OleCreatePictureIndirect tests\n"); return; } @@ -707,7 +707,7 @@ START_TEST(olepicture) pOleCreatePictureIndirect = (void*)GetProcAddress(hOleaut32, "OleCreatePictureIndirect"); if (!pOleLoadPicture) { - skip("OleLoadPicture is not available\n"); + win_skip("OleLoadPicture is not available\n"); return; } diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 738c306..b19efbd 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -449,7 +449,7 @@ static void test_VarWeekdayName(void) GetLocaleInfoW(LOCALE_USER_DEFAULT, 0, NULL, 0); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - skip("GetLocaleInfoW is not implemented\n"); + win_skip("GetLocaleInfoW is not implemented\n"); return; } diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 4f28234..eba0bc1 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -46,7 +46,7 @@ static HMODULE hOleaut32; /* Get a conversion function ptr, return if function not available */ #define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \ if (!p##func) { \ - skip("function " # func " not available, not testing it\n"); return; } + win_skip("function " # func " not available, not testing it\n"); return; } /* Is a given function exported from oleaut32? */ #define HAVE_FUNC(func) ((void*)GetProcAddress(hOleaut32, #func) != NULL) @@ -2349,7 +2349,7 @@ static void test_VarI8Copy(void) if (!HAVE_OLEAUT32_I8) { - skip("I8 and UI8 data types are not available\n"); + win_skip("I8 and UI8 data types are not available\n"); return; } @@ -2379,7 +2379,7 @@ static void test_VarI8ChangeTypeEx(void) if (!HAVE_OLEAUT32_I8) { - skip("I8 and UI8 data types are not available\n"); + win_skip("I8 and UI8 data types are not available\n"); return; } @@ -2611,7 +2611,7 @@ static void test_VarUI8Copy(void) if (!HAVE_OLEAUT32_I8) { - skip("I8 and UI8 data types are not available\n"); + win_skip("I8 and UI8 data types are not available\n"); return; } @@ -2641,7 +2641,7 @@ static void test_VarUI8ChangeTypeEx(void) if (!HAVE_OLEAUT32_I8) { - skip("I8 and UI8 data types are not available\n"); + win_skip("I8 and UI8 data types are not available\n"); return; }

1 0

Francois Gouget : rpcrt4/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard Feb. 23, 2009

Feb. 23, 2009

Module: wine Branch: master Commit: bf855d869649e8e2dab0e57fa2cec7e38c6d21d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf855d869649e8e2dab0e57fa… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 23 10:41:34 2009 +0100 rpcrt4/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/rpcrt4/tests/rpc_async.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc_async.c b/dlls/rpcrt4/tests/rpc_async.c index 64f0daf..f82799c 100644 --- a/dlls/rpcrt4/tests/rpc_async.c +++ b/dlls/rpcrt4/tests/rpc_async.c @@ -85,7 +85,7 @@ START_TEST( rpc_async ) pRpcAsyncGetCallStatus = (void *)GetProcAddress(hRpcRt4, "RpcAsyncGetCallStatus"); if (!pRpcAsyncInitializeHandle || !pRpcAsyncGetCallStatus) { - skip("asynchronous functions not available\n"); + win_skip("asynchronous functions not available\n"); return; } test_RpcAsyncInitializeHandle();

1 0

Francois Gouget : secur32/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard Feb. 23, 2009

Feb. 23, 2009

Module: wine Branch: master Commit: c3aa03d244f8f0eaa875db763a3e719e7cc7b574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3aa03d244f8f0eaa875db763… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 23 10:41:30 2009 +0100 secur32/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/secur32/tests/ntlm.c | 2 +- dlls/secur32/tests/schannel.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 370a714..43b7265 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -1292,7 +1292,7 @@ START_TEST(ntlm) test_cred_multiple_use(); } else - skip("Needed functions are not available\n"); + win_skip("Needed functions are not available\n"); if(secdll) FreeLibrary(secdll); diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 154ba97..167a0b4 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -173,7 +173,7 @@ static void testAcquireSecurityContext(void) !pEnumerateSecurityPackagesA || !pFreeContextBuffer || !pFreeCredentialsHandle || !pCryptAcquireContextW) { - skip("Needed functions are not available\n"); + win_skip("Needed functions are not available\n"); return; }

1 0

Francois Gouget : serialui/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard Feb. 23, 2009

Feb. 23, 2009

Module: wine Branch: master Commit: c64428182d2b95d3d1deb7c1e00ce9d57c62df2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c64428182d2b95d3d1deb7c1e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 23 10:41:23 2009 +0100 serialui/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/serialui/tests/confdlg.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/serialui/tests/confdlg.c b/dlls/serialui/tests/confdlg.c index 87a83ec..4606a75 100644 --- a/dlls/serialui/tests/confdlg.c +++ b/dlls/serialui/tests/confdlg.c @@ -96,7 +96,7 @@ static void test_drvCommConfigDialogA(void) res = pGetDefaultCommConfigA(bufferA, pCC, &len); if (res == ERROR_CALL_NOT_IMPLEMENTED) { /* NT does not implement the ANSI API */ - skip("*A not implemented\n"); + win_skip("*A not implemented\n"); return; } @@ -171,7 +171,7 @@ static void test_drvCommConfigDialogW(void) SetLastError(0xdeadbeef); res = pGetDefaultCommConfigW(bufferW, pCC, &len); if (res == ERROR_CALL_NOT_IMPLEMENTED) { - skip("*W not implemented\n"); + win_skip("*W not implemented\n"); return; } @@ -244,7 +244,7 @@ static void test_drvGetDefaultCommConfigA(void) res = pGetDefaultCommConfigA(com1A, pCC, &len); if (res == ERROR_CALL_NOT_IMPLEMENTED) { /* NT does not implement the ANSI API */ - skip("*A not implemented\n"); + win_skip("*A not implemented\n"); return; } ok( (res == ERROR_INSUFFICIENT_BUFFER) && (len >= i), @@ -336,7 +336,7 @@ static void test_drvGetDefaultCommConfigW(void) SetLastError(0xdeadbeef); res = pGetDefaultCommConfigW(com1W, pCC, &len); if (res == ERROR_CALL_NOT_IMPLEMENTED) { - skip("*W not implemented\n"); + win_skip("*W not implemented\n"); return; } ok( (res == ERROR_INSUFFICIENT_BUFFER) && (len >= i), @@ -419,7 +419,7 @@ START_TEST(confdlg) ptr = load_functions(); if (ptr) { - skip("got NULL with %u for %s\n", GetLastError(), ptr); + win_skip("got NULL with %u for %s\n", GetLastError(), ptr); return; }

1 0

Francois Gouget : setupapi/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard Feb. 23, 2009

Feb. 23, 2009

Module: wine Branch: master Commit: 292a10424dbb5e36a03a606dbe14cb239ade453e URL: http://source.winehq.org/git/wine.git/?a=commit;h=292a10424dbb5e36a03a606db… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 23 10:41:15 2009 +0100 setupapi/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/setupapi/tests/devinst.c | 14 +++++++------- dlls/setupapi/tests/install.c | 8 ++++---- dlls/setupapi/tests/misc.c | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index a4f80ba..1ae0720 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -259,7 +259,7 @@ static void test_SetupDiCreateDeviceInfoListEx(void) error = GetLastError(); if (error == ERROR_CALL_NOT_IMPLEMENTED) { - skip("SetupDiCreateDeviceInfoListExW is not implemented\n"); + win_skip("SetupDiCreateDeviceInfoListExW is not implemented\n"); return; } ok(devlist == INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %d (expected %p)\n", devlist, error, INVALID_HANDLE_VALUE); @@ -667,7 +667,7 @@ static void testCreateDeviceInterface(void) if (!pSetupDiCreateDeviceInterfaceA || !pSetupDiEnumDeviceInterfaces) { - skip("SetupDiCreateDeviceInterfaceA and/or SetupDiEnumDeviceInterfaces are not available\n"); + win_skip("SetupDiCreateDeviceInterfaceA and/or SetupDiEnumDeviceInterfaces are not available\n"); return; } SetLastError(0xdeadbeef); @@ -764,7 +764,7 @@ static void testGetDeviceInterfaceDetail(void) if (!pSetupDiCreateDeviceInterfaceA || !pSetupDiGetDeviceInterfaceDetailA) { - skip("SetupDiCreateDeviceInterfaceA and/or SetupDiGetDeviceInterfaceDetailA are not available\n"); + win_skip("SetupDiCreateDeviceInterfaceA and/or SetupDiGetDeviceInterfaceDetailA are not available\n"); return; } SetLastError(0xdeadbeef); @@ -1051,7 +1051,7 @@ static void testRegisterAndGetDetail(void) if (!pSetupDiCreateDeviceInterfaceA || !pSetupDiEnumDeviceInterfaces || !pSetupDiGetDeviceInterfaceDetailA) { - skip("Needed functions are not available\n"); + win_skip("Needed functions are not available\n"); return; } @@ -1357,19 +1357,19 @@ START_TEST(devinst) set = pSetupDiGetClassDevsW(NULL, NULL, 0, 0); if (set == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - skip("Win9x/WinMe has totally different behavior\n"); + win_skip("Win9x/WinMe has totally different behavior\n"); return; } if (pSetupDiCreateDeviceInfoListExW) test_SetupDiCreateDeviceInfoListEx(); else - skip("SetupDiCreateDeviceInfoListExW is not available\n"); + win_skip("SetupDiCreateDeviceInfoListExW is not available\n"); if (pSetupDiOpenClassRegKeyExA) test_SetupDiOpenClassRegKeyExA(); else - skip("SetupDiOpenClassRegKeyExA is not available\n"); + win_skip("SetupDiOpenClassRegKeyExA is not available\n"); testInstallClass(); testCreateDeviceInfo(); diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 4936923..5361238 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -190,7 +190,7 @@ static void test_install_svc_from(void) if (!scm_handle && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { - skip("OpenSCManagerA is not implemented, we are most likely on win9x\n"); + win_skip("OpenSCManagerA is not implemented, we are most likely on win9x\n"); return; } CloseServiceHandle(scm_handle); @@ -348,7 +348,7 @@ static void test_driver_install(void) if (!scm_handle && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { - skip("OpenSCManagerA is not implemented, we are most likely on win9x\n"); + win_skip("OpenSCManagerA is not implemented, we are most likely on win9x\n"); return; } else if (!scm_handle && (GetLastError() == ERROR_ACCESS_DENIED)) @@ -421,7 +421,7 @@ static void test_profile_items(void) pSHGetFolderPathA = (void*)GetProcAddress(hShell32, "SHGetFolderPathA"); if (!pSHGetFolderPathA) { - skip("SHGetFolderPathA is not available\n"); + win_skip("SHGetFolderPathA is not available\n"); goto cleanup; } @@ -500,7 +500,7 @@ START_TEST(install) ok(DeleteFile(inffile), "Expected source inf to exist, last error was %d\n", GetLastError()); } if (!pInstallHinfSectionW && !pInstallHinfSectionA) - skip("InstallHinfSectionA and InstallHinfSectionW are not available\n"); + win_skip("InstallHinfSectionA and InstallHinfSectionW are not available\n"); else { /* Set CBT hook to disallow MessageBox creation in current thread */ diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 60960b2..726d1eb 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -107,7 +107,7 @@ static void test_original_file_name(LPCSTR original, LPCSTR dest) if (!pSetupQueryInfOriginalFileInformationA) { - skip("SetupQueryInfOriginalFileInformationA is not available\n"); + win_skip("SetupQueryInfOriginalFileInformationA is not available\n"); return; } @@ -591,14 +591,14 @@ START_TEST(misc) if (pSetupCopyOEMInfA) test_SetupCopyOEMInf(); else - skip("SetupCopyOEMInfA is not available\n"); + win_skip("SetupCopyOEMInfA is not available\n"); test_SetupGetFileCompressionInfo(); if (pSetupGetFileCompressionInfoExA) test_SetupGetFileCompressionInfoEx(); else - skip("SetupGetFileCompressionInfoExA is not available\n"); + win_skip("SetupGetFileCompressionInfoExA is not available\n"); test_SetupDecompressOrCopyFile(); }

1 0

Francois Gouget : user32/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard Feb. 23, 2009

Feb. 23, 2009

Module: wine Branch: master Commit: 8b28508d2b0fe495048bab079ebb76365327bd70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b28508d2b0fe495048bab079… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 23 10:41:03 2009 +0100 user32/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/user32/tests/broadcast.c | 13 ++++++++----- dlls/user32/tests/input.c | 10 +++++----- dlls/user32/tests/menu.c | 8 ++++---- dlls/user32/tests/monitor.c | 8 ++++---- dlls/user32/tests/msg.c | 14 +++++++------- dlls/user32/tests/sysparams.c | 2 +- dlls/user32/tests/win.c | 2 +- dlls/user32/tests/wsprintf.c | 2 +- 8 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index 41f9491..48f1318 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -66,7 +66,10 @@ static BOOL init_procs(void) pBroadcastA = (PBROADCAST)GetProcAddress(user32, "BroadcastSystemMessage"); ok(pBroadcastA != NULL, "No BroadcastSystemMessage found\n"); if (!pBroadcastA) + { + win_skip("BroadcastA is not available\n"); return FALSE; + } pBroadcastW = (PBROADCAST)GetProcAddress(user32, "BroadcastSystemMessageW"); pBroadcastExA = (PBROADCASTEX)GetProcAddress(user32, "BroadcastSystemMessageExA"); @@ -86,7 +89,7 @@ static BOOL init_procs(void) cls.lpszClassName = "MainWindowClass"; if (!RegisterClassA(&cls)) - return 0; + return FALSE; if (!CreateWindowExA(0, "MainWindowClass", "Main window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP, 100, 100, 200, @@ -105,7 +108,7 @@ static void test_parameters(PBROADCAST broadcast, const char *functionname) ret = broadcast( 0x80000000, &recips, WM_NULL, 0, 0 ); if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - skip("%s is not implemented\n", functionname); + win_skip("%s is not implemented\n", functionname); return; } ok(!ret || broken(ret), "Returned: %d\n", ret); @@ -345,14 +348,14 @@ START_TEST(broadcast) test_parameters(pBroadcastW, "BroadcastSystemMessageW"); } else - skip("No BroadcastSystemMessageW, skipping\n"); + win_skip("No BroadcastSystemMessageW, skipping\n"); if (pBroadcastExA) { trace("Running BroadcastSystemMessageExA tests\n"); test_parametersEx(pBroadcastExA); } else - skip("No BroadcastSystemMessageExA, skipping\n"); + win_skip("No BroadcastSystemMessageExA, skipping\n"); if (pBroadcastExW) { trace("Running BroadcastSystemMessageExW tests\n"); @@ -361,5 +364,5 @@ START_TEST(broadcast) test_noprivileges(); } else - skip("No BroadcastSystemMessageExW, skipping\n"); + win_skip("No BroadcastSystemMessageExW, skipping\n"); } diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index defe142..0d58189 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1223,7 +1223,7 @@ static void test_ToUnicode(void) ret = ToUnicode(VK_RETURN, SC_RETURN, state, wStr, 2, 0); if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - skip("ToUnicode is not implemented\n"); + win_skip("ToUnicode is not implemented\n"); return; } @@ -1258,13 +1258,13 @@ START_TEST(input) { init_function_pointers(); - if (!pSendInput) - skip("SendInput is not available\n"); - else + if (pSendInput) { test_Input_blackbox(); test_Input_whitebox(); } + else win_skip("SendInput is not available\n"); + test_keynames(); test_mouse_ll_hook(); test_key_map(); @@ -1274,5 +1274,5 @@ START_TEST(input) if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx(); else - skip("GetMouseMovePointsEx is not available\n"); + win_skip("GetMouseMovePointsEx is not available\n"); } diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 64d3b13..4d0e7d4 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -527,7 +527,7 @@ static void test_menu_bmp_and_string(void) if( !pGetMenuInfo) { - skip("GetMenuInfo is not available\n"); + win_skip("GetMenuInfo is not available\n"); return; } @@ -635,7 +635,7 @@ static void test_menu_add_string( void ) SetLastError(0xdeadbeef); ret = GetMenuStringW( hmenu, 0, strbackW, 99, MF_BYPOSITION ); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - skip("GetMenuStringW is not implemented\n"); + win_skip("GetMenuStringW is not implemented\n"); else { ok (ret, "GetMenuStringW on ownerdraw entry failed\n"); @@ -698,7 +698,7 @@ static void test_menu_add_string( void ) SetLastError(0xdeadbeef); ret = GetMenuStringW( hmenu, 0, NULL, 0, MF_BYPOSITION); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - skip("GetMenuStringW is not implemented\n"); + win_skip("GetMenuStringW is not implemented\n"); else ok (!ret, "GetMenuStringW on ownerdraw entry succeeded.\n"); @@ -2428,7 +2428,7 @@ START_TEST(menu) test_menu_bmp_and_string(); if( !pSendInput) - skip("SendInput is not available\n"); + win_skip("SendInput is not available\n"); else test_menu_input(); test_menu_flags(); diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 944e49b..daa3035 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -78,7 +78,7 @@ static void test_enumdisplaydevices(void) if (!pEnumDisplayDevicesA) { - skip("EnumDisplayDevicesA is not available\n"); + win_skip("EnumDisplayDevicesA is not available\n"); return; } @@ -156,7 +156,7 @@ static void test_ChangeDisplaySettingsEx(void) if (!pChangeDisplaySettingsExA) { - skip("ChangeDisplaySettingsExA is not available\n"); + win_skip("ChangeDisplaySettingsExA is not available\n"); return; } @@ -288,7 +288,7 @@ static void test_monitors(void) if (!pMonitorFromPoint || !pMonitorFromWindow) { - skip("MonitorFromPoint or MonitorFromWindow are not available\n"); + win_skip("MonitorFromPoint or MonitorFromWindow are not available\n"); return; } @@ -331,7 +331,7 @@ static void test_work_area(void) if (!pEnumDisplayMonitors || !pGetMonitorInfoA) { - skip("EnumDisplayMonitors or GetMonitorInfoA are not available\n"); + win_skip("EnumDisplayMonitors or GetMonitorInfoA are not available\n"); return; } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 957f197..aa32eed 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6293,7 +6293,7 @@ static void test_interthread_messages(void) wnd_event.event = CreateEventW(NULL, 0, 0, NULL); if (!wnd_event.event) { - skip("skipping interthread message test under win9x\n"); + win_skip("skipping interthread message test under win9x\n"); return; } @@ -8051,7 +8051,7 @@ static void test_winevents(void) /* WH_MOUSE_LL is not supported on Win9x platforms */ if (!hCBT_global_hook) { - trace("Skipping WH_MOUSE_LL test on this platform\n"); + win_skip("Skipping WH_MOUSE_LL test on this platform\n"); goto skip_mouse_ll_hook_test; } @@ -10612,7 +10612,7 @@ static void test_dbcs_wm_char(void) if (!pGetCPInfoExA) { - skip("GetCPInfoExA is not available\n"); + win_skip("GetCPInfoExA is not available\n"); return; } @@ -11232,7 +11232,7 @@ static void test_menu_messages(void) if (!pGetMenuInfo || !pSetMenuInfo) { - skip("GetMenuInfo and/or SetMenuInfo are not available\n"); + win_skip("GetMenuInfo and/or SetMenuInfo are not available\n"); return; } cls.style = 0; @@ -11414,11 +11414,11 @@ START_TEST(msg) ok(pIsWinEventHookInstalled(event), "IsWinEventHookInstalled(%u) failed\n", event); } } - if (!hEvent_hook) skip( "no win event hook support\n" ); + if (!hEvent_hook) win_skip( "no win event hook support\n" ); cbt_hook_thread_id = GetCurrentThreadId(); hCBT_hook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); - if (!hCBT_hook) skip( "cannot set global hook, will skip hook tests\n" ); + if (!hCBT_hook) win_skip( "cannot set global hook, will skip hook tests\n" ); test_winevents(); @@ -11462,7 +11462,7 @@ START_TEST(msg) test_SetActiveWindow(); if (!pTrackMouseEvent) - skip("TrackMouseEvent is not available\n"); + win_skip("TrackMouseEvent is not available\n"); else test_TrackMouseEvent(); diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 194217f..05f728d 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2315,7 +2315,7 @@ static void test_WM_DISPLAYCHANGE(void) if (!pChangeDisplaySettingsExA) { - skip("ChangeDisplaySettingsExA is not available\n"); + win_skip("ChangeDisplaySettingsExA is not available\n"); return; } diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b40887a..33f1403 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4848,7 +4848,7 @@ static void test_GetWindowModuleFileName(void) if (!pGetWindowModuleFileNameA) { - skip("GetWindowModuleFileNameA is not available\n"); + win_skip("GetWindowModuleFileNameA is not available\n"); return; } diff --git a/dlls/user32/tests/wsprintf.c b/dlls/user32/tests/wsprintf.c index 29e74cb..bca16bd 100644 --- a/dlls/user32/tests/wsprintf.c +++ b/dlls/user32/tests/wsprintf.c @@ -45,7 +45,7 @@ static void wsprintfWTest(void) rc=wsprintfW(buf, fmt, -1); if (rc==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { - skip("wsprintfW is not implemented\n"); + win_skip("wsprintfW is not implemented\n"); return; } ok(rc == 10, "wsPrintfW length failure: rc=%d error=%d\n",rc,GetLastError());

1 0

Francois Gouget : mapi32/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard Feb. 23, 2009

Feb. 23, 2009

Module: wine Branch: master Commit: 323b616532f674232a09a10418b05e403ae06508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=323b616532f674232a09a1041… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 23 10:40:40 2009 +0100 mapi32/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/mapi32/tests/imalloc.c | 4 ++-- dlls/mapi32/tests/prop.c | 4 ++-- dlls/mapi32/tests/util.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mapi32/tests/imalloc.c b/dlls/mapi32/tests/imalloc.c index 5e3a060..9ce94b0 100644 --- a/dlls/mapi32/tests/imalloc.c +++ b/dlls/mapi32/tests/imalloc.c @@ -93,7 +93,7 @@ START_TEST(imalloc) pScInitMapiUtil = (void*)GetProcAddress(hMapi32, "ScInitMapiUtil(a)4"); if (!pScInitMapiUtil) { - skip("ScInitMapiUtil is not available\n"); + win_skip("ScInitMapiUtil is not available\n"); FreeLibrary(hMapi32); return; } @@ -102,7 +102,7 @@ START_TEST(imalloc) ret = pScInitMapiUtil(0); if ((ret != S_OK) && (GetLastError() == ERROR_PROC_NOT_FOUND)) { - skip("ScInitMapiUtil is not implemented\n"); + win_skip("ScInitMapiUtil is not implemented\n"); FreeLibrary(hMapi32); return; } diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index 8bee893..8226bea 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -1362,7 +1362,7 @@ START_TEST(prop) if(!InitFuncPtrs()) { - skip("Needed functions are not available\n"); + win_skip("Needed functions are not available\n"); return; } @@ -1370,7 +1370,7 @@ START_TEST(prop) ret = pScInitMapiUtil(0); if ((ret != S_OK) && (GetLastError() == ERROR_PROC_NOT_FOUND)) { - skip("ScInitMapiUtil is not implemented\n"); + win_skip("ScInitMapiUtil is not implemented\n"); FreeLibrary(hMapi32); return; } diff --git a/dlls/mapi32/tests/util.c b/dlls/mapi32/tests/util.c index 7283fc1..6cb7770 100644 --- a/dlls/mapi32/tests/util.c +++ b/dlls/mapi32/tests/util.c @@ -180,7 +180,7 @@ START_TEST(util) if (!pScInitMapiUtil) { - skip("ScInitMapiUtil is not available\n"); + win_skip("ScInitMapiUtil is not available\n"); FreeLibrary(hMapi32); return; } @@ -189,7 +189,7 @@ START_TEST(util) ret = pScInitMapiUtil(0); if ((ret != S_OK) && (GetLastError() == ERROR_PROC_NOT_FOUND)) { - skip("ScInitMapiUtil is not implemented\n"); + win_skip("ScInitMapiUtil is not implemented\n"); FreeLibrary(hMapi32); return; }

1 0

Henri Verbeet : wined3d: Merge indexbuffer.c with buffer.c.
by Alexandre Julliard Feb. 23, 2009

Feb. 23, 2009

Module: wine Branch: master Commit: 33dd39c4d0819ce37842b9b77afb3846424bd349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33dd39c4d0819ce37842b9b77… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 09:16:06 2009 +0100 wined3d: Merge indexbuffer.c with buffer.c. --- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/buffer.c | 251 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/indexbuffer.c | 232 ---------------------------------------- 3 files changed, 251 insertions(+), 233 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33dd39c4d0819ce37842b…

1 0

Henri Verbeet : wined3d: Merge vertexbuffer.c with buffer.c.
by Alexandre Julliard Feb. 23, 2009

Feb. 23, 2009

Module: wine Branch: master Commit: 392cfefbebd9cf632af487852f6fe38b9240a90e URL: http://source.winehq.org/git/wine.git/?a=commit;h=392cfefbebd9cf632af487852… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 09:16:04 2009 +0100 wined3d: Merge vertexbuffer.c with buffer.c. This just moves to code to the same file, but we want to merge the implementations as well at some point. --- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/buffer.c | 947 +++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/vertexbuffer.c | 820 ------------------------------------- 3 files changed, 947 insertions(+), 821 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=392cfefbebd9cf632af48…

1 0