February 2009 - Wine-commits

Paul Vriens : d3d8/tests: Fix a test failure on VMware.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: b6263f666428bb518e3faff54ff1fa18a686ee4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6263f666428bb518e3faff54… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Feb 25 12:06:02 2009 +0100 d3d8/tests: Fix a test failure on VMware. --- dlls/d3d8/tests/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index f622e1f..f97bbb3 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -774,7 +774,9 @@ static void test_display_modes(void) if(!pD3d) return; max_modes = IDirect3D8_GetAdapterModeCount(pD3d, D3DADAPTER_DEFAULT); - ok(max_modes > 0, "GetAdapterModeCount(D3DADAPTER_DEFAULT) returned 0!\n"); + ok(max_modes > 0 || + broken(max_modes == 0), /* VMware */ + "GetAdapterModeCount(D3DADAPTER_DEFAULT) returned 0!\n"); for(i=0; i<max_modes;i++) { res = IDirect3D8_EnumAdapterModes(pD3d, D3DADAPTER_DEFAULT, i, &dmode);

1 0

Paul Vriens : d3d8/tests: Fix a test failure on some boxes.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: a1ca18eaf89df658f2cfaad9553ce37d5cbf2779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1ca18eaf89df658f2cfaad95… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Feb 25 12:12:50 2009 +0100 d3d8/tests: Fix a test failure on some boxes. --- dlls/d3d8/tests/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index f97bbb3..ab21482 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1207,7 +1207,9 @@ static void test_lights(void) /* TODO: Test the rendering results in this situation */ hr = IDirect3DDevice8_LightEnable(device, i + 1, TRUE); - ok(hr == D3D_OK, "Enabling one light more than supported returned %08x\n", hr); + ok(hr == D3D_OK || + broken(hr == D3DERR_INVALIDCALL), /* Some Win9x and WinME */ + "Enabling one light more than supported returned %08x\n", hr); hr = IDirect3DDevice8_GetLightEnable(device, i + 1, &enabled); ok(hr == D3D_OK, "GetLightEnable on light %u failed with %08x\n", i + 1, hr); ok(enabled, "Light %d is %s\n", i + 1, enabled ? "enabled" : "disabled");

1 0

Paul Bryan Roberts : advapi32: Add stub for GetSecurityInfoExA.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: be9875fb609fe7b834b129eaf48b37cee36f501c URL: http://source.winehq.org/git/wine.git/?a=commit;h=be9875fb609fe7b834b129eaf… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Mon Feb 23 19:31:05 2009 +0000 advapi32: Add stub for GetSecurityInfoExA. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 219e3d1..bcb2047 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -272,7 +272,7 @@ # @ stub GetSecurityDescriptorRMControl @ stdcall GetSecurityDescriptorSacl (ptr ptr ptr ptr) @ stdcall GetSecurityInfo (long long long ptr ptr ptr ptr ptr) -# @ stub GetSecurityInfoExA +@ stdcall GetSecurityInfoExA (long long long str str ptr ptr ptr ptr) @ stdcall GetSecurityInfoExW (long long long wstr wstr ptr ptr ptr ptr) @ stdcall GetServiceDisplayNameA(ptr str ptr ptr) @ stdcall GetServiceDisplayNameW(ptr wstr ptr ptr) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 65fa0db..454c98f 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2946,6 +2946,20 @@ DWORD WINAPI GetSecurityInfo( } /****************************************************************************** + * GetSecurityInfoExA [ADVAPI32.@] + */ +DWORD WINAPI GetSecurityInfoExA( + HANDLE hObject, SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, LPCSTR lpProvider, + LPCSTR lpProperty, PACTRL_ACCESSA *ppAccessList, + PACTRL_AUDITA *ppAuditList, LPSTR *lppOwner, LPSTR *lppGroup +) +{ + FIXME("stub!\n"); + return ERROR_BAD_PROVIDER; +} + +/****************************************************************************** * GetSecurityInfoExW [ADVAPI32.@] */ DWORD WINAPI GetSecurityInfoExW(

1 0

Francois Gouget : wintrust/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 2017cf27f3ffab8f226e6fee96d85b333a39f791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2017cf27f3ffab8f226e6fee9… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 25 10:30:37 2009 +0100 wintrust/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/wintrust/tests/asn.c | 16 ++++++++-------- dlls/wintrust/tests/register.c | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index d50d249..308fb8b 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -41,7 +41,7 @@ static void test_encodeSPCFinancialCriteria(void) if (!pCryptEncodeObjectEx) { - skip("CryptEncodeObjectEx() is not available. Skipping the encodeFinancialCriteria tests\n"); + win_skip("CryptEncodeObjectEx() is not available. Skipping the encodeFinancialCriteria tests\n"); return; } ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_FINANCIAL_CRITERIA_STRUCT, @@ -73,7 +73,7 @@ static void test_decodeSPCFinancialCriteria(void) if (!pCryptDecodeObjectEx) { - skip("CryptDecodeObjectEx() is not available. Skipping the decodeSPCFinancialCriteria tests\n"); + win_skip("CryptDecodeObjectEx() is not available. Skipping the decodeSPCFinancialCriteria tests\n"); return; } @@ -123,7 +123,7 @@ static void test_encodeSPCLink(void) if (!pCryptEncodeObjectEx) { - skip("CryptEncodeObjectEx() is not available. Skipping the encodeSPCLink tests\n"); + win_skip("CryptEncodeObjectEx() is not available. Skipping the encodeSPCLink tests\n"); return; } @@ -215,7 +215,7 @@ static void test_decodeSPCLink(void) if (!pCryptDecodeObjectEx) { - skip("CryptDecodeObjectEx() is not available. Skipping the decodeSPCLink tests\n"); + win_skip("CryptDecodeObjectEx() is not available. Skipping the decodeSPCLink tests\n"); return; } @@ -325,7 +325,7 @@ static void test_encodeSPCPEImage(void) if (!pCryptEncodeObjectEx) { - skip("CryptEncodeObjectEx() is not available. Skipping the encodeSPCPEImage tests\n"); + win_skip("CryptEncodeObjectEx() is not available. Skipping the encodeSPCPEImage tests\n"); return; } @@ -430,7 +430,7 @@ static void test_decodeSPCPEImage(void) if (!pCryptDecodeObjectEx) { - skip("CryptDecodeObjectEx() is not available. Skipping the decodeSPCPEImage tests\n"); + win_skip("CryptDecodeObjectEx() is not available. Skipping the decodeSPCPEImage tests\n"); return; } @@ -556,7 +556,7 @@ static void test_encodeCatMemberInfo(void) if (!pCryptEncodeObjectEx) { - skip("CryptEncodeObjectEx() is not available. Skipping the encodeCatMemberInfo tests\n"); + win_skip("CryptEncodeObjectEx() is not available. Skipping the encodeCatMemberInfo tests\n"); return; } @@ -605,7 +605,7 @@ static void test_decodeCatMemberInfo(void) if (!pCryptDecodeObjectEx) { - skip("CryptDecodeObjectEx() is not available. Skipping the decodeCatMemberInfo tests\n"); + win_skip("CryptDecodeObjectEx() is not available. Skipping the decodeCatMemberInfo tests\n"); return; } diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index 8a6675c..dd266bd 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -66,7 +66,7 @@ static void test_AddRem_ActionID(void) if (!pWintrustAddActionID || !pWintrustRemoveActionID) { - skip("WintrustAddActionID and/or WintrustRemoveActionID are not available\n"); + win_skip("WintrustAddActionID and/or WintrustRemoveActionID are not available\n"); return; } @@ -176,7 +176,7 @@ static void test_AddDefaultForUsage(void) if (!pWintrustAddDefaultForUsage) { - skip("WintrustAddDefaultForUsage is not available\n"); + win_skip("WintrustAddDefaultForUsage is not available\n"); return; } @@ -229,7 +229,7 @@ static void test_LoadFunctionPointers(void) if (!pWintrustLoadFunctionPointers) { - skip("WintrustLoadFunctionPointers is not available\n"); + win_skip("WintrustLoadFunctionPointers is not available\n"); return; } SetLastError(0xdeadbeef); @@ -278,7 +278,7 @@ static void test_RegPolicyFlags(void) if (!pWintrustGetRegPolicyFlags || !pWintrustSetRegPolicyFlags) { - skip("Policy flags functions not present\n"); + win_skip("Policy flags functions not present\n"); return; }

1 0

Francois Gouget : comdlg32/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: ef5178af21f24eac0f65f41476c5ba4ac7c9c109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef5178af21f24eac0f65f4147… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 25 10:30:42 2009 +0100 comdlg32/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/comdlg32/tests/printdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index c305016..ec63da9 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -387,7 +387,7 @@ START_TEST(printdlg) /* PrintDlgEx not present before w2k */ if (ptr) { - skip("%s\n", ptr); + win_skip("%s\n", ptr); return; }

1 0

Paul Vriens : winetest: Extend PATH if we have dlls that only come with . NET.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: b446f74974fbc58376e8de88ab57e2cb8ad91531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b446f74974fbc58376e8de88a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Feb 25 11:56:31 2009 +0100 winetest: Extend PATH if we have dlls that only come with .NET. --- programs/winetest/main.c | 59 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 74a4307..2df81fa 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -44,6 +44,7 @@ struct wine_test int subtest_count; char **subtests; char *exename; + char *maindllpath; }; char *tag = NULL; @@ -61,6 +62,9 @@ static unsigned int nb_filters = 0; static HMODULE hmscoree; static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR, LPCWSTR, LPVOID, HMODULE *); +/* To store the current PATH setting (related to .NET only provided dlls) */ +static char *curpath; + /* check if test is being filtered out */ static BOOL test_filtered_out( LPCSTR module, LPCSTR testname ) { @@ -341,6 +345,19 @@ static DWORD wait_process( HANDLE process, DWORD timeout ) return WAIT_TIMEOUT; } +static void append_path( const char *path) +{ + char *newpath; + + newpath = xmalloc(strlen(curpath) + 1 + strlen(path) + 1); + strcpy(newpath, curpath); + strcat(newpath, ";"); + strcat(newpath, path); + SetEnvironmentVariableA("PATH", newpath); + + free(newpath); +} + /* Run a command for MS milliseconds. If OUT != NULL, also redirect stdout to there. @@ -446,8 +463,16 @@ get_subtests (const char *tempdir, struct wine_test *test, LPTSTR res_name) extract_test (test, tempdir, res_name); cmd = strmake (NULL, "%s --list", test->exename); + if (test->maindllpath) { + /* We need to add the path (to the main dll) to PATH */ + append_path(test->maindllpath); + } status = run_ex (cmd, subfile, tempdir, 5000); err = GetLastError(); + if (test->maindllpath) { + /* Restore PATH again */ + SetEnvironmentVariableA("PATH", curpath); + } free (cmd); if (status == -2) @@ -538,11 +563,26 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, strcpy(dllname, lpszName); *strstr(dllname, testexe) = 0; + wine_tests[nr_of_files].maindllpath = NULL; dll = LoadLibraryExA(dllname, NULL, LOAD_LIBRARY_AS_DATAFILE); if (!dll && pLoadLibraryShim) { MultiByteToWideChar(CP_ACP, 0, dllname, -1, dllnameW, MAX_PATH); - if (FAILED( pLoadLibraryShim(dllnameW, NULL, NULL, &dll) )) dll = 0; + if (FAILED( pLoadLibraryShim(dllnameW, NULL, NULL, &dll) )) + dll = 0; + else + { + char dllpath[MAX_PATH]; + + /* We have a dll that cannot be found through LoadLibraryExA. This + * is the case for .NET provided dll's. We will add the directory + * where the dll resides to the PATH variable when dealing with + * the tests for this dll. + */ + GetModuleFileNameA(dll, dllpath, MAX_PATH); + *strrchr(dllpath, '\\') = '\0'; + wine_tests[nr_of_files].maindllpath = xstrdup( dllpath ); + } } if (!dll) { xprintf (" %s=dll is missing\n", dllname); @@ -578,6 +618,12 @@ run_tests (char *logname) DWORD strsize; SECURITY_ATTRIBUTES sa; char tmppath[MAX_PATH], tempdir[MAX_PATH+4]; + DWORD needed; + + /* Get the current PATH only once */ + needed = GetEnvironmentVariableA("PATH", NULL, 0); + curpath = xmalloc(needed); + GetEnvironmentVariableA("PATH", curpath, needed); SetErrorMode (SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX); @@ -684,11 +730,21 @@ run_tests (char *logname) struct wine_test *test = wine_tests + i; int j; + if (test->maindllpath) { + /* We need to add the path (to the main dll) to PATH */ + append_path(test->maindllpath); + } + for (j = 0; j < test->subtest_count; j++) { report (R_STEP, "Running: %s:%s", test->name, test->subtests[j]); run_test (test, test->subtests[j], logfile, tempdir); } + + if (test->maindllpath) { + /* Restore PATH again */ + SetEnvironmentVariableA("PATH", curpath); + } } report (R_DELTA, 0, "Running: Done"); @@ -697,6 +753,7 @@ run_tests (char *logname) logfile = 0; remove_dir (tempdir); free (wine_tests); + free (curpath); return logname; }

