December 2009 - Wine-Commits

Paul Vriens : shell32/tests: Remove a now unused define.
by Alexandre Julliard Dec. 8, 2009

Dec. 8, 2009

Module: wine Branch: master Commit: ba5142f3427309f2b59e34f22a6cc356c2ec28b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba5142f3427309f2b59e34f22… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Dec 8 15:27:27 2009 +0100 shell32/tests: Remove a now unused define. --- dlls/shell32/tests/progman_dde.c | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 7c0b4c4..069ec56 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -51,9 +51,6 @@ #define DDE_TEST_COMPOUND 0x00070000 #define DDE_TEST_CALLMASK 0x00ff0000 -/* Type of Test (Common, Individual) */ -#define DDE_TEST_COMMON 0x01000000 - #define DDE_TEST_NUMMASK 0x0000ffff static HRESULT (WINAPI *pSHGetLocalizedName)(LPCWSTR, LPWSTR, UINT, int *); @@ -620,21 +617,21 @@ static int DdeTestProgman(DWORD instance, HCONV hConv) GetTempFileNameA(temppath, "dde", 0, f2g3); /* CreateGroup Tests (including AddItem, DeleteItem) */ - CreateGroupTest(instance, hConv, "[CreateGroup(Group1)]", DMLERR_NO_ERROR, "Group1", Group1Title, DDE_TEST_COMMON|DDE_TEST_CREATEGROUP|testnum++); + CreateGroupTest(instance, hConv, "[CreateGroup(Group1)]", DMLERR_NO_ERROR, "Group1", Group1Title, DDE_TEST_CREATEGROUP|testnum++); CreateAddItemText(itemtext, f1g1, "f1g1Name"); - AddItemTest(instance, hConv, itemtext, DMLERR_NO_ERROR, "f1g1Name.lnk", "Group1", DDE_TEST_COMMON|DDE_TEST_ADDITEM|testnum++); + AddItemTest(instance, hConv, itemtext, DMLERR_NO_ERROR, "f1g1Name.lnk", "Group1", DDE_TEST_ADDITEM|testnum++); CreateAddItemText(itemtext, f2g1, "f2g1Name"); - AddItemTest(instance, hConv, itemtext, DMLERR_NO_ERROR, "f2g1Name.lnk", "Group1", DDE_TEST_COMMON|DDE_TEST_ADDITEM|testnum++); - DeleteItemTest(instance, hConv, "[DeleteItem(f2g1Name)]", DMLERR_NO_ERROR, "f2g1Name.lnk", "Group1", DDE_TEST_COMMON|DDE_TEST_DELETEITEM|testnum++); + AddItemTest(instance, hConv, itemtext, DMLERR_NO_ERROR, "f2g1Name.lnk", "Group1", DDE_TEST_ADDITEM|testnum++); + DeleteItemTest(instance, hConv, "[DeleteItem(f2g1Name)]", DMLERR_NO_ERROR, "f2g1Name.lnk", "Group1", DDE_TEST_DELETEITEM|testnum++); CreateAddItemText(itemtext, f3g1, "f3g1Name"); - AddItemTest(instance, hConv, itemtext, DMLERR_NO_ERROR, "f3g1Name.lnk", "Group1", DDE_TEST_COMMON|DDE_TEST_ADDITEM|testnum++); - CreateGroupTest(instance, hConv, "[CreateGroup(Group2)]", DMLERR_NO_ERROR, "Group2", Group2Title, DDE_TEST_COMMON|DDE_TEST_CREATEGROUP|testnum++); + AddItemTest(instance, hConv, itemtext, DMLERR_NO_ERROR, "f3g1Name.lnk", "Group1", DDE_TEST_ADDITEM|testnum++); + CreateGroupTest(instance, hConv, "[CreateGroup(Group2)]", DMLERR_NO_ERROR, "Group2", Group2Title, DDE_TEST_CREATEGROUP|testnum++); /* Create Group that already exists - same instance */ - CreateGroupTest(instance, hConv, "[CreateGroup(Group1)]", DMLERR_NO_ERROR, "Group1", Group1Title, DDE_TEST_COMMON|DDE_TEST_CREATEGROUP|testnum++); + CreateGroupTest(instance, hConv, "[CreateGroup(Group1)]", DMLERR_NO_ERROR, "Group1", Group1Title, DDE_TEST_CREATEGROUP|testnum++); /* ShowGroup Tests */ ShowGroupTest(instance, hConv, "[ShowGroup(Group1)]", DMLERR_NOTPROCESSED, Startup, StartupTitle, TRUE, DDE_TEST_SHOWGROUP|testnum++); - DeleteItemTest(instance, hConv, "[DeleteItem(f3g1Name)]", DMLERR_NO_ERROR, "f3g1Name.lnk", "Group1", DDE_TEST_COMMON|DDE_TEST_DELETEITEM|testnum++); + DeleteItemTest(instance, hConv, "[DeleteItem(f3g1Name)]", DMLERR_NO_ERROR, "f3g1Name.lnk", "Group1", DDE_TEST_DELETEITEM|testnum++); ShowGroupTest(instance, hConv, "[ShowGroup(Startup,0)]", DMLERR_NO_ERROR, Startup, StartupTitle, TRUE, DDE_TEST_SHOWGROUP|testnum++); ShowGroupTest(instance, hConv, "[ShowGroup(Group1,0)]", DMLERR_NO_ERROR, "Group1", Group1Title, FALSE, DDE_TEST_SHOWGROUP|testnum++); @@ -647,7 +644,7 @@ static int DdeTestProgman(DWORD instance, HCONV hConv) lstrcatA(comptext, itemtext); CreateAddItemText(itemtext, f2g3, "f2g3Name"); lstrcatA(comptext, itemtext); - CompoundCommandTest(instance, hConv, comptext, DMLERR_NO_ERROR, "Group3", Group3Title, "f1g3Name.lnk", "f2g3Name.lnk", DDE_TEST_COMMON|DDE_TEST_COMPOUND|testnum++); + CompoundCommandTest(instance, hConv, comptext, DMLERR_NO_ERROR, "Group3", Group3Title, "f1g3Name.lnk", "f2g3Name.lnk", DDE_TEST_COMPOUND|testnum++); DeleteGroupTest(instance, hConv, "[DeleteGroup(Group3)]", DMLERR_NO_ERROR, "Group3", DDE_TEST_DELETEGROUP|testnum++); @@ -667,8 +664,8 @@ static int DdeTestProgman(DWORD instance, HCONV hConv) static void DdeTestProgman2(DWORD instance, HCONV hConv, int testnum) { /* Create Group that already exists on a separate connection */ - CreateGroupTest(instance, hConv, "[CreateGroup(Group2)]", DMLERR_NO_ERROR, "Group2", Group2Title, DDE_TEST_COMMON|DDE_TEST_CREATEGROUP|testnum++); - DeleteGroupTest(instance, hConv, "[DeleteGroup(Group2)]", DMLERR_NO_ERROR, "Group2", DDE_TEST_COMMON|DDE_TEST_DELETEGROUP|testnum++); + CreateGroupTest(instance, hConv, "[CreateGroup(Group2)]", DMLERR_NO_ERROR, "Group2", Group2Title, DDE_TEST_CREATEGROUP|testnum++); + DeleteGroupTest(instance, hConv, "[DeleteGroup(Group2)]", DMLERR_NO_ERROR, "Group2", DDE_TEST_DELETEGROUP|testnum++); } START_TEST(progman_dde)

