Headers diff for wininet.dll between 7.00.6002.18005-Windows 6.0 and 11.00.9600.18315-Windows 7.0 versions

wininet.h (7.00.6002.18005-Windows 6.0)		wininet.h (11.00.9600.18315-Windows 7.0)

skipping to change at line 428		skipping to change at line 428
//		//
#define INTERNET_PER_CONN_FLAGS 1		#define INTERNET_PER_CONN_FLAGS 1
#define INTERNET_PER_CONN_PROXY_SERVER 2		#define INTERNET_PER_CONN_PROXY_SERVER 2
#define INTERNET_PER_CONN_PROXY_BYPASS 3		#define INTERNET_PER_CONN_PROXY_BYPASS 3
#define INTERNET_PER_CONN_AUTOCONFIG_URL 4		#define INTERNET_PER_CONN_AUTOCONFIG_URL 4
#define INTERNET_PER_CONN_AUTODISCOVERY_FLAGS 5		#define INTERNET_PER_CONN_AUTODISCOVERY_FLAGS 5
#define INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL 6		#define INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL 6
#define INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS 7		#define INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS 7
#define INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME 8		#define INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME 8
#define INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL 9		#define INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL 9

		#define INTERNET_PER_CONN_FLAGS_UI 10

//		//
// PER_CONN_FLAGS		// PER_CONN_FLAGS
//		//
#define PROXY_TYPE_DIRECT 0x00000001 // direct t o net		#define PROXY_TYPE_DIRECT 0x00000001 // direct t o net
#define PROXY_TYPE_PROXY 0x00000002 // via name d proxy		#define PROXY_TYPE_PROXY 0x00000002 // via name d proxy
#define PROXY_TYPE_AUTO_PROXY_URL 0x00000004 // autoprox y URL		#define PROXY_TYPE_AUTO_PROXY_URL 0x00000004 // autoprox y URL
#define PROXY_TYPE_AUTO_DETECT 0x00000008 // use auto proxy detection		#define PROXY_TYPE_AUTO_DETECT 0x00000008 // use auto proxy detection

//		//

skipping to change at line 972		skipping to change at line 973
//		//

#define IRF_ASYNC WININET_API_FLAG_ASYNC		#define IRF_ASYNC WININET_API_FLAG_ASYNC
#define IRF_SYNC WININET_API_FLAG_SYNC		#define IRF_SYNC WININET_API_FLAG_SYNC
#define IRF_USE_CONTEXT WININET_API_FLAG_USE_CONTEXT		#define IRF_USE_CONTEXT WININET_API_FLAG_USE_CONTEXT
#define IRF_NO_WAIT 0x00000008		#define IRF_NO_WAIT 0x00000008

INTERNETAPI_(DWORD) InternetSetFilePointer(		INTERNETAPI_(DWORD) InternetSetFilePointer(
__in HINTERNET hFile,		__in HINTERNET hFile,
__in LONG lDistanceToMove,		__in LONG lDistanceToMove,

__reserved PVOID pReserved,		__inout_opt PLONG lpDistanceToMoveHigh,
__in DWORD dwMoveMethod,		__in DWORD dwMoveMethod,
__reserved DWORD_PTR dwContext		__reserved DWORD_PTR dwContext
);		);

BOOLAPI InternetWriteFile(		BOOLAPI InternetWriteFile(
__in HINTERNET hFile,		__in HINTERNET hFile,
__in_bcount(dwNumberOfBytesToWrite) LPCVOID lpBuffer,		__in_bcount(dwNumberOfBytesToWrite) LPCVOID lpBuffer,
__in DWORD dwNumberOfBytesToWrite,		__in DWORD dwNumberOfBytesToWrite,
__out LPDWORD lpdwNumberOfBytesWritten		__out LPDWORD lpdwNumberOfBytesWritten
);		);

skipping to change at line 1181		skipping to change at line 1182
#define INTERNET_OPTION_ACTIVATE_WORKER_THREADS 92		#define INTERNET_OPTION_ACTIVATE_WORKER_THREADS 92
#define INTERNET_OPTION_RESTORE_WORKER_THREAD_DEFAULTS 93		#define INTERNET_OPTION_RESTORE_WORKER_THREAD_DEFAULTS 93
#define INTERNET_OPTION_SOCKET_SEND_BUFFER_LENGTH 94		#define INTERNET_OPTION_SOCKET_SEND_BUFFER_LENGTH 94
#define INTERNET_OPTION_PROXY_SETTINGS_CHANGED 95		#define INTERNET_OPTION_PROXY_SETTINGS_CHANGED 95

#define INTERNET_OPTION_DATAFILE_EXT 96		#define INTERNET_OPTION_DATAFILE_EXT 96

#define INTERNET_OPTION_CODEPAGE_PATH 100		#define INTERNET_OPTION_CODEPAGE_PATH 100
#define INTERNET_OPTION_CODEPAGE_EXTRA 101		#define INTERNET_OPTION_CODEPAGE_EXTRA 101
#define INTERNET_OPTION_IDN 102		#define INTERNET_OPTION_IDN 102

		#define INTERNET_OPTION_MAX_CONNS_PER_PROXY 103
		#define INTERNET_OPTION_SUPPRESS_SERVER_AUTH 104
		#define INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT 105

#define INTERNET_FIRST_OPTION INTERNET_OPTION_CALLBACK		#define INTERNET_FIRST_OPTION INTERNET_OPTION_CALLBACK

#define INTERNET_LAST_OPTION INTERNET_OPTION_IDN		#define INTERNET_LAST_OPTION INTERNET_OPTION_SERVER_CERT_CHAI N_CONTEXT

//		//
// values for INTERNET_OPTION_PRIORITY		// values for INTERNET_OPTION_PRIORITY
//		//

#define INTERNET_PRIORITY_FOREGROUND 1000		#define INTERNET_PRIORITY_FOREGROUND 1000

//		//
// handle types		// handle types
//		//

