Headers diff for winhttp.dll between 6.0.6002.18005-Windows 6.0 and 6.1.7601.23375-Windows 7.0 versions

winhttp.h (6.0.6002.18005-Windows 6.0)		winhttp.h (6.1.7601.23375-Windows 7.0)

skipping to change at line 186		skipping to change at line 186
DWORD dwAutoDetectFlags;		DWORD dwAutoDetectFlags;
LPCWSTR lpszAutoConfigUrl;		LPCWSTR lpszAutoConfigUrl;
LPVOID lpvReserved;		LPVOID lpvReserved;
DWORD dwReserved;		DWORD dwReserved;
BOOL fAutoLogonIfChallenged;		BOOL fAutoLogonIfChallenged;
}		}
WINHTTP_AUTOPROXY_OPTIONS;		WINHTTP_AUTOPROXY_OPTIONS;

#define WINHTTP_AUTOPROXY_AUTO_DETECT 0x00000001		#define WINHTTP_AUTOPROXY_AUTO_DETECT 0x00000001
#define WINHTTP_AUTOPROXY_CONFIG_URL 0x00000002		#define WINHTTP_AUTOPROXY_CONFIG_URL 0x00000002

		#define WINHTTP_AUTOPROXY_HOST_KEEPCASE 0x00000004
		#define WINHTTP_AUTOPROXY_HOST_LOWERCASE 0x00000008
#define WINHTTP_AUTOPROXY_RUN_INPROCESS 0x00010000		#define WINHTTP_AUTOPROXY_RUN_INPROCESS 0x00010000
#define WINHTTP_AUTOPROXY_RUN_OUTPROCESS_ONLY 0x00020000		#define WINHTTP_AUTOPROXY_RUN_OUTPROCESS_ONLY 0x00020000


//		//
// Flags for dwAutoDetectFlags		// Flags for dwAutoDetectFlags
//		//
#define WINHTTP_AUTO_DETECT_TYPE_DHCP 0x00000001		#define WINHTTP_AUTO_DETECT_TYPE_DHCP 0x00000001
#define WINHTTP_AUTO_DETECT_TYPE_DNS_A 0x00000002		#define WINHTTP_AUTO_DETECT_TYPE_DNS_A 0x00000002

//		//
// WINHTTP_CERTIFICATE_INFO lpBuffer - contains the certificate returned from		// WINHTTP_CERTIFICATE_INFO lpBuffer - contains the certificate returned from
// the server		// the server
//		//

skipping to change at line 289		skipping to change at line 292
BOOLAPI		BOOLAPI
WinHttpTimeFromSystemTime		WinHttpTimeFromSystemTime
(		(
__in CONST SYSTEMTIME *pst, // input GMT time		__in CONST SYSTEMTIME *pst, // input GMT time
__out_bcount(WINHTTP_TIME_FORMAT_BUFSIZE) LPWSTR pwszTime // output string b uffer		__out_bcount(WINHTTP_TIME_FORMAT_BUFSIZE) LPWSTR pwszTime // output string b uffer
);		);

BOOLAPI		BOOLAPI
WinHttpTimeToSystemTime		WinHttpTimeToSystemTime
(		(

__in LPCWSTR pwszTime, // NULL terminated string		__in_z LPCWSTR pwszTime, // NULL terminated string
__out SYSTEMTIME *pst // output in GMT time		__out SYSTEMTIME *pst // output in GMT time
);		);

//		//
// flags for CrackUrl() and CombineUrl()		// flags for CrackUrl() and CombineUrl()
//		//

#define ICU_NO_ENCODE 0x20000000 // Don't convert unsafe characters to escape sequence		#define ICU_NO_ENCODE 0x20000000 // Don't convert unsafe characters to escape sequence
#define ICU_DECODE 0x10000000 // Convert %XX escape sequences to character s		#define ICU_DECODE 0x10000000 // Convert %XX escape sequences to character s
#define ICU_NO_META 0x08000000 // Don't convert .. etc. meta path sequences		#define ICU_NO_META 0x08000000 // Don't convert .. etc. meta path sequences
#define ICU_ENCODE_SPACES_ONLY 0x04000000 // Encode spaces only		#define ICU_ENCODE_SPACES_ONLY 0x04000000 // Encode spaces only

