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

include: Add a couple of INTERNET_SCHEME_XXX constants.
b436a15a · Francois Gouget · Alexandre Julliard · abf2be0a · b436a15a · b436a15a
Commit b436a15a authored Feb 08, 2017 by Francois Gouget Committed by Alexandre Julliard Feb 08, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

winhttp.h include/winhttp.h +3 -0

wininet.h include/wininet.h +4 -4

No files found.
--- 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

--- 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,