1 0

Paul Vriens : shell32/tests: Cope with non-English Vista+ and short names in the title bar of explorer windows .
by Alexandre Julliard Dec. 8, 2009

Dec. 8, 2009

Module: wine Branch: master Commit: b965a5f0e0d20658a7240767f6a236089487e0fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b965a5f0e0d20658a7240767f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Dec 8 14:54:53 2009 +0100 shell32/tests: Cope with non-English Vista+ and short names in the title bar of explorer windows. --- dlls/shell32/tests/progman_dde.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 7e6c874..610fb01 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -66,6 +66,7 @@ #define DDE_TEST_NUMMASK 0x0000ffff +static HRESULT (WINAPI *pSHGetLocalizedName)(LPCWSTR, LPWSTR, UINT, int *); static BOOL (WINAPI *pSHGetSpecialFolderPathA)(HWND, LPSTR, int, BOOL); static BOOL (WINAPI *pReadCabinetState)(CABINETSTATE *, int); @@ -74,6 +75,7 @@ static void init_function_pointers(void) HMODULE hmod; hmod = GetModuleHandleA("shell32.dll"); + pSHGetLocalizedName = (void*)GetProcAddress(hmod, "SHGetLocalizedName"); pSHGetSpecialFolderPathA = (void*)GetProcAddress(hmod, "SHGetSpecialFolderPathA"); pReadCabinetState = (void*)GetProcAddress(hmod, "ReadCabinetState"); if (!pReadCabinetState) @@ -102,7 +104,7 @@ static void init_strings(void) /* Win9x */ lstrcpyA(CommonPrograms, Programs); } - if (GetProcAddress(GetModuleHandleA("shell32.dll"), "SHGetKnownFolderPath")) + if (pSHGetLocalizedName) { /* Vista and higher use CSIDL_PROGRAMS for these tests. * Wine doesn't have SHGetKnownFolderPath yet but should most likely follow @@ -154,7 +156,32 @@ static void init_strings(void) } else { - lstrcpyA(StartupTitle, Startup); + /* Vista has the nice habit of displaying the full path in English + * and the short one localized. CSIDL_STARTUP on Vista gives us the + * English version so we have to 'translate' this one. + * + * MSDN claims it should be used for files not folders but this one + * suits our purposes just fine. + */ + if (pSHGetLocalizedName) + { + WCHAR startupW[MAX_PATH]; + WCHAR module[MAX_PATH]; + WCHAR module_expanded[MAX_PATH]; + WCHAR localized[MAX_PATH]; + int id; + + MultiByteToWideChar(CP_ACP, 0, startup, -1, startupW, sizeof(startupW)/sizeof(WCHAR)); + pSHGetLocalizedName(startupW, module, MAX_PATH, &id); + ExpandEnvironmentStringsW(module, module_expanded, MAX_PATH); + LoadStringW(GetModuleHandleW(module_expanded), id, localized, MAX_PATH); + + WideCharToMultiByte(CP_ACP, 0, localized, -1, StartupTitle, sizeof(StartupTitle), NULL, NULL); + } + else + { + lstrcpyA(StartupTitle, (strrchr(startup, '\\') + 1)); + } } }