skipping to change at line 320		skipping to change at line 323
__in DWORD dwUrlLength,		__in DWORD dwUrlLength,
__in DWORD dwFlags,		__in DWORD dwFlags,
__inout LPURL_COMPONENTS lpUrlComponents		__inout LPURL_COMPONENTS lpUrlComponents
);		);

BOOLAPI		BOOLAPI
WinHttpCreateUrl		WinHttpCreateUrl
(		(
__in LPURL_COMPONENTS lpUrlComponents,		__in LPURL_COMPONENTS lpUrlComponents,
__in DWORD dwFlags,		__in DWORD dwFlags,

__out_ecount_full_opt(*lpdwUrlLength) LPWSTR pwszUrl,		__out_ecount_part_opt(pdwUrlLength, pdwUrlLength) LPWSTR pwszUrl,
__inout LPDWORD lpdwUrlLength		__inout LPDWORD pdwUrlLength
);		);

//		//
// flags for WinHttpCrackUrl() and WinHttpCreateUrl()		// flags for WinHttpCrackUrl() and WinHttpCreateUrl()
//		//
#define ICU_ESCAPE 0x80000000 // (un)escape URL characters		#define ICU_ESCAPE 0x80000000 // (un)escape URL characters
#define ICU_ESCAPE_AUTHORITY 0x00002000 //causes InternetCreateUrlA to escape ch ars in authority components (user, pwd, host)		#define ICU_ESCAPE_AUTHORITY 0x00002000 //causes InternetCreateUrlA to escape ch ars in authority components (user, pwd, host)
#define ICU_REJECT_USERPWD 0x00004000 // rejects usrls whick have username/pwd sections		#define ICU_REJECT_USERPWD 0x00004000 // rejects usrls whick have username/pwd sections

BOOLAPI		BOOLAPI
WinHttpCheckPlatform(void);		WinHttpCheckPlatform(void);

WINHTTPAPI BOOL WINAPI WinHttpGetDefaultProxyConfiguration( IN OUT WINHTTP_PROXY _INFO * pProxyInfo);		WINHTTPAPI BOOL WINAPI WinHttpGetDefaultProxyConfiguration( IN OUT WINHTTP_PROXY _INFO * pProxyInfo);
WINHTTPAPI BOOL WINAPI WinHttpSetDefaultProxyConfiguration( IN WINHTTP_PROXY_INF O * pProxyInfo);		WINHTTPAPI BOOL WINAPI WinHttpSetDefaultProxyConfiguration( IN WINHTTP_PROXY_INF O * pProxyInfo);

WINHTTPAPI		WINHTTPAPI
HINTERNET		HINTERNET
WINAPI		WINAPI
WinHttpOpen		WinHttpOpen
(		(

__in_opt LPCWSTR pszAgentW,		__in_z_opt LPCWSTR pszAgentW,
__in DWORD dwAccessType,		__in DWORD dwAccessType,

__in_opt LPCWSTR pszProxyW,		__in_z_opt LPCWSTR pszProxyW,
__in_opt LPCWSTR pszProxyBypassW,		__in_z_opt LPCWSTR pszProxyBypassW,
__in DWORD dwFlags		__in DWORD dwFlags
);		);

// WinHttpOpen dwAccessType values (also for WINHTTP_PROXY_INFO::dwAccessType)		// WinHttpOpen dwAccessType values (also for WINHTTP_PROXY_INFO::dwAccessType)
#define WINHTTP_ACCESS_TYPE_DEFAULT_PROXY 0		#define WINHTTP_ACCESS_TYPE_DEFAULT_PROXY 0
#define WINHTTP_ACCESS_TYPE_NO_PROXY 1		#define WINHTTP_ACCESS_TYPE_NO_PROXY 1
#define WINHTTP_ACCESS_TYPE_NAMED_PROXY 3		#define WINHTTP_ACCESS_TYPE_NAMED_PROXY 3

