Re: [Mingw-w64-public] [PATCH] headers: Add missing names in wininet.h

2021-06-28 Thread LIU Hao

在 6/29/21 2:42 AM, Biswapriyo Nath 写道:

Interesting, gcc does not show any error with that change. Patch updated.




Thanks for the update. Pushed to master.

If the two macro definitions expand to identical sequences of tokens, then it's fine and GCC should 
accept it.



--
Best regards,
LIU Hao



OpenPGP_signature
Description: OpenPGP digital signature
___
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public


Re: [Mingw-w64-public] [PATCH] headers: Add missing names in wininet.h

2021-06-28 Thread Biswapriyo Nath
Interesting, gcc does not show any error with that change. Patch updated.
From 6d0e9b120280be3978688b7b42962f80d665a087 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath 
Date: Tue, 29 Jun 2021 00:09:31 +0530
Subject: [PATCH] headers: Add missing names in wininet.h

Signed-off-by: Biswapriyo Nath 
---
 mingw-w64-headers/include/wininet.h | 98 -
 1 file changed, 97 insertions(+), 1 deletion(-)

diff --git a/mingw-w64-headers/include/wininet.h 
b/mingw-w64-headers/include/wininet.h
index bb19d65..61c3a11 100644
--- a/mingw-w64-headers/include/wininet.h
+++ b/mingw-w64-headers/include/wininet.h
@@ -61,6 +61,9 @@ extern "C" {
 #define INTERNET_REQFLAG_CACHE_WRITE_DISABLED 0x0040
 #define INTERNET_REQFLAG_NET_TIMEOUT 0x0080
 
+#define INTERNET_FLAG_IDN_DIRECT 0x0001
+#define INTERNET_FLAG_IDN_PROXY 0x0002
+
 #define INTERNET_FLAG_RELOAD 0x8000
 
 #define INTERNET_FLAG_RAW_DATA 0x4000
@@ -104,6 +107,7 @@ extern "C" {
 #define INTERNET_FLAG_TRANSFER_BINARY FTP_TRANSFER_TYPE_BINARY
 
 #define SECURITY_INTERNET_MASK (INTERNET_FLAG_IGNORE_CERT_CN_INVALID | 
INTERNET_FLAG_IGNORE_CERT_DATE_INVALID | INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTPS 
| INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTP)
+#define SECURITY_IGNORE_ERROR_MASK (INTERNET_FLAG_IGNORE_CERT_CN_INVALID | 
INTERNET_FLAG_IGNORE_CERT_DATE_INVALID | SECURITY_FLAG_IGNORE_UNKNOWN_CA | 
SECURITY_FLAG_IGNORE_REVOCATION | SECURITY_FLAG_IGNORE_WEAK_SIGNATURE)
 #define INTERNET_FLAGS_MASK (INTERNET_FLAG_RELOAD | INTERNET_FLAG_RAW_DATA | 
INTERNET_FLAG_EXISTING_CONNECT | INTERNET_FLAG_ASYNC | INTERNET_FLAG_PASSIVE | 
INTERNET_FLAG_NO_CACHE_WRITE | INTERNET_FLAG_MAKE_PERSISTENT | 
INTERNET_FLAG_FROM_CACHE | INTERNET_FLAG_SECURE | INTERNET_FLAG_KEEP_CONNECTION 
| INTERNET_FLAG_NO_AUTO_REDIRECT | INTERNET_FLAG_READ_PREFETCH | 
INTERNET_FLAG_NO_COOKIES | INTERNET_FLAG_NO_AUTH | 
INTERNET_FLAG_CACHE_IF_NET_FAIL | SECURITY_INTERNET_MASK | 
INTERNET_FLAG_RESYNCHRONIZE | INTERNET_FLAG_HYPERLINK | INTERNET_FLAG_NO_UI | 
INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_CACHE_ASYNC | 
INTERNET_FLAG_FORMS_SUBMIT | INTERNET_FLAG_NEED_FILE | 
INTERNET_FLAG_RESTRICTED_ZONE | INTERNET_FLAG_TRANSFER_BINARY | 
INTERNET_FLAG_TRANSFER_ASCII | INTERNET_FLAG_FWD_BACK | INTERNET_FLAG_BGUPDATE)
 
 #define INTERNET_ERROR_MASK_INSERT_CDROM 0x1
