February 2011 - Wine-commits

Austin English : hlink/tests: Remove win9x hacks.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 5cce62a8f4d06b44d645b1814b7a658075324bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cce62a8f4d06b44d645b1814… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:33:41 2011 -0800 hlink/tests: Remove win9x hacks. --- dlls/hlink/tests/hlink.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index d151aa5..2b2cfaa 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -355,7 +355,6 @@ static void test_persist_save_data(const char *testname, IHlink *lnk, const unsigned char *data; DWORD i; BOOL same; - unsigned int expected_data_win9x_size = 0; hr = IHlink_QueryInterface(lnk, &IID_IPersistStream, (void **)&ps); ok(hr == S_OK, "IHlink_QueryInterface failed with error 0x%08x\n", hr); @@ -373,13 +372,9 @@ static void test_persist_save_data(const char *testname, IHlink *lnk, data = GlobalLock(hglobal); - if (expected_data_size % 4) - expected_data_win9x_size = 4 * ((expected_data_size / 4) + 1); - /* first check we have the right amount of data */ ok((data_size == expected_data_size) || - (data_size == expected_data_alt_size) || - broken(data_size == expected_data_win9x_size), /* Win9x and WinMe */ + (data_size == expected_data_alt_size), "%s: Size of saved data differs (expected %d or %d, actual %d)\n", testname, expected_data_size, expected_data_alt_size, data_size);

1 0

Austin English : inetmib1/tests: Add missing broken().
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: ead0efbacdcff46b5a9ef220aa713f9a42e9e463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ead0efbacdcff46b5a9ef220a… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:34:28 2011 -0800 inetmib1/tests: Add missing broken(). --- dlls/inetmib1/tests/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/inetmib1/tests/main.c b/dlls/inetmib1/tests/main.c index 03c9b62..80b3618 100644 --- a/dlls/inetmib1/tests/main.c +++ b/dlls/inetmib1/tests/main.c @@ -109,7 +109,7 @@ static void testQuery(void) ret = pQuery(SNMP_PDU_GET, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR || - error == ERROR_FILE_NOT_FOUND /* Win9x */, + broken(error == ERROR_FILE_NOT_FOUND) /* NT4 */, "expected SNMP_ERRORSTATUS_NOERROR or ERROR_FILE_NOT_FOUND, got %d\n", error); if (error == SNMP_ERRORSTATUS_NOERROR)

1 0

Austin English : kernel32/tests: Remove win9x hacks.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: d385435876febbf48c1e0c70e329aa23a1958c54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d385435876febbf48c1e0c70e… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:34:56 2011 -0800 kernel32/tests: Remove win9x hacks. --- dlls/kernel32/tests/volume.c | 36 ++++++++++++------------------------ 1 files changed, 12 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 4484a80..15f7e3c 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -40,14 +40,12 @@ static void test_query_dos_deviceA(void) char drivestr[] = "a:"; char *p, *buffer, buffer2[2000]; DWORD ret, ret2, buflen=32768; - BOOL iswin9x, found = FALSE; + BOOL found = FALSE; buffer = HeapAlloc( GetProcessHeap(), 0, buflen ); SetLastError(0xdeadbeef); ret = QueryDosDeviceA( NULL, buffer, buflen ); - iswin9x = !ret && (GetLastError() == ERROR_INVALID_PARAMETER /* win98 */ - || GetLastError() == ERROR_CALL_NOT_IMPLEMENTED /* win95*/); - ok((ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) || broken(iswin9x), + ok((ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER), "QueryDosDeviceA failed to return list, last error %u\n", GetLastError()); if (ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { @@ -64,15 +62,14 @@ static void test_query_dos_deviceA(void) for (;drivestr[0] <= 'z'; drivestr[0]++) { /* Older W2K fails with ERROR_INSUFFICIENT_BUFFER when buflen is > 32767 */ ret = QueryDosDeviceA( drivestr, buffer, buflen - 1); - /* fails for all drives in win9x */ - ok(ret || GetLastError() == ERROR_FILE_NOT_FOUND || broken(!ret && iswin9x), + ok(ret || GetLastError() == ERROR_FILE_NOT_FOUND, "QueryDosDeviceA failed to return current mapping for %s, last error %u\n", drivestr, GetLastError()); if(ret) { for (p = buffer; *p; p++) *p = toupper(*p); if (strstr(buffer, "HARDDISK") || strstr(buffer, "RAMDISK")) found = TRUE; } } - ok(found ^ iswin9x, "expected at least one devicename to contain HARDDISK or RAMDISK except on win9x\n"); + ok(found, "expected at least one devicename to contain HARDDISK or RAMDISK\n"); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -239,9 +236,7 @@ static void test_GetLogicalDriveStringsA(void) ok(size2 == size-1, "size2 = %d\n", size2); for(ptr = buf; ptr < buf+size2; ptr += 4) { - ok(('A' <= *ptr && *ptr <= 'Z') || - (broken('a' <= *ptr && *ptr <= 'z')), /* Win9x and WinMe */ - "device name '%c' is not uppercase\n", *ptr); + ok(('A' <= *ptr && *ptr <= 'Z'), "device name '%c' is not uppercase\n", *ptr); ok(ptr[1] == ':', "ptr[1] = %c, expected ':'\n", ptr[1]); ok(ptr[2] == '\\', "ptr[2] = %c expected '\\'\n", ptr[2]); ok(!ptr[3], "ptr[3] = %c expected nullbyte\n", ptr[3]); @@ -333,8 +328,7 @@ static void test_GetVolumeInformationA(void) SetLastError(0xdeadbeef); ret = pGetVolumeInformationA(Root_Colon, vol_name_buf, vol_name_size, NULL, NULL, NULL, fs_name_buf, fs_name_len); - ok(!ret && (GetLastError() == ERROR_INVALID_NAME || - broken(GetLastError() == ERROR_BAD_PATHNAME/* win9x */)), + ok(!ret && (GetLastError() == ERROR_INVALID_NAME), "GetVolumeInformationA did%s fail, last error %u\n", ret ? " not":"", GetLastError()); /* reset current directory */ @@ -362,8 +356,7 @@ static void test_GetVolumeInformationA(void) SetLastError(0xdeadbeef); ret = pGetVolumeInformationA(Root_Colon, vol_name_buf, vol_name_size, NULL, NULL, NULL, fs_name_buf, fs_name_len); - ok(!ret && (GetLastError() == ERROR_INVALID_NAME || - broken(GetLastError() == ERROR_BAD_PATHNAME/* Win9x */)), + ok(!ret && (GetLastError() == ERROR_INVALID_NAME), "GetVolumeInformationA did%s fail, last error %u\n", ret ? " not":"", GetLastError()); /* Try normal drive letter with trailing \ */ @@ -381,8 +374,7 @@ static void test_GetVolumeInformationA(void) SetLastError(0xdeadbeef); ret = pGetVolumeInformationA(Root_Colon, vol_name_buf, vol_name_size, NULL, NULL, NULL, fs_name_buf, fs_name_len); - ok(!ret && (GetLastError() == ERROR_INVALID_NAME || - broken(GetLastError() == ERROR_BAD_PATHNAME/* Win9x */)), + ok(!ret && (GetLastError() == ERROR_INVALID_NAME), "GetVolumeInformationA did%s fail, last error %u\n", ret ? " not":"", GetLastError()); /* Now C:\ becomes the current directory on drive C: */ @@ -420,32 +412,28 @@ static void test_GetVolumeInformationA(void) SetLastError(0xdeadbeef); ret = pGetVolumeInformationA(Root_UNC, vol_name_buf, vol_name_size, &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); - ok(ret || broken(!ret /* win9x */ && GetLastError()==ERROR_BAD_NETPATH), - "GetVolumeInformationA did%s fail, root=%s, last error=%u\n", ret ? " not":"", Root_UNC, GetLastError()); + ok(ret, "GetVolumeInformationA did%s fail, root=%s, last error=%u\n", ret ? " not":"", Root_UNC, GetLastError()); /* try again with device name space */ Root_UNC[2] = '.'; SetLastError(0xdeadbeef); ret = pGetVolumeInformationA(Root_UNC, vol_name_buf, vol_name_size, &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); - ok(ret || broken(!ret /* win9x */ && GetLastError()==ERROR_BAD_NETPATH), - "GetVolumeInformationA did%s fail, root=%s, last error=%u\n", ret ? " not":"", Root_UNC, GetLastError()); + ok(ret, "GetVolumeInformationA did%s fail, root=%s, last error=%u\n", ret ? " not":"", Root_UNC, GetLastError()); /* try again with a directory off the root - should generate error */ if (windowsdir[strlen(windowsdir)-1] != '\\') strcat(windowsdir, "\\"); SetLastError(0xdeadbeef); ret = pGetVolumeInformationA(windowsdir, vol_name_buf, vol_name_size, &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); - ok(!ret && (GetLastError()==ERROR_DIR_NOT_ROOT || - broken(GetLastError()==ERROR_BAD_PATHNAME/* win9x */)), + ok(!ret && (GetLastError()==ERROR_DIR_NOT_ROOT), "GetVolumeInformationA did%s fail, root=%s, last error=%u\n", ret ? " not":"", windowsdir, GetLastError()); /* A subdir with trailing \ yields DIR_NOT_ROOT instead of INVALID_NAME */ if (windowsdir[strlen(windowsdir)-1] == '\\') windowsdir[strlen(windowsdir)-1] = 0; SetLastError(0xdeadbeef); ret = pGetVolumeInformationA(windowsdir, vol_name_buf, vol_name_size, &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); - ok(!ret && (GetLastError()==ERROR_INVALID_NAME || - broken(GetLastError()==ERROR_BAD_PATHNAME/* win9x */)), + ok(!ret && (GetLastError()==ERROR_INVALID_NAME), "GetVolumeInformationA did%s fail, root=%s, last error=%u\n", ret ? " not":"", windowsdir, GetLastError()); if (!pGetVolumeNameForVolumeMountPointA) {

1 0

Austin English : mlang/tests: Remove win9x hacks.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 5ed5f21d0277deddfe8f0a5fb3b12646df69b15e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ed5f21d0277deddfe8f0a5fb… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:35:46 2011 -0800 mlang/tests: Remove win9x hacks. --- dlls/mlang/tests/mlang.c | 52 ++++++--------------------------------------- 1 files changed, 7 insertions(+), 45 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 96a19a6..65e0266 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -254,28 +254,6 @@ static BOOL init_function_ptrs(void) ok(0, (format), string1, string2); \ } -/* lstrcmpW is not supported on Win9x! */ -static int mylstrcmpW(const WCHAR* str1, const WCHAR* str2) -{ - if (!str2) return 1; - while (*str1 && *str1==*str2) { - str1++; - str2++; - } - return *str1-*str2; -} - -/* lstrcpyW is not supported on Win95 */ -static void mylstrcpyW(WCHAR* str1, const WCHAR* str2) -{ - while (str2 && *str2) { - *str1 = *str2; - str1++; - str2++; - } - *str1 = '\0'; -} - static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) { /* these APIs are broken regarding constness of the input buffer */ @@ -586,8 +564,6 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) #ifdef DUMP_CP_INFO trace("%u: codepage %u family %u\n", i, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); #endif - /* Win95 does not support UTF-7 */ - if (cpinfo[i].uiCodePage == CP_UTF7) continue; /* support files for some codepages might be not installed, or * the codepage is just an alias. @@ -1227,21 +1203,21 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2) "#%02d: got '%s' (expected '%s')\n", i, rfc1766A, info_table[i].rfc1766); /* Some IE versions truncate an oversized name one character to short */ - mylstrcpyW(short_broken_name, info_table[i].broken_name); + lstrcpyW(short_broken_name, info_table[i].broken_name); short_broken_name[MAX_LOCALE_NAME - 2] = '\0'; if (info_table[i].todo & TODO_NAME) { todo_wine - ok( (!mylstrcmpW(prfc->wszLocaleName, info_table[i].localename)) || - broken(!mylstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */ - broken(!mylstrcmpW(prfc->wszLocaleName, short_broken_name)), + ok( (!lstrcmpW(prfc->wszLocaleName, info_table[i].localename)) || + broken(!lstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */ + broken(!lstrcmpW(prfc->wszLocaleName, short_broken_name)), "#%02d: got %s (expected %s)\n", i, wine_dbgstr_w(prfc->wszLocaleName), wine_dbgstr_w(info_table[i].localename)); } else - ok( (!mylstrcmpW(prfc->wszLocaleName, info_table[i].localename)) || - broken(!mylstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */ - broken(!mylstrcmpW(prfc->wszLocaleName, short_broken_name)), + ok( (!lstrcmpW(prfc->wszLocaleName, info_table[i].localename)) || + broken(!lstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */ + broken(!lstrcmpW(prfc->wszLocaleName, short_broken_name)), "#%02d: got %s (expected %s)\n", i, wine_dbgstr_w(prfc->wszLocaleName), wine_dbgstr_w(info_table[i].localename)); @@ -1902,20 +1878,6 @@ static void test_IsCodePageInstallable(IMultiLanguage2 *ml2) UINT i; HRESULT hr; - SetLastError(0xdeadbeef); - lstrcmpW(NULL, NULL); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - /* This corruption leads (sometimes) to test failures in oleaut32 but also - * to the inability to use the Regional Settings. - * This only seems to be an issue with Win98 and IE6 (mlang version 6.0.2800.1106). - * - * A reboot restores the codepages again. - */ - win_skip("IsCodePageInstallable could mess up the codepages on Win98\n"); - return; - } - for (i = 0; i < 0xffff; i++) { hr = IMultiLanguage2_IsCodePageInstallable(ml2, i);

1 0

Austin English : msi/tests: Remove win9x hacks.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 0a284208bd7c726e8640507dc4004eb46b47db1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a284208bd7c726e8640507dc… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:36:03 2011 -0800 msi/tests: Remove win9x hacks. --- dlls/msi/tests/action.c | 39 +-------------------------------------- 1 files changed, 1 insertions(+), 38 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 33f5620..f7919a4 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -50,7 +50,6 @@ static HMODULE hsrclient; static BOOL (WINAPI *pSRRemoveRestorePoint)(DWORD); static BOOL (WINAPI *pSRSetRestorePointA)(RESTOREPOINTINFOA *, STATEMGRSTATUS *); -static BOOL on_win9x; static BOOL is_wow64; static const BOOL is_64bit = sizeof(void *) > sizeof(int); @@ -1850,8 +1849,7 @@ static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, voi DWORD dwCreateDisposition = OPEN_EXISTING; dwAccess = GENERIC_READ | GENERIC_WRITE; - /* FILE_SHARE_DELETE is not supported by Windows Me/98/95 */ - dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; + dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; if (GetFileAttributesA(pszFile) != INVALID_FILE_ATTRIBUTES) dwCreateDisposition = OPEN_EXISTING; @@ -1965,19 +1963,6 @@ static BOOL is_process_limited(void) return FALSE; } -static BOOL check_win9x(void) -{ - SC_HANDLE scm; - - scm = OpenSCManager(NULL, NULL, GENERIC_ALL); - if (!scm && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) - return TRUE; - - CloseServiceHandle(scm); - - return FALSE; -} - static LPSTR get_user_sid(LPSTR *usersid) { HANDLE token; @@ -4613,11 +4598,6 @@ static void test_envvar(void) char buffer[16]; UINT i; - if (on_win9x) - { - win_skip("Environment variables are handled differently on Win9x and WinMe\n"); - return; - } if (is_process_limited()) { skip("process is limited\n"); @@ -4787,11 +4767,6 @@ static void test_start_services(void) BOOL ret; DWORD error = ERROR_SUCCESS; - if (on_win9x) - { - win_skip("Services are not implemented on Win9x and WinMe\n"); - return; - } scm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (!scm && GetLastError() == ERROR_ACCESS_DENIED) { @@ -4869,11 +4844,6 @@ static void test_delete_services(void) { UINT r; - if (on_win9x) - { - win_skip("Services are not implemented on Win9x and WinMe\n"); - return; - } if (is_process_limited()) { skip("process is limited\n"); @@ -5528,11 +5498,6 @@ static void test_remove_env_strings(void) DWORD type, size; char buffer[0x10]; - if (on_win9x) - { - win_skip("Environment variables are handled differently on win9x and winme\n"); - return; - } if (is_process_limited()) { skip("process is limited\n"); @@ -6038,8 +6003,6 @@ START_TEST(action) init_functionpointers(); - on_win9x = check_win9x(); - if (pIsWow64Process) pIsWow64Process(GetCurrentProcess(), &is_wow64);

1 0

Austin English : gdi32/tests: Remove win9x hacks.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 197f2f8cada0b6b78e9c7c77b4b60ccf618d23aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=197f2f8cada0b6b78e9c7c77b… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:33:17 2011 -0800 gdi32/tests: Remove win9x hacks. --- dlls/gdi32/tests/icm.c | 34 ++++++++++++---------------------- 1 files changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index a1c4f97..86f173a 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -63,16 +63,10 @@ static void test_GetICMProfileA( HDC dc ) ok( !ret, "GetICMProfileA succeeded\n" ); ok( size, "expected size > 0\n" ); ok( filename[0] == 0, "Expected filename to be empty\n" ); - ok( error == ERROR_INSUFFICIENT_BUFFER || - error == ERROR_SUCCESS, /* Win95 */ - "got %d, expected ERROR_INSUFFICIENT_BUFFER or ERROR_SUCCESS(Win95)\n", error ); + ok( error == ERROR_INSUFFICIENT_BUFFER, "got %d, expected ERROR_INSUFFICIENT_BUFFER\n", error ); - /* Next test will crash on Win95 */ - if ( error == ERROR_INSUFFICIENT_BUFFER ) - { - ret = GetICMProfileA( dc, NULL, filename ); - ok( !ret, "GetICMProfileA succeeded\n" ); - } + ret = GetICMProfileA( dc, NULL, filename ); + ok( !ret, "GetICMProfileA succeeded\n" ); size = MAX_PATH; ret = GetICMProfileA( dc, &size, filename ); @@ -190,15 +184,11 @@ static void test_EnumICMProfilesA( HDC dc ) ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret); ret = EnumICMProfilesA( dc, enum_profiles_callbackA, 0 ); - ok(ret == -1 || broken(ret == 0) /* nt4 */ || broken(ret == 1) /* win95 */, + ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret); - if (ret != 1) - { - /* Crashes on Win95 */ - ret = EnumICMProfilesA( dc, NULL, 0 ); - ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret); - } + ret = EnumICMProfilesA( dc, NULL, 0 ); + ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret); } static CALLBACK INT enum_profiles_callbackW( LPWSTR filename, LPARAM lparam ) @@ -211,13 +201,13 @@ static void test_EnumICMProfilesW( HDC dc ) INT ret; ret = EnumICMProfilesW( NULL, NULL, 0 ); - ok(ret == -1 || broken(ret == 0) /* win9x, nt4 */, "expected -1, got %d\n", ret); + ok(ret == -1 || broken(ret == 0) /* NT4 */, "expected -1, got %d\n", ret); ret = EnumICMProfilesW( dc, NULL, 0 ); - ok(ret == -1 || broken(ret == 0) /* win9x, nt4 */, "expected -1, got %d\n", ret); + ok(ret == -1 || broken(ret == 0) /* NT4 */, "expected -1, got %d\n", ret); ret = EnumICMProfilesW( dc, enum_profiles_callbackW, 0 ); - ok(ret == -1 || ret == 1 || broken(ret == 0) /* win9x, nt4 */, "expected -1, got %d\n", ret); + ok(ret == -1 || ret == 1 || broken(ret == 0) /* NT4 */, "expected -1, got %d\n", ret); } static void test_SetICMProfileA( HDC dc ) @@ -242,21 +232,21 @@ static void test_SetICMProfileA( HDC dc ) ret = SetICMProfileA( NULL, NULL ); error = GetLastError(); ok(!ret, "SetICMProfileA succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER || broken(error == 0xdeadbeef) /* win9x */, + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); SetLastError( 0xdeadbeef ); ret = SetICMProfileA( NULL, profile ); error = GetLastError(); ok(!ret, "SetICMProfileA succeeded\n"); - ok(error == ERROR_INVALID_HANDLE || broken(error == 0xdeadbeef) /* win9x */, + ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %u\n", error); SetLastError( 0xdeadbeef ); ret = SetICMProfileA( dc, NULL ); error = GetLastError(); ok(!ret, "SetICMProfileA succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER || broken(error == 0xdeadbeef) /* win95 */, + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); ret = SetICMProfileA( dc, profile );

1 0

Rico Schüller : d3dcompiler/tests: Improve test_reflection_bound_resources().
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: f9d4a45fbb667f8db9ee34ab0d4dcf019e3a10e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9d4a45fbb667f8db9ee34ab0… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 27 22:51:01 2011 +0100 d3dcompiler/tests: Improve test_reflection_bound_resources(). --- dlls/d3dcompiler_43/tests/reflection.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 76249f7..7d53f7a 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1018,22 +1018,22 @@ static void test_reflection_bound_resources(void) /* check invalid cases */ hr = ref11->lpVtbl->GetResourceBindingDesc(ref11, 0, NULL); - ok(hr == E_INVALIDARG, "GetResourceBindingDesc failed %x\n", hr); + ok(hr == E_INVALIDARG, "GetResourceBindingDesc failed, got %x, expected %x\n", hr, E_INVALIDARG); hr = ref11->lpVtbl->GetResourceBindingDesc(ref11, 0xffffffff, &desc); - ok(hr == E_INVALIDARG, "GetResourceBindingDesc failed %x\n", hr); + ok(hr == E_INVALIDARG, "GetResourceBindingDesc failed, got %x, expected %x\n", hr, E_INVALIDARG); hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, NULL, &desc); - ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed %x\n", hr); + ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed, got %x, expected %x\n", hr, E_INVALIDARG); hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, "sam", NULL); - ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed %x\n", hr); + ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed, got %x, expected %x\n", hr, E_INVALIDARG); hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, "invalid", NULL); - ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed %x\n", hr); + ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed, got %x, expected %x\n", hr, E_INVALIDARG); hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, "invalid", &desc); - ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed %x\n", hr); + ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed, got %x, expected %x\n", hr, E_INVALIDARG); /* GetResourceBindingDesc */ for (i = 0; i < sizeof(test_reflection_bound_resources_result)/sizeof(*test_reflection_bound_resources_result); ++i)

1 0

Austin English : advapi32/tests: Remove Win9x hacks.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 4bf211714e5ae15d05d91e8ab35c016bf8218a50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bf211714e5ae15d05d91e8ab… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:27:58 2011 -0800 advapi32/tests: Remove Win9x hacks. --- dlls/advapi32/tests/security.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index bfe9783..4ba244f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1881,12 +1881,6 @@ static void test_LookupAccountName(void) user_size = UNLEN + 1; SetLastError(0xdeadbeef); ret = GetUserNameA(user_name, &user_size); - if (!ret && (GetLastError() == ERROR_NOT_LOGGED_ON)) - { - /* Probably on win9x where the user used 'Cancel' instead of properly logging in */ - skip("Cannot get the user name (win9x and not logged in properly)\n"); - return; - } ok(ret, "Failed to get user name : %d\n", GetLastError()); /* get sizes */

1 0

Austin English : advpack/tests: Remove win9x hacks.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: befe57aa14782f8210fcbbe89d9e8b371a1777dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=befe57aa14782f8210fcbbe89… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:28:33 2011 -0800 advpack/tests: Remove win9x hacks. --- dlls/advpack/tests/install.c | 28 +++++++--------------------- 1 files changed, 7 insertions(+), 21 deletions(-) diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 3b0954f..91bef81 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -109,9 +109,7 @@ static void test_RunSetupCommand(void) /* try to run an exe with the RSC_FLAG_INF flag */ hexe = (HANDLE)0xdeadbeef; hr = pRunSetupCommand(NULL, "winver.exe", "Install", systemdir, "Title", &hexe, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); - ok(is_spapi_err(hr) || - hr == E_FAIL, /* win9x */ - "Expected a setupapi error or E_FAIL, got %d\n", hr); + ok(is_spapi_err(hr), "Expected a setupapi error, got %d\n", hr); ok(hexe == (HANDLE)0xdeadbeef, "Expected hexe to be 0xdeadbeef\n"); ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n"); @@ -144,9 +142,7 @@ static void test_RunSetupCommand(void) /* try a relative path to the INF, with working dir provided */ hr = pRunSetupCommand(NULL, "one\\test.inf", "DefaultInstall", dir, "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); - ok(hr == ERROR_SUCCESS || - hr == E_FAIL, /* win9x */ - "Expected ERROR_SUCCESS, got %d\n", hr); + ok(hr == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", hr); /* try a relative path to the INF, NULL working dir */ hr = pRunSetupCommand(NULL, "one\\test.inf", "DefaultInstall", NULL, "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); @@ -155,15 +151,11 @@ static void test_RunSetupCommand(void) /* try a relative path to the INF, empty working dir */ hr = pRunSetupCommand(NULL, "one\\test.inf", "DefaultInstall", "", "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); - ok(hr == ERROR_SUCCESS || - hr == E_FAIL, /* win9x */ - "Expected ERROR_SUCCESS or E_FAIL, got %d\n", hr); + ok(hr == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", hr); /* try only the INF filename, with working dir provided */ hr = pRunSetupCommand(NULL, "test.inf", "DefaultInstall", dir, "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || - hr == E_FAIL, /* win9x */ - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) or E_FAIL, got %d\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %d\n", hr); /* try only the INF filename, NULL working dir */ hr = pRunSetupCommand(NULL, "test.inf", "DefaultInstall", NULL, "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); @@ -172,9 +164,7 @@ static void test_RunSetupCommand(void) /* try only the INF filename, empty working dir */ hr = pRunSetupCommand(NULL, "test.inf", "DefaultInstall", "", "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || - hr == E_FAIL, /* win9x */ - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) or E_FAIL, got %d\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %d\n", hr); DeleteFileA("one\\test.inf"); RemoveDirectoryA("one"); @@ -183,9 +173,7 @@ static void test_RunSetupCommand(void) /* try INF file in the current directory, working directory provided */ hr = pRunSetupCommand(NULL, "test.inf", "DefaultInstall", CURR_DIR, "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || - hr == E_FAIL, /* win9x */ - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) or E_FAIL, got %d\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %d\n", hr); /* try INF file in the current directory, NULL working directory */ hr = pRunSetupCommand(NULL, "test.inf", "DefaultInstall", NULL, "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); @@ -194,9 +182,7 @@ static void test_RunSetupCommand(void) /* try INF file in the current directory, empty working directory */ hr = pRunSetupCommand(NULL, "test.inf", "DefaultInstall", CURR_DIR, "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || - hr == E_FAIL, /* win9x */ - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) or E_FAIL, got %d\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %d\n", hr); } static void test_LaunchINFSection(void)