// WinHttpOpen prettifiers for optional parameters		// WinHttpOpen prettifiers for optional parameters
#define WINHTTP_NO_PROXY_NAME NULL		#define WINHTTP_NO_PROXY_NAME NULL

skipping to change at line 379		skipping to change at line 382
IN HINTERNET hSession,		IN HINTERNET hSession,
IN LPCWSTR pswzServerName,		IN LPCWSTR pswzServerName,
IN INTERNET_PORT nServerPort,		IN INTERNET_PORT nServerPort,
IN DWORD dwReserved		IN DWORD dwReserved
);		);

BOOLAPI		BOOLAPI
WinHttpReadData		WinHttpReadData
(		(
IN HINTERNET hRequest,		IN HINTERNET hRequest,

IN __out_data_source(NETWORK) LPVOID lpBuffer,		__out_bcount_part(dwNumberOfBytesToRead, *lpdwNumberOfBytesRead) __out_data_ source(NETWORK) LPVOID lpBuffer,
IN DWORD dwNumberOfBytesToRead,		IN DWORD dwNumberOfBytesToRead,
OUT LPDWORD lpdwNumberOfBytesRead		OUT LPDWORD lpdwNumberOfBytesRead
);		);

BOOLAPI		BOOLAPI
WinHttpWriteData		WinHttpWriteData
(		(
IN HINTERNET hRequest,		IN HINTERNET hRequest,

IN LPCVOID lpBuffer,		__in_bcount_opt(dwNumberOfBytesToWrite) LPCVOID lpBuffer,
IN DWORD dwNumberOfBytesToWrite,		IN DWORD dwNumberOfBytesToWrite,
OUT LPDWORD lpdwNumberOfBytesWritten		OUT LPDWORD lpdwNumberOfBytesWritten
);		);

BOOLAPI		BOOLAPI
WinHttpQueryDataAvailable		WinHttpQueryDataAvailable
(		(
IN HINTERNET hRequest,		IN HINTERNET hRequest,

OUT __out_data_source(NETWORK) LPDWORD lpdwNumberOfBytesAvailable OPTIONAL		__out_data_source(NETWORK) LPDWORD lpdwNumberOfBytesAvailable
);		);


		__success(return != FALSE)
BOOLAPI		BOOLAPI
WinHttpQueryOption		WinHttpQueryOption
(		(
IN HINTERNET hInternet,		IN HINTERNET hInternet,
IN DWORD dwOption,		IN DWORD dwOption,

OUT __out_data_source(NETWORK) LPVOID lpBuffer OPTIONAL,		__out_bcount_part_opt(lpdwBufferLength, lpdwBufferLength) __out_data_sourc e(NETWORK) LPVOID lpBuffer,
IN OUT LPDWORD lpdwBufferLength		IN OUT LPDWORD lpdwBufferLength
);		);

#define WINHTTP_NO_CLIENT_CERT_CONTEXT NULL		#define WINHTTP_NO_CLIENT_CERT_CONTEXT NULL

BOOLAPI		BOOLAPI
WinHttpSetOption		WinHttpSetOption
(		(
IN HINTERNET hInternet,		IN HINTERNET hInternet,
IN DWORD dwOption,		IN DWORD dwOption,

IN LPVOID lpBuffer,		__in_awcount((dwOption != WINHTTP_OPTION_USERNAME &&
		dwOption != WINHTTP_OPTION_PASSWORD &&
		dwOption != WINHTTP_OPTION_PROXY_USERNAME &&
		dwOption != WINHTTP_OPTION_PROXY_PASSWORD &&
		dwOption != WINHTTP_OPTION_USER_AGENT),
		dwBufferLength)
		__typefix(LPCWSTR) LPVOID lpBuffer,
IN DWORD dwBufferLength		IN DWORD dwBufferLength
);		);

