[ros-diffs] [akhaldi] 74867: [PSDK] Update winhttp.h and wininet.h. CORE-13362

Author: akhaldi
Date: Sun Jun  4 01:49:03 2017
New Revision: 74867

URL: http://svn.reactos.org/svn/reactos?rev=74867&view=rev
Log:
[PSDK] Update winhttp.h and wininet.h. CORE-13362

Modified:
    trunk/reactos/sdk/include/psdk/winhttp.h
    trunk/reactos/sdk/include/psdk/wininet.h

Modified: trunk/reactos/sdk/include/psdk/winhttp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winhttp.h…
==============================================================================
--- trunk/reactos/sdk/include/psdk/winhttp.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/psdk/winhttp.h	[iso-8859-1] Sun Jun  4 01:49:03 2017
@@ -38,8 +38,11 @@
 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

Modified: trunk/reactos/sdk/include/psdk/wininet.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/wininet.h…
==============================================================================
--- trunk/reactos/sdk/include/psdk/wininet.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/psdk/wininet.h	[iso-8859-1] Sun Jun  4 01:49:03 2017
@@ -136,14 +136,14 @@
     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,
@@ -2531,13 +2531,16 @@
 
 #define INTERNET_AUTODIAL_FLAGS_MASK (INTERNET_AUTODIAL_FORCE_ONLINE |
INTERNET_AUTODIAL_FORCE_UNATTENDED | INTERNET_AUTODIAL_FAILIFSECURITYCHECK)
 
-BOOLAPI InternetAutodialHangup(_Reserved_ DWORD);
-BOOLAPI InternetGetConnectedState(_Out_ LPDWORD, _Reserved_ DWORD);
-
-#define INTERNET_CONNECTION_MODEM           1
-#define INTERNET_CONNECTION_LAN             2
-#define INTERNET_CONNECTION_PROXY           4
-#define INTERNET_CONNECTION_MODEM_BUSY      8
+BOOL WINAPI InternetAutodialHangup(_Reserved_ DWORD);
+BOOL WINAPI InternetGetConnectedState(_Out_ LPDWORD, _Reserved_ DWORD);
+
+#define INTERNET_CONNECTION_MODEM        0x01
+#define INTERNET_CONNECTION_LAN          0x02
+#define INTERNET_CONNECTION_PROXY        0x04
+#define INTERNET_CONNECTION_MODEM_BUSY   0x08
+#define INTERNET_RAS_INSTALLED           0x10
+#define INTERNET_CONNECTION_OFFLINE      0x20
+#define INTERNET_CONNECTION_CONFIGURED   0x40
 
 typedef DWORD (CALLBACK *PFN_DIAL_HANDLER) (HWND,LPCSTR,DWORD,LPDWORD);