Francois Gouget : include: Add a couple of INTERNET_SCHEME_XXX constants.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b436a15a87e2652062f7aa6f35ec499f64abfbbb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b436a15a87e2652062f7aa6f35...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Wed Feb  8 12:10:20 2017 +0100

include: Add a couple of INTERNET_SCHEME_XXX constants.

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(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 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 3d87280..52c60e4 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 9e0fb40..39a6646 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,