BOOLAPI		BOOLAPI
WinHttpSetTimeouts		WinHttpSetTimeouts
(		(
IN HINTERNET hInternet, // Session/Request handle.		IN HINTERNET hInternet, // Session/Request handle.
IN int nResolveTimeout,		IN int nResolveTimeout,
IN int nConnectTimeout,		IN int nConnectTimeout,
IN int nSendTimeout,		IN int nSendTimeout,
IN int nReceiveTimeout		IN int nReceiveTimeout
);		);


		WINHTTPAPI
		DWORD
		WINAPI
		WinHttpIsHostInProxyBypassList
		(
		__in const WINHTTP_PROXY_INFO *pProxyInfo,
		__in_z PCWSTR pwszHost,
		__in INTERNET_SCHEME tScheme,
		__in INTERNET_PORT nPort,
		__out BOOL *pfIsInBypassList
		);

//		//
// options manifests for WinHttp{Query\|Set}Option		// options manifests for WinHttp{Query\|Set}Option
//		//

#define WINHTTP_FIRST_OPTION WINHTTP_OPTION_CALLBACK		#define WINHTTP_FIRST_OPTION WINHTTP_OPTION_CALLBACK


#define WINHTTP_OPTION_CALLBACK 1		#define WINHTTP_OPTION_CALLBACK 1
#define WINHTTP_OPTION_RESOLVE_TIMEOUT 2		#define WINHTTP_OPTION_RESOLVE_TIMEOUT 2
#define WINHTTP_OPTION_CONNECT_TIMEOUT 3		#define WINHTTP_OPTION_CONNECT_TIMEOUT 3
#define WINHTTP_OPTION_CONNECT_RETRIES 4		#define WINHTTP_OPTION_CONNECT_RETRIES 4
#define WINHTTP_OPTION_SEND_TIMEOUT 5		#define WINHTTP_OPTION_SEND_TIMEOUT 5
#define WINHTTP_OPTION_RECEIVE_TIMEOUT 6		#define WINHTTP_OPTION_RECEIVE_TIMEOUT 6
#define WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT 7		#define WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT 7
#define WINHTTP_OPTION_HANDLE_TYPE 9		#define WINHTTP_OPTION_HANDLE_TYPE 9
#define WINHTTP_OPTION_READ_BUFFER_SIZE 12		#define WINHTTP_OPTION_READ_BUFFER_SIZE 12
#define WINHTTP_OPTION_WRITE_BUFFER_SIZE 13		#define WINHTTP_OPTION_WRITE_BUFFER_SIZE 13
#define WINHTTP_OPTION_PARENT_HANDLE 21		#define WINHTTP_OPTION_PARENT_HANDLE 21
#define WINHTTP_OPTION_EXTENDED_ERROR 24		#define WINHTTP_OPTION_EXTENDED_ERROR 24
#define WINHTTP_OPTION_SECURITY_FLAGS 31		#define WINHTTP_OPTION_SECURITY_FLAGS 31
#define WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT 32		#define WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT 32
#define WINHTTP_OPTION_URL 34		#define WINHTTP_OPTION_URL 34
#define WINHTTP_OPTION_SECURITY_KEY_BITNESS 36		#define WINHTTP_OPTION_SECURITY_KEY_BITNESS 36
#define WINHTTP_OPTION_PROXY 38		#define WINHTTP_OPTION_PROXY 38


#define WINHTTP_OPTION_USER_AGENT 41		#define WINHTTP_OPTION_USER_AGENT 41
#define WINHTTP_OPTION_CONTEXT_VALUE 45		#define WINHTTP_OPTION_CONTEXT_VALUE 45
#define WINHTTP_OPTION_CLIENT_CERT_CONTEXT 47		#define WINHTTP_OPTION_CLIENT_CERT_CONTEXT 47
#define WINHTTP_OPTION_REQUEST_PRIORITY 58		#define WINHTTP_OPTION_REQUEST_PRIORITY 58
#define WINHTTP_OPTION_HTTP_VERSION 59		#define WINHTTP_OPTION_HTTP_VERSION 59
#define WINHTTP_OPTION_DISABLE_FEATURE 63		#define WINHTTP_OPTION_DISABLE_FEATURE 63


