Ros-diffs January 2021

ros-diffs@reactos.org

15 participants
146 discussions

[reactos] 20/39: [WINESYNC] wininet: Use stricmp() instead of _strnicmp(..., -1).

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94937754edcace3279790… commit 94937754edcace32797904924b6e6a430d77b2d8 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Tue Dec 8 18:01:21 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Jan 5 11:03:13 2021 +0100 [WINESYNC] wininet: Use stricmp() instead of _strnicmp(..., -1). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id de5d147de8b3d9c2f65bcb6d5646320ef1d92e58 by Paul Gofman <gofmanp(a)gmail.com> --- dll/win32/wininet/ftp.c | 2 +- dll/win32/wininet/internet.c | 2 +- sdk/tools/winesync/wininet.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/wininet/ftp.c b/dll/win32/wininet/ftp.c index 40f336b1681..979b21f8b8d 100644 --- a/dll/win32/wininet/ftp.c +++ b/dll/win32/wininet/ftp.c @@ -3749,7 +3749,7 @@ static BOOL FTP_ParseNextFile(INT nSocket, LPCWSTR lpszSearchFile, LPFILEPROPERT pszToken = strtok(NULL, szSpace); if(!pszToken) continue; - if(!_strnicmp(pszToken, "<DIR>", -1)) { + if(!stricmp(pszToken, "<DIR>")) { lpfp->bIsDirectory = TRUE; lpfp->nSize = 0; TRACE("Is directory\n"); diff --git a/dll/win32/wininet/internet.c b/dll/win32/wininet/internet.c index 111ce34ba3f..eda3bc7da42 100644 --- a/dll/win32/wininet/internet.c +++ b/dll/win32/wininet/internet.c @@ -2378,7 +2378,7 @@ static BOOL is_domain_suffix( const char *domain, const char *suffix ) int len_domain = strlen( domain ), len_suffix = strlen( suffix ); if (len_suffix > len_domain) return FALSE; - if (!_strnicmp( domain + len_domain - len_suffix, suffix, -1 )) return TRUE; + if (!stricmp( domain + len_domain - len_suffix, suffix )) return TRUE; return FALSE; } diff --git a/sdk/tools/winesync/wininet.cfg b/sdk/tools/winesync/wininet.cfg index a73ecd94515..354d6ec6950 100644 --- a/sdk/tools/winesync/wininet.cfg +++ b/sdk/tools/winesync/wininet.cfg @@ -5,4 +5,4 @@ files: include/wininet.h: sdk/include/psdk/wininet.h include/winineti.h: sdk/include/psdk/winineti.h tags: - wine: 9fe900532eb310d114c04d15a8d0b986ec831552 + wine: de5d147de8b3d9c2f65bcb6d5646320ef1d92e58

3 years, 8 months

[reactos] 19/39: [WINESYNC] wininet: Use _ltow instead of sprintf for port number in InternetCreateUrl.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9b564981ba38e460b4bfe… commit 9b564981ba38e460b4bfedb42b49686b902f65f9 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Tue Dec 8 18:01:20 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Jan 5 11:03:13 2021 +0100 [WINESYNC] wininet: Use _ltow instead of sprintf for port number in InternetCreateUrl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 9fe900532eb310d114c04d15a8d0b986ec831552 by Jacek Caban <jacek(a)codeweavers.com> --- dll/win32/wininet/internet.c | 13 ++++++------- sdk/tools/winesync/wininet.cfg | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dll/win32/wininet/internet.c b/dll/win32/wininet/internet.c index e400fb22162..111ce34ba3f 100644 --- a/dll/win32/wininet/internet.c +++ b/dll/win32/wininet/internet.c @@ -4280,9 +4280,10 @@ static BOOL calc_url_length(LPURL_COMPONENTSW lpUrlComponents, if (!url_uses_default_port(nScheme, lpUrlComponents->nPort)) { - char szPort[MAX_WORD_DIGITS+1]; + WCHAR port[MAX_WORD_DIGITS + 1]; - *lpdwUrlLength += sprintf(szPort, "%d", lpUrlComponents->nPort); + _ltow(lpUrlComponents->nPort, port, 10); + *lpdwUrlLength += lstrlenW(port); *lpdwUrlLength += strlen(":"); } @@ -4438,10 +4439,8 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags, { DWORD dwLen; INTERNET_SCHEME nScheme; - WCHAR *start = lpszUrl; static const WCHAR slashSlashW[] = {'/','/'}; - static const WCHAR fmtW[] = {'%','u',0}; TRACE("(%p,%d,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength); @@ -4526,9 +4525,9 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags, if (!url_uses_default_port(nScheme, lpUrlComponents->nPort)) { - *lpszUrl = ':'; - lpszUrl++; - lpszUrl += swprintf(lpszUrl, *lpdwUrlLength - (lpszUrl - start), fmtW, lpUrlComponents->nPort); + *lpszUrl++ = ':'; + _ltow(lpUrlComponents->nPort, lpszUrl, 10); + lpszUrl += lstrlenW(lpszUrl); } /* add slash between hostname and path if necessary */ diff --git a/sdk/tools/winesync/wininet.cfg b/sdk/tools/winesync/wininet.cfg index 99642310238..a73ecd94515 100644 --- a/sdk/tools/winesync/wininet.cfg +++ b/sdk/tools/winesync/wininet.cfg @@ -5,4 +5,4 @@ files: include/wininet.h: sdk/include/psdk/wininet.h include/winineti.h: sdk/include/psdk/winineti.h tags: - wine: aa384d36429110970aa72acbc5043158de6aff03 + wine: 9fe900532eb310d114c04d15a8d0b986ec831552

3 years, 8 months

[reactos] 18/39: [WINESYNC] tools: Remove 0x0501 API versions forced by winapi_test.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d133af41eddbd33d3327… commit 6d133af41eddbd33d33274d0a107e997635cf8be Author: winesync <ros-dev(a)reactos.org> AuthorDate: Tue Dec 8 18:00:54 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Jan 5 11:03:13 2021 +0100 [WINESYNC] tools: Remove 0x0501 API versions forced by winapi_test. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id aa384d36429110970aa72acbc5043158de6aff03 by Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- sdk/tools/winesync/wininet.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/tools/winesync/wininet.cfg b/sdk/tools/winesync/wininet.cfg index 44c2b49f672..99642310238 100644 --- a/sdk/tools/winesync/wininet.cfg +++ b/sdk/tools/winesync/wininet.cfg @@ -5,4 +5,4 @@ files: include/wininet.h: sdk/include/psdk/wininet.h include/winineti.h: sdk/include/psdk/winineti.h tags: - wine: 6fcd1378b2516165468bcbd71263c1b18c6be491 + wine: aa384d36429110970aa72acbc5043158de6aff03

3 years, 8 months

[reactos] 17/39: [WINESYNC] wininet: Add stub for INTERNET_OPTION_IGNORE_OFFLINE.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82be999d2f024b363edf2… commit 82be999d2f024b363edf23b4631d903eb9a17ca3 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Tue Dec 8 18:00:54 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Jan 5 11:03:13 2021 +0100 [WINESYNC] wininet: Add stub for INTERNET_OPTION_IGNORE_OFFLINE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48739 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 6fcd1378b2516165468bcbd71263c1b18c6be491 by Roman Pišl <rpisl(a)seznam.cz> --- dll/win32/wininet/internet.c | 3 +++ sdk/tools/winesync/wininet.cfg | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dll/win32/wininet/internet.c b/dll/win32/wininet/internet.c index 94dd800d869..e400fb22162 100644 --- a/dll/win32/wininet/internet.c +++ b/dll/win32/wininet/internet.c @@ -2972,6 +2972,9 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, case INTERNET_OPTION_DISABLE_PASSPORT_AUTH: TRACE("Option INTERNET_OPTION_DISABLE_PASSPORT_AUTH: harmless stub, since not enabled\n"); break; + case INTERNET_OPTION_IGNORE_OFFLINE: + FIXME("Option INTERNET_OPTION_IGNORE_OFFLINE: STUB\n"); + break; case INTERNET_OPTION_SEND_TIMEOUT: case INTERNET_OPTION_RECEIVE_TIMEOUT: case INTERNET_OPTION_DATA_SEND_TIMEOUT: diff --git a/sdk/tools/winesync/wininet.cfg b/sdk/tools/winesync/wininet.cfg index f77c1846e67..44c2b49f672 100644 --- a/sdk/tools/winesync/wininet.cfg +++ b/sdk/tools/winesync/wininet.cfg @@ -5,4 +5,4 @@ files: include/wininet.h: sdk/include/psdk/wininet.h include/winineti.h: sdk/include/psdk/winineti.h tags: - wine: 4c640f24c9901ccaf8706de31e22149130c57be6 + wine: 6fcd1378b2516165468bcbd71263c1b18c6be491

3 years, 8 months

[reactos] 16/39: [WINESYNC] wininet/tests: Fix test failures on Windows XP.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7743a2c9118e6df68d6c… commit d7743a2c9118e6df68d6c5daeff8180dc7271d68 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Tue Dec 8 18:00:50 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Jan 5 11:03:13 2021 +0100 [WINESYNC] wininet/tests: Fix test failures on Windows XP. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 4c640f24c9901ccaf8706de31e22149130c57be6 by Hans Leidekker <hans(a)codeweavers.com> --- modules/rostests/winetests/wininet/http.c | 23 +++++++++++++++++++---- sdk/tools/winesync/wininet.cfg | 2 +- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/modules/rostests/winetests/wininet/http.c b/modules/rostests/winetests/wininet/http.c index 8835a6a94b1..1cdaed9d8e9 100644 --- a/modules/rostests/winetests/wininet/http.c +++ b/modules/rostests/winetests/wininet/http.c @@ -42,6 +42,7 @@ #define TEST_URL "http://test.winehq.org/tests/hello.html" static BOOL first_connection_to_test_url = TRUE; +static BOOL https_support = TRUE; /* Adapted from dlls/urlmon/tests/protocol.c */ @@ -6240,6 +6241,12 @@ static void test_security_flags(void) char buf[100]; BOOL res; + if (!https_support) + { + win_skip("Can't make https connections, skipping security flags test\n"); + return; + } + trace("Testing security flags...\n"); reset_events(); @@ -6577,7 +6584,7 @@ static void test_secure_connection(void) static const WCHAR get[] = {'G','E','T',0}; static const WCHAR testpage[] = {'/','t','e','s','t','s','/','h','e','l','l','o','.','h','t','m','l',0}; HINTERNET ses, con, req; - DWORD size, flags; + DWORD size, flags, err; INTERNET_CERTIFICATE_INFOA *certificate_structA = NULL; INTERNET_CERTIFICATE_INFOW *certificate_structW = NULL; BOOL ret; @@ -6595,11 +6602,13 @@ static void test_secure_connection(void) ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret || broken(GetLastError() == ERROR_INTERNET_CANNOT_CONNECT), - "HttpSendRequest failed: %d\n", GetLastError()); + err = GetLastError(); + ok(ret || broken(err == ERROR_INTERNET_CANNOT_CONNECT) || + broken(err == ERROR_INTERNET_SECURITY_CHANNEL_ERROR), "HttpSendRequest failed: %u\n", err); if (!ret) { win_skip("Cannot connect to https.\n"); + if (err == ERROR_INTERNET_SECURITY_CHANNEL_ERROR) https_support = FALSE; goto done; } @@ -7396,6 +7405,11 @@ static void test_default_service_port(void) ok(request != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(request, NULL, 0, NULL, 0); + if (!ret && GetLastError() == ERROR_INTERNET_SECURITY_CHANNEL_ERROR) + { + win_skip("Can't make https connection\n"); + goto done; + } ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); size = sizeof(buffer); @@ -7423,6 +7437,7 @@ static void test_default_service_port(void) ok(ret, "HttpQueryInfo failed with error %u\n", GetLastError()); ok(!strcmp(buffer, "test.winehq.org:443"), "Expected test.winehg.org:443, got '%s'\n", buffer); +done: InternetCloseHandle(request); InternetCloseHandle(connect); InternetCloseHandle(session); @@ -7557,6 +7572,7 @@ START_TEST(http) InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[1]); InternetReadFile_test(0, &test_data[1]); InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[2]); + test_secure_connection(); test_security_flags(); InternetReadFile_test(0, &test_data[2]); InternetReadFileExA_test(INTERNET_FLAG_ASYNC); @@ -7571,7 +7587,6 @@ START_TEST(http) InternetOpenUrlA_test(); HttpHeaders_test(); test_http_connection(); - test_secure_connection(); test_user_agent_header(); test_bogus_accept_types_array(); InternetReadFile_chunked_test(); diff --git a/sdk/tools/winesync/wininet.cfg b/sdk/tools/winesync/wininet.cfg index 8de58f5a0fd..f77c1846e67 100644 --- a/sdk/tools/winesync/wininet.cfg +++ b/sdk/tools/winesync/wininet.cfg @@ -5,4 +5,4 @@ files: include/wininet.h: sdk/include/psdk/wininet.h include/winineti.h: sdk/include/psdk/winineti.h tags: - wine: 3a22407396bfe18ef9bdab69ef192be10306142e + wine: 4c640f24c9901ccaf8706de31e22149130c57be6

3 years, 8 months

[reactos] 15/39: [WINESYNC] wininet/tests: Make a check for available data less strict.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ee9150c95c760f137f0a… commit 2ee9150c95c760f137f0ae7a9a697031d8fe899d Author: winesync <ros-dev(a)reactos.org> AuthorDate: Tue Dec 8 18:00:50 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Jan 5 11:03:13 2021 +0100 [WINESYNC] wininet/tests: Make a check for available data less strict. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 3a22407396bfe18ef9bdab69ef192be10306142e by Hans Leidekker <hans(a)codeweavers.com> --- modules/rostests/winetests/wininet/http.c | 2 +- sdk/tools/winesync/wininet.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/winetests/wininet/http.c b/modules/rostests/winetests/wininet/http.c index 28ebd68bcf5..8835a6a94b1 100644 --- a/modules/rostests/winetests/wininet/http.c +++ b/modules/rostests/winetests/wininet/http.c @@ -5560,7 +5560,7 @@ static void test_http_read(int port) send_response_len_and_wait(20000, TRUE, &ib); avail = expect_data_available(req.request, -1); - ok(avail < 17000, "avail = %u\n", avail); + ok(avail <= 20000, "avail = %u\n", avail); SET_WINE_ALLOW(INTERNET_STATUS_CLOSING_CONNECTION); SET_WINE_ALLOW(INTERNET_STATUS_CONNECTION_CLOSED); diff --git a/sdk/tools/winesync/wininet.cfg b/sdk/tools/winesync/wininet.cfg index 754407c2f18..8de58f5a0fd 100644 --- a/sdk/tools/winesync/wininet.cfg +++ b/sdk/tools/winesync/wininet.cfg @@ -5,4 +5,4 @@ files: include/wininet.h: sdk/include/psdk/wininet.h include/winineti.h: sdk/include/psdk/winineti.h tags: - wine: 6b839a0f85236aac2cc794d5d586f1ba371866b1 + wine: 3a22407396bfe18ef9bdab69ef192be10306142e

3 years, 8 months

[reactos] 14/39: [WINESYNC] wininet/tests: Fix some test failures with Windows 10.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f64bdd073263ee5305894… commit f64bdd073263ee5305894c615d83f403b2611d52 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Tue Dec 8 18:00:50 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Jan 5 11:03:13 2021 +0100 [WINESYNC] wininet/tests: Fix some test failures with Windows 10. Windows 10 1607+ no longer validates a NULL window handle, so remove that test. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 6b839a0f85236aac2cc794d5d586f1ba371866b1 by Zebediah Figura <z.figura12(a)gmail.com> --- modules/rostests/winetests/wininet/internet.c | 22 ++++++++-------------- sdk/include/psdk/winineti.h | 11 +++++++++++ sdk/tools/winesync/wininet.cfg | 2 +- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/modules/rostests/winetests/wininet/internet.c b/modules/rostests/winetests/wininet/internet.c index c7525f796b8..e69b45a7e6f 100644 --- a/modules/rostests/winetests/wininet/internet.c +++ b/modules/rostests/winetests/wininet/internet.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winuser.h" #include "wininet.h" +#include "winineti.h" #include "winerror.h" #include "winreg.h" @@ -1498,13 +1499,6 @@ static void test_InternetErrorDlg(void) req = HttpOpenRequestA(con, "GET", "/", NULL, NULL, NULL, 0, 0); ok(req != 0, "HttpOpenRequest failed: 0x%08x\n", GetLastError()); - /* NULL hwnd and FLAGS_ERROR_UI_FLAGS_NO_UI not set */ - for(i = INTERNET_ERROR_BASE; i < INTERNET_ERROR_LAST; i++) - { - res = InternetErrorDlg(NULL, req, i, 0, NULL); - ok(res == ERROR_INVALID_HANDLE, "Got %d (%d)\n", res, i); - } - hwnd = GetDesktopWindow(); ok(hwnd != NULL, "GetDesktopWindow failed (%d)\n", GetLastError()); @@ -1537,6 +1531,8 @@ static void test_InternetErrorDlg(void) if(i == ERROR_INTERNET_SEC_CERT_REVOKED) continue; /* Interactive (XP, Win7) */ + if (i == ERROR_INTERNET_PROXY_ALERT) + continue; /* Interactive (Win10 1607+) */ res = InternetErrorDlg(hwnd, req, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); @@ -1550,13 +1546,8 @@ static void test_InternetErrorDlg(void) expected = ERROR_CANCELLED; break; case ERROR_INTERNET_FORTEZZA_LOGIN_NEEDED: - if(res != expected) - { - /* Windows XP, W2K3 */ - ok(res == NTE_PROV_TYPE_NOT_DEF, "Got %d\n", res); - win_skip("Skipping some tests for %d\n", i); - continue; - } + if (res == NTE_PROV_TYPE_NOT_DEF) /* XP, 2003 */ + expected = NTE_PROV_TYPE_NOT_DEF; break; case ERROR_INTERNET_CHG_POST_IS_NON_SECURE: if(res == ERROR_SUCCESS) /* win10 returns ERROR_SUCCESS */ @@ -1565,6 +1556,9 @@ static void test_InternetErrorDlg(void) default: break; } + if (expected == ERROR_NOT_SUPPORTED && res == ERROR_CANCELLED) /* Win10 1607+ */ + expected = ERROR_CANCELLED; + todo_wine_if(test_flags & FLAG_TODO) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); diff --git a/sdk/include/psdk/winineti.h b/sdk/include/psdk/winineti.h index 5b6f15f1170..20466db1776 100644 --- a/sdk/include/psdk/winineti.h +++ b/sdk/include/psdk/winineti.h @@ -106,6 +106,17 @@ typedef enum { #define CACHE_CONFIG_CONTENT_USAGE_FC 0x00002000 #define CACHE_CONFIG_STICKY_CONTENT_USAGE_FC 0x00004000 +#define ERROR_INTERNET_NO_NEW_CONTAINERS (INTERNET_ERROR_BASE + 51) +#define ERROR_INTERNET_SOURCE_PORT_IN_USE (INTERNET_ERROR_BASE + 58) +#define ERROR_INTERNET_INSECURE_FALLBACK_REQUIRED (INTERNET_ERROR_BASE + 59) +#define ERROR_INTERNET_PROXY_ALERT (INTERNET_ERROR_BASE + 61) +#define ERROR_INTERNET_NO_CM_CONNECTION (INTERNET_ERROR_BASE + 80) +#define ERROR_HTTP_PUSH_STATUS_CODE_NOT_SUPPORTED (INTERNET_ERROR_BASE + 147) +#define ERROR_HTTP_PUSH_RETRY_NOT_SUPPORTED (INTERNET_ERROR_BASE + 148) +#define ERROR_HTTP_PUSH_ENABLE_FAILED (INTERNET_ERROR_BASE + 149) + +#define ERROR_INTERNET_OFFLINE ERROR_INTERNET_DISCONNECTED + #ifdef __cplusplus extern "C" { #endif diff --git a/sdk/tools/winesync/wininet.cfg b/sdk/tools/winesync/wininet.cfg index ae159d094fb..754407c2f18 100644 --- a/sdk/tools/winesync/wininet.cfg +++ b/sdk/tools/winesync/wininet.cfg @@ -5,4 +5,4 @@ files: include/wininet.h: sdk/include/psdk/wininet.h include/winineti.h: sdk/include/psdk/winineti.h tags: - wine: af9d246952b7aaf8f557ec1b85cbb4bce1245227 + wine: 6b839a0f85236aac2cc794d5d586f1ba371866b1

3 years, 8 months

[reactos] 13/39: [WINESYNC] wininet/tests: Simplify test_InternetErrorDlg().

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4ceb8c619b8b2f58fb00… commit d4ceb8c619b8b2f58fb00a3d9a926ac04cc8f975 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Tue Dec 8 18:00:50 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Jan 5 11:03:13 2021 +0100 [WINESYNC] wininet/tests: Simplify test_InternetErrorDlg(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id af9d246952b7aaf8f557ec1b85cbb4bce1245227 by Zebediah Figura <z.figura12(a)gmail.com> --- modules/rostests/winetests/wininet/internet.c | 34 +++++++++++++-------------- sdk/tools/winesync/wininet.cfg | 2 +- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/modules/rostests/winetests/wininet/internet.c b/modules/rostests/winetests/wininet/internet.c index b94c0647e20..c7525f796b8 100644 --- a/modules/rostests/winetests/wininet/internet.c +++ b/modules/rostests/winetests/wininet/internet.c @@ -1459,7 +1459,7 @@ static void test_Option_PerConnectionOptionA(void) static void test_InternetErrorDlg(void) { HINTERNET ses, con, req; - DWORD res, flags; + DWORD res; HWND hwnd; ULONG i; static const struct { @@ -1486,12 +1486,9 @@ static void test_InternetErrorDlg(void) { ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT, ERROR_CANCELLED, FLAG_TODO }, { ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION, ERROR_CANCELLED, FLAG_TODO }, { ERROR_INTERNET_SEC_CERT_REVOKED , ERROR_CANCELLED, 0 }, - { 0, ERROR_NOT_SUPPORTED } }; - flags = 0; - - res = InternetErrorDlg(NULL, NULL, 12055, flags, NULL); + res = InternetErrorDlg(NULL, NULL, ERROR_INTERNET_SEC_CERT_ERRORS, 0, NULL); ok(res == ERROR_INVALID_HANDLE, "Got %d\n", res); ses = InternetOpenA(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); @@ -1504,27 +1501,28 @@ static void test_InternetErrorDlg(void) /* NULL hwnd and FLAGS_ERROR_UI_FLAGS_NO_UI not set */ for(i = INTERNET_ERROR_BASE; i < INTERNET_ERROR_LAST; i++) { - res = InternetErrorDlg(NULL, req, i, flags, NULL); + res = InternetErrorDlg(NULL, req, i, 0, NULL); ok(res == ERROR_INVALID_HANDLE, "Got %d (%d)\n", res, i); } hwnd = GetDesktopWindow(); ok(hwnd != NULL, "GetDesktopWindow failed (%d)\n", GetLastError()); - flags = FLAGS_ERROR_UI_FLAGS_NO_UI; for(i = INTERNET_ERROR_BASE; i < INTERNET_ERROR_LAST; i++) { - DWORD expected, test_flags, j; + DWORD expected = ERROR_NOT_SUPPORTED, test_flags = 0, j; - for(j = 0; no_ui_res[j].error != 0; ++j) - if(no_ui_res[j].error == i) - break; - - test_flags = no_ui_res[j].test_flags; - expected = no_ui_res[j].res; + for (j = 0; j < ARRAY_SIZE(no_ui_res); ++j) + { + if (no_ui_res[j].error == i) + { + test_flags = no_ui_res[j].test_flags; + expected = no_ui_res[j].res; + } + } /* Try an invalid request handle */ - res = InternetErrorDlg(hwnd, (HANDLE)0xdeadbeef, i, flags, NULL); + res = InternetErrorDlg(hwnd, (HANDLE)0xdeadbeef, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); if(res == ERROR_CALL_NOT_IMPLEMENTED) { ok(test_flags & FLAG_UNIMPL, "%i is unexpectedly unimplemented.\n", i); @@ -1540,7 +1538,7 @@ static void test_InternetErrorDlg(void) if(i == ERROR_INTERNET_SEC_CERT_REVOKED) continue; /* Interactive (XP, Win7) */ - res = InternetErrorDlg(hwnd, req, i, flags, NULL); + res = InternetErrorDlg(hwnd, req, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); /* Handle some special cases */ switch(i) @@ -1571,7 +1569,7 @@ static void test_InternetErrorDlg(void) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); /* Same thing with NULL hwnd */ - res = InternetErrorDlg(NULL, req, i, flags, NULL); + res = InternetErrorDlg(NULL, req, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); todo_wine_if(test_flags & FLAG_TODO) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); @@ -1580,7 +1578,7 @@ static void test_InternetErrorDlg(void) if(test_flags & FLAG_NEEDREQ) expected = ERROR_INVALID_PARAMETER; - res = InternetErrorDlg(hwnd, NULL, i, flags, NULL); + res = InternetErrorDlg(hwnd, NULL, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); todo_wine_if( test_flags & FLAG_TODO || i == ERROR_INTERNET_INCORRECT_PASSWORD) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); } diff --git a/sdk/tools/winesync/wininet.cfg b/sdk/tools/winesync/wininet.cfg index 4080112d70f..ae159d094fb 100644 --- a/sdk/tools/winesync/wininet.cfg +++ b/sdk/tools/winesync/wininet.cfg @@ -5,4 +5,4 @@ files: include/wininet.h: sdk/include/psdk/wininet.h include/winineti.h: sdk/include/psdk/winineti.h tags: - wine: 4928c623dc7f3b7f2355cf61c9f97784ff2380fe + wine: af9d246952b7aaf8f557ec1b85cbb4bce1245227

3 years, 8 months

[reactos] 12/39: [WINESYNC] wininet/tests: Don't test that the URL cache is used for persistent cookies.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e286e01e6cc8ff80ea18… commit 4e286e01e6cc8ff80ea18cdd44cff0deade4c7e2 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Tue Dec 8 18:00:50 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Jan 5 11:03:13 2021 +0100 [WINESYNC] wininet/tests: Don't test that the URL cache is used for persistent cookies. This seems to be an implementation detail, which is no longer true in Windows 1709+. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 4928c623dc7f3b7f2355cf61c9f97784ff2380fe by Zebediah Figura <z.figura12(a)gmail.com> --- modules/rostests/winetests/wininet/internet.c | 20 +++++--------------- sdk/tools/winesync/wininet.cfg | 2 +- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/modules/rostests/winetests/wininet/internet.c b/modules/rostests/winetests/wininet/internet.c index 13b29309888..b94c0647e20 100644 --- a/modules/rostests/winetests/wininet/internet.c +++ b/modules/rostests/winetests/wininet/internet.c @@ -376,7 +376,6 @@ static void test_complicated_cookie(void) BOOL ret; CHAR buffer[1024]; - CHAR user[256]; WCHAR wbuf[1024]; static const WCHAR testing_example_comW[] = @@ -530,25 +529,16 @@ static void test_complicated_cookie(void) ret = InternetSetCookieA("http://testing.example.com", NULL, "A=B; expires=Fri, 01-Jan-2038 00:00:00 GMT"); ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); - len = sizeof(user); - ret = GetUserNameA(user, &len); - ok(ret, "GetUserName failed with error %d\n", GetLastError()); - for(; len>0; len--) - user[len-1] = tolower(user[len-1]); - - sprintf(buffer, "Cookie:%s@testing.example.com/", user); - ret = GetUrlCacheEntryInfoA(buffer, NULL, &len); - ok(!ret, "GetUrlCacheEntryInfo succeeded\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() = %d\n", GetLastError()); + len = sizeof(buffer); + ret = InternetGetCookieA("http://testing.example.com/foobar", NULL, buffer, &len); + ok(ret, "got error %u\n", GetLastError()); + ok(len == 24, "got len %u\n", len); + ok(!!strstr(buffer, "A=B"), "cookie is not present\n"); /* remove persistent cookie */ ret = InternetSetCookieA("http://testing.example.com", NULL, "A=B"); ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); - ret = GetUrlCacheEntryInfoA(buffer, NULL, &len); - ok(!ret, "GetUrlCacheEntryInfo succeeded\n"); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() = %d\n", GetLastError()); - /* try setting cookie for different domain */ ret = InternetSetCookieA("http://www.aaa.example.com/bar",NULL,"E=F; domain=different.com"); ok(!ret, "InternetSetCookie succeeded\n"); diff --git a/sdk/tools/winesync/wininet.cfg b/sdk/tools/winesync/wininet.cfg index 94e2e098198..4080112d70f 100644 --- a/sdk/tools/winesync/wininet.cfg +++ b/sdk/tools/winesync/wininet.cfg @@ -5,4 +5,4 @@ files: include/wininet.h: sdk/include/psdk/wininet.h include/winineti.h: sdk/include/psdk/winineti.h tags: - wine: 4335be346271072f440419b9234883aef187d857 + wine: 4928c623dc7f3b7f2355cf61c9f97784ff2380fe

3 years, 8 months

[reactos] 11/39: [WINESYNC] wininet: Don't set default gopher protocol in InternetCrackUrlW.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1fb556935e0625c735399… commit 1fb556935e0625c7353992e87ae4cbda55a46d69 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Tue Dec 8 18:00:49 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Jan 5 11:03:13 2021 +0100 [WINESYNC] wininet: Don't set default gopher protocol in InternetCrackUrlW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 4335be346271072f440419b9234883aef187d857 by Jacek Caban <jacek(a)codeweavers.com> --- dll/win32/wininet/internet.c | 3 --- modules/rostests/winetests/wininet/url.c | 3 +++ sdk/tools/winesync/wininet.cfg | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/wininet/internet.c b/dll/win32/wininet/internet.c index 10e47625726..94dd800d869 100644 --- a/dll/win32/wininet/internet.c +++ b/dll/win32/wininet/internet.c @@ -1836,9 +1836,6 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF case INTERNET_SCHEME_FTP: lpUC->nPort = INTERNET_DEFAULT_FTP_PORT; break; - case INTERNET_SCHEME_GOPHER: - lpUC->nPort = INTERNET_DEFAULT_GOPHER_PORT; - break; default: break; } diff --git a/modules/rostests/winetests/wininet/url.c b/modules/rostests/winetests/wininet/url.c index ba9d9654424..bce7dc76c59 100644 --- a/modules/rostests/winetests/wininet/url.c +++ b/modules/rostests/winetests/wininet/url.c @@ -172,6 +172,9 @@ static const crack_url_test_t crack_url_tests[] = { {"res://IELib.dll/test.htm", 0, 3, INTERNET_SCHEME_RES, 6, 9, -1, 0, -1, 0, -1, 0, 15, 9, -1, 0, "res", "IELib.dll", "", "", "/test.htm", ""}, + {"gopher://www.winehq.org/site/about#hi", + 0, 6, INTERNET_SCHEME_GOPHER, 9, 14, -1, 0, -1, 0, -1, 0, 23, 11, 34, 3, + "gopher", "www.winehq.org", "", "", "/site/about", "#hi"}, }; static WCHAR *a2w(const char *str) diff --git a/sdk/tools/winesync/wininet.cfg b/sdk/tools/winesync/wininet.cfg index 125dba9e287..94e2e098198 100644 --- a/sdk/tools/winesync/wininet.cfg +++ b/sdk/tools/winesync/wininet.cfg @@ -5,4 +5,4 @@ files: include/wininet.h: sdk/include/psdk/wininet.h include/winineti.h: sdk/include/psdk/winineti.h tags: - wine: 64cb9425da43271109bc1df8df4aa32132f257ae + wine: 4335be346271072f440419b9234883aef187d857

3 years, 8 months

← Newer
1
...
8
9
10
11
12
13
14
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2021