1 0

Francois Gouget : wininet/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: c0cfe453e387d1362132717bd415f08e858010c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0cfe453e387d1362132717bd… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 25 10:29:58 2009 +0100 wininet/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/wininet/tests/ftp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index a785fa9..b4de4e1 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -707,7 +707,7 @@ static void test_command(HINTERNET hFtp, HINTERNET hConnect) if (!pFtpCommandA) { - skip("FtpCommandA() is not available. Skipping the Ftp command tests\n"); + win_skip("FtpCommandA() is not available. Skipping the Ftp command tests\n"); return; } @@ -813,7 +813,7 @@ static void test_get_current_dir(HINTERNET hFtp, HINTERNET hConnect) if (!pFtpCommandA) { - skip("FtpCommandA() is not available. Skipping the Ftp get_current_dir tests\n"); + win_skip("FtpCommandA() is not available. Skipping the Ftp get_current_dir tests\n"); return; }

1 0

Francois Gouget : winspool.drv/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 5e79fd7534b559ff341bd11bd47621d155142888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e79fd7534b559ff341bd11bd… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 25 10:30:13 2009 +0100 winspool.drv/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/winspool.drv/tests/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 1e47983..9ac82e1 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -479,7 +479,7 @@ static void test_AddPortEx(void) if (!pAddPortExA) { - skip("AddPortEx not supported\n"); + win_skip("AddPortEx not supported\n"); return; } @@ -2235,7 +2235,7 @@ static void test_EnumPrinters(void) /* EnumPrintersW is not supported on all platforms */ if (!ret && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { - skip("EnumPrintersW is not implemented\n"); + win_skip("EnumPrintersW is not implemented\n"); return; }

1 0

Francois Gouget : shell32/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 80b8a0b58e28206ab192b769d8ecb152e3243af6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80b8a0b58e28206ab192b769d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 25 10:28:30 2009 +0100 shell32/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/shell32/tests/appbar.c | 2 +- dlls/shell32/tests/shelllink.c | 6 +++--- dlls/shell32/tests/shellpath.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index 0d0c898..5d15fcd 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -372,7 +372,7 @@ static void test_appbarget(void) if (!pMonitorFromWindow) { - skip("MonitorFromWindow is not available\n"); + win_skip("MonitorFromWindow is not available\n"); } else { diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 7206df3..9e792fd 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -512,7 +512,7 @@ static void test_load_save(void) if (!pGetLongPathNameA) { - skip("GetLongPathNameA is not available\n"); + win_skip("GetLongPathNameA is not available\n"); return; } @@ -655,7 +655,7 @@ static void test_datalink(void) "CoCreateInstance failed (0x%08x)\n", r); if (!sl) { - skip("no shelllink\n"); + win_skip("no shelllink\n"); return; } @@ -666,7 +666,7 @@ static void test_datalink(void) if (!dl) { - skip("no datalink interface\n"); + win_skip("no datalink interface\n"); IShellLinkW_Release( sl ); return; } diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 883f231..bf4e4ae 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -864,7 +864,7 @@ START_TEST(shellpath) { /* Report missing functions once */ if (!pSHGetFolderLocation) - skip("SHGetFolderLocation is not available\n"); + win_skip("SHGetFolderLocation is not available\n"); /* first test various combinations of parameters: */ testApiParameters();

1 0

Francois Gouget : shlwapi/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: a49dd715a83dc38b47efadd0b40e6ca08ec4b6ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a49dd715a83dc38b47efadd0b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 25 10:28:49 2009 +0100 shlwapi/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/shlwapi/tests/ordinal.c | 2 +- dlls/shlwapi/tests/string.c | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 7865acb..d0e8dd8 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -464,7 +464,7 @@ static void test_SHPackDispParams(void) HRESULT hres; if(!pSHPackDispParams) - skip("SHPackSidpParams not available\n"); + win_skip("SHPackSidpParams not available\n"); memset(&params, 0xc0, sizeof(params)); memset(vars, 0xc0, sizeof(vars)); diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index df9398a..fa50626 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -504,7 +504,7 @@ static void test_StrFormatByteSize64A(void) if (!pStrFormatByteSize64A) { - skip("StrFormatByteSize64A() is not available. Tests skipped\n"); + win_skip("StrFormatByteSize64A() is not available\n"); return; } @@ -528,7 +528,7 @@ static void test_StrFormatKBSizeW(void) if (!pStrFormatKBSizeW) { - skip("StrFormatKBSizeW() is not available. Tests skipped\n"); + win_skip("StrFormatKBSizeW() is not available\n"); return; } @@ -550,7 +550,7 @@ static void test_StrFormatKBSizeA(void) if (!pStrFormatKBSizeA) { - skip("StrFormatKBSizeA() is not available. Tests skipped\n"); + win_skip("StrFormatKBSizeA() is not available\n"); return; } @@ -596,7 +596,7 @@ static void test_StrCmpA(void) ok(!pStrIsIntlEqualA(TRUE, str1, str2, 5), "StrIsIntlEqualA(TRUE,...) isn't case-sensitive\n"); } else - skip("StrIsIntlEqualA() is not available. Tests skipped\n"); + win_skip("StrIsIntlEqualA() is not available\n"); if (pIntlStrEqWorkerA) { @@ -604,7 +604,7 @@ static void test_StrCmpA(void) ok(!pIntlStrEqWorkerA(TRUE, str1, str2, 5), "pIntlStrEqWorkerA(TRUE,...) isn't case-sensitive\n"); } else - skip("IntlStrEqWorkerA() is not available. Tests skipped\n"); + win_skip("IntlStrEqWorkerA() is not available\n"); } static void test_StrCmpW(void) @@ -623,7 +623,7 @@ static void test_StrCmpW(void) ok(!pStrIsIntlEqualW(TRUE, str1, str2, 5), "StrIsIntlEqualW(TRUE,...) isn't case-sensitive\n"); } else - skip("StrIsIntlEqualW() is not available. Tests skipped\n"); + win_skip("StrIsIntlEqualW() is not available\n"); if (pIntlStrEqWorkerW) { @@ -631,7 +631,7 @@ static void test_StrCmpW(void) ok(!pIntlStrEqWorkerW(TRUE, str1, str2, 5), "IntlStrEqWorkerW(TRUE,...) isn't case-sensitive\n"); } else - skip("IntlStrEqWorkerW() is not available. Tests skipped\n"); + win_skip("IntlStrEqWorkerW() is not available\n"); } static WCHAR *CoDupStrW(const char* src) @@ -652,7 +652,7 @@ static void test_StrRetToBSTR(void) if (!pStrRetToBSTR) { - skip("StrRetToBSTR() is not available. Tests skipped\n"); + win_skip("StrRetToBSTR() is not available\n"); return; } @@ -690,7 +690,7 @@ static void test_StrCpyNXA(void) if (!pStrCpyNXA) { - skip("StrCpyNXA() is not available. Tests skipped\n"); + win_skip("StrCpyNXA() is not available\n"); return; } @@ -711,7 +711,7 @@ static void test_StrCpyNXW(void) if (!pStrCpyNXW) { - skip("StrCpyNXW() is not available. Tests skipped\n"); + win_skip("StrCpyNXW() is not available\n"); return; } @@ -768,7 +768,7 @@ static void test_SHAnsiToAnsi(void) if (!pSHAnsiToAnsi) { - skip("SHAnsiToAnsi() is not available. Tests skipped\n"); + win_skip("SHAnsiToAnsi() is not available\n"); return; } @@ -789,7 +789,7 @@ static void test_SHUnicodeToUnicode(void) if (!pSHUnicodeToUnicode) { - skip("SHUnicodeToUnicode() is not available. Tests skipped\n"); + win_skip("SHUnicodeToUnicode() is not available\n"); return; } @@ -829,7 +829,7 @@ static void test_StrXXX_overflows(void) expect_eq(buf[100], '\xbf', CHAR, "%x"); } else - skip("StrCatBuffA() is not available. Tests skipped\n"); + win_skip("StrCatBuffA() is not available\n"); memset(wbuf, 0xbf, sizeof(wbuf)); expect_eq(StrCpyNW(wbuf, wstr1, 10), wbuf, PWCHAR, "%p"); @@ -843,7 +843,7 @@ static void test_StrXXX_overflows(void) expect_eq(wbuf[100], (WCHAR)0xbfbf, WCHAR, "%x"); } else - skip("StrCatBuffW() is not available. Tests skipped\n"); + win_skip("StrCatBuffW() is not available\n"); if (pStrRetToBufW) { @@ -855,7 +855,7 @@ static void test_StrXXX_overflows(void) expect_eq(wbuf[10], (WCHAR)0xbfbf, WCHAR, "%x"); } else - skip("StrRetToBufW() is not available. Tests skipped\n"); + win_skip("StrRetToBufW() is not available\n"); if (pStrRetToBufA) { @@ -867,7 +867,7 @@ static void test_StrXXX_overflows(void) expect_eq(buf[10], (CHAR)0xbf, CHAR, "%x"); } else - skip("StrRetToBufA() is not available. Tests skipped\n"); + win_skip("StrRetToBufA() is not available\n"); if (pwnsprintfA) { @@ -878,7 +878,7 @@ static void test_StrXXX_overflows(void) expect_eq(buf[10], (CHAR)0xbf, CHAR, "%x"); } else - skip("wnsprintfA() is not available. Tests skipped\n"); + win_skip("wnsprintfA() is not available\n"); if (pwnsprintfW) { @@ -889,7 +889,7 @@ static void test_StrXXX_overflows(void) expect_eq(wbuf[10], (WCHAR)0xbfbf, WCHAR, "%x"); } else - skip("wnsprintfW() is not available. Tests skipped\n"); + win_skip("wnsprintfW() is not available\n"); } START_TEST(string)

1 0