1 0

Austin English : comdlg32/tests: Remove win9x hacks.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 5c9d341c693d57feb1e1807586381c6403e17c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9d341c693d57feb1e180758… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:29:32 2011 -0800 comdlg32/tests: Remove win9x hacks. --- dlls/comdlg32/tests/filedlg.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 73e8d36..7f5d175 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -142,9 +142,7 @@ static void test_DialogCancel(void) else { ok(0 == result, "expected 0, got %d\n", result); - ok(0 == CommDlgExtendedError() || - broken(CDERR_INITIALIZATION == CommDlgExtendedError()), /* win9x */ - "expected 0, got %d\n", CommDlgExtendedError()); + ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); } SetLastError(0xdeadbeef); @@ -154,9 +152,7 @@ static void test_DialogCancel(void) else { ok(0 == result, "expected 0, got %d\n", result); - ok(0 == CommDlgExtendedError() || - broken(CDERR_INITIALIZATION == CommDlgExtendedError()), /* win9x */ - "expected 0, got %d\n", CommDlgExtendedError()); + ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); } } @@ -219,7 +215,7 @@ static UINT_PTR CALLBACK create_view_window2_hook(HWND dlg, UINT msg, WPARAM wPa hr = IShellView2_DestroyViewWindow(shell_view2); ok(SUCCEEDED(hr), "DestroyViewWindow returned %#x\n", hr); - /* XP and W2K3 need this. On Win9x and W2K the call to DestroyWindow() fails and has + /* XP and W2K3 need this. On W2K the call to DestroyWindow() fails and has * no side effects. NT4 doesn't get here. (FIXME: Vista doesn't get here yet). */ DestroyWindow(view_params.hwndView); @@ -231,9 +227,7 @@ static UINT_PTR CALLBACK create_view_window2_hook(HWND dlg, UINT msg, WPARAM wPa hr = IShellView2_GetCurrentInfo(shell_view2, &folder_settings); ok(SUCCEEDED(hr), "GetCurrentInfo returned %#x\n", hr); - ok(folder_settings.ViewMode == FVM_DETAILS || - broken(folder_settings.ViewMode == FVM_LIST), /* Win9x */ - "view mode is %d, expected FVM_DETAILS\n", + ok(folder_settings.ViewMode == FVM_DETAILS, "view mode is %d, expected FVM_DETAILS\n", folder_settings.ViewMode); cleanup: @@ -433,8 +427,7 @@ static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L /* sized horizontal and moved vertical */ case cmb1: case edt1: - ok( TESTRECTS( ctrlrcs[i], rc, 0, 10, 10, 0) || - broken(TESTRECTS( ctrlrcs[i], rc, 0, 10, 0, 0)),/*win98*/ + ok( TESTRECTS( ctrlrcs[i], rc, 0, 10, 10, 0), "control id %03x should have sized horizontally and moved vertically, before %d,%d-%d,%d after %d,%d-%d,%d\n", ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, ctrlrcs[i].right, ctrlrcs[i].bottom, @@ -451,8 +444,7 @@ static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L /* moved horizontal and vertical */ case IDCANCEL: case pshHelp: - ok( TESTRECTS( ctrlrcs[i], rc, 10, 10, 0, 0) || - broken(TESTRECTS( ctrlrcs[i], rc, 0, 10, 0, 0)),/*win98*/ + ok( TESTRECTS( ctrlrcs[i], rc, 10, 10, 0, 0), "control id %03x should have moved horizontally and vertically, before %d,%d-%d,%d after %d,%d-%d,%d\n", ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, ctrlrcs[i].right, ctrlrcs[i].bottom,

1 0