#define WINHTTP_OPTION_CODEPAGE 68		#define WINHTTP_OPTION_CODEPAGE 68
#define WINHTTP_OPTION_MAX_CONNS_PER_SERVER 73		#define WINHTTP_OPTION_MAX_CONNS_PER_SERVER 73
#define WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER 74		#define WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER 74
#define WINHTTP_OPTION_AUTOLOGON_POLICY 77		#define WINHTTP_OPTION_AUTOLOGON_POLICY 77
#define WINHTTP_OPTION_SERVER_CERT_CONTEXT 78		#define WINHTTP_OPTION_SERVER_CERT_CONTEXT 78
#define WINHTTP_OPTION_ENABLE_FEATURE 79		#define WINHTTP_OPTION_ENABLE_FEATURE 79
#define WINHTTP_OPTION_WORKER_THREAD_COUNT 80		#define WINHTTP_OPTION_WORKER_THREAD_COUNT 80
#define WINHTTP_OPTION_PASSPORT_COBRANDING_TEXT 81		#define WINHTTP_OPTION_PASSPORT_COBRANDING_TEXT 81
#define WINHTTP_OPTION_PASSPORT_COBRANDING_URL 82		#define WINHTTP_OPTION_PASSPORT_COBRANDING_URL 82
#define WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH 83		#define WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH 83
#define WINHTTP_OPTION_SECURE_PROTOCOLS 84		#define WINHTTP_OPTION_SECURE_PROTOCOLS 84
#define WINHTTP_OPTION_ENABLETRACING 85		#define WINHTTP_OPTION_ENABLETRACING 85
#define WINHTTP_OPTION_PASSPORT_SIGN_OUT 86		#define WINHTTP_OPTION_PASSPORT_SIGN_OUT 86
#define WINHTTP_OPTION_PASSPORT_RETURN_URL 87		#define WINHTTP_OPTION_PASSPORT_RETURN_URL 87
#define WINHTTP_OPTION_REDIRECT_POLICY 88		#define WINHTTP_OPTION_REDIRECT_POLICY 88
#define WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS 89		#define WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS 89
#define WINHTTP_OPTION_MAX_HTTP_STATUS_CONTINUE 90		#define WINHTTP_OPTION_MAX_HTTP_STATUS_CONTINUE 90
#define WINHTTP_OPTION_MAX_RESPONSE_HEADER_SIZE 91		#define WINHTTP_OPTION_MAX_RESPONSE_HEADER_SIZE 91
#define WINHTTP_OPTION_MAX_RESPONSE_DRAIN_SIZE 92		#define WINHTTP_OPTION_MAX_RESPONSE_DRAIN_SIZE 92
#define WINHTTP_OPTION_CONNECTION_INFO 93		#define WINHTTP_OPTION_CONNECTION_INFO 93
#define WINHTTP_OPTION_CLIENT_CERT_ISSUER_LIST 94		#define WINHTTP_OPTION_CLIENT_CERT_ISSUER_LIST 94
#define WINHTTP_OPTION_SPN 96		#define WINHTTP_OPTION_SPN 96


#define WINHTTP_OPTION_GLOBAL_PROXY_CREDS 97		#define WINHTTP_OPTION_GLOBAL_PROXY_CREDS 97
#define WINHTTP_OPTION_GLOBAL_SERVER_CREDS 98		#define WINHTTP_OPTION_GLOBAL_SERVER_CREDS 98


#define WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT 99		#define WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT 99
#define WINHTTP_OPTION_REJECT_USERPWD_IN_URL 100		#define WINHTTP_OPTION_REJECT_USERPWD_IN_URL 100
#define WINHTTP_OPTION_USE_GLOBAL_SERVER_CREDENTIALS 101		#define WINHTTP_OPTION_USE_GLOBAL_SERVER_CREDENTIALS 101


#define WINHTTP_LAST_OPTION WINHTTP_OPTION_USE_GLOBAL_S		#define WINHTTP_OPTION_RECEIVE_PROXY_CONNECT_RESPONSE 103
ERVER_CREDENTIALS		#define WINHTTP_OPTION_IS_PROXY_CONNECT_RESPONSE 104

		#define WINHTTP_OPTION_SERVER_SPN_USED 106
		#define WINHTTP_OPTION_PROXY_SPN_USED 107

		#define WINHTTP_OPTION_SERVER_CBT 108

		#define WINHTTP_LAST_OPTION WINHTTP_OPTION_SERVER_CBT