skipping to change at line 2248		skipping to change at line 2252
// HTTP_QUERY_FLAG_SYSTEMTIME - if this bit is set in the dwInfoLevel parameter		// HTTP_QUERY_FLAG_SYSTEMTIME - if this bit is set in the dwInfoLevel parameter
// of HttpQueryInfo() AND the header being queried contains date information,		// of HttpQueryInfo() AND the header being queried contains date information,
// e.g. the "Expires:" header then lpBuffer will contain a SYSTEMTIME structure		// e.g. the "Expires:" header then lpBuffer will contain a SYSTEMTIME structure
// containing the date and time information converted from the header string		// containing the date and time information converted from the header string
//		//

#define HTTP_QUERY_FLAG_SYSTEMTIME 0x40000000		#define HTTP_QUERY_FLAG_SYSTEMTIME 0x40000000

//		//
// HTTP_QUERY_FLAG_NUMBER - if this bit is set in the dwInfoLevel parameter of		// HTTP_QUERY_FLAG_NUMBER - if this bit is set in the dwInfoLevel parameter of

// HttpQueryInfo(), then the value of the header will be converted to a number		// HttpQueryInfo(), then the value of the header will be converted to a 32bit
// before being returned to the caller, if applicable		// number before being returned to the caller, if applicable
//		//

#define HTTP_QUERY_FLAG_NUMBER 0x20000000		#define HTTP_QUERY_FLAG_NUMBER 0x20000000

//		//
// HTTP_QUERY_FLAG_COALESCE - combine the values from several headers of the		// HTTP_QUERY_FLAG_COALESCE - combine the values from several headers of the
// same name into the output buffer		// same name into the output buffer
//		//

#define HTTP_QUERY_FLAG_COALESCE 0x10000000		#define HTTP_QUERY_FLAG_COALESCE 0x10000000


		//
		// HTTP_QUERY_FLAG_NUMBER64 - if this bit is set in the dwInfoLevel parameter of
		// HttpQueryInfo(), then the value of the header will be converted to a 64bit
		// number before being returned to the caller, if applicable
		//

		#define HTTP_QUERY_FLAG_NUMBER64 0x08000000

#define HTTP_QUERY_MODIFIER_FLAGS_MASK (HTTP_QUERY_FLAG_REQUEST_HEADERS \		#define HTTP_QUERY_MODIFIER_FLAGS_MASK (HTTP_QUERY_FLAG_REQUEST_HEADERS \
\| HTTP_QUERY_FLAG_SYSTEMTIME \		\| HTTP_QUERY_FLAG_SYSTEMTIME \
\| HTTP_QUERY_FLAG_NUMBER \		\| HTTP_QUERY_FLAG_NUMBER \
\| HTTP_QUERY_FLAG_COALESCE \		\| HTTP_QUERY_FLAG_COALESCE \

		\| HTTP_QUERY_FLAG_NUMBER64 \
)		)

#define HTTP_QUERY_HEADER_MASK (~HTTP_QUERY_MODIFIER_FLAGS_MASK )		#define HTTP_QUERY_HEADER_MASK (~HTTP_QUERY_MODIFIER_FLAGS_MASK )

//		//
// HTTP Response Status Codes:		// HTTP Response Status Codes:
//		//

#define HTTP_STATUS_CONTINUE 100 // OK to continue with request		#define HTTP_STATUS_CONTINUE 100 // OK to continue with request
#define HTTP_STATUS_SWITCH_PROTOCOLS 101 // server has switched protocols in upgrade header		#define HTTP_STATUS_SWITCH_PROTOCOLS 101 // server has switched protocols in upgrade header

skipping to change at line 2516		skipping to change at line 2529
#define INTERNET_COOKIE_THIRD_PARTY 0x10		#define INTERNET_COOKIE_THIRD_PARTY 0x10
#define INTERNET_COOKIE_PROMPT_REQUIRED 0x20		#define INTERNET_COOKIE_PROMPT_REQUIRED 0x20
#define INTERNET_COOKIE_EVALUATE_P3P 0x40		#define INTERNET_COOKIE_EVALUATE_P3P 0x40
#define INTERNET_COOKIE_APPLY_P3P 0x80		#define INTERNET_COOKIE_APPLY_P3P 0x80

#define INTERNET_COOKIE_P3P_ENABLED 0x100		#define INTERNET_COOKIE_P3P_ENABLED 0x100
#define INTERNET_COOKIE_IS_RESTRICTED 0x200		#define INTERNET_COOKIE_IS_RESTRICTED 0x200
#define INTERNET_COOKIE_IE6 0x400		#define INTERNET_COOKIE_IE6 0x400
#define INTERNET_COOKIE_IS_LEGACY 0x800		#define INTERNET_COOKIE_IS_LEGACY 0x800


		#define INTERNET_COOKIE_NON_SCRIPT 0x00001000
		#define INTERNET_COOKIE_HTTPONLY 0x00002000

