include: Add a couple of INTERNET_SCHEME_XXX constants.

Francois Gouget fgouget at codeweavers.com
Wed Feb 8 05:10:20 CST 2017


Also add comments noting that it is not a mistake for the wininet.h
constants to be incompatible with the winhttp.h ones.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
 include/winhttp.h | 3 +++
 include/wininet.h | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/winhttp.h b/include/winhttp.h
index 3d872807702..52c60e47606 100644
--- a/include/winhttp.h
+++ b/include/winhttp.h
@@ -38,8 +38,11 @@ typedef HINTERNET *LPHINTERNET;
 typedef WORD INTERNET_PORT;
 typedef INTERNET_PORT *LPINTERNET_PORT;
 
+/* Yes, these values contradict wininet.h */
 #define INTERNET_SCHEME_HTTP            1
 #define INTERNET_SCHEME_HTTPS           2
+#define INTERNET_SCHEME_FTP             3
+#define INTERNET_SCHEME_SOCKS           4
 typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME;
 
 #define ICU_ESCAPE  0x80000000
diff --git a/include/wininet.h b/include/wininet.h
index 9e0fb40e2cf..39a66466da0 100644
--- a/include/wininet.h
+++ b/include/wininet.h
@@ -136,14 +136,14 @@ typedef enum {
     INTERNET_SCHEME_PARTIAL = -2,
     INTERNET_SCHEME_UNKNOWN = -1,
     INTERNET_SCHEME_DEFAULT = 0,
-    INTERNET_SCHEME_FTP,
+    INTERNET_SCHEME_FTP,   /* yes, this contradicts winhttp.h */
     INTERNET_SCHEME_GOPHER,
-    INTERNET_SCHEME_HTTP,
-    INTERNET_SCHEME_HTTPS,
+    INTERNET_SCHEME_HTTP,  /* yes, this contradicts winhttp.h */
+    INTERNET_SCHEME_HTTPS, /* yes, this contradicts winhttp.h */
     INTERNET_SCHEME_FILE,
     INTERNET_SCHEME_NEWS,
     INTERNET_SCHEME_MAILTO,
-    INTERNET_SCHEME_SOCKS,
+    INTERNET_SCHEME_SOCKS, /* yes, this contradicts winhttp.h */
     INTERNET_SCHEME_JAVASCRIPT,
     INTERNET_SCHEME_VBSCRIPT,
     INTERNET_SCHEME_RES,
-- 
2.11.0




More information about the wine-patches mailing list