#define WINHTTP_OPTION_USERNAME 0x1000		#define WINHTTP_OPTION_USERNAME 0x1000
#define WINHTTP_OPTION_PASSWORD 0x1001		#define WINHTTP_OPTION_PASSWORD 0x1001
#define WINHTTP_OPTION_PROXY_USERNAME 0x1002		#define WINHTTP_OPTION_PROXY_USERNAME 0x1002
#define WINHTTP_OPTION_PROXY_PASSWORD 0x1003		#define WINHTTP_OPTION_PROXY_PASSWORD 0x1003

// manifest value for WINHTTP_OPTION_MAX_CONNS_PER_SERVER and WINHTTP_OPTION_MAX _CONNS_PER_1_0_SERVER		// manifest value for WINHTTP_OPTION_MAX_CONNS_PER_SERVER and WINHTTP_OPTION_MAX _CONNS_PER_1_0_SERVER
#define WINHTTP_CONNS_PER_SERVER_UNLIMITED 0xFFFFFFFF		#define WINHTTP_CONNS_PER_SERVER_UNLIMITED 0xFFFFFFFF

// values for WINHTTP_OPTION_AUTOLOGON_POLICY		// values for WINHTTP_OPTION_AUTOLOGON_POLICY

skipping to change at line 603		skipping to change at line 633
#define WINHTTP_CALLBACK_STATUS_FLAG_CERT_REVOKED 0x00000004		#define WINHTTP_CALLBACK_STATUS_FLAG_CERT_REVOKED 0x00000004
#define WINHTTP_CALLBACK_STATUS_FLAG_INVALID_CA 0x00000008		#define WINHTTP_CALLBACK_STATUS_FLAG_INVALID_CA 0x00000008
#define WINHTTP_CALLBACK_STATUS_FLAG_CERT_CN_INVALID 0x00000010		#define WINHTTP_CALLBACK_STATUS_FLAG_CERT_CN_INVALID 0x00000010
#define WINHTTP_CALLBACK_STATUS_FLAG_CERT_DATE_INVALID 0x00000020		#define WINHTTP_CALLBACK_STATUS_FLAG_CERT_DATE_INVALID 0x00000020
#define WINHTTP_CALLBACK_STATUS_FLAG_CERT_WRONG_USAGE 0x00000040		#define WINHTTP_CALLBACK_STATUS_FLAG_CERT_WRONG_USAGE 0x00000040
#define WINHTTP_CALLBACK_STATUS_FLAG_SECURITY_CHANNEL_ERROR 0x80000000		#define WINHTTP_CALLBACK_STATUS_FLAG_SECURITY_CHANNEL_ERROR 0x80000000

#define WINHTTP_FLAG_SECURE_PROTOCOL_SSL2 0x00000008		#define WINHTTP_FLAG_SECURE_PROTOCOL_SSL2 0x00000008
#define WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 0x00000020		#define WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 0x00000020
#define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 0x00000080		#define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 0x00000080

		#define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 0x00000200
		#define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2 0x00000800
#define WINHTTP_FLAG_SECURE_PROTOCOL_ALL (WINHTTP_FLAG_SECURE_PROTOCOL_SSL2 \| \		#define WINHTTP_FLAG_SECURE_PROTOCOL_ALL (WINHTTP_FLAG_SECURE_PROTOCOL_SSL2 \| \
WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 \| \		WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 \| \
WINHTTP_FLAG_SECURE_PROTOCOL_TLS1)		WINHTTP_FLAG_SECURE_PROTOCOL_TLS1)

//		//
// callback function for WinHttpSetStatusCallback		// callback function for WinHttpSetStatusCallback
//		//

typedef		typedef
VOID		VOID

skipping to change at line 904		skipping to change at line 936
);		);