1 0

Roderick Colenbrander : iphlpapi: Use winediag for icmp failure.
by Alexandre Julliard Dec. 8, 2009

Dec. 8, 2009

Module: wine Branch: master Commit: 715a3988998ffabd3eabb3093a3765b47b5b0ad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=715a3988998ffabd3eabb3093… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Dec 8 14:14:21 2009 +0100 iphlpapi: Use winediag for icmp failure. --- dlls/iphlpapi/icmp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index ca965fb..d8ee101 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -99,6 +99,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(icmp); +WINE_DECLARE_DEBUG_CHANNEL(winediag); typedef struct { @@ -153,7 +154,7 @@ HANDLE WINAPI IcmpCreateFile(VOID) int sid=socket(AF_INET,SOCK_RAW,IPPROTO_ICMP); if (sid < 0) { - MESSAGE("WARNING: Trying to use ICMP (network ping) will fail unless running as root\n"); + ERR_(winediag)("Failed to use ICMP (network ping), this requires special permissions.\n"); SetLastError(ERROR_ACCESS_DENIED); return INVALID_HANDLE_VALUE; }

1 0

Francois Gouget : crypt32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Dec. 8, 2009

Dec. 8, 2009

Module: wine Branch: master Commit: d1e592ad20dcacdce40a64775a260ec594061c21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e592ad20dcacdce40a64775… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 8 12:26:13 2009 +0100 crypt32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/crypt32/tests/chain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 4192e11..a626b82 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4018,7 +4018,7 @@ static void check_ssl_policy(void) /* And again authenticating a client, but specify the size of the policy * parameter. */ - sslPolicyPara.cbSize = sizeof(sslPolicyCheck); + U(sslPolicyPara).cbSize = sizeof(sslPolicyCheck); sslPolicyPara.dwAuthType = AUTHTYPE_CLIENT; for (i = 0; i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++)

1 0

Paul Chitescu : server: Only check if permission bits changed before calling fchmod().
by Alexandre Julliard Dec. 8, 2009

Dec. 8, 2009

Module: wine Branch: master Commit: 923524951aa3c138d67f7a848baeef3bcc1bae34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=923524951aa3c138d67f7a848… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Tue Dec 8 14:10:01 2009 +0200 server: Only check if permission bits changed before calling fchmod(). --- server/change.c | 2 +- server/file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/change.c b/server/change.c index 7ef456f..11b4729 100644 --- a/server/change.c +++ b/server/change.c @@ -376,7 +376,7 @@ static int dir_set_sd( struct object *obj, const struct security_descriptor *sd, mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG); mode |= sd_to_mode( sd, owner ); - if (st.st_mode != mode && fchmod( unix_fd, mode ) == -1) + if (((st.st_mode ^ mode) & (S_IRWXU|S_IRWXG|S_IRWXO)) && fchmod( unix_fd, mode ) == -1) { file_set_error(); return 0; diff --git a/server/file.c b/server/file.c index 3e09ddd..5db64cd 100644 --- a/server/file.c +++ b/server/file.c @@ -560,7 +560,7 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG); mode |= sd_to_mode( sd, owner ); - if (st.st_mode != mode && fchmod( unix_fd, mode ) == -1) + if (((st.st_mode ^ mode) & (S_IRWXU|S_IRWXG|S_IRWXO)) && fchmod( unix_fd, mode ) == -1) { file_set_error(); return 0;

1 0

Roderick Colenbrander : ws2_32: Use winediag for socket failures.
by Alexandre Julliard Dec. 8, 2009

Dec. 8, 2009

Module: wine Branch: master Commit: 6a8aae0becf4c9ab801ca3f13581cc02107b2fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8aae0becf4c9ab801ca3f13… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Dec 8 14:09:05 2009 +0100 ws2_32: Use winediag for socket failures. --- dlls/ws2_32/socket.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index df9c37d..02d8af5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -166,6 +166,7 @@ #endif WINE_DEFAULT_DEBUG_CHANNEL(winsock); +WINE_DECLARE_DEBUG_CHANNEL(winediag); /* critical section to protect some non-reentrant net function */ static CRITICAL_SECTION csWSgetXXXbyYYY; @@ -4322,11 +4323,9 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, if (GetLastError() == WSAEACCES) /* raw socket denied */ { if (type == SOCK_RAW) - MESSAGE("WARNING: Trying to create a socket of type SOCK_RAW, this" - " will fail unless you have special permissions.\n"); + ERR_(winediag)("Failed to create a socket of type SOCK_RAW, this requires special permissions.\n"); else - MESSAGE("WS_SOCKET: Failed to create socket, this requires" - " special permissions.\n"); + ERR_(winediag)("Failed to create socket, this requires special permissions.\n"); SetLastError(WSAESOCKTNOSUPPORT); }

1 0

Juan Lang : snmpapi: Add stub for SnmpSvcGetUptime.
by Alexandre Julliard Dec. 8, 2009

Dec. 8, 2009

Module: wine Branch: master Commit: b7f753a826e6c35086e16867b40918d293e783a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f753a826e6c35086e16867b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 7 12:02:07 2009 -0800 snmpapi: Add stub for SnmpSvcGetUptime. --- dlls/snmpapi/main.c | 18 ++++++++++++++++++ dlls/snmpapi/snmpapi.spec | 2 +- 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 9e14a19..1c4d1fa 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -112,6 +112,8 @@ static void asn_any_free(AsnAny *any) any->asnType = ASN_NULL; } +static ULONGLONG startTime; + /*********************************************************************** * DllMain for SNMPAPI */ @@ -127,6 +129,7 @@ BOOL WINAPI DllMain( return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); + startTime = GetTickCount64(); break; case DLL_PROCESS_DETACH: break; @@ -136,6 +139,21 @@ BOOL WINAPI DllMain( } /*********************************************************************** + * SnmpSvcGetUptime (SNMPAPI.@) + * + * BUGS + * This returns the number of centiseconds since the DLL was loaded, + * rather than the number of centiseconds since the SNMP service was + * started, since there isn't yet any SNMP service in Wine. + */ +DWORD WINAPI SnmpSvcGetUptime(void) +{ + ULONGLONG now = GetTickCount64(); + + return (now - startTime) / 10; +} + +/*********************************************************************** * SnmpUtilDbgPrint (SNMPAPI.@) * * NOTES diff --git a/dlls/snmpapi/snmpapi.spec b/dlls/snmpapi/snmpapi.spec index 385ca8a..208231e 100644 --- a/dlls/snmpapi/snmpapi.spec +++ b/dlls/snmpapi/snmpapi.spec @@ -11,7 +11,7 @@ @ stub SnmpSvcGenerateTrap @ stub SnmpSvcGenerateWarmStartTrap @ stub SnmpSvcGetEnterpriseOID -@ stub SnmpSvcGetUptime +@ stdcall SnmpSvcGetUptime() @ stub SnmpSvcInitUptime @ stub SnmpSvcReleaseMessage @ stub SnmpSvcReportEvent

1 0

Paul Vriens : winspool.drv/tests: Fix test failures on XP+ with long printer names.
by Alexandre Julliard Dec. 8, 2009

Dec. 8, 2009

Module: wine Branch: master Commit: 5719881ed5244135bce6800584a90ebb14a7a2ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=5719881ed5244135bce680058… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Dec 8 10:25:18 2009 +0100 winspool.drv/tests: Fix test failures on XP+ with long printer names. --- dlls/winspool.drv/tests/info.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index ef726f4..1f876b3 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2412,7 +2412,8 @@ static void test_DEVMODE(const DEVMODE *dm, LONG dmSize, LPCSTR exp_prn_name) We skip the Tests on this Platform */ if (dm->dmSpecVersion || dm->dmDriverVersion || dm->dmDriverExtra) { /* The 0-terminated Printername can be larger (MAX_PATH) than CCHDEVICENAME */ - ok(!strncmp(exp_prn_name, (LPCSTR)dm->dmDeviceName, CCHDEVICENAME -1), + ok(!strncmp(exp_prn_name, (LPCSTR)dm->dmDeviceName, CCHDEVICENAME -1) || + !strncmp(exp_prn_name, (LPCSTR)dm->dmDeviceName, CCHDEVICENAME -2), /* XP+ */ "expected '%s', got '%s'\n", exp_prn_name, dm->dmDeviceName); ok(dm->dmSize + dm->dmDriverExtra == dmSize, "%u != %d\n", dm->dmSize + dm->dmDriverExtra, dmSize);

1 0

Hans Leidekker : ntdll/tests: Fix a memory leak.
by Alexandre Julliard Dec. 8, 2009

Dec. 8, 2009

Module: wine Branch: master Commit: fe8f5c22325986a2225610a283319626d107f4e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe8f5c22325986a2225610a28… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 8 11:44:04 2009 +0100 ntdll/tests: Fix a memory leak. Found by Valgrind. --- dlls/ntdll/tests/file.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index dff5d9f..7e8f101 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -43,7 +43,7 @@ static BOOL (WINAPI * pGetVolumePathNameW)(LPCWSTR, LPWSTR, DWORD); static UINT (WINAPI *pGetSystemWow64DirectoryW)( LPWSTR, UINT ); -static NTSTATUS (WINAPI *pRtlFreeUnicodeString)( PUNICODE_STRING ); +static VOID (WINAPI *pRtlFreeUnicodeString)( PUNICODE_STRING ); static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)( LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR* ); static NTSTATUS (WINAPI *pRtlWow64EnableFsRedirectionEx)( ULONG, ULONG * ); @@ -337,6 +337,7 @@ static void open_file_test(void) } CloseHandle( dir ); + pRtlFreeUnicodeString( &nameW ); } static void delete_file_test(void)

