ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wininet: Don't define DELETED_CACHE_ENTRY in public headers.

This commit is contained in:
Piotr Caban 2012-09-18 14:43:12 +02:00 committed by Alexandre Julliard
parent 22454d6341
commit 7967f8beec
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/wininet/tests/urlcache.c
View File

@ -582,8 +582,8 @@ static void test_urlcacheA(void)
memset(lpCacheEntryInfo, 0, cbCacheEntryInfo); memset(lpCacheEntryInfo, 0, cbCacheEntryInfo);
ret = GetUrlCacheEntryInfo(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo); ret = GetUrlCacheEntryInfo(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo);
ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError());
ok(lpCacheEntryInfo->CacheEntryType & DELETED_CACHE_ENTRY, ok(lpCacheEntryInfo->CacheEntryType & 0x400000,
"CacheEntryType hasn't DELETED_CACHE_ENTRY set, (flags %08x)\n", "CacheEntryType hasn't PENDING_DELETE_CACHE_ENTRY set, (flags %08x)\n",
lpCacheEntryInfo->CacheEntryType); lpCacheEntryInfo->CacheEntryType);
HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo);

6
dlls/wininet/urlcache.c
View File

@ -79,6 +79,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet);
#define HASHTABLE_REDR 5 #define HASHTABLE_REDR 5
#define HASHTABLE_FLAG_BITS 5 #define HASHTABLE_FLAG_BITS 5
#define PENDING_DELETE_CACHE_ENTRY 0x00400000
#define DWORD_SIG(a,b,c,d) (a | (b << 8) | (c << 16) | (d << 24)) #define DWORD_SIG(a,b,c,d) (a | (b << 8) | (c << 16) | (d << 24))
#define URL_SIGNATURE DWORD_SIG('U','R','L',' ') #define URL_SIGNATURE DWORD_SIG('U','R','L',' ')
#define REDR_SIGNATURE DWORD_SIG('R','E','D','R') #define REDR_SIGNATURE DWORD_SIG('R','E','D','R')
@ -2193,7 +2195,7 @@ static BOOL DeleteUrlCacheEntryInternal(LPURLCACHE_HEADER pHeader,
{ {
/* FIXME: implement timeout object unlocking */ /* FIXME: implement timeout object unlocking */
TRACE("Trying to delete locked entry\n"); TRACE("Trying to delete locked entry\n");
pUrlEntry->CacheEntryType |= DELETED_CACHE_ENTRY; pUrlEntry->CacheEntryType |= PENDING_DELETE_CACHE_ENTRY;
SetLastError(ERROR_SHARING_VIOLATION); SetLastError(ERROR_SHARING_VIOLATION);
return FALSE; return FALSE;
} }
@ -2294,7 +2296,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileA(
if (!pUrlEntry->dwUseCount) if (!pUrlEntry->dwUseCount)
{ {
URLCache_HashEntrySetFlags(pHashEntry, HASHTABLE_URL); URLCache_HashEntrySetFlags(pHashEntry, HASHTABLE_URL);
if (pUrlEntry->CacheEntryType & DELETED_CACHE_ENTRY) if (pUrlEntry->CacheEntryType & PENDING_DELETE_CACHE_ENTRY)
DeleteUrlCacheEntryInternal(pHeader, pHashEntry); DeleteUrlCacheEntryInternal(pHeader, pHashEntry);
} }

1
include/wininet.h
View File

@ -1497,7 +1497,6 @@ INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LP
#define EDITED_CACHE_ENTRY 0x00000008 #define EDITED_CACHE_ENTRY 0x00000008
#define COOKIE_CACHE_ENTRY 0x00100000 #define COOKIE_CACHE_ENTRY 0x00100000
#define URLHISTORY_CACHE_ENTRY 0x00200000 #define URLHISTORY_CACHE_ENTRY 0x00200000
#define DELETED_CACHE_ENTRY 0x00400000
#define TRACK_OFFLINE_CACHE_ENTRY 0x00000010 #define TRACK_OFFLINE_CACHE_ENTRY 0x00000010
#define TRACK_ONLINE_CACHE_ENTRY 0x00000020 #define TRACK_ONLINE_CACHE_ENTRY 0x00000020
#define SPARSE_CACHE_ENTRY 0x00010000 #define SPARSE_CACHE_ENTRY 0x00010000