// WinHttpOpenRequest prettifers for optional parameters		// WinHttpOpenRequest prettifers for optional parameters
#define WINHTTP_NO_REFERER NULL		#define WINHTTP_NO_REFERER NULL
#define WINHTTP_DEFAULT_ACCEPT_TYPES NULL		#define WINHTTP_DEFAULT_ACCEPT_TYPES NULL

BOOLAPI		BOOLAPI
WinHttpAddRequestHeaders		WinHttpAddRequestHeaders
(		(
IN HINTERNET hRequest,		IN HINTERNET hRequest,

IN LPCWSTR pwszHeaders,		__in_ecount(dwHeadersLength) LPCWSTR pwszHeaders,
IN DWORD dwHeadersLength,		IN DWORD dwHeadersLength,
IN DWORD dwModifiers		IN DWORD dwModifiers
);		);

//		//
// values for dwModifiers parameter of WinHttpAddRequestHeaders()		// values for dwModifiers parameter of WinHttpAddRequestHeaders()
//		//

#define WINHTTP_ADDREQ_INDEX_MASK 0x0000FFFF		#define WINHTTP_ADDREQ_INDEX_MASK 0x0000FFFF
#define WINHTTP_ADDREQ_FLAGS_MASK 0xFFFF0000		#define WINHTTP_ADDREQ_FLAGS_MASK 0xFFFF0000

skipping to change at line 957		skipping to change at line 989
//		//

#define WINHTTP_ADDREQ_FLAG_REPLACE 0x80000000		#define WINHTTP_ADDREQ_FLAG_REPLACE 0x80000000

#define WINHTTP_IGNORE_REQUEST_TOTAL_LENGTH 0		#define WINHTTP_IGNORE_REQUEST_TOTAL_LENGTH 0

BOOLAPI		BOOLAPI
WinHttpSendRequest		WinHttpSendRequest
(		(
IN HINTERNET hRequest,		IN HINTERNET hRequest,

IN LPCWSTR pwszHeaders OPTIONAL,		__in_ecount_opt(dwHeadersLength) LPCWSTR lpszHeaders,
IN DWORD dwHeadersLength,		IN DWORD dwHeadersLength,

IN LPVOID lpOptional OPTIONAL,		__in_bcount_opt(dwOptionalLength) LPVOID lpOptional,
IN DWORD dwOptionalLength,		IN DWORD dwOptionalLength,
IN DWORD dwTotalLength,		IN DWORD dwTotalLength,
IN DWORD_PTR dwContext		IN DWORD_PTR dwContext
);		);

// WinHttpSendRequest prettifiers for optional parameters.		// WinHttpSendRequest prettifiers for optional parameters.
#define WINHTTP_NO_ADDITIONAL_HEADERS NULL		#define WINHTTP_NO_ADDITIONAL_HEADERS NULL
#define WINHTTP_NO_REQUEST_DATA NULL		#define WINHTTP_NO_REQUEST_DATA NULL

BOOLAPI WinHttpSetCredentials		BOOLAPI WinHttpSetCredentials

skipping to change at line 1014		skipping to change at line 1046

WINHTTPAPI		WINHTTPAPI
BOOL		BOOL
WINAPI		WINAPI
WinHttpReceiveResponse		WinHttpReceiveResponse
(		(
IN HINTERNET hRequest,		IN HINTERNET hRequest,
IN LPVOID lpReserved		IN LPVOID lpReserved
);		);


		__success(return != FALSE)
BOOLAPI		BOOLAPI
WinHttpQueryHeaders		WinHttpQueryHeaders
(		(
IN HINTERNET hRequest,		IN HINTERNET hRequest,
IN DWORD dwInfoLevel,		IN DWORD dwInfoLevel,
IN LPCWSTR pwszName OPTIONAL,		IN LPCWSTR pwszName OPTIONAL,

OUT __out_data_source(NETWORK) LPVOID lpBuffer OPTIONAL,		__out_bcount_part_opt(lpdwBufferLength, lpdwBufferLength) __out_data_sourc e(NETWORK) LPVOID lpBuffer,
IN OUT LPDWORD lpdwBufferLength,		IN OUT LPDWORD lpdwBufferLength,
IN OUT LPDWORD lpdwIndex OPTIONAL		IN OUT LPDWORD lpdwIndex OPTIONAL
);		);

