*include/wininet.h (CACHEGROUP_SEARCH_ALL, CACHEGROUP_SEARCH_BYURL):

	Add defines.
	(INTERNET_CACHE_GROUP_ADD, INTERNET_CACHE_GROUP_REMOVE): Add defines.
	(GROUPID) Add typedef.
	(INTERNET_CACHE_GROUP_INFO[AW]): Define structures.
	(CreateUrlCacheGroup): Add prototype.
	(DeleteUrlCacheGroup): Add prototype.
	(FindFirstUrlCacheGroup): Add prototype.
	(FindNextUrlCacheGroup): Add prototype.
	(GetUrlCacheGroupAttribute[AW]): Add prototypes.
	(SetUrlCacheGroupAttribute[AW]): Add prototypes.

2 files changed, 56 insertions, 0 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index c17a7d7b7..67abaf742 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,17 @@
+2004-03-13  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	*include/wininet.h (CACHEGROUP_SEARCH_ALL, CACHEGROUP_SEARCH_BYURL):
+	Add defines.
+	(INTERNET_CACHE_GROUP_ADD, INTERNET_CACHE_GROUP_REMOVE): Add defines.
+	(GROUPID) Add typedef.
+	(INTERNET_CACHE_GROUP_INFO[AW]): Define structures.
+	(CreateUrlCacheGroup): Add prototype.
+	(DeleteUrlCacheGroup): Add prototype.
+	(FindFirstUrlCacheGroup): Add prototype.
+	(FindNextUrlCacheGroup): Add prototype.
+	(GetUrlCacheGroupAttribute[AW]): Add prototypes.
+	(SetUrlCacheGroupAttribute[AW]): Add prototypes.
+
 2004-03-10  Al Slater  <al.slater@scluk.com>
 
 	* include/winsock2.h: Add missing LPFN_ typdefs for
diff --git a/winsup/w32api/include/wininet.h b/winsup/w32api/include/wininet.h
index 1c3353423..722114dcc 100644
--- a/winsup/w32api/include/wininet.h
+++ b/winsup/w32api/include/wininet.h
@@ -477,10 +477,15 @@ GOPHER_TYPE_UNIX_UUENCODED|GOPHER_TYPE_BINARY|GOPHER_TYPE_GIF|GOPHER_TYPE_IMAGE|
 #define INTERNET_CONNECTION_LAN	2
 #define INTERNET_CONNECTION_PROXY	4
 #define INTERNET_CONNECTION_MODEM_BUSY	8
+#define CACHEGROUP_SEARCH_ALL	0
+#define CACHEGROUP_SEARCH_BYURL	1
+#define INTERNET_CACHE_GROUP_ADD	0
+#define INTERNET_CACHE_GROUP_REMOVE	1
 
 #ifndef RC_INVOKED
 typedef PVOID HINTERNET;
 typedef HINTERNET *LPHINTERNET;
