Piotr Caban : wininet: Don't define DELETED_CACHE_ENTRY in public headers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7967f8beecf6a44d768365aa7921ba9ea4ae1a14
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7967f8beecf6a44d768365aa79...

Author: Piotr Caban 
Date:   Tue Sep 18 14:43:12 2012 +0200

wininet: Don't define DELETED_CACHE_ENTRY in public headers.

---

dlls/wininet/tests/urlcache.c |    4 ++--
 dlls/wininet/urlcache.c       |    6 ++++--
 include/wininet.h             |    1 -
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c
index 02d8d28..12827e9 100644
--- a/dlls/wininet/tests/urlcache.c
+++ b/dlls/wininet/tests/urlcache.c
@@ -582,8 +582,8 @@ static void test_urlcacheA(void)
     memset(lpCacheEntryInfo, 0, cbCacheEntryInfo);
     ret = GetUrlCacheEntryInfo(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo);
     ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError());
-    ok(lpCacheEntryInfo->CacheEntryType & DELETED_CACHE_ENTRY,
-        "CacheEntryType hasn't DELETED_CACHE_ENTRY set, (flags %08x)\n",
+    ok(lpCacheEntryInfo->CacheEntryType & 0x400000,
+        "CacheEntryType hasn't PENDING_DELETE_CACHE_ENTRY set, (flags %08x)\n",
         lpCacheEntryInfo->CacheEntryType);
     HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo);

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

diff --git a/include/wininet.h b/include/wininet.h
index c7a428a..51d9864 100644
--- a/include/wininet.h
+++ b/include/wininet.h
@@ -1497,7 +1497,6 @@ INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LP
 #define EDITED_CACHE_ENTRY              0x00000008
 #define COOKIE_CACHE_ENTRY              0x00100000
 #define URLHISTORY_CACHE_ENTRY          0x00200000
-#define DELETED_CACHE_ENTRY             0x00400000
 #define TRACK_OFFLINE_CACHE_ENTRY       0x00000010
 #define TRACK_ONLINE_CACHE_ENTRY        0x00000020
 #define SPARSE_CACHE_ENTRY              0x00010000