@@ -476,6 +480,7 @@ extern "C" {
 #define INTERNET_OPTION_ERROR_MASK 62
 #define INTERNET_OPTION_FROM_CACHE_TIMEOUT 63
 #define INTERNET_OPTION_BYPASS_EDITED_ENTRY 64
+#define INTERNET_OPTION_HTTP_DECODING 65
 #define INTERNET_OPTION_DIAGNOSTIC_SOCKET_INFO 67
 #define INTERNET_OPTION_CODEPAGE 68
 #define INTERNET_OPTION_CACHE_TIMESTAMPS 69
@@ -507,11 +512,47 @@ extern "C" {
 
 #define INTERNET_OPTION_DATAFILE_EXT 96
 
+#define INTERNET_OPTION_CODEPAGE_PATH 100
+#define INTERNET_OPTION_CODEPAGE_EXTRA 101
+#define INTERNET_OPTION_IDN 102
+#define INTERNET_OPTION_MAX_CONNS_PER_PROXY 103
+#define INTERNET_OPTION_SUPPRESS_SERVER_AUTH 104
+#define INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT 105
+
+#define INTERNET_OPTION_ENABLE_REDIRECT_CACHE_READ 122
+
+#define INTERNET_OPTION_COMPRESSED_CONTENT_LENGTH 147
+#define INTERNET_OPTION_ENABLE_HTTP_PROTOCOL 148
+#define INTERNET_OPTION_HTTP_PROTOCOL_USED 149
+
+#define INTERNET_OPTION_ENCODE_EXTRA 155
+
+#define INTERNET_OPTION_HSTS 157
+
+#define INTERNET_OPTION_ENTERPRISE_CONTEXT 159
+
+#define INTERNET_OPTION_CONNECTION_FILTER 162
+#define INTERNET_OPTION_REFERER_TOKEN_BINDING_HOSTNAME 163
+
+#define INTERNET_OPTION_TOKEN_BINDING_PUBLIC_KEY 181
+
+#define INTERNET_OPTION_COOKIES_SAME_SITE_LEVEL 187
+
 #define INTERNET_FIRST_OPTION INTERNET_OPTION_CALLBACK
 #define INTERNET_LAST_OPTION INTERNET_OPTION_DATAFILE_EXT
 
 #define INTERNET_PRIORITY_FOREGROUND 1000
 
+#define HTTP_COOKIES_SAME_SITE_LEVEL_UNKNOWN 0x0
+#define HTTP_COOKIES_SAME_SITE_LEVEL_SAME_SITE 0x1
+#define HTTP_COOKIES_SAME_SITE_LEVEL_CROSS_SITE_LAX 0x2
+#define HTTP_COOKIES_SAME_SITE_LEVEL_CROSS_SITE 0x3
+
+#define HTTP_COOKIES_SAME_SITE_LEVEL_MAX 
HTTP_COOKIES_SAME_SITE_LEVEL_CROSS_SITE
+
+#define HTTP_PROTOCOL_FLAG_HTTP2 0x2
+#define HTTP_PROTOCOL_MASK HTTP_PROTOCOL_FLAG_HTTP2
+
 #define INTERNET_HANDLE_TYPE_INTERNET 1
 #define INTERNET_HANDLE_TYPE_CONNECT_FTP 2
 #define INTERNET_HANDLE_TYPE_CONNECT_GOPHER 3
@@ -530,6 +571,7 @@ extern "C" {
 #define AUTH_FLAG_DISABLE_NEGOTIATE 0x0001
 #define AUTH_FLAG_ENABLE_NEGOTIATE 0x0002
 #define AUTH_FLAG_DISABLE_BASIC_CLEARCHANNEL 0x0004
+#define AUTH_FLAG_DISABLE_SERVER_AUTH 0x0008
 
 #define SECURITY_FLAG_SECURE 0x0001
 #define SECURITY_FLAG_STRENGTH_WEAK 0x1000
@@ -552,6 +594,7 @@ extern "C" {
 #define SECURITY_FLAG_IGNORE_REVOCATION 0x0080
 #define SECURITY_FLAG_IGNORE_UNKNOWN_CA 0x0100
 #define SECURITY_FLAG_IGNORE_WRONG_USAGE 0x0200
+#define SECURITY_FLAG_IGNORE_WEAK_SIGNATURE 0x0001
 
 #define SECURITY_FLAG_IGNORE_CERT_CN_INVALID 
INTERNET_FLAG_IGNORE_CERT_CN_INVALID
 #define SECURITY_FLAG_IGNORE_CERT_DATE_INVALID 

Re: [Mingw-w64-public] [PATCH] headers: Add missing names in wininet.h

2021-06-28 Thread LIU Hao

在 2021-06-27 23:56, Biswapriyo Nath 写道:

+
+#define INTERNET_OPTION_TOKEN_BINDING_PUBLIC_KEY 181
+
+#define INTERNET_OPTION_COOKIES_SAME_SITE_LEVEL 187
+
+#define INTERNET_OPTION_ENABLE_REDIRECT_CACHE_READ 122
+


`INTERNET_OPTION_ENABLE_REDIRECT_CACHE_READ` is duplicated here.

Others parts look good to me.


BTW I have re-generated my OpenPGP key pair due to the name change.


--
Best regards,
LIU Hao


OpenPGP_signature
Description: OpenPGP digital signature
___
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public


[Mingw-w64-public] [PATCH] headers: Add missing names in wininet.h

2021-06-27 Thread Biswapriyo Nath

From 93db93c912ab8a120766cbf8470aed6b2c207cef Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath 
Date: Sun, 27 Jun 2021 21:25:27 +0530
Subject: [PATCH] headers: Add missing names in wininet.h

Signed-off-by: Biswapriyo Nath 
---
 mingw-w64-headers/include/wininet.h | 100 +++-
 1 file changed, 99 insertions(+), 1 deletion(-)

diff --git a/mingw-w64-headers/include/wininet.h 
b/mingw-w64-headers/include/wininet.h
index bb19d65..221b06f 100644
--- a/mingw-w64-headers/include/wininet.h
+++ b/mingw-w64-headers/include/wininet.h
@@ -61,6 +61,9 @@ extern "C" {
 #define INTERNET_REQFLAG_CACHE_WRITE_DISABLED 0x0040
 #define INTERNET_REQFLAG_NET_TIMEOUT 0x0080
 
+#define INTERNET_FLAG_IDN_DIRECT 0x0001
+#define INTERNET_FLAG_IDN_PROXY 0x0002
+
 #define INTERNET_FLAG_RELOAD 0x8000
 
 #define INTERNET_FLAG_RAW_DATA 0x4000
@@ -104,6 +107,7 @@ extern "C" {
 #define INTERNET_FLAG_TRANSFER_BINARY FTP_TRANSFER_TYPE_BINARY
 
 #define SECURITY_INTERNET_MASK (INTERNET_FLAG_IGNORE_CERT_CN_INVALID | 
INTERNET_FLAG_IGNORE_CERT_DATE_INVALID | INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTPS 
| INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTP)
+#define SECURITY_IGNORE_ERROR_MASK (INTERNET_FLAG_IGNORE_CERT_CN_INVALID | 
INTERNET_FLAG_IGNORE_CERT_DATE_INVALID | SECURITY_FLAG_IGNORE_UNKNOWN_CA | 
SECURITY_FLAG_IGNORE_REVOCATION | SECURITY_FLAG_IGNORE_WEAK_SIGNATURE)
 #define INTERNET_FLAGS_MASK (INTERNET_FLAG_RELOAD | INTERNET_FLAG_RAW_DATA | 
INTERNET_FLAG_EXISTING_CONNECT | INTERNET_FLAG_ASYNC | INTERNET_FLAG_PASSIVE | 
INTERNET_FLAG_NO_CACHE_WRITE | INTERNET_FLAG_MAKE_PERSISTENT | 
INTERNET_FLAG_FROM_CACHE | INTERNET_FLAG_SECURE | INTERNET_FLAG_KEEP_CONNECTION 
| INTERNET_FLAG_NO_AUTO_REDIRECT | INTERNET_FLAG_READ_PREFETCH | 
INTERNET_FLAG_NO_COOKIES | INTERNET_FLAG_NO_AUTH | 
INTERNET_FLAG_CACHE_IF_NET_FAIL | SECURITY_INTERNET_MASK | 
INTERNET_FLAG_RESYNCHRONIZE | INTERNET_FLAG_HYPERLINK | INTERNET_FLAG_NO_UI | 
INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_CACHE_ASYNC | 
INTERNET_FLAG_FORMS_SUBMIT | INTERNET_FLAG_NEED_FILE | 
INTERNET_FLAG_RESTRICTED_ZONE | INTERNET_FLAG_TRANSFER_BINARY | 
INTERNET_FLAG_TRANSFER_ASCII | INTERNET_FLAG_FWD_BACK | INTERNET_FLAG_BGUPDATE)
 
 #define INTERNET_ERROR_MASK_INSERT_CDROM 0x1
@@ -476,6 +480,7 @@ extern "C" {
 #define INTERNET_OPTION_ERROR_MASK 62
 #define INTERNET_OPTION_FROM_CACHE_TIMEOUT 63
 #define INTERNET_OPTION_BYPASS_EDITED_ENTRY 64
+#define INTERNET_OPTION_HTTP_DECODING 65
 #define INTERNET_OPTION_DIAGNOSTIC_SOCKET_INFO 67
 #define INTERNET_OPTION_CODEPAGE 68
 #define INTERNET_OPTION_CACHE_TIMESTAMPS 69
@@ -507,11 +512,49 @@ extern "C" {
 
 #define INTERNET_OPTION_DATAFILE_EXT 96
 
+#define INTERNET_OPTION_CODEPAGE_PATH 100
+#define INTERNET_OPTION_CODEPAGE_EXTRA 101
+#define INTERNET_OPTION_IDN 102
+#define INTERNET_OPTION_MAX_CONNS_PER_PROXY 103
+#define INTERNET_OPTION_SUPPRESS_SERVER_AUTH 104
+#define INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT 105
+
+#define INTERNET_OPTION_ENABLE_REDIRECT_CACHE_READ 122
+
+#define INTERNET_OPTION_COMPRESSED_CONTENT_LENGTH 147
+#define INTERNET_OPTION_ENABLE_HTTP_PROTOCOL 148
+#define INTERNET_OPTION_HTTP_PROTOCOL_USED 149
+
+#define INTERNET_OPTION_ENCODE_EXTRA 155
+
+#define INTERNET_OPTION_HSTS 157
+
+#define INTERNET_OPTION_ENTERPRISE_CONTEXT 159
+
+#define INTERNET_OPTION_CONNECTION_FILTER 162
+#define INTERNET_OPTION_REFERER_TOKEN_BINDING_HOSTNAME 163
+
+#define INTERNET_OPTION_TOKEN_BINDING_PUBLIC_KEY 181
+
+#define INTERNET_OPTION_COOKIES_SAME_SITE_LEVEL 187
+
+#define INTERNET_OPTION_ENABLE_REDIRECT_CACHE_READ 122
+
 #define INTERNET_FIRST_OPTION INTERNET_OPTION_CALLBACK
 #define INTERNET_LAST_OPTION INTERNET_OPTION_DATAFILE_EXT
 
 #define INTERNET_PRIORITY_FOREGROUND 1000
 
+#define HTTP_COOKIES_SAME_SITE_LEVEL_UNKNOWN 0x0
+#define HTTP_COOKIES_SAME_SITE_LEVEL_SAME_SITE 0x1
+#define HTTP_COOKIES_SAME_SITE_LEVEL_CROSS_SITE_LAX 0x2
+#define HTTP_COOKIES_SAME_SITE_LEVEL_CROSS_SITE 0x3
+
+#define HTTP_COOKIES_SAME_SITE_LEVEL_MAX 
HTTP_COOKIES_SAME_SITE_LEVEL_CROSS_SITE
+
+#define HTTP_PROTOCOL_FLAG_HTTP2 0x2
+#define HTTP_PROTOCOL_MASK HTTP_PROTOCOL_FLAG_HTTP2
+
 #define INTERNET_HANDLE_TYPE_INTERNET 1
 #define INTERNET_HANDLE_TYPE_CONNECT_FTP 2
 #define INTERNET_HANDLE_TYPE_CONNECT_GOPHER 3
@@ -530,6 +573,7 @@ extern "C" {
 #define AUTH_FLAG_DISABLE_NEGOTIATE 0x0001
 #define AUTH_FLAG_ENABLE_NEGOTIATE 0x0002
 #define AUTH_FLAG_DISABLE_BASIC_CLEARCHANNEL 0x0004
+#define AUTH_FLAG_DISABLE_SERVER_AUTH 0x0008
 
 #define SECURITY_FLAG_SECURE 0x0001
 #define SECURITY_FLAG_STRENGTH_WEAK 0x1000
@@ -552,6 +596,7 @@ extern "C" {
 #define SECURITY_FLAG_IGNORE_REVOCATION 0x0080
 #define SECURITY_FLAG_IGNORE_UNKNOWN_CA 0x0100
 #define SECURITY_FLAG_IGNORE_WRONG_USAGE 0x0200
+#define SECURITY_FLAG_IGNORE_WEAK_SIGNATURE 0x0001
 
 #define SECURITY_FLAG_IGNORE_CERT_CN_INVALID 
INTERNET_FLAG_IGNORE_CERT_CN_INVALID
 #define SECURITY_FLAG_IGNORE_CERT_DATE_INVALID