+typedef LONGLONG GROUPID;
 typedef WORD INTERNET_PORT,*LPINTERNET_PORT;
 typedef enum {
 	INTERNET_SCHEME_PARTIAL = -2, INTERNET_SCHEME_UNKNOWN = -1,
@@ -687,6 +692,27 @@ typedef struct _INTERNET_BUFFERSW {
 	DWORD dwOffsetHigh;
 } INTERNET_BUFFERSW,*LPINTERNET_BUFFERSW;
 
+#define GROUP_OWNER_STORAGE_SIZE 4
+#define GROUPNAME_MAX_LENGTH 120
+typedef struct _INTERNET_CACHE_GROUP_INFOA {
+	DWORD dwGroupSize;
+	DWORD dwGroupFlags;
+	DWORD dwGroupType;
+	DWORD dwDiskUsage;
+	DWORD dwDiskQuota;
+	DWORD dwOwnerStorage[GROUP_OWNER_STORAGE_SIZE];
+	CHAR  szGroupName[GROUPNAME_MAX_LENGTH];
+} INTERNET_CACHE_GROUP_INFOA, * LPINTERNET_CACHE_GROUP_INFOA;
+typedef struct _INTERNET_CACHE_GROUP_INFOW {
+	DWORD dwGroupSize;
+	DWORD dwGroupFlags;
+	DWORD dwGroupType;
+	DWORD dwDiskUsage;
+	DWORD dwDiskQuota;
+	DWORD dwOwnerStorage[GROUP_OWNER_STORAGE_SIZE];
+	WCHAR szGroupName[GROUPNAME_MAX_LENGTH];
+} INTERNET_CACHE_GROUP_INFOW, * LPINTERNET_CACHE_GROUP_INFOW;
+
 #ifdef UNICODE
 typedef URL_COMPONENTSW URL_COMPONENTS;
 typedef LPURL_COMPONENTSW LPURL_COMPONENTS;
@@ -695,6 +721,8 @@ typedef LPGOPHER_FIND_DATAW LPGOPHER_FIND_DATA;
 typedef INTERNET_CACHE_ENTRY_INFOW INTERNET_CACHE_ENTRY_INFO;
 typedef LPINTERNET_CACHE_ENTRY_INFOW LPINTERNET_CACHE_ENTRY_INFO;
 typedef INTERNET_BUFFERSW INTERNET_BUFFERS,*LPINTERNET_BUFFERS;
+typedef INTERNET_CACHE_GROUP_INFOW INTERNET_CACHE_GROUP_INFO;
+typedef LPINTERNET_CACHE_GROUP_INFOW LPINTERNET_CACHE_GROUP_INFO;
 #else
 typedef URL_COMPONENTSA URL_COMPONENTS;
 typedef LPURL_COMPONENTSA LPURL_COMPONENTS;
@@ -703,6 +731,8 @@ typedef LPGOPHER_FIND_DATAA LPGOPHER_FIND_DATA;
 typedef INTERNET_CACHE_ENTRY_INFOA INTERNET_CACHE_ENTRY_INFO;
 typedef LPINTERNET_CACHE_ENTRY_INFOA LPINTERNET_CACHE_ENTRY_INFO;
 typedef INTERNET_BUFFERSA INTERNET_BUFFERS,*LPINTERNET_BUFFERS;
+typedef INTERNET_CACHE_GROUP_INFOA INTERNET_CACHE_GROUP_INFO;
+typedef LPINTERNET_CACHE_GROUP_INFOA LPINTERNET_CACHE_GROUP_INFO;
 #endif
 BOOL WINAPI InternetTimeFromSystemTime(SYSTEMTIME*,DWORD,LPSTR,DWORD);
 BOOL WINAPI InternetTimeToSystemTime(LPCSTR,SYSTEMTIME*,DWORD);
@@ -820,6 +850,14 @@ BOOL WINAPI InternetGetConnectedState(LPDWORD,DWORD);
 BOOL WINAPI InternetSetDialState(LPCTSTR,DWORD,DWORD);
 BOOL WINAPI InternetReadFileExA(HINTERNET,LPINTERNET_BUFFERSA,DWORD,DWORD_PTR);
 BOOL WINAPI InternetReadFileExW(HINTERNET,LPINTERNET_BUFFERSW,DWORD,DWORD_PTR);
+GROUPID WINAPI CreateUrlCacheGroup(DWORD,LPVOID);
+BOOL WINAPI DeleteUrlCacheGroup(GROUPID,DWORD,LPVOID);
+HANDLE WINAPI FindFirstUrlCacheGroup(DWORD,DWORD,LPVOID,DWORD,GROUPID*,LPVOID);
+BOOL WINAPI FindNextUrlCacheGroup(HANDLE,GROUPID*,LPVOID);
+BOOL WINAPI GetUrlCacheGroupAttributeA(GROUPID,DWORD,DWORD,LPINTERNET_CACHE_GROUP_INFOA,LPDWORD,LPVOID);
+BOOL WINAPI GetUrlCacheGroupAttributeW(GROUPID,DWORD,DWORD,LPINTERNET_CACHE_GROUP_INFOW,LPDWORD,LPVOID);
+BOOL WINAPI SetUrlCacheGroupAttributeA(GROUPID,DWORD,DWORD,LPINTERNET_CACHE_GROUP_INFOA,LPVOID);
+BOOL WINAPI SetUrlCacheGroupAttributeW(GROUPID,DWORD,DWORD,LPINTERNET_CACHE_GROUP_INFOW,LPVOID);
 
 #ifdef UNICODE
 #define InternetCrackUrl InternetCrackUrlW
@@ -867,6 +905,8 @@ BOOL WINAPI InternetReadFileExW(HINTERNET,LPINTERNET_BUFFERSW,DWORD,DWORD_PTR);
 #define RetrieveUrlCacheEntryFile RetrieveUrlCacheEntryFileW
 #define HttpSendRequestEx	 HttpSendRequestExW
 #define HttpEndRequest		 HttpEndRequestW
+#define GetUrlCacheGroupAttribute  GetUrlCacheGroupAttributeW
+#define SetUrlCacheGroupAttribute  SetUrlCacheGroupAttributeW
 #else
 #define GopherGetAttribute GopherGetAttributeA
 #define InternetCrackUrl InternetCrackUrlA
@@ -913,6 +953,8 @@ BOOL WINAPI InternetReadFileExW(HINTERNET,LPINTERNET_BUFFERSW,DWORD,DWORD_PTR);
 #define RetrieveUrlCacheEntryFile RetrieveUrlCacheEntryFileA
 #define HttpSendRequestEx	 HttpSendRequestExA
 #define HttpEndRequest		 HttpEndRequestA
+#define GetUrlCacheGroupAttribute  GetUrlCacheGroupAttributeA
+#define SetUrlCacheGroupAttribute  SetUrlCacheGroupAttributeA
 #endif /* UNICODE */
 #endif /* RC_INVOKED */
 #ifdef __cplusplus