1 0

Hans Leidekker : wininet/tests: Mark behavior of IE5 as broken for some ftp tests.
by Alexandre Julliard Dec. 8, 2009

Dec. 8, 2009

Module: wine Branch: master Commit: bf58fdd197f516a598ee7f098282c058d2d3e908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf58fdd197f516a598ee7f098… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 8 11:44:29 2009 +0100 wininet/tests: Mark behavior of IE5 as broken for some ftp tests. --- dlls/wininet/tests/ftp.c | 39 +++++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 37c71da..d152601 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -438,7 +438,7 @@ static void test_openfile(HINTERNET hFtp, HINTERNET hConnect) bRet = FtpCreateDirectoryA(hFtp, "new_directory_deadbeef"); error = GetLastError(); ok ( bRet == FALSE, "Expected FtpCreateDirectoryA to fail\n"); - ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS, + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_INTERNET_EXTENDED_ERROR), "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); trace_extended_error(error); @@ -446,22 +446,24 @@ static void test_openfile(HINTERNET hFtp, HINTERNET hConnect) bRet = FtpDeleteFileA(hFtp, "non_existent_file_deadbeef"); error = GetLastError(); ok ( bRet == FALSE, "Expected FtpDeleteFileA to fail\n"); - ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS, + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_INTERNET_EXTENDED_ERROR), "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); trace_extended_error(error); SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); - ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + error = GetLastError(); + ok ( bRet == FALSE || broken(bRet == TRUE), "Expected FtpGetFileA to fail\n"); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_SUCCESS), + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); DeleteFileA("should_be_non_existing_deadbeef"); /* Just in case */ SetLastError(0xdeadbeef); hOpenFile2 = FtpOpenFileA(hFtp, "welcome.msg", GENERIC_READ, FTP_TRANSFER_TYPE_ASCII, 0); - ok ( bRet == FALSE, "Expected FtpOpenFileA to fail\n"); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + error = GetLastError(); + ok ( bRet == FALSE || broken(bRet == TRUE), "Expected FtpOpenFileA to fail\n"); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_SUCCESS), + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); InternetCloseHandle(hOpenFile2); /* Just in case */ /* Create a temporary local file */ @@ -471,22 +473,25 @@ static void test_openfile(HINTERNET hFtp, HINTERNET hConnect) CloseHandle(hFile); SetLastError(0xdeadbeef); bRet = FtpPutFileA(hFtp, "now_existing_local", "non_existing_remote", FTP_TRANSFER_TYPE_UNKNOWN, 0); + error = GetLastError(); ok ( bRet == FALSE, "Expected FtpPutFileA to fail\n"); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_INTERNET_EXTENDED_ERROR), + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); DeleteFileA("now_existing_local"); SetLastError(0xdeadbeef); bRet = FtpRemoveDirectoryA(hFtp, "should_be_non_existing_deadbeef_dir"); + error = GetLastError(); ok ( bRet == FALSE, "Expected FtpRemoveDirectoryA to fail\n"); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_INTERNET_EXTENDED_ERROR), + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); SetLastError(0xdeadbeef); bRet = FtpRenameFileA(hFtp , "should_be_non_existing_deadbeef", "new"); + error = GetLastError(); ok ( bRet == FALSE, "Expected FtpRenameFileA to fail\n"); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_INTERNET_EXTENDED_ERROR), + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); } InternetCloseHandle(hOpenFile); @@ -748,6 +753,7 @@ static void test_find_first_file(HINTERNET hFtp, HINTERNET hConnect) HINTERNET hSearch; HINTERNET hSearch2; HINTERNET hOpenFile; + DWORD error; /* NULL as the search file ought to return the first file in the directory */ SetLastError(0xdeadbeef); @@ -793,9 +799,10 @@ static void test_find_first_file(HINTERNET hFtp, HINTERNET hConnect) /* This should fail as the OpenFile handle wasn't closed */ SetLastError(0xdeadbeef); hSearch = FtpFindFirstFileA(hFtp, "welcome.msg", &findData, 0, 0); + error = GetLastError(); ok ( hSearch == NULL, "Expected FtpFindFirstFileA to fail\n" ); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError() ); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_INTERNET_EXTENDED_ERROR), + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error ); InternetCloseHandle(hSearch); /* Just in case */ InternetCloseHandle(hOpenFile);

1 0