// WinHttpQueryHeaders prettifiers for optional parameters.		// WinHttpQueryHeaders prettifiers for optional parameters.
#define WINHTTP_HEADER_NAME_BY_INDEX NULL		#define WINHTTP_HEADER_NAME_BY_INDEX NULL
#define WINHTTP_NO_OUTPUT_BUFFER NULL		#define WINHTTP_NO_OUTPUT_BUFFER NULL
#define WINHTTP_NO_HEADER_INDEX NULL		#define WINHTTP_NO_HEADER_INDEX NULL

BOOLAPI		BOOLAPI
WinHttpDetectAutoProxyConfigUrl		WinHttpDetectAutoProxyConfigUrl
(		(

__in DWORD dwAutoDetectFlags,		DWORD dwAutoDetectFlags,
__out LPWSTR * ppwszAutoConfigUrl		__deref_out_opt LPWSTR * ppwstrAutoConfigUrl
);		);

BOOLAPI		BOOLAPI
WinHttpGetProxyForUrl		WinHttpGetProxyForUrl
(		(
IN HINTERNET hSession,		IN HINTERNET hSession,
IN LPCWSTR lpcwszUrl,		IN LPCWSTR lpcwszUrl,
IN WINHTTP_AUTOPROXY_OPTIONS * pAutoProxyOptions,		IN WINHTTP_AUTOPROXY_OPTIONS * pAutoProxyOptions,
OUT WINHTTP_PROXY_INFO * pProxyInfo		OUT WINHTTP_PROXY_INFO * pProxyInfo
);		);

skipping to change at line 1102		skipping to change at line 1135
#define ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND (WINHTTP_ERROR_BASE + 101)		#define ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND (WINHTTP_ERROR_BASE + 101)
#define ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND (WINHTTP_ERROR_BASE + 102)		#define ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND (WINHTTP_ERROR_BASE + 102)
#define ERROR_WINHTTP_CANNOT_CALL_AFTER_OPEN (WINHTTP_ERROR_BASE + 103)		#define ERROR_WINHTTP_CANNOT_CALL_AFTER_OPEN (WINHTTP_ERROR_BASE + 103)

//		//
// HTTP API errors		// HTTP API errors
//		//

#define ERROR_WINHTTP_HEADER_NOT_FOUND (WINHTTP_ERROR_BASE + 150)		#define ERROR_WINHTTP_HEADER_NOT_FOUND (WINHTTP_ERROR_BASE + 150)
#define ERROR_WINHTTP_INVALID_SERVER_RESPONSE (WINHTTP_ERROR_BASE + 152)		#define ERROR_WINHTTP_INVALID_SERVER_RESPONSE (WINHTTP_ERROR_BASE + 152)

#define ERROR_WINHTTP_INVALID_HEADER (WINHTTP_ERROR_BASE + 153)		#define ERROR_WINHTTP_INVALID_HEADER (WINHTTP_ERROR_BASE + 153)
#define ERROR_WINHTTP_INVALID_QUERY_REQUEST (WINHTTP_ERROR_BASE + 154)		#define ERROR_WINHTTP_INVALID_QUERY_REQUEST (WINHTTP_ERROR_BASE + 154)
#define ERROR_WINHTTP_HEADER_ALREADY_EXISTS (WINHTTP_ERROR_BASE + 155)		#define ERROR_WINHTTP_HEADER_ALREADY_EXISTS (WINHTTP_ERROR_BASE + 155)
#define ERROR_WINHTTP_REDIRECT_FAILED (WINHTTP_ERROR_BASE + 156)		#define ERROR_WINHTTP_REDIRECT_FAILED (WINHTTP_ERROR_BASE + 156)

//		//
// additional WinHttp API error codes		// additional WinHttp API error codes
//		//

//		//
// additional WinHttp API error codes		// additional WinHttp API error codes

End of changes. 27 change blocks.
71 lines changed or deleted		103 lines changed or added

This html diff was produced by rfcdiff 1.41.