BOOLAPI		BOOLAPI
InternetSetCookieA(		InternetSetCookieA(
__in LPCSTR lpszUrl,		__in LPCSTR lpszUrl,
__in_opt LPCSTR lpszCookieName,		__in_opt LPCSTR lpszCookieName,
__in LPCSTR lpszCookieData		__in LPCSTR lpszCookieData
);		);
BOOLAPI		BOOLAPI
InternetSetCookieW(		InternetSetCookieW(
__in LPCWSTR lpszUrl,		__in LPCWSTR lpszUrl,
__in_opt LPCWSTR lpszCookieName,		__in_opt LPCWSTR lpszCookieName,

skipping to change at line 3184		skipping to change at line 3200
BOOLAPI		BOOLAPI
ReadUrlCacheEntryStream(		ReadUrlCacheEntryStream(
__in HANDLE hUrlCacheStream,		__in HANDLE hUrlCacheStream,
__in DWORD dwLocation,		__in DWORD dwLocation,
__out_bcount(*lpdwLen) __out_data_source(NETWORK) LPVOID lpBuffer,		__out_bcount(*lpdwLen) __out_data_source(NETWORK) LPVOID lpBuffer,
__inout LPDWORD lpdwLen,		__inout LPDWORD lpdwLen,
__reserved DWORD Reserved		__reserved DWORD Reserved
);		);

BOOLAPI		BOOLAPI

		ReadUrlCacheEntryStreamEx(
		__in HANDLE hUrlCacheStream,
		__in DWORDLONG qwLocation,
		__out_bcount(*lpdwLen) __out_data_source(NETWORK) LPVOID lpBuffer,
		__inout LPDWORD lpdwLen
		);

		BOOLAPI
UnlockUrlCacheEntryStream(		UnlockUrlCacheEntryStream(
__in HANDLE hUrlCacheStream,		__in HANDLE hUrlCacheStream,
__reserved DWORD Reserved		__reserved DWORD Reserved
);		);

URLCACHEAPI_(BOOL)		URLCACHEAPI_(BOOL)
GetUrlCacheEntryInfoA(		GetUrlCacheEntryInfoA(
__in LPCSTR lpszUrlName,		__in LPCSTR lpszUrlName,
__inout_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpCache EntryInfo,		__inout_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpCache EntryInfo,
__inout_opt LPDWORD lpcbCacheEntryInfo		__inout_opt LPDWORD lpcbCacheEntryInfo

skipping to change at line 3533		skipping to change at line 3557
#define INTERNET_DIAL_UNATTENDED 0x8000		#define INTERNET_DIAL_UNATTENDED 0x8000

INTERNETAPI_(DWORD) InternetHangUp(		INTERNETAPI_(DWORD) InternetHangUp(
__in DWORD_PTR dwConnection,		__in DWORD_PTR dwConnection,
__reserved DWORD dwReserved);		__reserved DWORD dwReserved);

#define INTERENT_GOONLINE_REFRESH 0x00000001		#define INTERENT_GOONLINE_REFRESH 0x00000001
#define INTERENT_GOONLINE_MASK 0x00000001		#define INTERENT_GOONLINE_MASK 0x00000001

INTERNETAPI_(BOOL) InternetGoOnlineA(		INTERNETAPI_(BOOL) InternetGoOnlineA(

__in_opt LPSTR lpszURL,		__in_opt LPCSTR lpszURL,
__in HWND hwndParent,		__in HWND hwndParent,
__in DWORD dwFlags		__in DWORD dwFlags
);		);

INTERNETAPI_(BOOL) InternetGoOnlineW(		INTERNETAPI_(BOOL) InternetGoOnlineW(

__in_opt LPWSTR lpszURL,		__in_opt LPCWSTR lpszURL,
__in HWND hwndParent,		__in HWND hwndParent,
__in DWORD dwFlags		__in DWORD dwFlags
);		);

#ifdef UNICODE		#ifdef UNICODE
#define InternetGoOnline InternetGoOnlineW		#define InternetGoOnline InternetGoOnlineW
#else		#else
#ifdef _WINX32_		#ifdef _WINX32_
#define InternetGoOnline InternetGoOnlineA		#define InternetGoOnline InternetGoOnlineA
#else		#else

skipping to change at line 3672		skipping to change at line 3696
typedef BOOL (CALLBACK *pfnInternetDeInitializeAutoProxyDll)(LPSTR lpszMime,		typedef BOOL (CALLBACK *pfnInternetDeInitializeAutoProxyDll)(LPSTR lpszMime,
DWORD dwReserved);		DWORD dwReserved);

typedef BOOL (CALLBACK *pfnInternetGetProxyInfo)(LPCSTR lpszUrl,		typedef BOOL (CALLBACK *pfnInternetGetProxyInfo)(LPCSTR lpszUrl,
DWORD dwUrlLength,		DWORD dwUrlLength,
LPSTR lpszUrlHostName,		LPSTR lpszUrlHostName,
DWORD dwUrlHostNameLength,		DWORD dwUrlHostNameLength,
LPSTR* lplpszProxyHostName,		LPSTR* lplpszProxyHostName,
LPDWORD lpdwProxyHostNameLength);		LPDWORD lpdwProxyHostNameLength);


		typedef enum{
		WPAD_CACHE_DELETE_CURRENT = 0x0,
		WPAD_CACHE_DELETE_ALL = 0x1
		} WPAD_CACHE_DELETE;

		INTERNETAPI_(BOOL) DeleteWpadCacheForNetworks(
		__in WPAD_CACHE_DELETE
		);

INTERNETAPI_(BOOL) InternetInitializeAutoProxyDll(		INTERNETAPI_(BOOL) InternetInitializeAutoProxyDll(
__in DWORD dwReserved		__in DWORD dwReserved
);		);

INTERNETAPI_(BOOL) DetectAutoProxyUrl(		INTERNETAPI_(BOOL) DetectAutoProxyUrl(
__out_ecount(dwAutoProxyUrlLength) LPSTR lpszAutoProxyUrl,		__out_ecount(dwAutoProxyUrlLength) LPSTR lpszAutoProxyUrl,
__in DWORD dwAutoProxyUrlLength,		__in DWORD dwAutoProxyUrlLength,
__in DWORD dwDetectFlags		__in DWORD dwDetectFlags
);		);


End of changes. 12 change blocks.
6 lines changed or deleted		39 lines changed or added

winineti.h (7.00.6002.18005-Windows 6.0)		winineti.h (11.00.9600.18315-Windows 7.0)

#include <iedial.h>		#include <iedial.h>
#include <schannel.h>		#include <schannel.h>

		#define SECURITY_WIN32
		#include <sspi.h>
#if !defined(_WININETEX_)		#if !defined(_WININETEX_)
#define _WININETEX_		#define _WININETEX_

#if defined(__cplusplus)		#if defined(__cplusplus)
extern "C" {		extern "C" {
#endif		#endif

#define MAX_CACHE_ENTRY_INFO_SIZE 4096		#define MAX_CACHE_ENTRY_INFO_SIZE 4096


		//
		// These two flags should really be included in a new mask called INTERNET_FLAGS
		_INTERNAL_MASK.
		// Since BGUPDATE is included in INTERNET_FLAGS_MASK already it will cause compi
		le
		// errors when used without winineti.h. FTP_FOLDER_VIEW is not being included
		// so as to not compound the problem.
		//

#define INTERNET_FLAG_BGUPDATE 0x00000008		#define INTERNET_FLAG_BGUPDATE 0x00000008

#define INTERNET_FLAG_UNUSED_4 0x00000004		#define INTERNET_FLAG_FTP_FOLDER_VIEW 0x00000004
		#define INTERNET_FLAGS_MASK_INTERNAL (INTERNET_FLAGS_MASK \| \
		INTERNET_FLAG_FTP_FOLDER_VIEW)

//		//
// INTERNET_PREFETCH_STATUS -		// INTERNET_PREFETCH_STATUS -
//		//

typedef struct {		typedef struct {

//		//
// dwStatus - status of download. See INTERNET_PREFETCH_ flags		// dwStatus - status of download. See INTERNET_PREFETCH_ flags
//		//

skipping to change at line 90		skipping to change at line 102
// pcCertChain - Certificate chain for the certificate		// pcCertChain - Certificate chain for the certificate
//		//

PCCERT_CHAIN_CONTEXT pcCertChain;		PCCERT_CHAIN_CONTEXT pcCertChain;

// SECPKG_ATTR_CONNECTION_INFO		// SECPKG_ATTR_CONNECTION_INFO
SecPkgContext_ConnectionInfo connectionInfo;		SecPkgContext_ConnectionInfo connectionInfo;

// SECPKG_ATTR_CIPHER_INFO (Supported on >= LH)		// SECPKG_ATTR_CIPHER_INFO (Supported on >= LH)
SecPkgContext_CipherInfo cipherInfo;		SecPkgContext_CipherInfo cipherInfo;


		//
		// pcUnverifiedCertChain - Cert chain from initial WinVerifyTrust state
		//
		PCCERT_CHAIN_CONTEXT pcUnverifiedCertChain;

		//
		// Channel Binding Token
		//

		SecPkgContext_Bindings channelBindingToken;

} INTERNET_SECURITY_INFO, * LPINTERNET_SECURITY_INFO;		} INTERNET_SECURITY_INFO, * LPINTERNET_SECURITY_INFO;

typedef struct {		typedef struct {
//		//
// dwSize - size of INTERNET_SECURITY_CONNECTION_INFO		// dwSize - size of INTERNET_SECURITY_CONNECTION_INFO
//		//
DWORD dwSize;		DWORD dwSize;

// fSecure - Is this a secure connection.		// fSecure - Is this a secure connection.
BOOL fSecure;		BOOL fSecure;

skipping to change at line 329		skipping to change at line 353
#define INTERNET_OPTION_NET_SPEED 61		#define INTERNET_OPTION_NET_SPEED 61
// Pass in pointer to INTERNET_SECURITY_CONNECTION_INFO to be filled in.		// Pass in pointer to INTERNET_SECURITY_CONNECTION_INFO to be filled in.
#define INTERNET_OPTION_SECURITY_CONNECTION_INFO 66		#define INTERNET_OPTION_SECURITY_CONNECTION_INFO 66
#define INTERNET_OPTION_DETECT_POST_SEND 71		#define INTERNET_OPTION_DETECT_POST_SEND 71
#define INTERNET_OPTION_DISABLE_NTLM_PREAUTH 72		#define INTERNET_OPTION_DISABLE_NTLM_PREAUTH 72
#define INTERNET_OPTION_ORIGINAL_CONNECT_FLAGS 97		#define INTERNET_OPTION_ORIGINAL_CONNECT_FLAGS 97

#define INTERNET_OPTION_CERT_ERROR_FLAGS 98		#define INTERNET_OPTION_CERT_ERROR_FLAGS 98
#define INTERNET_OPTION_IGNORE_CERT_ERROR_FLAGS 99		#define INTERNET_OPTION_IGNORE_CERT_ERROR_FLAGS 99


#define INTERNET_LAST_OPTION_INTERNAL INTERNET_OPTION_IDN		#define INTERNET_OPTION_SESSION_START_TIME 106
		#define INTERNET_OPTION_PROXY_CREDENTIALS 107
		#define INTERNET_OPTION_EXTENDED_CALLBACKS 108
		#define INTERNET_OPTION_PROXY_FROM_REQUEST 109
		#define INTERNET_OPTION_ALLOW_FAILED_CONNECT_CONTENT 110
		#define INTERNET_OPTION_CACHE_PARTITION 111
		#define INTERNET_OPTION_AUTODIAL_HWND 112
		#define INTERNET_OPTION_SERVER_CREDENTIALS 113
		#define INTERNET_OPTION_WPAD_SLEEP 114
		#define INTERNET_LAST_OPTION_INTERNAL INTERNET_OPTION_WPAD_SLEEP

#define INTERNET_OPTION_OFFLINE_TIMEOUT INTERNET_OPTION_DISCONNECTED_TIMEOUT		#define INTERNET_OPTION_OFFLINE_TIMEOUT INTERNET_OPTION_DISCONNECTED_TIMEOUT
#define INTERNET_OPTION_LINE_STATE INTERNET_OPTION_CONNECTED_STATE		#define INTERNET_OPTION_LINE_STATE INTERNET_OPTION_CONNECTED_STATE

#define AUTH_FLAG_RESET 0x00000000 /* let registry decid e */		#define AUTH_FLAG_RESET 0x00000000 /* let registry decid e */


		//
		// Extended callbacks.
		//
		// They can happen outside the context of the registered session's API calls.
		//

		#define INTERNET_STATUS_PROXY_CREDENTIALS 400
		#define INTERNET_STATUS_SERVER_CREDENTIALS 401
		#define INTERNET_STATUS_SERVER_CONNECTION_STATE 410
		#define INTERNET_STATUS_END_BROWSER_SESSION 420
		#define INTERNET_STATUS_COOKIE 430

		//
		// Extended callback data structures.
		//

		typedef struct _INTERNET_SERVER_CONNECTION_STATE {
		LPCWSTR lpcwszHostName;
		BOOL fProxy; // Is this a proxy?
		DWORD dwCounter; // Server connection state callback counter.
		DWORD dwConnectionLimit; // Current Limit.
		DWORD dwAvailableCreates; // Connections allowed to be created.
		DWORD dwAvailableKeepAlives; // Keep alive connections available to be us
		ed.
		DWORD dwActiveConnections; // Current number of active connections.
		DWORD dwWaiters; // Number of request waiting on connections.
		} INTERNET_SERVER_CONNECTION_STATE, *PINTERNET_SERVER_CONNECTION_STATE;

		typedef struct _INTERNET_END_BROWSER_SESSION_DATA {
		LPVOID lpBuffer;
		DWORD dwBufferLength;
		} INTERNET_END_BROWSER_SESSION_DATA, *PINTERNET_END_BROWSER_SESSION_DATA;

		typedef struct _INTERNET_CALLBACK_COOKIE {
		PCWSTR pcwszName;
		PCWSTR pcwszValue;
		PCWSTR pcwszDomain;
		PCWSTR pcwszPath;
		FILETIME ftExpires;
		DWORD dwFlags;
		} INTERNET_CALLBACK_COOKIE, *PINTERNET_CALLBACK_COOKIE;

		#if _MSC_VER >= 1200
		#pragma warning(push)
		#endif
		#pragma warning(disable:4201)

		typedef struct _INTERNET_CREDENTIALS {
		LPCWSTR lpcwszHostName;
		DWORD dwPort;
		DWORD dwScheme;
		LPCWSTR lpcwszUrl;
		LPCWSTR lpcwszRealm;
		BOOL fAuthIdentity; // TRUE if pAuthIdentityOpaque is used in below struct.
		union {
		struct {
		LPCWSTR lpcwszUserName;
		LPCWSTR lpcwszPassword;
		};
		PVOID pAuthIdentityOpaque;
		};
		} INTERNET_CREDENTIALS, *PINTERNET_CREDENTIALS;

		#if _MSC_VER >= 1200
		#pragma warning(pop)
		#else
		#pragma warning(default:4201)
		#endif

//		//
// !!! NOTE !!!		// !!! NOTE !!!
//		//
// these defines are needed beecause PREFAST donesn't understand enums in		// these defines are needed beecause PREFAST donesn't understand enums in
// range specifications. Make sue that these are always in sync with any		// range specifications. Make sue that these are always in sync with any
// changes to the InternetCookieState enum, above.		// changes to the InternetCookieState enum, above.
//		//
#define COOKIE_STATE_LB 0 // COOKIE_STATE_UNKNOWN		#define COOKIE_STATE_LB 0 // COOKIE_STATE_UNKNOWN
#define COOKIE_STATE_UB 5 // COOKIE_STATE_MAX		#define COOKIE_STATE_UB 5 // COOKIE_STATE_MAX

/* maximum length of privacy-settings in Unicode characters */		/* maximum length of privacy-settings in Unicode characters */
#define MaxPrivacySettings 0x4000		#define MaxPrivacySettings 0x4000

// Utility for mapping P3P compact-policy tokens to unique indexes		// Utility for mapping P3P compact-policy tokens to unique indexes

INTERNETAPI_(int) FindP3PPolicySymbol(const char *pszSymbol);		INTERNETAPI_(int) FindP3PPolicySymbol(__in const char *pszSymbol);

#define INTERNET_STATE_ONLINE INTERNET_STATE_CONNECTED		#define INTERNET_STATE_ONLINE INTERNET_STATE_CONNECTED
#define INTERNET_STATE_OFFLINE INTERNET_STATE_DISCONNECTED		#define INTERNET_STATE_OFFLINE INTERNET_STATE_DISCONNECTED
#define INTERNET_STATE_OFFLINE_USER INTERNET_STATE_DISCONNECTED_BY_USER		#define INTERNET_STATE_OFFLINE_USER INTERNET_STATE_DISCONNECTED_BY_USER
#define INTERNET_LINE_STATE_MASK (INTERNET_STATE_ONLINE \| INTERNET_STATE_OFFL INE)		#define INTERNET_LINE_STATE_MASK (INTERNET_STATE_ONLINE \| INTERNET_STATE_OFFL INE)
#define INTERNET_BUSY_STATE_MASK (INTERNET_STATE_IDLE \| INTERNET_STATE_BUSY)		#define INTERNET_BUSY_STATE_MASK (INTERNET_STATE_IDLE \| INTERNET_STATE_BUSY)

//		//
// the following are used with InternetSetOption(..., INTERNET_OPTION_CALLBACK_F ILTER, ...)		// the following are used with InternetSetOption(..., INTERNET_OPTION_CALLBACK_F ILTER, ...)
// to filter out unrequired callbacks. INTERNET_STATUS_REQUEST_COMPLETE cannot		// to filter out unrequired callbacks. INTERNET_STATUS_REQUEST_COMPLETE cannot

skipping to change at line 430		skipping to change at line 532
#define COOKIE_DONT_ALLOW_ALL 8		#define COOKIE_DONT_ALLOW_ALL 8

// values for dwOperation member		// values for dwOperation member
#define COOKIE_OP_SET 0x01		#define COOKIE_OP_SET 0x01
#define COOKIE_OP_MODIFY 0x02		#define COOKIE_OP_MODIFY 0x02
#define COOKIE_OP_GET 0x04		#define COOKIE_OP_GET 0x04
#define COOKIE_OP_SESSION 0x08		#define COOKIE_OP_SESSION 0x08
#define COOKIE_OP_PERSISTENT 0x10		#define COOKIE_OP_PERSISTENT 0x10
#define COOKIE_OP_3RD_PARTY 0x20		#define COOKIE_OP_3RD_PARTY 0x20


		// INTERNET_COOKIE_RESTRICTED_ZONE is the same as INTERNET_FLAG_RESTRICTED_ZONE
		#define INTERNET_COOKIE_RESTRICTED_ZONE 0x00020000
		#define INTERNET_COOKIE_NO_CALLBACK 0x40000000
#define INTERNET_COOKIE_ECTX_3RDPARTY 0x80000000		#define INTERNET_COOKIE_ECTX_3RDPARTY 0x80000000
//		//
// DAV Detection		// DAV Detection
//		//
BOOLAPI HttpCheckDavComplianceA(		BOOLAPI HttpCheckDavComplianceA(
__in LPCSTR lpszUrl,		__in LPCSTR lpszUrl,
__in LPCSTR lpszComplianceToken,		__in LPCSTR lpszComplianceToken,
__inout LPBOOL lpfFound,		__inout LPBOOL lpfFound,
__in HWND hWnd,		__in HWND hWnd,
__in LPVOID lpvReserved		__in LPVOID lpvReserved
);		);

		// INTERNET_COOKIE_RESTRICTED_ZONE is the same as INTERNET_FLAG_RESTRICTED_ZONE
		#define INTERNET_COOKIE_RESTRICTED_ZONE 0x00020000
		#define INTERNET_COOKIE_NO_CALLBACK 0x40000000
		#define INTERNET_COOKIE_ECTX_3RDPARTY 0x80000000
//		//
// DAV Detection		// DAV Detection
//		//
BOOLAPI HttpCheckDavComplianceW(		BOOLAPI HttpCheckDavComplianceW(
__in LPCWSTR lpszUrl,		__in LPCWSTR lpszUrl,
__in LPCWSTR lpszComplianceToken,		__in LPCWSTR lpszComplianceToken,
__inout LPBOOL lpfFound,		__inout LPBOOL lpfFound,
__in HWND hWnd,		__in HWND hWnd,
__in LPVOID lpvReserved		__in LPVOID lpvReserved
);		);

skipping to change at line 515		skipping to change at line 624
#define ERROR_INTERNET_INTERNAL_SOCKET_ERROR (INTERNET_INTERNAL_ERROR_BASE + 1)		#define ERROR_INTERNET_INTERNAL_SOCKET_ERROR (INTERNET_INTERNAL_ERROR_BASE + 1)
#define ERROR_INTERNET_CONNECTION_AVAILABLE (INTERNET_INTERNAL_ERROR_BASE + 2)		#define ERROR_INTERNET_CONNECTION_AVAILABLE (INTERNET_INTERNAL_ERROR_BASE + 2)
#define ERROR_INTERNET_NO_KNOWN_SERVERS (INTERNET_INTERNAL_ERROR_BASE + 3)		#define ERROR_INTERNET_NO_KNOWN_SERVERS (INTERNET_INTERNAL_ERROR_BASE + 3)
#define ERROR_INTERNET_PING_FAILED (INTERNET_INTERNAL_ERROR_BASE + 4)		#define ERROR_INTERNET_PING_FAILED (INTERNET_INTERNAL_ERROR_BASE + 4)
#define ERROR_INTERNET_NO_PING_SUPPORT (INTERNET_INTERNAL_ERROR_BASE + 5)		#define ERROR_INTERNET_NO_PING_SUPPORT (INTERNET_INTERNAL_ERROR_BASE + 5)
#define ERROR_INTERNET_CACHE_SUCCESS (INTERNET_INTERNAL_ERROR_BASE + 6)		#define ERROR_INTERNET_CACHE_SUCCESS (INTERNET_INTERNAL_ERROR_BASE + 6)
#define ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION_EX (INTERNET_INTERNAL_ERROR_BASE + 7)		#define ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION_EX (INTERNET_INTERNAL_ERROR_BASE + 7)
#define HTTP_1_1_CACHE_ENTRY 0x00000040		#define HTTP_1_1_CACHE_ENTRY 0x00000040
#define STATIC_CACHE_ENTRY 0x00000080		#define STATIC_CACHE_ENTRY 0x00000080
#define MUST_REVALIDATE_CACHE_ENTRY 0x00000100		#define MUST_REVALIDATE_CACHE_ENTRY 0x00000100

		#define SHORTPATH_CACHE_ENTRY 0x00000200
#define COOKIE_ACCEPTED_CACHE_ENTRY 0x00001000		#define COOKIE_ACCEPTED_CACHE_ENTRY 0x00001000
#define COOKIE_LEASHED_CACHE_ENTRY 0x00002000		#define COOKIE_LEASHED_CACHE_ENTRY 0x00002000
#define COOKIE_DOWNGRADED_CACHE_ENTRY 0x00004000		#define COOKIE_DOWNGRADED_CACHE_ENTRY 0x00004000
#define COOKIE_REJECTED_CACHE_ENTRY 0x00008000		#define COOKIE_REJECTED_CACHE_ENTRY 0x00008000

		#define PRIVACY_MODE_CACHE_ENTRY 0x00020000
		#define XDR_CACHE_ENTRY 0x00040000
#define PENDING_DELETE_CACHE_ENTRY 0x00400000		#define PENDING_DELETE_CACHE_ENTRY 0x00400000
#define OTHER_USER_CACHE_ENTRY 0x00800000		#define OTHER_USER_CACHE_ENTRY 0x00800000
#define PRIVACY_IMPACTED_CACHE_ENTRY 0x02000000		#define PRIVACY_IMPACTED_CACHE_ENTRY 0x02000000
#define POST_RESPONSE_CACHE_ENTRY 0x04000000		#define POST_RESPONSE_CACHE_ENTRY 0x04000000
#define INSTALLED_CACHE_ENTRY 0x10000000		#define INSTALLED_CACHE_ENTRY 0x10000000
#define POST_CHECK_CACHE_ENTRY 0x20000000		#define POST_CHECK_CACHE_ENTRY 0x20000000
#define IDENTITY_CACHE_ENTRY 0x80000000		#define IDENTITY_CACHE_ENTRY 0x80000000

		#define ANY_CACHE_ENTRY 0xFFFFFFFF

// We include some entry types even if app doesn't specifically ask for them.		// We include some entry types even if app doesn't specifically ask for them.
#define INCLUDE_BY_DEFAULT_CACHE_ENTRY \		#define INCLUDE_BY_DEFAULT_CACHE_ENTRY \
( HTTP_1_1_CACHE_ENTRY \		( HTTP_1_1_CACHE_ENTRY \
\| STATIC_CACHE_ENTRY \		\| STATIC_CACHE_ENTRY \
\| MUST_REVALIDATE_CACHE_ENTRY \		\| MUST_REVALIDATE_CACHE_ENTRY \
\| PRIVACY_IMPACTED_CACHE_ENTRY \		\| PRIVACY_IMPACTED_CACHE_ENTRY \
\| POST_CHECK_CACHE_ENTRY \		\| POST_CHECK_CACHE_ENTRY \
\| COOKIE_ACCEPTED_CACHE_ENTRY \		\| COOKIE_ACCEPTED_CACHE_ENTRY \
\| COOKIE_LEASHED_CACHE_ENTRY \		\| COOKIE_LEASHED_CACHE_ENTRY \
\| COOKIE_DOWNGRADED_CACHE_ENTRY \		\| COOKIE_DOWNGRADED_CACHE_ENTRY \
\| COOKIE_REJECTED_CACHE_ENTRY \		\| COOKIE_REJECTED_CACHE_ENTRY \

		\| SHORTPATH_CACHE_ENTRY \
)		)

#define CACHEGROUP_FLAG_VALID 0x00000007		#define CACHEGROUP_FLAG_VALID 0x00000007

//		//
// Well known sticky group ID		// Well known sticky group ID
//		//
#define CACHEGROUP_ID_BUILTIN_STICKY 0x1000000000000007		#define CACHEGROUP_ID_BUILTIN_STICKY 0x1000000000000007

//		//

skipping to change at line 811		skipping to change at line 925
#define CACHE_CONFIG_CONTENT_PATHS_FC 0x00000100		#define CACHE_CONFIG_CONTENT_PATHS_FC 0x00000100
#define CACHE_CONFIG_COOKIES_PATHS_FC 0x00000200		#define CACHE_CONFIG_COOKIES_PATHS_FC 0x00000200
#define CACHE_CONFIG_HISTORY_PATHS_FC 0x00000400		#define CACHE_CONFIG_HISTORY_PATHS_FC 0x00000400
#define CACHE_CONFIG_QUOTA_FC 0x00000800		#define CACHE_CONFIG_QUOTA_FC 0x00000800
#define CACHE_CONFIG_USER_MODE_FC 0x00001000		#define CACHE_CONFIG_USER_MODE_FC 0x00001000
#define CACHE_CONFIG_CONTENT_USAGE_FC 0x00002000		#define CACHE_CONFIG_CONTENT_USAGE_FC 0x00002000
#define CACHE_CONFIG_STICKY_CONTENT_USAGE_FC 0x00004000		#define CACHE_CONFIG_STICKY_CONTENT_USAGE_FC 0x00004000

BOOLAPI		BOOLAPI
GetUrlCacheConfigInfoA(		GetUrlCacheConfigInfoA(

__out LPINTERNET_CACHE_CONFIG_INFOA lpCacheConfigInfo,		__inout LPINTERNET_CACHE_CONFIG_INFOA lpCacheConfigInfo,
__reserved LPDWORD lpcbCacheConfigInfo,		__reserved LPDWORD lpcbCacheConfigInfo,
__in DWORD dwFieldControl		__in DWORD dwFieldControl
);		);
BOOLAPI		BOOLAPI
GetUrlCacheConfigInfoW(		GetUrlCacheConfigInfoW(

__out LPINTERNET_CACHE_CONFIG_INFOW lpCacheConfigInfo,		__inout LPINTERNET_CACHE_CONFIG_INFOW lpCacheConfigInfo,
__reserved LPDWORD lpcbCacheConfigInfo,		__reserved LPDWORD lpcbCacheConfigInfo,
__in DWORD dwFieldControl		__in DWORD dwFieldControl
);		);
#ifdef UNICODE		#ifdef UNICODE
#define GetUrlCacheConfigInfo GetUrlCacheConfigInfoW		#define GetUrlCacheConfigInfo GetUrlCacheConfigInfoW
#else		#else
#define GetUrlCacheConfigInfo GetUrlCacheConfigInfoA		#define GetUrlCacheConfigInfo GetUrlCacheConfigInfoA
#endif // !UNICODE		#endif // !UNICODE

BOOLAPI SetUrlCacheConfigInfoA(		BOOLAPI SetUrlCacheConfigInfoA(

skipping to change at line 1005		skipping to change at line 1119
#define INTERNET_DIAL_UNATTENDED 0x8000		#define INTERNET_DIAL_UNATTENDED 0x8000

INTERNETAPI_(DWORD) InternetHangUp(		INTERNETAPI_(DWORD) InternetHangUp(
__in DWORD_PTR dwConnection,		__in DWORD_PTR dwConnection,
__reserved DWORD dwReserved);		__reserved DWORD dwReserved);

#define INTERENT_GOONLINE_REFRESH 0x00000001		#define INTERENT_GOONLINE_REFRESH 0x00000001
#define INTERENT_GOONLINE_MASK 0x00000001		#define INTERENT_GOONLINE_MASK 0x00000001

INTERNETAPI_(BOOL) InternetGoOnlineA(		INTERNETAPI_(BOOL) InternetGoOnlineA(

__in_opt LPSTR lpszURL,		__in_opt LPCSTR lpszURL,
__in HWND hwndParent,		__in HWND hwndParent,
__in DWORD dwFlags		__in DWORD dwFlags
);		);

INTERNETAPI_(BOOL) InternetGoOnlineW(		INTERNETAPI_(BOOL) InternetGoOnlineW(

__in_opt LPWSTR lpszURL,		__in_opt LPCWSTR lpszURL,
__in HWND hwndParent,		__in HWND hwndParent,
__in DWORD dwFlags		__in DWORD dwFlags
);		);

#ifdef UNICODE		#ifdef UNICODE
#define InternetGoOnline InternetGoOnlineW		#define InternetGoOnline InternetGoOnlineW
#else		#else
#ifdef _WINX32_		#ifdef _WINX32_
#define InternetGoOnline InternetGoOnlineA		#define InternetGoOnline InternetGoOnlineA
#else		#else

skipping to change at line 1077		skipping to change at line 1191
__in IDialEventSink * pdes,		__in IDialEventSink * pdes,
__out IDialEngine ** ppde		__out IDialEngine ** ppde
);		);

INTERNETAPI		INTERNETAPI
InternetGetDialBrandingW(		InternetGetDialBrandingW(
__in LPWSTR pwzConnectoid,		__in LPWSTR pwzConnectoid,
__out IDialBranding ** ppdb		__out IDialBranding ** ppdb
);		);


		BOOLAPI
		ReadGuidsForConnectedNetworks(
		__out_opt DWORD *pcNetworks,
		__out_opt PWSTR **pppwszNetworkGuids,
		__out_opt BSTR **pppbstrNetworkNames,
		__out_opt PWSTR **pppwszGWMacs,
		__out_opt DWORD *pcGatewayMacs,
		__out_opt DWORD *pdwFlags
		);

//		//
// INTERNET_AUTOPROXY_INIT_FLAGS - Flags for InternetInitializeAutoProxyDll		// INTERNET_AUTOPROXY_INIT_FLAGS - Flags for InternetInitializeAutoProxyDll
//		//
#define INTERNET_AUTOPROXY_INIT_DEFAULT 0x1		#define INTERNET_AUTOPROXY_INIT_DEFAULT 0x1
#define INTERNET_AUTOPROXY_INIT_DOWNLOADSYNC 0x2		#define INTERNET_AUTOPROXY_INIT_DOWNLOADSYNC 0x2
#define INTERNET_AUTOPROXY_INIT_QUERYSTATE 0x4		#define INTERNET_AUTOPROXY_INIT_QUERYSTATE 0x4
#define INTERNET_AUTOPROXY_INIT_ONLYQUERY 0x8		#define INTERNET_AUTOPROXY_INIT_ONLYQUERY 0x8

#define INTERNET_AUTOPROXY_INIT_MASK (INTERNET_AUTOPROXY_INIT_DEFAULT\|INTERNET_A UTOPROXY_INIT_DOWNLOADSYNC\|INTERNET_AUTOPROXY_INIT_QUERYSTATE\|INTERNET_AUTOPROXY _INIT_ONLYQUERY)		#define INTERNET_AUTOPROXY_INIT_MASK (INTERNET_AUTOPROXY_INIT_DEFAULT\|INTERNET_A UTOPROXY_INIT_DOWNLOADSYNC\|INTERNET_AUTOPROXY_INIT_QUERYSTATE\|INTERNET_AUTOPROXY _INIT_ONLYQUERY)


skipping to change at line 1297		skipping to change at line 1421
__inout unsigned long *pcSiteNameSize,		__inout unsigned long *pcSiteNameSize,
__out unsigned long *pdwDecision,		__out unsigned long *pdwDecision,
__in unsigned long dwIndex		__in unsigned long dwIndex
);		);
#ifdef UNICODE		#ifdef UNICODE
#define InternetEnumPerSiteCookieDecision InternetEnumPerSiteCookieDecisionW		#define InternetEnumPerSiteCookieDecision InternetEnumPerSiteCookieDecisionW
#else		#else
#define InternetEnumPerSiteCookieDecision InternetEnumPerSiteCookieDecisionA		#define InternetEnumPerSiteCookieDecision InternetEnumPerSiteCookieDecisionA
#endif // !UNICODE		#endif // !UNICODE


		#define INTERNET_SUPPRESS_COOKIE_PERSIST 0x03
		#define INTERNET_SUPPRESS_COOKIE_PERSIST_RESET 0x04
//		//
// Privacy settings values and APIs		// Privacy settings values and APIs
//		//

#define PRIVACY_TEMPLATE_NO_COOKIES 0		#define PRIVACY_TEMPLATE_NO_COOKIES 0
#define PRIVACY_TEMPLATE_HIGH 1		#define PRIVACY_TEMPLATE_HIGH 1
#define PRIVACY_TEMPLATE_MEDIUM_HIGH 2		#define PRIVACY_TEMPLATE_MEDIUM_HIGH 2
#define PRIVACY_TEMPLATE_MEDIUM 3		#define PRIVACY_TEMPLATE_MEDIUM 3
#define PRIVACY_TEMPLATE_MEDIUM_LOW 4		#define PRIVACY_TEMPLATE_MEDIUM_LOW 4
#define PRIVACY_TEMPLATE_LOW 5		#define PRIVACY_TEMPLATE_LOW 5

skipping to change at line 1391		skipping to change at line 1517
P3P_NotStarted = 0x8,		P3P_NotStarted = 0x8,
P3P_XMLError = 0x9,		P3P_XMLError = 0x9,
P3P_Expired = 0xA,		P3P_Expired = 0xA,

P3P_Error = 0xFF,		P3P_Error = 0xFF,
}		}
P3PStatus;		P3PStatus;

INTERNETAPI_(int) MapResourceToPolicy(struct P3PResource pResource, __out_ecoun t(dwSize) P3PURL pszPolicy, unsigned long dwSize, struct P3PSignal pSignal);		INTERNETAPI_(int) MapResourceToPolicy(struct P3PResource pResource, __out_ecoun t(dwSize) P3PURL pszPolicy, unsigned long dwSize, struct P3PSignal pSignal);


INTERNETAPI_(int) GetP3PPolicy(P3PCURL pszPolicyURL, HANDLE hDestination, P3PCXS L pszXSLtransform, struct P3PSignal *pSignal);		INTERNETAPI_(int) GetP3PPolicy(__in P3PCURL pszPolicyURL, __in HANDLE hDestinati on, __in P3PCXSL pszXSLtransform, __out struct P3PSignal *pSignal);


INTERNETAPI_(int) FreeP3PObject(P3PHANDLE hObject);		INTERNETAPI_(int) FreeP3PObject(__in P3PHANDLE hObject);


INTERNETAPI_(int) GetP3PRequestStatus(P3PHANDLE hObject);		INTERNETAPI_(int) GetP3PRequestStatus(__in P3PHANDLE hObject);

#if defined(__cplusplus)		#if defined(__cplusplus)
}		}
#endif		#endif

#endif // !define(_WININETEX_)		#endif // !define(_WININETEX_)

End of changes. 22 change blocks.
10 lines changed or deleted		139 lines changed or added

This html diff was produced by rfcdiff 1.41.