Headers diff for wininet.dll between 6.00.3790.3959-Windows 5.0 and 7.00.6002.18005-Windows 6.0 versions



 wininet.h (6.00.3790.3959-Windows 5.0)   wininet.h (7.00.6002.18005-Windows 6.0) 
skipping to change at line 110 skipping to change at line 110
#define INTERNET_REQFLAG_FROM_CACHE 0x00000001 // response came from cache #define INTERNET_REQFLAG_FROM_CACHE 0x00000001 // response came from cache
#define INTERNET_REQFLAG_ASYNC 0x00000002 // request was made asynchro nously #define INTERNET_REQFLAG_ASYNC 0x00000002 // request was made asynchro nously
#define INTERNET_REQFLAG_VIA_PROXY 0x00000004 // request was made via a pr oxy #define INTERNET_REQFLAG_VIA_PROXY 0x00000004 // request was made via a pr oxy
#define INTERNET_REQFLAG_NO_HEADERS 0x00000008 // orginal response containe d no headers #define INTERNET_REQFLAG_NO_HEADERS 0x00000008 // orginal response containe d no headers
#define INTERNET_REQFLAG_PASSIVE 0x00000010 // FTP: passive-mode connect ion #define INTERNET_REQFLAG_PASSIVE 0x00000010 // FTP: passive-mode connect ion
#define INTERNET_REQFLAG_CACHE_WRITE_DISABLED 0x00000040 // HTTPS: this request not cacheable #define INTERNET_REQFLAG_CACHE_WRITE_DISABLED 0x00000040 // HTTPS: this request not cacheable
#define INTERNET_REQFLAG_NET_TIMEOUT 0x00000080 // w/ _FROM_CACHE: net reque st timed out #define INTERNET_REQFLAG_NET_TIMEOUT 0x00000080 // w/ _FROM_CACHE: net reque st timed out
// //
// flags for IDN enable/disable via INTERNET_OPTION_IDN
//
#define INTERNET_FLAG_IDN_DIRECT 0x00000001 // IDN enabled for direct co
nnections
#define INTERNET_FLAG_IDN_PROXY 0x00000002 // IDN enabled for proxy
//
// flags common to open functions (not InternetOpen()): // flags common to open functions (not InternetOpen()):
// //
#define INTERNET_FLAG_RELOAD 0x80000000 // retrieve the original ite m #define INTERNET_FLAG_RELOAD 0x80000000 // retrieve the original ite m
// //
// flags for InternetOpenUrl(): // flags for InternetOpenUrl():
// //
#define INTERNET_FLAG_RAW_DATA 0x40000000 // FTP/gopher find: receive the item as raw (structured) data #define INTERNET_FLAG_RAW_DATA 0x40000000 // FTP/gopher find: receive the item as raw (structured) data
skipping to change at line 197 skipping to change at line 204
// //
// flags field masks // flags field masks
// //
#define SECURITY_INTERNET_MASK (INTERNET_FLAG_IGNORE_CERT_CN_INVALID | \ #define SECURITY_INTERNET_MASK (INTERNET_FLAG_IGNORE_CERT_CN_INVALID | \
INTERNET_FLAG_IGNORE_CERT_DATE_INVALID | \ INTERNET_FLAG_IGNORE_CERT_DATE_INVALID | \
INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTPS | \ INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTPS | \
INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTP ) INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTP )
#define SECURITY_IGNORE_ERROR_MASK (INTERNET_FLAG_IGNORE_CERT_CN_INVALID | \
INTERNET_FLAG_IGNORE_CERT_DATE_INVALID | \
SECURITY_FLAG_IGNORE_UNKNOWN_CA | \
SECURITY_FLAG_IGNORE_REVOCATION )
#define INTERNET_FLAGS_MASK (INTERNET_FLAG_RELOAD \ #define INTERNET_FLAGS_MASK (INTERNET_FLAG_RELOAD \
| INTERNET_FLAG_RAW_DATA \ | INTERNET_FLAG_RAW_DATA \
| INTERNET_FLAG_EXISTING_CONNECT \ | INTERNET_FLAG_EXISTING_CONNECT \
| INTERNET_FLAG_ASYNC \ | INTERNET_FLAG_ASYNC \
| INTERNET_FLAG_PASSIVE \ | INTERNET_FLAG_PASSIVE \
| INTERNET_FLAG_NO_CACHE_WRITE \ | INTERNET_FLAG_NO_CACHE_WRITE \
| INTERNET_FLAG_MAKE_PERSISTENT \ | INTERNET_FLAG_MAKE_PERSISTENT \
| INTERNET_FLAG_FROM_CACHE \ | INTERNET_FLAG_FROM_CACHE \
| INTERNET_FLAG_SECURE \ | INTERNET_FLAG_SECURE \
| INTERNET_FLAG_KEEP_CONNECTION \ | INTERNET_FLAG_KEEP_CONNECTION \
skipping to change at line 504 skipping to change at line 516
// returned if both pointer and corresponding length fields are non-zero then // returned if both pointer and corresponding length fields are non-zero then
// the pointer field points to a buffer where the component is copied. The // the pointer field points to a buffer where the component is copied. The
// component may be un-escaped, depending on dwFlags // component may be un-escaped, depending on dwFlags
// //
// For InternetCreateUrl(), the pointer fields should be NULL if the component // For InternetCreateUrl(), the pointer fields should be NULL if the component
// is not required. If the corresponding length field is zero then the pointer // is not required. If the corresponding length field is zero then the pointer
// field is the address of a zero-terminated string. If the length field is not // field is the address of a zero-terminated string. If the length field is not
// zero then it is the string length of the corresponding pointer field // zero then it is the string length of the corresponding pointer field
// //
#if _MSC_VER >= 1200
#pragma warning(push)
#endif
#pragma warning( disable : 4121 ) // disable alignment warning #pragma warning( disable : 4121 ) // disable alignment warning
typedef struct { typedef struct {
DWORD dwStructSize; // size of this structure. Used in version check DWORD dwStructSize; // size of this structure. Used in version check
LPSTR lpszScheme; // pointer to scheme name LPSTR lpszScheme; // pointer to scheme name
DWORD dwSchemeLength; // length of scheme name DWORD dwSchemeLength; // length of scheme name
INTERNET_SCHEME nScheme; // enumerated scheme type (if known) INTERNET_SCHEME nScheme; // enumerated scheme type (if known)
LPSTR lpszHostName; // pointer to host name LPSTR lpszHostName; // pointer to host name
DWORD dwHostNameLength; // length of host name DWORD dwHostNameLength; // length of host name
INTERNET_PORT nPort; // converted port number INTERNET_PORT nPort; // converted port number
skipping to change at line 548 skipping to change at line 563
DWORD dwExtraInfoLength; // length of extra information DWORD dwExtraInfoLength; // length of extra information
} URL_COMPONENTSW, * LPURL_COMPONENTSW; } URL_COMPONENTSW, * LPURL_COMPONENTSW;
#ifdef UNICODE #ifdef UNICODE
typedef URL_COMPONENTSW URL_COMPONENTS; typedef URL_COMPONENTSW URL_COMPONENTS;
typedef LPURL_COMPONENTSW LPURL_COMPONENTS; typedef LPURL_COMPONENTSW LPURL_COMPONENTS;
#else #else
typedef URL_COMPONENTSA URL_COMPONENTS; typedef URL_COMPONENTSA URL_COMPONENTS;
typedef LPURL_COMPONENTSA LPURL_COMPONENTS; typedef LPURL_COMPONENTSA LPURL_COMPONENTS;
#endif // UNICODE #endif // UNICODE
#if _MSC_VER >= 1200
#pragma warning(pop)
#else
#pragma warning( default : 4121 ) // restore alignment warning #pragma warning( default : 4121 ) // restore alignment warning
#endif
// //
// INTERNET_CERTIFICATE_INFO lpBuffer - contains the certificate returned from // INTERNET_CERTIFICATE_INFO lpBuffer - contains the certificate returned from
// the server // the server
// //
typedef struct { typedef struct {
// //
// ftExpiry - date the certificate expires. // ftExpiry - date the certificate expires.
skipping to change at line 693 skipping to change at line 712
// //
// constants for InternetTimeFromSystemTime // constants for InternetTimeFromSystemTime
// //
#define INTERNET_RFC1123_FORMAT 0 #define INTERNET_RFC1123_FORMAT 0
#define INTERNET_RFC1123_BUFSIZE 30 #define INTERNET_RFC1123_BUFSIZE 30
BOOLAPI InternetTimeToSystemTimeA( BOOLAPI InternetTimeToSystemTimeA(
__in LPCSTR lpszTime, // NULL terminated string __in LPCSTR lpszTime, // NULL terminated string
__out SYSTEMTIME *pst, // output in GMT time __out SYSTEMTIME *pst, // output in GMT time
__null DWORD dwReserved __reserved DWORD dwReserved
); );
BOOLAPI InternetTimeToSystemTimeW( BOOLAPI InternetTimeToSystemTimeW(
__in LPCWSTR lpszTime, // NULL terminated string __in LPCWSTR lpszTime, // NULL terminated string
__out SYSTEMTIME *pst, // output in GMT time __out SYSTEMTIME *pst, // output in GMT time
__null DWORD dwReserved __reserved DWORD dwReserved
); );
#ifdef UNICODE #ifdef UNICODE
#define InternetTimeToSystemTime InternetTimeToSystemTimeW #define InternetTimeToSystemTime InternetTimeToSystemTimeW
#else #else
#ifdef _WINX32_ #ifdef _WINX32_
#define InternetTimeToSystemTime InternetTimeToSystemTimeA #define InternetTimeToSystemTime InternetTimeToSystemTimeA
#else #else
BOOLAPI InternetTimeToSystemTime( BOOLAPI InternetTimeToSystemTime(
__in LPCSTR lpszTime, // NULL terminated string __in LPCSTR lpszTime, // NULL terminated string
__out SYSTEMTIME *pst, // output in GMT time __out SYSTEMTIME *pst, // output in GMT time
__null DWORD dwReserved __reserved DWORD dwReserved
); );
#endif // _WINX32_ #endif // _WINX32_
#endif // !UNICODE #endif // !UNICODE
BOOLAPI BOOLAPI
InternetCrackUrlA( InternetCrackUrlA(
__in_ecount(dwUrlLength) LPCSTR lpszUrl, __in_ecount(dwUrlLength) LPCSTR lpszUrl,
__in DWORD dwUrlLength, __in DWORD dwUrlLength,
__in DWORD dwFlags, __in DWORD dwFlags,
__inout LPURL_COMPONENTSA lpUrlComponents __inout LPURL_COMPONENTSA lpUrlComponents
skipping to change at line 918 skipping to change at line 937
__in_opt DWORD_PTR dwContext __in_opt DWORD_PTR dwContext
); );
#ifdef UNICODE #ifdef UNICODE
#define InternetOpenUrl InternetOpenUrlW #define InternetOpenUrl InternetOpenUrlW
#else #else
#define InternetOpenUrl InternetOpenUrlA #define InternetOpenUrl InternetOpenUrlA
#endif // !UNICODE #endif // !UNICODE
BOOLAPI InternetReadFile( BOOLAPI InternetReadFile(
__in HINTERNET hFile, __in HINTERNET hFile,
__out_bcount(dwNumberOfBytesToRead) LPVOID lpBuffer, __out_bcount(dwNumberOfBytesToRead) __out_data_source(NETWORK) LPVOID lpBuff er,
__in DWORD dwNumberOfBytesToRead, __in DWORD dwNumberOfBytesToRead,
__out LPDWORD lpdwNumberOfBytesRead __out LPDWORD lpdwNumberOfBytesRead
); );
INTERNETAPI_(BOOL) InternetReadFileExA( INTERNETAPI_(BOOL) InternetReadFileExA(
__in HINTERNET hFile, __in HINTERNET hFile,
__out LPINTERNET_BUFFERSA lpBuffersOut, __out __out_data_source(NETWORK) LPINTERNET_BUFFERSA lpBuffersOut,
__in DWORD dwFlags, __in DWORD dwFlags,
__in_opt DWORD_PTR dwContext __in_opt DWORD_PTR dwContext
); );
INTERNETAPI_(BOOL) InternetReadFileExW( INTERNETAPI_(BOOL) InternetReadFileExW(
__in HINTERNET hFile, __in HINTERNET hFile,
__out LPINTERNET_BUFFERSW lpBuffersOut, __out __out_data_source(NETWORK) LPINTERNET_BUFFERSW lpBuffersOut,
__in DWORD dwFlags, __in DWORD dwFlags,
__in_opt DWORD_PTR dwContext __in_opt DWORD_PTR dwContext
); );
#ifdef UNICODE #ifdef UNICODE
#define InternetReadFileEx InternetReadFileExW #define InternetReadFileEx InternetReadFileExW
#else #else
#define InternetReadFileEx InternetReadFileExA #define InternetReadFileEx InternetReadFileExA
#endif // !UNICODE #endif // !UNICODE
// //
skipping to change at line 953 skipping to change at line 972
// //
#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,
__null PVOID pReserved, __reserved PVOID pReserved,
__in DWORD dwMoveMethod, __in DWORD dwMoveMethod,
__null 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
); );
BOOLAPI InternetQueryDataAvailable( BOOLAPI InternetQueryDataAvailable(
__in HINTERNET hFile, __in HINTERNET hFile,
__out_opt LPDWORD lpdwNumberOfBytesAvailable, __out_opt LPDWORD __out_data_source(NETWORK) lpdwNumberOfBytesAvailable,
__in DWORD dwFlags, __in DWORD dwFlags,
__in_opt DWORD_PTR dwContext __in_opt DWORD_PTR dwContext
); );
BOOLAPI InternetFindNextFileA( BOOLAPI InternetFindNextFileA(
__in HINTERNET hFind, __in HINTERNET hFind,
__out LPVOID lpvFindData __out LPVOID lpvFindData
); );
BOOLAPI InternetFindNextFileW( BOOLAPI InternetFindNextFileW(
__in HINTERNET hFind, __in HINTERNET hFind,
skipping to change at line 989 skipping to change at line 1008
); );
#ifdef UNICODE #ifdef UNICODE
#define InternetFindNextFile InternetFindNextFileW #define InternetFindNextFile InternetFindNextFileW
#else #else
#define InternetFindNextFile InternetFindNextFileA #define InternetFindNextFile InternetFindNextFileA
#endif // !UNICODE #endif // !UNICODE
BOOLAPI InternetQueryOptionA( BOOLAPI InternetQueryOptionA(
__in_opt HINTERNET hInternet, __in_opt HINTERNET hInternet,
__in DWORD dwOption, __in DWORD dwOption,
__out_bcount_opt(*lpdwBufferLength) LPVOID lpBuffer, __out_bcount_opt(*lpdwBufferLength) __out_data_source(NETWORK) LPVOID lpBuff er,
__inout LPDWORD lpdwBufferLength __inout LPDWORD lpdwBufferLength
); );
BOOLAPI InternetQueryOptionW( BOOLAPI InternetQueryOptionW(
__in_opt HINTERNET hInternet, __in_opt HINTERNET hInternet,
__in DWORD dwOption, __in DWORD dwOption,
__out_bcount_opt(*lpdwBufferLength) LPVOID lpBuffer, __out_bcount_opt(*lpdwBufferLength) __out_data_source(NETWORK) LPVOID lpBuff er,
__inout LPDWORD lpdwBufferLength __inout LPDWORD lpdwBufferLength
); );
#ifdef UNICODE #ifdef UNICODE
#define InternetQueryOption InternetQueryOptionW #define InternetQueryOption InternetQueryOptionW
#else #else
#define InternetQueryOption InternetQueryOptionA #define InternetQueryOption InternetQueryOptionA
#endif // !UNICODE #endif // !UNICODE
BOOLAPI InternetSetOptionA( BOOLAPI InternetSetOptionA(
__in_opt HINTERNET hInternet, __in_opt HINTERNET hInternet,
__in DWORD dwOption, __in DWORD dwOption,
__in_opt LPVOID lpBuffer, __in_opt LPVOID lpBuffer,
__in DWORD dwBufferLength __in DWORD dwBufferLength
); );
BOOLAPI InternetSetOptionW( BOOLAPI InternetSetOptionW(
__in_opt HINTERNET hInternet, __in_opt HINTERNET hInternet,
__in DWORD dwOption, __in DWORD dwOption,
__in_opt LPVOID lpBuffer, __in_opt LPVOID lpBuffer,
__in DWORD dwBufferLength __in DWORD dwBufferLength
); );
#ifdef UNICODE #ifdef UNICODE
#define InternetSetOption InternetSetOptionW #define InternetSetOption InternetSetOptionW
#else #else
#define InternetSetOption InternetSetOptionA #define InternetSetOption InternetSetOptionA
#endif // !UNICODE #endif // !UNICODE
BOOLAPI InternetSetOptionExA( BOOLAPI InternetSetOptionExA(
__in_opt HINTERNET hInternet, __in_opt HINTERNET hInternet,
__in DWORD dwOption, __in DWORD dwOption,
__in_opt LPVOID lpBuffer, __in_opt LPVOID lpBuffer,
__in DWORD dwBufferLength, __in DWORD dwBufferLength,
__in DWORD dwFlags __in DWORD dwFlags
); );
BOOLAPI InternetSetOptionExW( BOOLAPI InternetSetOptionExW(
__in_opt HINTERNET hInternet, __in_opt HINTERNET hInternet,
__in DWORD dwOption, __in DWORD dwOption,
__in_opt LPVOID lpBuffer, __in_opt LPVOID lpBuffer,
__in DWORD dwBufferLength, __in DWORD dwBufferLength,
__in DWORD dwFlags __in DWORD dwFlags
); );
#ifdef UNICODE #ifdef UNICODE
#define InternetSetOptionEx InternetSetOptionExW #define InternetSetOptionEx InternetSetOptionExW
#else #else
#define InternetSetOptionEx InternetSetOptionExA #define InternetSetOptionEx InternetSetOptionExA
#endif // !UNICODE #endif // !UNICODE
BOOLAPI InternetLockRequestFile( BOOLAPI InternetLockRequestFile(
__in HINTERNET hInternet, __in HINTERNET hInternet,
__out HANDLE * lphLockRequestInfo __out HANDLE * lphLockRequestInfo
); );
BOOLAPI InternetUnlockRequestFile( BOOLAPI InternetUnlockRequestFile(
__in HANDLE hLockRequestInfo __inout HANDLE hLockRequestInfo
); );
// //
// flags for InternetSetOptionEx() // flags for InternetSetOptionEx()
// //
#define ISO_GLOBAL 0x00000001 // modify option globally #define ISO_GLOBAL 0x00000001 // modify option globally
#define ISO_REGISTRY 0x00000002 // write option to registry (where applicabl e) #define ISO_REGISTRY 0x00000002 // write option to registry (where applicabl e)
#define ISO_VALID_FLAGS (ISO_GLOBAL | ISO_REGISTRY) #define ISO_VALID_FLAGS (ISO_GLOBAL | ISO_REGISTRY)
skipping to change at line 1125 skipping to change at line 1144
#define INTERNET_OPTION_CALLBACK_FILTER 54 #define INTERNET_OPTION_CALLBACK_FILTER 54
#define INTERNET_OPTION_CONNECT_TIME 55 #define INTERNET_OPTION_CONNECT_TIME 55
#define INTERNET_OPTION_SEND_THROUGHPUT 56 #define INTERNET_OPTION_SEND_THROUGHPUT 56
#define INTERNET_OPTION_RECEIVE_THROUGHPUT 57 #define INTERNET_OPTION_RECEIVE_THROUGHPUT 57
#define INTERNET_OPTION_REQUEST_PRIORITY 58 #define INTERNET_OPTION_REQUEST_PRIORITY 58
#define INTERNET_OPTION_HTTP_VERSION 59 #define INTERNET_OPTION_HTTP_VERSION 59
#define INTERNET_OPTION_RESET_URLCACHE_SESSION 60 #define INTERNET_OPTION_RESET_URLCACHE_SESSION 60
#define INTERNET_OPTION_ERROR_MASK 62 #define INTERNET_OPTION_ERROR_MASK 62
#define INTERNET_OPTION_FROM_CACHE_TIMEOUT 63 #define INTERNET_OPTION_FROM_CACHE_TIMEOUT 63
#define INTERNET_OPTION_BYPASS_EDITED_ENTRY 64 #define INTERNET_OPTION_BYPASS_EDITED_ENTRY 64
#define INTERNET_OPTION_HTTP_DECODING 65
#define INTERNET_OPTION_DIAGNOSTIC_SOCKET_INFO 67 #define INTERNET_OPTION_DIAGNOSTIC_SOCKET_INFO 67
#define INTERNET_OPTION_CODEPAGE 68 #define INTERNET_OPTION_CODEPAGE 68
#define INTERNET_OPTION_CACHE_TIMESTAMPS 69 #define INTERNET_OPTION_CACHE_TIMESTAMPS 69
#define INTERNET_OPTION_DISABLE_AUTODIAL 70 #define INTERNET_OPTION_DISABLE_AUTODIAL 70
#define INTERNET_OPTION_MAX_CONNS_PER_SERVER 73 #define INTERNET_OPTION_MAX_CONNS_PER_SERVER 73
#define INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER 74 #define INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER 74
#define INTERNET_OPTION_PER_CONNECTION_OPTION 75 #define INTERNET_OPTION_PER_CONNECTION_OPTION 75
#define INTERNET_OPTION_DIGEST_AUTH_UNLOAD 76 #define INTERNET_OPTION_DIGEST_AUTH_UNLOAD 76
#define INTERNET_OPTION_IGNORE_OFFLINE 77 #define INTERNET_OPTION_IGNORE_OFFLINE 77
#define INTERNET_OPTION_IDENTITY 78 #define INTERNET_OPTION_IDENTITY 78
skipping to change at line 1154 skipping to change at line 1176
#define INTERNET_OPTION_SEND_UTF8_SERVERNAME_TO_PROXY 88 #define INTERNET_OPTION_SEND_UTF8_SERVERNAME_TO_PROXY 88
#define INTERNET_OPTION_EXEMPT_CONNECTION_LIMIT 89 #define INTERNET_OPTION_EXEMPT_CONNECTION_LIMIT 89
#define INTERNET_OPTION_ENABLE_PASSPORT_AUTH 90 #define INTERNET_OPTION_ENABLE_PASSPORT_AUTH 90
#define INTERNET_OPTION_HIBERNATE_INACTIVE_WORKER_THREADS 91 #define INTERNET_OPTION_HIBERNATE_INACTIVE_WORKER_THREADS 91
#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 #define INTERNET_OPTION_DATAFILE_EXT 96
96
#define INTERNET_OPTION_CODEPAGE_PATH 100
#define INTERNET_OPTION_CODEPAGE_EXTRA 101
#define INTERNET_OPTION_IDN 102
#define INTERNET_FIRST_OPTION INTERNET_OPTION_CALLBACK #define INTERNET_FIRST_OPTION INTERNET_OPTION_CALLBACK
#define INTERNET_LAST_OPTION INTERNET_OPTION_DATAFILE_EXT #define INTERNET_LAST_OPTION INTERNET_OPTION_IDN
// //
// 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 1965 skipping to change at line 1991
// //
// prototypes // prototypes
// //
BOOLAPI GopherCreateLocatorA( BOOLAPI GopherCreateLocatorA(
__in LPCSTR lpszHost, __in LPCSTR lpszHost,
__in INTERNET_PORT nServerPort, __in INTERNET_PORT nServerPort,
__in_opt LPCSTR lpszDisplayString, __in_opt LPCSTR lpszDisplayString,
__in_opt LPCSTR lpszSelectorString, __in_opt LPCSTR lpszSelectorString,
__in DWORD dwGopherType, __in DWORD dwGopherType,
__out_opt LPSTR lpszLocator, __out_ecount_opt(*lpdwBufferLength) LPSTR lpszLocator,
__inout LPDWORD lpdwBufferLength __inout LPDWORD lpdwBufferLength
); );
BOOLAPI GopherCreateLocatorW( BOOLAPI GopherCreateLocatorW(
__in LPCWSTR lpszHost, __in LPCWSTR lpszHost,
__in INTERNET_PORT nServerPort, __in INTERNET_PORT nServerPort,
__in_opt LPCWSTR lpszDisplayString, __in_opt LPCWSTR lpszDisplayString,
__in_opt LPCWSTR lpszSelectorString, __in_opt LPCWSTR lpszSelectorString,
__in DWORD dwGopherType, __in DWORD dwGopherType,
__out_opt LPWSTR lpszLocator, __out_ecount_opt(*lpdwBufferLength) LPWSTR lpszLocator,
__inout LPDWORD lpdwBufferLength __inout LPDWORD lpdwBufferLength
); );
#ifdef UNICODE #ifdef UNICODE
#define GopherCreateLocator GopherCreateLocatorW #define GopherCreateLocator GopherCreateLocatorW
#else #else
#define GopherCreateLocator GopherCreateLocatorA #define GopherCreateLocator GopherCreateLocatorA
#endif // !UNICODE #endif // !UNICODE
BOOLAPI GopherGetLocatorTypeA( BOOLAPI GopherGetLocatorTypeA(
__in LPCSTR lpszLocator, __in LPCSTR lpszLocator,
skipping to change at line 2304 skipping to change at line 2330
// //
// prototypes // prototypes
// //
INTERNETAPI_(HINTERNET) HttpOpenRequestA( INTERNETAPI_(HINTERNET) HttpOpenRequestA(
__in HINTERNET hConnect, __in HINTERNET hConnect,
__in_opt LPCSTR lpszVerb, __in_opt LPCSTR lpszVerb,
__in_opt LPCSTR lpszObjectName, __in_opt LPCSTR lpszObjectName,
__in_opt LPCSTR lpszVersion, __in_opt LPCSTR lpszVersion,
__in_opt LPCSTR lpszReferrer, __in_opt LPCSTR lpszReferrer,
__in_opt LPCSTR FAR * lplpszAcceptTypes, __in_z_opt LPCSTR FAR * lplpszAcceptTypes,
__in DWORD dwFlags, __in DWORD dwFlags,
__in_opt DWORD_PTR dwContext __in_opt DWORD_PTR dwContext
); );
INTERNETAPI_(HINTERNET) HttpOpenRequestW( INTERNETAPI_(HINTERNET) HttpOpenRequestW(
__in HINTERNET hConnect, __in HINTERNET hConnect,
__in_opt LPCWSTR lpszVerb, __in_opt LPCWSTR lpszVerb,
__in_opt LPCWSTR lpszObjectName, __in_opt LPCWSTR lpszObjectName,
__in_opt LPCWSTR lpszVersion, __in_opt LPCWSTR lpszVersion,
__in_opt LPCWSTR lpszReferrer, __in_opt LPCWSTR lpszReferrer,
__in_opt LPCWSTR FAR * lplpszAcceptTypes, __in_z_opt LPCWSTR FAR * lplpszAcceptTypes,
__in DWORD dwFlags, __in DWORD dwFlags,
__in_opt DWORD_PTR dwContext __in_opt DWORD_PTR dwContext
); );
#ifdef UNICODE #ifdef UNICODE
#define HttpOpenRequest HttpOpenRequestW #define HttpOpenRequest HttpOpenRequestW
#else #else
#define HttpOpenRequest HttpOpenRequestA #define HttpOpenRequest HttpOpenRequestA
#endif // !UNICODE #endif // !UNICODE
BOOLAPI HttpAddRequestHeadersA( BOOLAPI HttpAddRequestHeadersA(
skipping to change at line 2456 skipping to change at line 2482
); );
#ifdef UNICODE #ifdef UNICODE
#define HttpEndRequest HttpEndRequestW #define HttpEndRequest HttpEndRequestW
#else #else
#define HttpEndRequest HttpEndRequestA #define HttpEndRequest HttpEndRequestA
#endif // !UNICODE #endif // !UNICODE
BOOLAPI HttpQueryInfoA( BOOLAPI HttpQueryInfoA(
__in HINTERNET hRequest, __in HINTERNET hRequest,
__in DWORD dwInfoLevel, __in DWORD dwInfoLevel,
__inout_bcount_opt(*lpdwBufferLength) LPVOID lpBuffer, __inout_bcount_opt(*lpdwBufferLength) __out_data_source(NETWORK) LPVOID lpBu ffer,
__inout LPDWORD lpdwBufferLength, __inout LPDWORD lpdwBufferLength,
__inout_opt LPDWORD lpdwIndex __inout_opt LPDWORD lpdwIndex
); );
BOOLAPI HttpQueryInfoW( BOOLAPI HttpQueryInfoW(
__in HINTERNET hRequest, __in HINTERNET hRequest,
__in DWORD dwInfoLevel, __in DWORD dwInfoLevel,
__inout_bcount_opt(*lpdwBufferLength) LPVOID lpBuffer, __inout_bcount_opt(*lpdwBufferLength) __out_data_source(NETWORK) LPVOID lpBu ffer,
__inout LPDWORD lpdwBufferLength, __inout LPDWORD lpdwBufferLength,
__inout_opt LPDWORD lpdwIndex __inout_opt LPDWORD lpdwIndex
); );
#ifdef UNICODE #ifdef UNICODE
#define HttpQueryInfo HttpQueryInfoW #define HttpQueryInfo HttpQueryInfoW
#else #else
#define HttpQueryInfo HttpQueryInfoA #define HttpQueryInfo HttpQueryInfoA
#endif // !UNICODE #endif // !UNICODE
// //
skipping to change at line 2534 skipping to change at line 2560
#else #else
#define InternetGetCookie InternetGetCookieA #define InternetGetCookie InternetGetCookieA
#endif // !UNICODE #endif // !UNICODE
INTERNETAPI_(DWORD) INTERNETAPI_(DWORD)
InternetSetCookieExA( InternetSetCookieExA(
__in LPCSTR lpszUrl, __in LPCSTR lpszUrl,
__in_opt LPCSTR lpszCookieName, __in_opt LPCSTR lpszCookieName,
__in LPCSTR lpszCookieData, __in LPCSTR lpszCookieData,
__in DWORD dwFlags, __in DWORD dwFlags,
__null DWORD_PTR dwReserved __in_opt DWORD_PTR dwReserved
); );
INTERNETAPI_(DWORD) INTERNETAPI_(DWORD)
InternetSetCookieExW( InternetSetCookieExW(
__in LPCWSTR lpszUrl, __in LPCWSTR lpszUrl,
__in_opt LPCWSTR lpszCookieName, __in_opt LPCWSTR lpszCookieName,
__in LPCWSTR lpszCookieData, __in LPCWSTR lpszCookieData,
__in DWORD dwFlags, __in DWORD dwFlags,
__null DWORD_PTR dwReserved __in_opt DWORD_PTR dwReserved
); );
#ifdef UNICODE #ifdef UNICODE
#define InternetSetCookieEx InternetSetCookieExW #define InternetSetCookieEx InternetSetCookieExW
#else #else
#define InternetSetCookieEx InternetSetCookieExA #define InternetSetCookieEx InternetSetCookieExA
#endif // !UNICODE #endif // !UNICODE
BOOLAPI BOOLAPI
InternetGetCookieExA( InternetGetCookieExA(
__in LPCSTR lpszUrl, __in LPCSTR lpszUrl,
__in_opt LPCSTR lpszCookieName, __in_opt LPCSTR lpszCookieName,
__in_ecount_opt(*lpdwSize) LPSTR lpszCookieData, __in_ecount_opt(*lpdwSize) LPSTR lpszCookieData,
__inout_opt LPDWORD lpdwSize, __inout LPDWORD lpdwSize,
__in DWORD dwFlags, __in DWORD dwFlags,
__null LPVOID lpReserved __reserved LPVOID lpReserved
); );
BOOLAPI BOOLAPI
InternetGetCookieExW( InternetGetCookieExW(
__in LPCWSTR lpszUrl, __in LPCWSTR lpszUrl,
__in_opt LPCWSTR lpszCookieName, __in_opt LPCWSTR lpszCookieName,
__in_ecount_opt(*lpdwSize) LPWSTR lpszCookieData, __in_ecount_opt(*lpdwSize) LPWSTR lpszCookieData,
__inout_opt LPDWORD lpdwSize, __inout LPDWORD lpdwSize,
__in DWORD dwFlags, __in DWORD dwFlags,
__null LPVOID lpReserved __reserved LPVOID lpReserved
); );
#ifdef UNICODE #ifdef UNICODE
#define InternetGetCookieEx InternetGetCookieExW #define InternetGetCookieEx InternetGetCookieExW
#else #else
#define InternetGetCookieEx InternetGetCookieExA #define InternetGetCookieEx InternetGetCookieExA
#endif // !UNICODE #endif // !UNICODE
// //
// offline browsing // offline browsing
// //
INTERNETAPI_(DWORD) INTERNETAPI_(DWORD)
InternetAttemptConnect( InternetAttemptConnect(
__null DWORD dwReserved __in DWORD dwReserved
); );
BOOLAPI BOOLAPI
InternetCheckConnectionA( InternetCheckConnectionA(
__in_opt LPCSTR lpszUrl, __in LPCSTR lpszUrl,
__in DWORD dwFlags, __in DWORD dwFlags,
__null DWORD dwReserved __in DWORD dwReserved
); );
BOOLAPI BOOLAPI
InternetCheckConnectionW( InternetCheckConnectionW(
__in_opt LPCWSTR lpszUrl, __in LPCWSTR lpszUrl,
__in DWORD dwFlags, __in DWORD dwFlags,
__null DWORD dwReserved __in DWORD dwReserved
); );
#ifdef UNICODE #ifdef UNICODE
#define InternetCheckConnection InternetCheckConnectionW #define InternetCheckConnection InternetCheckConnectionW
#else #else
#define InternetCheckConnection InternetCheckConnectionA #define InternetCheckConnection InternetCheckConnectionA
#endif // !UNICODE #endif // !UNICODE
#define FLAG_ICC_FORCE_CONNECTION 0x00000001 #define FLAG_ICC_FORCE_CONNECTION 0x00000001
// //
skipping to change at line 2648 skipping to change at line 2674
DWORD_PTR dwContext; // context to pass to to notification function DWORD_PTR dwContext; // context to pass to to notification function
} }
INTERNET_AUTH_NOTIFY_DATA; INTERNET_AUTH_NOTIFY_DATA;
INTERNETAPI_(BOOL) ResumeSuspendedDownload( INTERNETAPI_(BOOL) ResumeSuspendedDownload(
__in HINTERNET hRequest, __in HINTERNET hRequest,
__in DWORD dwResultCode __in DWORD dwResultCode
); );
INTERNETAPI_(DWORD) InternetErrorDlg( INTERNETAPI_(DWORD) InternetErrorDlg(
__in_opt HWND hWnd, __in HWND hWnd,
__in_opt HINTERNET hRequest, __inout_opt HINTERNET hRequest,
__in DWORD dwError, __in DWORD dwError,
__in DWORD dwFlags, __in DWORD dwFlags,
__inout_opt LPVOID * lppvData __inout_opt LPVOID * lppvData
); );
INTERNETAPI_(DWORD) InternetConfirmZoneCrossingA( INTERNETAPI_(DWORD) InternetConfirmZoneCrossingA(
__in HWND hWnd, __in HWND hWnd,
__in LPSTR szUrlPrev, __in LPSTR szUrlPrev,
__in LPSTR szUrlNew, __in LPSTR szUrlNew,
__in BOOL bPost __in BOOL bPost
skipping to change at line 2810 skipping to change at line 2836
#define ERROR_INTERNET_SEC_INVALID_CERT (INTERNET_ERROR_BASE + 169) #define ERROR_INTERNET_SEC_INVALID_CERT (INTERNET_ERROR_BASE + 169)
#define ERROR_INTERNET_SEC_CERT_REVOKED (INTERNET_ERROR_BASE + 170) #define ERROR_INTERNET_SEC_CERT_REVOKED (INTERNET_ERROR_BASE + 170)
// InternetAutodial specific errors // InternetAutodial specific errors
#define ERROR_INTERNET_FAILED_DUETOSECURITYCHECK (INTERNET_ERROR_BASE + 171) #define ERROR_INTERNET_FAILED_DUETOSECURITYCHECK (INTERNET_ERROR_BASE + 171)
#define ERROR_INTERNET_NOT_INITIALIZED (INTERNET_ERROR_BASE + 172) #define ERROR_INTERNET_NOT_INITIALIZED (INTERNET_ERROR_BASE + 172)
#define ERROR_INTERNET_NEED_MSN_SSPI_PKG (INTERNET_ERROR_BASE + 173) #define ERROR_INTERNET_NEED_MSN_SSPI_PKG (INTERNET_ERROR_BASE + 173)
#define ERROR_INTERNET_LOGIN_FAILURE_DISPLAY_ENTITY_BODY (INTERNET_ERROR_BASE + 174) #define ERROR_INTERNET_LOGIN_FAILURE_DISPLAY_ENTITY_BODY (INTERNET_ERROR_BASE + 174)
#define INTERNET_ERROR_LAST ERROR_INTERNET_LOGIN_FAILURE_DIS // Decoding/Decompression specific errors
PLAY_ENTITY_BODY
#define ERROR_INTERNET_DECODING_FAILED (INTERNET_ERROR_BASE + 175)
#define INTERNET_ERROR_LAST ERROR_INTERNET_DECODING_FAILED
//#endif // !defined(_WINERROR_) //#endif // !defined(_WINERROR_)
// //
// URLCACHE APIs // URLCACHE APIs
// //
// //
// datatype definitions. // datatype definitions.
// //
skipping to change at line 2986 skipping to change at line 3016
#else #else
typedef INTERNET_CACHE_GROUP_INFOA INTERNET_CACHE_GROUP_INFO; typedef INTERNET_CACHE_GROUP_INFOA INTERNET_CACHE_GROUP_INFO;
typedef LPINTERNET_CACHE_GROUP_INFOA LPINTERNET_CACHE_GROUP_INFO; typedef LPINTERNET_CACHE_GROUP_INFOA LPINTERNET_CACHE_GROUP_INFO;
#endif // UNICODE #endif // UNICODE
// //
// Cache APIs // Cache APIs
// //
BOOLAPI CreateUrlCacheEntryA( BOOLAPI CreateUrlCacheEntryA(
__in LPCSTR lpszUrlName, __in LPCSTR lpszUrlName,
__in DWORD dwExpectedFileSize, __in DWORD dwExpectedFileSize,
__in_opt LPCSTR lpszFileExtension, __in_opt LPCSTR lpszFileExtension,
__out LPSTR lpszFileName, __inout_ecount(MAX_PATH) LPSTR lpszFileName,
__null DWORD dwReserved __in DWORD dwReserved
); );
BOOLAPI CreateUrlCacheEntryW( BOOLAPI CreateUrlCacheEntryW(
__in LPCWSTR lpszUrlName, __in LPCWSTR lpszUrlName,
__in DWORD dwExpectedFileSize, __in DWORD dwExpectedFileSize,
__in_opt LPCWSTR lpszFileExtension, __in_opt LPCWSTR lpszFileExtension,
__out LPWSTR lpszFileName, __inout_ecount(MAX_PATH) LPWSTR lpszFileName,
__null DWORD dwReserved __in DWORD dwReserved
); );
#ifdef UNICODE #ifdef UNICODE
#define CreateUrlCacheEntry CreateUrlCacheEntryW #define CreateUrlCacheEntry CreateUrlCacheEntryW
#else #else
#define CreateUrlCacheEntry CreateUrlCacheEntryA #define CreateUrlCacheEntry CreateUrlCacheEntryA
#endif // !UNICODE #endif // !UNICODE
#ifndef USE_FIXED_COMMIT_URL_CACHE_ENTRY #ifndef USE_FIXED_COMMIT_URL_CACHE_ENTRY
// Temporary state of affairs until we reconcile our apis. // Temporary state of affairs until we reconcile our apis.
skipping to change at line 3026 skipping to change at line 3056
BOOLAPI BOOLAPI
CommitUrlCacheEntryA( CommitUrlCacheEntryA(
__in LPCSTR lpszUrlName, __in LPCSTR lpszUrlName,
__in_opt LPCSTR lpszLocalFileName, __in_opt LPCSTR lpszLocalFileName,
__in FILETIME ExpireTime, __in FILETIME ExpireTime,
__in FILETIME LastModifiedTime, __in FILETIME LastModifiedTime,
__in DWORD CacheEntryType, __in DWORD CacheEntryType,
__in_ecount_opt(dwHeaderSize) LPBYTE lpHeaderInfo, __in_ecount_opt(dwHeaderSize) LPBYTE lpHeaderInfo,
__in_opt DWORD dwHeaderSize, __in_opt DWORD dwHeaderSize,
__null LPCSTR lpszFileExtension, __reserved LPCSTR lpszFileExtension,
__in_opt LPCSTR lpszOriginalUrl __in_opt LPCSTR lpszOriginalUrl
); );
BOOLAPI BOOLAPI
CommitUrlCacheEntryW( CommitUrlCacheEntryW(
__in LPCWSTR lpszUrlName, __in LPCWSTR lpszUrlName,
__in_opt LPCWSTR lpszLocalFileName, __in_opt LPCWSTR lpszLocalFileName,
__in FILETIME ExpireTime, __in FILETIME ExpireTime,
__in FILETIME LastModifiedTime, __in FILETIME LastModifiedTime,
__in DWORD CacheEntryType, __in DWORD CacheEntryType,
__in_ecount_opt(dwHeaders) LPWSTR lpszHeaderInfo, __in_ecount_opt(dwHeaders) LPWSTR lpszHeaderInfo,
__in DWORD dwHeaders, __in DWORD dwHeaders,
__null LPCWSTR lpszFileExtension, __reserved LPCWSTR lpszFileExtension,
__in_opt LPCWSTR lpszOriginalUrl __in_opt LPCWSTR lpszOriginalUrl
); );
#ifdef UNICODE #ifdef UNICODE
#define CommitUrlCacheEntry CommitUrlCacheEntryW #define CommitUrlCacheEntry CommitUrlCacheEntryW
#else #else
#define CommitUrlCacheEntry CommitUrlCacheEntryA #define CommitUrlCacheEntry CommitUrlCacheEntryA
#endif #endif
#else #else
CommitUrlCacheEntryA( CommitUrlCacheEntryA(
__in LPCSTR lpszUrlName, __in LPCSTR lpszUrlName,
__in_opt LPCSTR lpszLocalFileName, __in_opt LPCSTR lpszLocalFileName,
__in FILETIME ExpireTime, __in FILETIME ExpireTime,
__in FILETIME LastModifiedTime, __in FILETIME LastModifiedTime,
__in DWORD CacheEntryType, __in DWORD CacheEntryType,
__in_ecount_opt(dwHeaderSize) LPCSTR lpHeaderInfo, __in_ecount_opt(dwHeaderSize) LPCSTR lpHeaderInfo,
__in DWORD dwHeaderSize, __in DWORD dwHeaderSize,
__null LPCSTR lpszFileExtension, __reserved LPCSTR lpszFileExtension,
__in_opt LPCSTR lpszOriginalUrl __in_opt LPCSTR lpszOriginalUrl
); );
CommitUrlCacheEntryW( CommitUrlCacheEntryW(
__in LPCWSTR lpszUrlName, __in LPCWSTR lpszUrlName,
__in_opt LPCWSTR lpszLocalFileName, __in_opt LPCWSTR lpszLocalFileName,
__in FILETIME ExpireTime, __in FILETIME ExpireTime,
__in FILETIME LastModifiedTime, __in FILETIME LastModifiedTime,
__in DWORD CacheEntryType, __in DWORD CacheEntryType,
__in_ecount_opt(dwHeaderSize) LPCWSTR lpHeaderInfo, __in_ecount_opt(dwHeaderSize) LPCWSTR lpHeaderInfo,
__in DWORD dwHeaderSize, __in DWORD dwHeaderSize,
__null LPCWSTR lpszFileExtension, __reserved LPCWSTR lpszFileExtension,
__in_opt LPCWSTR lpszOriginalUrl __in_opt LPCWSTR lpszOriginalUrl
); );
#ifdef UNICODE #ifdef UNICODE
#define CommitUrlCacheEntry CommitUrlCacheEntryW #define CommitUrlCacheEntry CommitUrlCacheEntryW
#else #else
#define CommitUrlCacheEntry CommitUrlCacheEntryA #define CommitUrlCacheEntry CommitUrlCacheEntryA
#endif // !UNICODE #endif // !UNICODE
#endif #endif
BOOLAPI BOOLAPI
RetrieveUrlCacheEntryFileA( RetrieveUrlCacheEntryFileA(
__in LPCSTR lpszUrlName, __in LPCSTR lpszUrlName,
__out_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpCacheEn tryInfo, __inout_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpCache EntryInfo,
__inout LPDWORD lpcbCacheEntryInfo, __inout LPDWORD lpcbCacheEntryInfo,
__null DWORD dwReserved __reserved DWORD dwReserved
); );
BOOLAPI BOOLAPI
RetrieveUrlCacheEntryFileW( RetrieveUrlCacheEntryFileW(
__in LPCWSTR lpszUrlName, __in LPCWSTR lpszUrlName,
__out_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpCacheEn tryInfo, __inout_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpCache EntryInfo,
__inout LPDWORD lpcbCacheEntryInfo, __inout LPDWORD lpcbCacheEntryInfo,
__null DWORD dwReserved __reserved DWORD dwReserved
); );
#ifdef UNICODE #ifdef UNICODE
#define RetrieveUrlCacheEntryFile RetrieveUrlCacheEntryFileW #define RetrieveUrlCacheEntryFile RetrieveUrlCacheEntryFileW
#else #else
#define RetrieveUrlCacheEntryFile RetrieveUrlCacheEntryFileA #define RetrieveUrlCacheEntryFile RetrieveUrlCacheEntryFileA
#endif // !UNICODE #endif // !UNICODE
BOOLAPI UnlockUrlCacheEntryFileA( BOOLAPI UnlockUrlCacheEntryFileA(
__in LPCSTR lpszUrlName, __in LPCSTR lpszUrlName,
__null DWORD dwReserved __reserved DWORD dwReserved
); );
BOOLAPI UnlockUrlCacheEntryFileW( BOOLAPI UnlockUrlCacheEntryFileW(
__in LPCWSTR lpszUrlName, __in LPCWSTR lpszUrlName,
__null DWORD dwReserved __reserved DWORD dwReserved
); );
#ifdef UNICODE #ifdef UNICODE
#define UnlockUrlCacheEntryFile UnlockUrlCacheEntryFileW #define UnlockUrlCacheEntryFile UnlockUrlCacheEntryFileW
#else #else
#ifdef _WINX32_ #ifdef _WINX32_
#define UnlockUrlCacheEntryFile UnlockUrlCacheEntryFileA #define UnlockUrlCacheEntryFile UnlockUrlCacheEntryFileA
#else #else
BOOLAPI UnlockUrlCacheEntryFile( BOOLAPI UnlockUrlCacheEntryFile(
__in LPCSTR lpszUrlName, __in LPCSTR lpszUrlName,
__null DWORD dwReserved __reserved DWORD dwReserved
); );
#endif // _WINX32_ #endif // _WINX32_
#endif // !UNICODE #endif // !UNICODE
INTERNETAPI_(HANDLE) INTERNETAPI_(HANDLE)
RetrieveUrlCacheEntryStreamA( RetrieveUrlCacheEntryStreamA(
__in LPCSTR lpszUrlName, __in LPCSTR lpszUrlName,
__out_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpCacheEn tryInfo, __inout_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpCache EntryInfo,
__inout LPDWORD lpcbCacheEntryInfo, __inout LPDWORD lpcbCacheEntryInfo,
__in BOOL fRandomRead, __in BOOL fRandomRead,
__null DWORD dwReserved __reserved DWORD dwReserved
); );
INTERNETAPI_(HANDLE) INTERNETAPI_(HANDLE)
RetrieveUrlCacheEntryStreamW( RetrieveUrlCacheEntryStreamW(
__in LPCWSTR lpszUrlName, __in LPCWSTR lpszUrlName,
__out_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpCacheEn tryInfo, __inout_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpCache EntryInfo,
__inout LPDWORD lpcbCacheEntryInfo, __inout LPDWORD lpcbCacheEntryInfo,
__in BOOL fRandomRead, __in BOOL fRandomRead,
__null DWORD dwReserved __reserved DWORD dwReserved
); );
#ifdef UNICODE #ifdef UNICODE
#define RetrieveUrlCacheEntryStream RetrieveUrlCacheEntryStreamW #define RetrieveUrlCacheEntryStream RetrieveUrlCacheEntryStreamW
#else #else
#define RetrieveUrlCacheEntryStream RetrieveUrlCacheEntryStreamA #define RetrieveUrlCacheEntryStream RetrieveUrlCacheEntryStreamA
#endif // !UNICODE #endif // !UNICODE
BOOLAPI BOOLAPI
ReadUrlCacheEntryStream( ReadUrlCacheEntryStream(
__in HANDLE hUrlCacheStream, __in HANDLE hUrlCacheStream,
__in DWORD dwLocation, __in DWORD dwLocation,
__out_bcount(*lpdwLen) LPVOID lpBuffer, __out_bcount(*lpdwLen) __out_data_source(NETWORK) LPVOID lpBuffer,
__inout LPDWORD lpdwLen, __inout LPDWORD lpdwLen,
__null DWORD Reserved __reserved DWORD Reserved
); );
BOOLAPI BOOLAPI
UnlockUrlCacheEntryStream( UnlockUrlCacheEntryStream(
__in HANDLE hUrlCacheStream, __in HANDLE hUrlCacheStream,
__null DWORD Reserved __reserved DWORD Reserved
); );
URLCACHEAPI_(BOOL) URLCACHEAPI_(BOOL)
GetUrlCacheEntryInfoA( GetUrlCacheEntryInfoA(
__in LPCSTR lpszUrlName, __in LPCSTR lpszUrlName,
__out_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpCacheEn tryInfo, __inout_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpCache EntryInfo,
__inout_opt LPDWORD lpcbCacheEntryInfo __inout_opt LPDWORD lpcbCacheEntryInfo
); );
URLCACHEAPI_(BOOL) URLCACHEAPI_(BOOL)
GetUrlCacheEntryInfoW( GetUrlCacheEntryInfoW(
__in LPCWSTR lpszUrlName, __in LPCWSTR lpszUrlName,
__out_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpCacheEn tryInfo, __inout_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpCache EntryInfo,
__inout_opt LPDWORD lpcbCacheEntryInfo __inout_opt LPDWORD lpcbCacheEntryInfo
); );
#ifdef UNICODE #ifdef UNICODE
#define GetUrlCacheEntryInfo GetUrlCacheEntryInfoW #define GetUrlCacheEntryInfo GetUrlCacheEntryInfoW
#else #else
#define GetUrlCacheEntryInfo GetUrlCacheEntryInfoA #define GetUrlCacheEntryInfo GetUrlCacheEntryInfoA
#endif // !UNICODE #endif // !UNICODE
URLCACHEAPI_(HANDLE) FindFirstUrlCacheGroup( URLCACHEAPI_(HANDLE) FindFirstUrlCacheGroup(
__in DWORD dwFlags, __in DWORD dwFlags,
__in DWORD dwFilter, __in DWORD dwFilter,
__null LPVOID lpSearchCondition, __reserved LPVOID lpSearchCondition,
__in DWORD dwSearchCondition, __reserved DWORD dwSearchCondition,
__out GROUPID* lpGroupId, __out GROUPID* lpGroupId,
__null LPVOID lpReserved __reserved LPVOID lpReserved
); );
URLCACHEAPI_(BOOL) FindNextUrlCacheGroup( URLCACHEAPI_(BOOL) FindNextUrlCacheGroup(
__in HANDLE hFind, __in HANDLE hFind,
__out GROUPID* lpGroupId, __out GROUPID* lpGroupId,
__null LPVOID lpReserved __reserved LPVOID lpReserved
); );
URLCACHEAPI_(BOOL) GetUrlCacheGroupAttributeA( URLCACHEAPI_(BOOL) GetUrlCacheGroupAttributeA(
__in GROUPID gid, __in GROUPID gid,
__null DWORD dwFlags, __reserved DWORD dwFlags,
__in DWORD dwAttributes, __in DWORD dwAttributes,
__out_bcount(*lpdwGroupInfo) LPINTERNET_CACHE_GROUP_INFOA lpGroupInfo, __out LPINTERNET_CACHE_GROUP_INFOA lpGroupInfo,
__inout LPDWORD lpdwGroupInfo, __inout LPDWORD lpdwGroupInfo,
__null LPVOID lpReserved __reserved LPVOID lpReserved
); );
URLCACHEAPI_(BOOL) GetUrlCacheGroupAttributeW( URLCACHEAPI_(BOOL) GetUrlCacheGroupAttributeW(
__in GROUPID gid, __in GROUPID gid,
__null DWORD dwFlags, __reserved DWORD dwFlags,
__in DWORD dwAttributes, __in DWORD dwAttributes,
__out_bcount(*lpdwGroupInfo) LPINTERNET_CACHE_GROUP_INFOW lpGroupInfo, __out LPINTERNET_CACHE_GROUP_INFOW lpGroupInfo,
__inout LPDWORD lpdwGroupInfo, __inout LPDWORD lpdwGroupInfo,
__null LPVOID lpReserved __reserved LPVOID lpReserved
); );
#ifdef UNICODE #ifdef UNICODE
#define GetUrlCacheGroupAttribute GetUrlCacheGroupAttributeW #define GetUrlCacheGroupAttribute GetUrlCacheGroupAttributeW
#else #else
#define GetUrlCacheGroupAttribute GetUrlCacheGroupAttributeA #define GetUrlCacheGroupAttribute GetUrlCacheGroupAttributeA
#endif // !UNICODE #endif // !UNICODE
URLCACHEAPI_(BOOL) SetUrlCacheGroupAttributeA( URLCACHEAPI_(BOOL) SetUrlCacheGroupAttributeA(
__in GROUPID gid, __in GROUPID gid,
__null DWORD dwFlags, __reserved DWORD dwFlags,
__in DWORD dwAttributes, __in DWORD dwAttributes,
__in LPINTERNET_CACHE_GROUP_INFOA lpGroupInfo, __in LPINTERNET_CACHE_GROUP_INFOA lpGroupInfo,
__null LPVOID lpReserved __reserved LPVOID lpReserved
); );
URLCACHEAPI_(BOOL) SetUrlCacheGroupAttributeW( URLCACHEAPI_(BOOL) SetUrlCacheGroupAttributeW(
__in GROUPID gid, __in GROUPID gid,
__null DWORD dwFlags, __reserved DWORD dwFlags,
__in DWORD dwAttributes, __in DWORD dwAttributes,
__in LPINTERNET_CACHE_GROUP_INFOW lpGroupInfo, __in LPINTERNET_CACHE_GROUP_INFOW lpGroupInfo,
__null LPVOID lpReserved __reserved LPVOID lpReserved
); );
#ifdef UNICODE #ifdef UNICODE
#define SetUrlCacheGroupAttribute SetUrlCacheGroupAttributeW #define SetUrlCacheGroupAttribute SetUrlCacheGroupAttributeW
#else #else
#define SetUrlCacheGroupAttribute SetUrlCacheGroupAttributeA #define SetUrlCacheGroupAttribute SetUrlCacheGroupAttributeA
#endif // !UNICODE #endif // !UNICODE
INTERNETAPI_(GROUPID) CreateUrlCacheGroup(
__in DWORD dwFlags,
__null LPVOID lpReserved
);
BOOLAPI DeleteUrlCacheGroup(
__in GROUPID GroupId,
__in DWORD dwFlags,
__null LPVOID lpReserved
);
BOOLAPI BOOLAPI
GetUrlCacheEntryInfoExA( GetUrlCacheEntryInfoExA(
__in LPCSTR lpszUrl, __in LPCSTR lpszUrl,
__out_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpCacheEn tryInfo, __inout_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpCache EntryInfo,
__inout_opt LPDWORD lpcbCacheEntryInfo, __inout_opt LPDWORD lpcbCacheEntryInfo,
__null LPSTR lpszRedirectUrl, __reserved LPSTR lpszRedirectUrl,
__null LPDWORD lpcbRedirectUrl, __reserved LPDWORD lpcbRedirectUrl,
__null LPVOID lpReserved, __reserved LPVOID lpReserved,
__in DWORD dwFlags __in DWORD dwFlags
); );
BOOLAPI BOOLAPI
GetUrlCacheEntryInfoExW( GetUrlCacheEntryInfoExW(
__in LPCWSTR lpszUrl, __in LPCWSTR lpszUrl,
__out_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpCacheEn tryInfo, __inout_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpCache EntryInfo,
__inout_opt LPDWORD lpcbCacheEntryInfo, __inout_opt LPDWORD lpcbCacheEntryInfo,
__null LPWSTR lpszRedirectUrl, __reserved LPWSTR lpszRedirectUrl,
__null LPDWORD lpcbRedirectUrl, __reserved LPDWORD lpcbRedirectUrl,
__null LPVOID lpReserved, __reserved LPVOID lpReserved,
__in DWORD dwFlags __in DWORD dwFlags
); );
#ifdef UNICODE #ifdef UNICODE
#define GetUrlCacheEntryInfoEx GetUrlCacheEntryInfoExW #define GetUrlCacheEntryInfoEx GetUrlCacheEntryInfoExW
#else #else
#define GetUrlCacheEntryInfoEx GetUrlCacheEntryInfoExA #define GetUrlCacheEntryInfoEx GetUrlCacheEntryInfoExA
#endif // !UNICODE #endif // !UNICODE
#define CACHE_ENTRY_ATTRIBUTE_FC 0x00000004 #define CACHE_ENTRY_ATTRIBUTE_FC 0x00000004
#define CACHE_ENTRY_HITRATE_FC 0x00000010 #define CACHE_ENTRY_HITRATE_FC 0x00000010
skipping to change at line 3302 skipping to change at line 3321
#else #else
#define SetUrlCacheEntryInfo SetUrlCacheEntryInfoA #define SetUrlCacheEntryInfo SetUrlCacheEntryInfoA
#endif // !UNICODE #endif // !UNICODE
// //
// Cache Group Functions // Cache Group Functions
// //
INTERNETAPI_(GROUPID) CreateUrlCacheGroup( INTERNETAPI_(GROUPID) CreateUrlCacheGroup(
__in DWORD dwFlags, __in DWORD dwFlags,
__null LPVOID lpReserved // must pass NULL __reserved LPVOID lpReserved
); );
BOOLAPI DeleteUrlCacheGroup( BOOLAPI DeleteUrlCacheGroup(
__in GROUPID GroupId, __in GROUPID GroupId,
__in DWORD dwFlags, // must pass 0 __in DWORD dwFlags, // must pass 0
__null LPVOID lpReserved // must pass NULL __reserved LPVOID lpReserved
); );
// Flags for SetUrlCacheEntryGroup // Flags for SetUrlCacheEntryGroup
#define INTERNET_CACHE_GROUP_ADD 0 #define INTERNET_CACHE_GROUP_ADD 0
#define INTERNET_CACHE_GROUP_REMOVE 1 #define INTERNET_CACHE_GROUP_REMOVE 1
BOOLAPI SetUrlCacheEntryGroupA( BOOLAPI SetUrlCacheEntryGroupA(
__in LPCSTR lpszUrlName, __in LPCSTR lpszUrlName,
__in DWORD dwFlags, __in DWORD dwFlags,
__in GROUPID GroupId, __in GROUPID GroupId,
__null LPBYTE pbGroupAttributes, // must pass NULL __reserved LPBYTE pbGroupAttributes,
__null DWORD cbGroupAttributes, // must pass 0 __reserved DWORD cbGroupAttributes,
__null LPVOID lpReserved // must pass NULL __reserved LPVOID lpReserved
); );
BOOLAPI SetUrlCacheEntryGroupW( BOOLAPI SetUrlCacheEntryGroupW(
__in LPCWSTR lpszUrlName, __in LPCWSTR lpszUrlName,
__in DWORD dwFlags, __in DWORD dwFlags,
__in GROUPID GroupId, __in GROUPID GroupId,
__null LPBYTE pbGroupAttributes, // must pass NULL __reserved LPBYTE pbGroupAttributes,
__null DWORD cbGroupAttributes, // must pass 0 __reserved DWORD cbGroupAttributes,
__null LPVOID lpReserved // must pass NULL __reserved LPVOID lpReserved
); );
#ifdef UNICODE #ifdef UNICODE
#define SetUrlCacheEntryGroup SetUrlCacheEntryGroupW #define SetUrlCacheEntryGroup SetUrlCacheEntryGroupW
#else #else
#ifdef _WINX32_ #ifdef _WINX32_
#define SetUrlCacheEntryGroup SetUrlCacheEntryGroupA #define SetUrlCacheEntryGroup SetUrlCacheEntryGroupA
#else #else
BOOLAPI SetUrlCacheEntryGroup( BOOLAPI SetUrlCacheEntryGroup(
__in LPCSTR lpszUrlName, __in LPCSTR lpszUrlName,
__in DWORD dwFlags, __in DWORD dwFlags,
__in GROUPID GroupId, __in GROUPID GroupId,
__null LPBYTE pbGroupAttributes, // must pass NULL __reserved LPBYTE pbGroupAttributes,
__null DWORD cbGroupAttributes, // must pass 0 __reserved DWORD cbGroupAttributes,
__null LPVOID lpReserved // must pass NULL __reserved LPVOID lpReserved
); );
#endif // _WINX32_ #endif // _WINX32_
#endif // !UNICODE #endif // !UNICODE
INTERNETAPI_(HANDLE) INTERNETAPI_(HANDLE)
FindFirstUrlCacheEntryExA( FindFirstUrlCacheEntryExA(
__in_opt LPCSTR lpszUrlSearchPattern, __in_opt LPCSTR lpszUrlSearchPattern,
__in DWORD dwFlags, __in DWORD dwFlags,
__in DWORD dwFilter, __in DWORD dwFilter,
__in GROUPID GroupId, __in GROUPID GroupId,
__out_bcount_opt(*lpcbEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpFirstCacheEn tryInfo, __inout_bcount_opt(*lpcbEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpFirstCache EntryInfo,
__inout LPDWORD lpcbEntryInfo, __inout LPDWORD lpcbEntryInfo,
__null LPVOID lpGroupAttributes, __reserved LPVOID lpGroupAttributes,
__null LPDWORD lpcbGroupAttributes, __reserved LPDWORD lpcbGroupAttributes,
__null LPVOID lpReserved __reserved LPVOID lpReserved
); );
INTERNETAPI_(HANDLE) INTERNETAPI_(HANDLE)
FindFirstUrlCacheEntryExW( FindFirstUrlCacheEntryExW(
__in_opt LPCWSTR lpszUrlSearchPattern, __in_opt LPCWSTR lpszUrlSearchPattern,
__in DWORD dwFlags, __in DWORD dwFlags,
__in DWORD dwFilter, __in DWORD dwFilter,
__in GROUPID GroupId, __in GROUPID GroupId,
__out_bcount_opt(*lpcbEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpFirstCacheEn tryInfo, __inout_bcount_opt(*lpcbEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpFirstCache EntryInfo,
__inout LPDWORD lpcbEntryInfo, __inout LPDWORD lpcbEntryInfo,
__null LPVOID lpGroupAttributes, __reserved LPVOID lpGroupAttributes,
__null LPDWORD lpcbGroupAttributes, __reserved LPDWORD lpcbGroupAttributes,
__null LPVOID lpReserved __reserved LPVOID lpReserved
); );
#ifdef UNICODE #ifdef UNICODE
#define FindFirstUrlCacheEntryEx FindFirstUrlCacheEntryExW #define FindFirstUrlCacheEntryEx FindFirstUrlCacheEntryExW
#else #else
#define FindFirstUrlCacheEntryEx FindFirstUrlCacheEntryExA #define FindFirstUrlCacheEntryEx FindFirstUrlCacheEntryExA
#endif // !UNICODE #endif // !UNICODE
BOOLAPI BOOLAPI
FindNextUrlCacheEntryExA( FindNextUrlCacheEntryExA(
__in HANDLE hEnumHandle, __in HANDLE hEnumHandle,
__out_bcount_opt(*lpcbEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpNextCacheEnt ryInfo, __inout_bcount_opt(*lpcbEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpNextCacheE ntryInfo,
__inout LPDWORD lpcbEntryInfo, __inout LPDWORD lpcbEntryInfo,
__null LPVOID lpGroupAttributes, __reserved LPVOID lpGroupAttributes,
__null LPDWORD lpcbGroupAttributes, __reserved LPDWORD lpcbGroupAttributes,
__null LPVOID lpReserved __reserved LPVOID lpReserved
); );
BOOLAPI BOOLAPI
FindNextUrlCacheEntryExW( FindNextUrlCacheEntryExW(
__in HANDLE hEnumHandle, __in HANDLE hEnumHandle,
__out_bcount_opt(*lpcbEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpNextCacheEnt ryInfo, __inout_bcount_opt(*lpcbEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpNextCacheE ntryInfo,
__inout LPDWORD lpcbEntryInfo, __inout LPDWORD lpcbEntryInfo,
__null LPVOID lpGroupAttributes, __reserved LPVOID lpGroupAttributes,
__null LPDWORD lpcbGroupAttributes, __reserved LPDWORD lpcbGroupAttributes,
__null LPVOID lpReserved __reserved LPVOID lpReserved
); );
#ifdef UNICODE #ifdef UNICODE
#define FindNextUrlCacheEntryEx FindNextUrlCacheEntryExW #define FindNextUrlCacheEntryEx FindNextUrlCacheEntryExW
#else #else
#define FindNextUrlCacheEntryEx FindNextUrlCacheEntryExA #define FindNextUrlCacheEntryEx FindNextUrlCacheEntryExA
#endif // !UNICODE #endif // !UNICODE
INTERNETAPI_(HANDLE) INTERNETAPI_(HANDLE)
FindFirstUrlCacheEntryA( FindFirstUrlCacheEntryA(
__in_opt LPCSTR lpszUrlSearchPattern, __in_opt LPCSTR lpszUrlSearchPattern,
__out_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpFirstCa cheEntryInfo, __inout_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpFirst CacheEntryInfo,
__inout LPDWORD lpcbCacheEntryInfo __inout LPDWORD lpcbCacheEntryInfo
); );
INTERNETAPI_(HANDLE) INTERNETAPI_(HANDLE)
FindFirstUrlCacheEntryW( FindFirstUrlCacheEntryW(
__in_opt LPCWSTR lpszUrlSearchPattern, __in_opt LPCWSTR lpszUrlSearchPattern,
__out_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpFirstCa cheEntryInfo, __inout_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpFirst CacheEntryInfo,
__inout LPDWORD lpcbCacheEntryInfo __inout LPDWORD lpcbCacheEntryInfo
); );
#ifdef UNICODE #ifdef UNICODE
#define FindFirstUrlCacheEntry FindFirstUrlCacheEntryW #define FindFirstUrlCacheEntry FindFirstUrlCacheEntryW
#else #else
#define FindFirstUrlCacheEntry FindFirstUrlCacheEntryA #define FindFirstUrlCacheEntry FindFirstUrlCacheEntryA
#endif // !UNICODE #endif // !UNICODE
BOOLAPI BOOLAPI
FindNextUrlCacheEntryA( FindNextUrlCacheEntryA(
__in HANDLE hEnumHandle, __in HANDLE hEnumHandle,
__out_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpNextCac heEntryInfo, __inout_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpNextC acheEntryInfo,
__inout LPDWORD lpcbCacheEntryInfo __inout LPDWORD lpcbCacheEntryInfo
); );
BOOLAPI BOOLAPI
FindNextUrlCacheEntryW( FindNextUrlCacheEntryW(
__in HANDLE hEnumHandle, __in HANDLE hEnumHandle,
__out_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpNextCac heEntryInfo, __inout_bcount_opt(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpNextC acheEntryInfo,
__inout LPDWORD lpcbCacheEntryInfo __inout LPDWORD lpcbCacheEntryInfo
); );
#ifdef UNICODE #ifdef UNICODE
#define FindNextUrlCacheEntry FindNextUrlCacheEntryW #define FindNextUrlCacheEntry FindNextUrlCacheEntryW
#else #else
#define FindNextUrlCacheEntry FindNextUrlCacheEntryA #define FindNextUrlCacheEntry FindNextUrlCacheEntryA
#endif // !UNICODE #endif // !UNICODE
BOOLAPI FindCloseUrlCache( BOOLAPI FindCloseUrlCache(
__in HANDLE hEnumHandle __in HANDLE hEnumHandle
skipping to change at line 3469 skipping to change at line 3488
__in LPCSTR lpszUrlName __in LPCSTR lpszUrlName
); );
#endif // _WINX32_ #endif // _WINX32_
#endif // !UNICODE #endif // !UNICODE
// //
// Autodial APIs // Autodial APIs
// //
INTERNETAPI_(DWORD) InternetDialA( INTERNETAPI_(DWORD) InternetDialA(
__in HWND hwndParent, __in HWND hwndParent,
__in LPSTR lpszConnectoid, __in_opt LPSTR lpszConnectoid,
__in DWORD dwFlags, __in DWORD dwFlags,
__out DWORD_PTR *lpdwConnection, __out DWORD_PTR *lpdwConnection,
__null DWORD dwReserved __in DWORD dwReserved
); );
INTERNETAPI_(DWORD) InternetDialW( INTERNETAPI_(DWORD) InternetDialW(
__in HWND hwndParent, __in HWND hwndParent,
__in LPWSTR lpszConnectoid, __in_opt LPWSTR lpszConnectoid,
__in DWORD dwFlags, __in DWORD dwFlags,
__out DWORD_PTR *lpdwConnection, __out DWORD_PTR *lpdwConnection,
__null DWORD dwReserved __in DWORD dwReserved
); );
#ifdef UNICODE #ifdef UNICODE
#define InternetDial InternetDialW #define InternetDial InternetDialW
#else #else
#ifdef _WINX32_ #ifdef _WINX32_
#define InternetDial InternetDialA #define InternetDial InternetDialA
#else #else
INTERNETAPI_(DWORD) InternetDial( INTERNETAPI_(DWORD) InternetDial(
__in HWND hwndParent, __in HWND hwndParent,
__in LPSTR lpszConnectoid, __in_opt LPSTR lpszConnectoid,
__in DWORD dwFlags, __in DWORD dwFlags,
__out LPDWORD lpdwConnection, __out LPDWORD lpdwConnection,
__null DWORD dwReserved __in DWORD dwReserved
); );
#endif // _WINX32_ #endif // _WINX32_
#endif // !UNICODE #endif // !UNICODE
// Flags for InternetDial - must not conflict with InternetAutodial flags // Flags for InternetDial - must not conflict with InternetAutodial flags
// as they are valid here also. // as they are valid here also.
#define INTERNET_DIAL_FORCE_PROMPT 0x2000 #define INTERNET_DIAL_FORCE_PROMPT 0x2000
#define INTERNET_DIAL_SHOW_OFFLINE 0x4000 #define INTERNET_DIAL_SHOW_OFFLINE 0x4000
#define INTERNET_DIAL_UNATTENDED 0x8000 #define INTERNET_DIAL_UNATTENDED 0x8000
INTERNETAPI_(DWORD) InternetHangUp( INTERNETAPI_(DWORD) InternetHangUp(
__in DWORD_PTR dwConnection, __in DWORD_PTR dwConnection,
__null 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 LPSTR lpszURL,
__in HWND hwndParent, __in HWND hwndParent,
__in DWORD dwFlags __in DWORD dwFlags
); );
skipping to change at line 3540 skipping to change at line 3559
#else #else
INTERNETAPI_(BOOL) InternetGoOnline( INTERNETAPI_(BOOL) InternetGoOnline(
__in_opt LPSTR lpszURL, __in_opt LPSTR lpszURL,
__in HWND hwndParent, __in HWND hwndParent,
__in DWORD dwFlags __in DWORD dwFlags
); );
#endif // _WINX32_ #endif // _WINX32_
#endif // !UNICODE #endif // !UNICODE
INTERNETAPI_(BOOL) InternetAutodial( INTERNETAPI_(BOOL) InternetAutodial(
__in DWORD dwFlags, __in DWORD dwFlags,
__in_opt HWND hwndParent); __in_opt HWND hwndParent);
// Flags for InternetAutodial // Flags for InternetAutodial
#define INTERNET_AUTODIAL_FORCE_ONLINE 1 #define INTERNET_AUTODIAL_FORCE_ONLINE 1
#define INTERNET_AUTODIAL_FORCE_UNATTENDED 2 #define INTERNET_AUTODIAL_FORCE_UNATTENDED 2
#define INTERNET_AUTODIAL_FAILIFSECURITYCHECK 4 #define INTERNET_AUTODIAL_FAILIFSECURITYCHECK 4
#define INTERNET_AUTODIAL_OVERRIDE_NET_PRESENT 8 #define INTERNET_AUTODIAL_OVERRIDE_NET_PRESENT 8
#define INTERNET_AUTODIAL_FLAGS_MASK (INTERNET_AUTODIAL_FORCE_ONLINE | INTERNET_ AUTODIAL_FORCE_UNATTENDED | INTERNET_AUTODIAL_FAILIFSECURITYCHECK | INTERNET_AUT ODIAL_OVERRIDE_NET_PRESENT) #define INTERNET_AUTODIAL_FLAGS_MASK (INTERNET_AUTODIAL_FORCE_ONLINE | INTERNET_ AUTODIAL_FORCE_UNATTENDED | INTERNET_AUTODIAL_FAILIFSECURITYCHECK | INTERNET_AUT ODIAL_OVERRIDE_NET_PRESENT)
INTERNETAPI_(BOOL) InternetAutodialHangup( INTERNETAPI_(BOOL) InternetAutodialHangup(
__null DWORD dwReserved); __in DWORD dwReserved);
INTERNETAPI_(BOOL) InternetGetConnectedState( INTERNETAPI_(BOOL) InternetGetConnectedState(
__out LPDWORD lpdwFlags, __out LPDWORD lpdwFlags,
__null DWORD dwReserved); __reserved DWORD dwReserved);
INTERNETAPI_(BOOL) INTERNETAPI_(BOOL)
InternetGetConnectedStateExA( InternetGetConnectedStateExA(
__out_opt LPDWORD lpdwFlags, __out_opt LPDWORD lpdwFlags,
__out_ecount_opt(dwBufLen) LPSTR lpszConnectionName, __out_ecount_opt(dwBufLen) LPSTR lpszConnectionName,
__in DWORD dwBufLen, __in DWORD dwBufLen,
__null DWORD dwReserved __reserved DWORD dwReserved
); );
INTERNETAPI_(BOOL) INTERNETAPI_(BOOL)
InternetGetConnectedStateExW( InternetGetConnectedStateExW(
__out_opt LPDWORD lpdwFlags, __out_opt LPDWORD lpdwFlags,
__out_ecount_opt(dwBufLen) LPWSTR lpszConnectionName, __out_ecount_opt(dwBufLen) LPWSTR lpszConnectionName,
__in DWORD dwBufLen, __in DWORD dwBufLen,
__null DWORD dwReserved __reserved DWORD dwReserved
); );
#define PROXY_AUTO_DETECT_TYPE_DHCP 1 #define PROXY_AUTO_DETECT_TYPE_DHCP 1
#define PROXY_AUTO_DETECT_TYPE_DNS_A 2 #define PROXY_AUTO_DETECT_TYPE_DNS_A 2
struct AutoProxyHelperFunctions; struct AutoProxyHelperFunctions;
typedef struct AutoProxyHelperVtbl typedef struct AutoProxyHelperVtbl
{ {
BOOL ( __stdcall *IsResolvable )( BOOL ( __stdcall *IsResolvable )(
skipping to change at line 3597 skipping to change at line 3616
DWORD ( __stdcall *ResolveHostName )( DWORD ( __stdcall *ResolveHostName )(
LPSTR lpszHostName, LPSTR lpszHostName,
LPSTR lpszIPAddress, LPSTR lpszIPAddress,
LPDWORD lpdwIPAddressSize); LPDWORD lpdwIPAddressSize);
BOOL ( __stdcall *IsInNet )( BOOL ( __stdcall *IsInNet )(
LPSTR lpszIPAddress, LPSTR lpszIPAddress,
LPSTR lpszDest, LPSTR lpszDest,
LPSTR lpszMask); LPSTR lpszMask);
BOOL ( __stdcall *IsResolvableEx )(
LPSTR lpszHost
);
DWORD ( __stdcall *GetIPAddressEx )(
LPSTR lpszIPAddress,
LPDWORD lpdwIPAddressSize
);
DWORD ( __stdcall *ResolveHostNameEx )(
LPSTR lpszHostName,
LPSTR lpszIPAddress,
LPDWORD lpdwIPAddressSize
);
BOOL ( __stdcall *IsInNetEx )(
LPSTR lpszIPAddress,
LPSTR lpszIPPrefix
);
DWORD ( __stdcall *SortIpList )(
LPSTR lpszIPAddressList,
LPSTR lpszIPSortedList,
LPDWORD lpdwIPSortedListSize
);
}AutoProxyHelperVtbl; }AutoProxyHelperVtbl;
typedef struct typedef struct
{ {
DWORD dwStructSize; // Size of struct DWORD dwStructSize; // Size of struct
LPSTR lpszScriptBuffer; // Buffer to Pass LPSTR lpszScriptBuffer; // Buffer to Pass
DWORD dwScriptBufferSize; // Size of buffer above DWORD dwScriptBufferSize; // Size of buffer above
} AUTO_PROXY_SCRIPT_BUFFER, *LPAUTO_PROXY_SCRIPT_BUFFER; } AUTO_PROXY_SCRIPT_BUFFER, *LPAUTO_PROXY_SCRIPT_BUFFER;
typedef struct AutoProxyHelperFunctions typedef struct AutoProxyHelperFunctions
skipping to change at line 3628 skipping to change at line 3673
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);
INTERNETAPI_(BOOL) InternetInitializeAutoProxyDll( INTERNETAPI_(BOOL) InternetInitializeAutoProxyDll(
__null DWORD dwReserved __in DWORD dwReserved
);
INTERNETAPI_(BOOL) InternetDeInitializeAutoProxyDll(
__in LPSTR lpszMime,
__null DWORD dwReserved
);
INTERNETAPI_(BOOL) InternetGetProxyInfo(
__in_ecount(dwUrlLength) LPCSTR lpszUrl,
__in DWORD dwUrlLength,
__in_ecount(dwUrlHostNameLength) LPSTR lpszUrlHostName,
__in DWORD dwUrlHostNameLength,
__out LPSTR * lplpszProxyHostName,
__out LPDWORD lpdwProxyHostNameLength
); );
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
); );
INTERNETAPI_(BOOL) CreateMD5SSOHash ( INTERNETAPI_(BOOL) CreateMD5SSOHash (
__in PWSTR pszChallengeInfo, __in PWSTR pszChallengeInfo,
skipping to change at line 3668 skipping to change at line 3699
#ifdef UNICODE #ifdef UNICODE
#define InternetGetConnectedStateEx InternetGetConnectedStateExW #define InternetGetConnectedStateEx InternetGetConnectedStateExW
#else #else
#ifdef _WINX32_ #ifdef _WINX32_
#define InternetGetConnectedStateEx InternetGetConnectedStateExA #define InternetGetConnectedStateEx InternetGetConnectedStateExA
#else #else
INTERNETAPI_(BOOL) InternetGetConnectedStateEx( INTERNETAPI_(BOOL) InternetGetConnectedStateEx(
__out LPDWORD lpdwFlags, __out LPDWORD lpdwFlags,
__out_ecount_opt(dwNameLen) LPSTR lpszConnectionName, __out_ecount_opt(dwNameLen) LPSTR lpszConnectionName,
__in DWORD dwNameLen, __in DWORD dwNameLen,
__null DWORD dwReserved __in DWORD dwReserved
); );
#endif // _WINX32_ #endif // _WINX32_
#endif // !UNICODE #endif // !UNICODE
// Flags for InternetGetConnectedState and Ex // Flags for InternetGetConnectedState and Ex
#define INTERNET_CONNECTION_MODEM 0x01 #define INTERNET_CONNECTION_MODEM 0x01
#define INTERNET_CONNECTION_LAN 0x02 #define INTERNET_CONNECTION_LAN 0x02
#define INTERNET_CONNECTION_PROXY 0x04 #define INTERNET_CONNECTION_PROXY 0x04
#define INTERNET_CONNECTION_MODEM_BUSY 0x08 /* no longer used */ #define INTERNET_CONNECTION_MODEM_BUSY 0x08 /* no longer used */
#define INTERNET_RAS_INSTALLED 0x10 #define INTERNET_RAS_INSTALLED 0x10
skipping to change at line 3701 skipping to change at line 3732
#define INTERNET_CUSTOMDIAL_UNATTENDED 1 #define INTERNET_CUSTOMDIAL_UNATTENDED 1
#define INTERNET_CUSTOMDIAL_DISCONNECT 2 #define INTERNET_CUSTOMDIAL_DISCONNECT 2
#define INTERNET_CUSTOMDIAL_SHOWOFFLINE 4 #define INTERNET_CUSTOMDIAL_SHOWOFFLINE 4
// Custom dial handler supported functionality flags // Custom dial handler supported functionality flags
#define INTERNET_CUSTOMDIAL_SAFE_FOR_UNATTENDED 1 #define INTERNET_CUSTOMDIAL_SAFE_FOR_UNATTENDED 1
#define INTERNET_CUSTOMDIAL_WILL_SUPPLY_STATE 2 #define INTERNET_CUSTOMDIAL_WILL_SUPPLY_STATE 2
#define INTERNET_CUSTOMDIAL_CAN_HANGUP 4 #define INTERNET_CUSTOMDIAL_CAN_HANGUP 4
INTERNETAPI_(BOOL) InternetSetDialStateA( INTERNETAPI_(BOOL) InternetSetDialStateA(
__in_opt LPCSTR lpszConnectoid, __in_opt LPCSTR lpszConnectoid,
__in DWORD dwState, __in DWORD dwState,
__null DWORD dwReserved __in DWORD dwReserved
); );
INTERNETAPI_(BOOL) InternetSetDialStateW( INTERNETAPI_(BOOL) InternetSetDialStateW(
__in_opt LPCWSTR lpszConnectoid, __in_opt LPCWSTR lpszConnectoid,
__in DWORD dwState, __in DWORD dwState,
__null DWORD dwReserved __in DWORD dwReserved
); );
#ifdef UNICODE #ifdef UNICODE
#define InternetSetDialState InternetSetDialStateW #define InternetSetDialState InternetSetDialStateW
#else #else
#ifdef _WINX32_ #ifdef _WINX32_
#define InternetSetDialState InternetSetDialStateA #define InternetSetDialState InternetSetDialStateA
#else #else
INTERNETAPI_(BOOL) InternetSetDialState( INTERNETAPI_(BOOL) InternetSetDialState(
__in_opt LPCSTR lpszConnectoid, __in_opt LPCSTR lpszConnectoid,
__in DWORD dwState, __in DWORD dwState,
__null DWORD dwReserved __in DWORD dwReserved
); );
#endif // _WINX32_ #endif // _WINX32_
#endif // !UNICODE #endif // !UNICODE
// States for InternetSetDialState // States for InternetSetDialState
#define INTERNET_DIALSTATE_DISCONNECTED 1 #define INTERNET_DIALSTATE_DISCONNECTED 1
INTERNETAPI_(BOOL) InternetSetPerSiteCookieDecisionA( INTERNETAPI_(BOOL) InternetSetPerSiteCookieDecisionA(
__in LPCSTR pchHostName, __in LPCSTR pchHostName,
__in DWORD dwDecision __in DWORD dwDecision
 End of changes. 124 change blocks. 
181 lines changed or deleted 211 lines changed or added

This html diff was produced by rfcdiff 1.41.