Signed-off-by: Zebediah Figura z.figura12@gmail.com --- include/wininet.h | 6 +++++- include/winineti.h | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/include/wininet.h b/include/wininet.h index e9126de4ba8..ce5aebdca8c 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1463,6 +1463,8 @@ INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LP #define ERROR_INTERNET_SEC_CERT_ERRORS (INTERNET_ERROR_BASE + 55) #define ERROR_INTERNET_SEC_CERT_NO_REV (INTERNET_ERROR_BASE + 56) #define ERROR_INTERNET_SEC_CERT_REV_FAILED (INTERNET_ERROR_BASE + 57) +#define ERROR_HTTP_HSTS_REDIRECT_REQUIRED (INTERNET_ERROR_BASE + 60) +#define ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE (INTERNET_ERROR_BASE + 62) #define ERROR_FTP_TRANSFER_IN_PROGRESS (INTERNET_ERROR_BASE + 110) #define ERROR_FTP_DROPPED (INTERNET_ERROR_BASE + 111) #define ERROR_FTP_NO_PASSIVE_MODE (INTERNET_ERROR_BASE + 112) @@ -1501,7 +1503,9 @@ INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LP #define ERROR_INTERNET_NEED_MSN_SSPI_PKG (INTERNET_ERROR_BASE + 173) #define ERROR_INTERNET_LOGIN_FAILURE_DISPLAY_ENTITY_BODY (INTERNET_ERROR_BASE + 174) #define ERROR_INTERNET_DECODING_FAILED (INTERNET_ERROR_BASE + 175) -#define INTERNET_ERROR_LAST ERROR_INTERNET_DECODING_FAILED +#define ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED_PROXY (INTERNET_ERROR_BASE + 187) +#define ERROR_INTERNET_SECURE_FAILURE_PROXY (INTERNET_ERROR_BASE + 188) +#define INTERNET_ERROR_LAST ERROR_INTERNET_SECURE_FAILURE_PROXY
#define NORMAL_CACHE_ENTRY 0x00000001 diff --git a/include/winineti.h b/include/winineti.h index 5e38424fa3d..812ff793317 100644 --- a/include/winineti.h +++ b/include/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
Fixes test failures like http://test.winehq.org/data/71e96bd3b757a2b058b6a769c341d81f82329d79/win8_cw-rx460-32/wininet:internet.html.
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/wininet/tests/internet.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 7889e40ea8e..13b29309888 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1555,14 +1555,11 @@ static void test_InternetErrorDlg(void) /* Handle some special cases */ switch(i) { - case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR: - case ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR: + case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR: /* later 9.x versions */ + case ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR: /* later 9.x versions */ + case ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE: /* later 11.x versions */ if(res == ERROR_CANCELLED) - { - /* Some windows XP, w2k3 x64, W2K8 */ - win_skip("Skipping some tests for %d\n", i); - continue; - } + expected = ERROR_CANCELLED; break; case ERROR_INTERNET_FORTEZZA_LOGIN_NEEDED: if(res != expected)
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=57832
Your paranoid android.
=== w1064v1809_ar (task log) ===
Task errors: The task timed out
=== w1064v1809_he (task log) ===
Task errors: The task timed out
=== w1064v1809_ja (task log) ===
Task errors: The task timed out
=== w1064v1809_zh_CN (task log) ===
Task errors: The task timed out
-
Marvin -
Zebediah Figura