From 8743767965df27cdc94d7bfa4ffd3fc3daf20a10 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 4 Jun 2017 01:49:03 +0000 Subject: [PATCH] [PSDK] Update winhttp.h and wininet.h. CORE-13362 svn path=/trunk/; revision=74867 --- reactos/sdk/include/psdk/winhttp.h | 3 +++ reactos/sdk/include/psdk/wininet.h | 23 +++++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/reactos/sdk/include/psdk/winhttp.h b/reactos/sdk/include/psdk/winhttp.h index bd84334fcda..45be58a18ed 100644 --- a/reactos/sdk/include/psdk/winhttp.h +++ b/reactos/sdk/include/psdk/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/reactos/sdk/include/psdk/wininet.h b/reactos/sdk/include/psdk/wininet.h index c5699160e4f..c29646c7cd2 100644 --- a/reactos/sdk/include/psdk/wininet.h +++ b/reactos/sdk/include/psdk/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, @@ -2531,13 +2531,16 @@ BOOLAPI InternetAutodial(_In_ DWORD, _In_opt_ HWND); #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); +BOOL WINAPI InternetAutodialHangup(_Reserved_ DWORD); +BOOL WINAPI 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 +#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);