Piotr Caban : wininet: Move GetUrlCacheEntryInfoA code to GetUrlCacheEntryInfoExA function.
Alexandre Julliard
julliard at winehq.org
Tue Sep 25 15:13:39 CDT 2012
Module: wine
Branch: master
Commit: 134db11effd1360e376d9e8afecbd1041f5261ab
URL: http://source.winehq.org/git/wine.git/?a=commit;h=134db11effd1360e376d9e8afecbd1041f5261ab
Author: Piotr Caban <piotr at codeweavers.com>
Date: Tue Sep 25 17:30:42 2012 +0200
wininet: Move GetUrlCacheEntryInfoA code to GetUrlCacheEntryInfoExA function.
---
dlls/wininet/urlcache.c | 54 +++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c
index 45f447f..25e2ecf 100644
--- a/dlls/wininet/urlcache.c
+++ b/dlls/wininet/urlcache.c
@@ -1708,6 +1708,13 @@ BOOL WINAPI GetUrlCacheEntryInfoExA(
LPVOID lpReserved,
DWORD dwFlags)
{
+ LPURLCACHE_HEADER pHeader;
+ struct _HASH_ENTRY * pHashEntry;
+ const CACHEFILE_ENTRY * pEntry;
+ const URL_CACHEFILE_ENTRY * pUrlEntry;
+ URLCACHECONTAINER * pContainer;
+ DWORD error;
+
TRACE("(%s, %p, %p, %p, %p, %p, %x)\n",
debugstr_a(lpszUrl),
lpCacheEntryInfo,
@@ -1731,29 +1738,8 @@ BOOL WINAPI GetUrlCacheEntryInfoExA(
SetLastError(ERROR_FILE_NOT_FOUND);
return FALSE;
}
- return GetUrlCacheEntryInfoA(lpszUrl, lpCacheEntryInfo, lpdwCacheEntryInfoBufSize);
-}
-
-/***********************************************************************
- * GetUrlCacheEntryInfoA (WININET.@)
- *
- */
-BOOL WINAPI GetUrlCacheEntryInfoA(
- IN LPCSTR lpszUrlName,
- IN LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo,
- IN OUT LPDWORD lpdwCacheEntryInfoBufferSize
-)
-{
- LPURLCACHE_HEADER pHeader;
- struct _HASH_ENTRY * pHashEntry;
- const CACHEFILE_ENTRY * pEntry;
- const URL_CACHEFILE_ENTRY * pUrlEntry;
- URLCACHECONTAINER * pContainer;
- DWORD error;
- TRACE("(%s, %p, %p)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize);
-
- error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer);
+ error = URLCacheContainers_FindContainerA(lpszUrl, &pContainer);
if (error != ERROR_SUCCESS)
{
SetLastError(error);
@@ -1770,10 +1756,10 @@ BOOL WINAPI GetUrlCacheEntryInfoA(
if (!(pHeader = URLCacheContainer_LockIndex(pContainer)))
return FALSE;
- if (!URLCache_FindHash(pHeader, lpszUrlName, &pHashEntry))
+ if (!URLCache_FindHash(pHeader, lpszUrl, &pHashEntry))
{
URLCacheContainer_UnlockIndex(pContainer, pHeader);
- WARN("entry %s not found!\n", debugstr_a(lpszUrlName));
+ WARN("entry %s not found!\n", debugstr_a(lpszUrl));
SetLastError(ERROR_FILE_NOT_FOUND);
return FALSE;
}
@@ -1792,16 +1778,16 @@ BOOL WINAPI GetUrlCacheEntryInfoA(
if (pUrlEntry->dwOffsetHeaderInfo)
TRACE("Header info: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo));
- if (lpdwCacheEntryInfoBufferSize)
+ if (lpdwCacheEntryInfoBufSize)
{
if (!lpCacheEntryInfo)
- *lpdwCacheEntryInfoBufferSize = 0;
+ *lpdwCacheEntryInfoBufSize = 0;
error = URLCache_CopyEntry(
pContainer,
pHeader,
lpCacheEntryInfo,
- lpdwCacheEntryInfoBufferSize,
+ lpdwCacheEntryInfoBufSize,
pUrlEntry,
FALSE /* ANSI */);
if (error != ERROR_SUCCESS)
@@ -1819,6 +1805,20 @@ BOOL WINAPI GetUrlCacheEntryInfoA(
}
/***********************************************************************
+ * GetUrlCacheEntryInfoA (WININET.@)
+ *
+ */
+BOOL WINAPI GetUrlCacheEntryInfoA(
+ IN LPCSTR lpszUrlName,
+ IN LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo,
+ IN OUT LPDWORD lpdwCacheEntryInfoBufferSize
+)
+{
+ return GetUrlCacheEntryInfoExA(lpszUrlName, lpCacheEntryInfo,
+ lpdwCacheEntryInfoBufferSize, NULL, NULL, NULL, 0);
+}
+
+/***********************************************************************
* GetUrlCacheEntryInfoW (WININET.@)
*
*/
More information about the wine-cvs
mailing list