wininet: Code clean up by using heap_strdup* functions.
This commit is contained in:
parent
0055cfedc2
commit
1c46be7a76
|
@ -221,18 +221,14 @@ static BOOL WININET_SetProxyAuthorization( HINTERNET hRequest,
|
||||||
|
|
||||||
hIC = lpwhs->lpAppInfo;
|
hIC = lpwhs->lpAppInfo;
|
||||||
|
|
||||||
p = HeapAlloc( GetProcessHeap(), 0, (strlenW( username ) + 1)*sizeof(WCHAR) );
|
p = heap_strdupW(username);
|
||||||
if( !p )
|
if( !p )
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
lstrcpyW( p, username );
|
|
||||||
hIC->lpszProxyUsername = p;
|
hIC->lpszProxyUsername = p;
|
||||||
|
|
||||||
p = HeapAlloc( GetProcessHeap(), 0, (strlenW( password ) + 1)*sizeof(WCHAR) );
|
p = heap_strdupW(password);
|
||||||
if( !p )
|
if( !p )
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
lstrcpyW( p, password );
|
|
||||||
hIC->lpszProxyPassword = p;
|
hIC->lpszProxyPassword = p;
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
|
@ -465,7 +465,6 @@ static void URLCacheContainer_CloseIndex(URLCACHECONTAINER * pContainer)
|
||||||
static BOOL URLCacheContainers_AddContainer(LPCWSTR cache_prefix, LPCWSTR path, LPWSTR mutex_name)
|
static BOOL URLCacheContainers_AddContainer(LPCWSTR cache_prefix, LPCWSTR path, LPWSTR mutex_name)
|
||||||
{
|
{
|
||||||
URLCACHECONTAINER * pContainer = HeapAlloc(GetProcessHeap(), 0, sizeof(URLCACHECONTAINER));
|
URLCACHECONTAINER * pContainer = HeapAlloc(GetProcessHeap(), 0, sizeof(URLCACHECONTAINER));
|
||||||
int path_len = strlenW(path);
|
|
||||||
int cache_prefix_len = strlenW(cache_prefix);
|
int cache_prefix_len = strlenW(cache_prefix);
|
||||||
|
|
||||||
if (!pContainer)
|
if (!pContainer)
|
||||||
|
@ -476,15 +475,13 @@ static BOOL URLCacheContainers_AddContainer(LPCWSTR cache_prefix, LPCWSTR path,
|
||||||
pContainer->hMapping = NULL;
|
pContainer->hMapping = NULL;
|
||||||
pContainer->file_size = 0;
|
pContainer->file_size = 0;
|
||||||
|
|
||||||
pContainer->path = HeapAlloc(GetProcessHeap(), 0, (path_len + 1) * sizeof(WCHAR));
|
pContainer->path = heap_strdupW(path);
|
||||||
if (!pContainer->path)
|
if (!pContainer->path)
|
||||||
{
|
{
|
||||||
HeapFree(GetProcessHeap(), 0, pContainer);
|
HeapFree(GetProcessHeap(), 0, pContainer);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
memcpy(pContainer->path, path, (path_len + 1) * sizeof(WCHAR));
|
|
||||||
|
|
||||||
pContainer->cache_prefix = HeapAlloc(GetProcessHeap(), 0, (cache_prefix_len + 1) * sizeof(WCHAR));
|
pContainer->cache_prefix = HeapAlloc(GetProcessHeap(), 0, (cache_prefix_len + 1) * sizeof(WCHAR));
|
||||||
if (!pContainer->cache_prefix)
|
if (!pContainer->cache_prefix)
|
||||||
{
|
{
|
||||||
|
@ -593,6 +590,9 @@ static DWORD URLCacheContainers_FindContainerW(LPCWSTR lpwszUrl, URLCACHECONTAIN
|
||||||
|
|
||||||
TRACE("searching for prefix for URL: %s\n", debugstr_w(lpwszUrl));
|
TRACE("searching for prefix for URL: %s\n", debugstr_w(lpwszUrl));
|
||||||
|
|
||||||
|
if(!lpwszUrl)
|
||||||
|
return ERROR_INVALID_PARAMETER;
|
||||||
|
|
||||||
LIST_FOR_EACH_ENTRY(pContainer, &UrlContainers, URLCACHECONTAINER, entry)
|
LIST_FOR_EACH_ENTRY(pContainer, &UrlContainers, URLCACHECONTAINER, entry)
|
||||||
{
|
{
|
||||||
int prefix_len = strlenW(pContainer->cache_prefix);
|
int prefix_len = strlenW(pContainer->cache_prefix);
|
||||||
|
@ -609,17 +609,15 @@ static DWORD URLCacheContainers_FindContainerW(LPCWSTR lpwszUrl, URLCACHECONTAIN
|
||||||
|
|
||||||
static DWORD URLCacheContainers_FindContainerA(LPCSTR lpszUrl, URLCACHECONTAINER ** ppContainer)
|
static DWORD URLCacheContainers_FindContainerA(LPCSTR lpszUrl, URLCACHECONTAINER ** ppContainer)
|
||||||
{
|
{
|
||||||
|
LPWSTR url = NULL;
|
||||||
DWORD ret;
|
DWORD ret;
|
||||||
LPWSTR lpwszUrl;
|
|
||||||
int url_len = MultiByteToWideChar(CP_ACP, 0, lpszUrl, -1, NULL, 0);
|
if (lpszUrl && !(url = heap_strdupAtoW(lpszUrl)))
|
||||||
if (url_len && (lpwszUrl = HeapAlloc(GetProcessHeap(), 0, url_len * sizeof(WCHAR))))
|
return ERROR_OUTOFMEMORY;
|
||||||
{
|
|
||||||
MultiByteToWideChar(CP_ACP, 0, lpszUrl, -1, lpwszUrl, url_len);
|
ret = URLCacheContainers_FindContainerW(url, ppContainer);
|
||||||
ret = URLCacheContainers_FindContainerW(lpwszUrl, ppContainer);
|
HeapFree(GetProcessHeap(), 0, url);
|
||||||
HeapFree(GetProcessHeap(), 0, lpwszUrl);
|
return ret;
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
return GetLastError();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static BOOL URLCacheContainers_Enum(LPCWSTR lpwszSearchPattern, DWORD dwIndex, URLCACHECONTAINER ** ppContainer)
|
static BOOL URLCacheContainers_Enum(LPCWSTR lpwszSearchPattern, DWORD dwIndex, URLCACHECONTAINER ** ppContainer)
|
||||||
|
@ -1241,17 +1239,15 @@ static BOOL URLCache_FindHash(LPCURLCACHE_HEADER pHeader, LPCSTR lpszUrl, struct
|
||||||
static BOOL URLCache_FindHashW(LPCURLCACHE_HEADER pHeader, LPCWSTR lpszUrl, struct _HASH_ENTRY ** ppHashEntry)
|
static BOOL URLCache_FindHashW(LPCURLCACHE_HEADER pHeader, LPCWSTR lpszUrl, struct _HASH_ENTRY ** ppHashEntry)
|
||||||
{
|
{
|
||||||
LPSTR urlA;
|
LPSTR urlA;
|
||||||
int url_len;
|
|
||||||
BOOL ret;
|
BOOL ret;
|
||||||
|
|
||||||
url_len = WideCharToMultiByte(CP_ACP, 0, lpszUrl, -1, NULL, 0, NULL, NULL);
|
urlA = heap_strdupWtoA(lpszUrl);
|
||||||
urlA = HeapAlloc(GetProcessHeap(), 0, url_len * sizeof(CHAR));
|
|
||||||
if (!urlA)
|
if (!urlA)
|
||||||
{
|
{
|
||||||
SetLastError(ERROR_OUTOFMEMORY);
|
SetLastError(ERROR_OUTOFMEMORY);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
WideCharToMultiByte(CP_ACP, 0, lpszUrl, -1, urlA, url_len, NULL, NULL);
|
|
||||||
ret = URLCache_FindHash(pHeader, urlA, ppHashEntry);
|
ret = URLCache_FindHash(pHeader, urlA, ppHashEntry);
|
||||||
HeapFree(GetProcessHeap(), 0, urlA);
|
HeapFree(GetProcessHeap(), 0, urlA);
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -2143,21 +2139,16 @@ BOOL WINAPI CreateUrlCacheEntryA(
|
||||||
IN DWORD dwReserved
|
IN DWORD dwReserved
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
DWORD len;
|
|
||||||
WCHAR *url_name;
|
WCHAR *url_name;
|
||||||
WCHAR *file_extension;
|
WCHAR *file_extension;
|
||||||
WCHAR file_name[MAX_PATH];
|
WCHAR file_name[MAX_PATH];
|
||||||
BOOL bSuccess = FALSE;
|
BOOL bSuccess = FALSE;
|
||||||
DWORD dwError = 0;
|
DWORD dwError = 0;
|
||||||
|
|
||||||
if ((len = MultiByteToWideChar(CP_ACP, 0, lpszUrlName, -1, NULL, 0)) != 0 &&
|
if (lpszUrlName && (url_name = heap_strdupAtoW(lpszUrlName)))
|
||||||
(url_name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR))) != 0)
|
|
||||||
{
|
{
|
||||||
MultiByteToWideChar(CP_ACP, 0, lpszUrlName, -1, url_name, len);
|
if (lpszFileExtension && (file_extension = heap_strdupAtoW(lpszFileExtension)))
|
||||||
if ((len = MultiByteToWideChar(CP_ACP, 0, lpszFileExtension, -1, NULL, 0)) != 0 &&
|
|
||||||
(file_extension = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR))) != 0)
|
|
||||||
{
|
{
|
||||||
MultiByteToWideChar(CP_ACP, 0, lpszFileExtension, -1, file_extension, len);
|
|
||||||
if (CreateUrlCacheEntryW(url_name, dwExpectedFileSize, file_extension, file_name, dwReserved))
|
if (CreateUrlCacheEntryW(url_name, dwExpectedFileSize, file_extension, file_name, dwReserved))
|
||||||
{
|
{
|
||||||
if (WideCharToMultiByte(CP_ACP, 0, file_name, -1, lpszFileName, MAX_PATH, NULL, NULL) < MAX_PATH)
|
if (WideCharToMultiByte(CP_ACP, 0, file_name, -1, lpszFileName, MAX_PATH, NULL, NULL) < MAX_PATH)
|
||||||
|
@ -2444,25 +2435,17 @@ static BOOL CommitUrlCacheEntryInternal(
|
||||||
if (!(pHeader = URLCacheContainer_LockIndex(pContainer)))
|
if (!(pHeader = URLCacheContainer_LockIndex(pContainer)))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
len = WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, NULL, 0, NULL, NULL);
|
lpszUrlNameA = heap_strdupWtoA(lpszUrlName);
|
||||||
lpszUrlNameA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char));
|
|
||||||
if (!lpszUrlNameA)
|
if (!lpszUrlNameA)
|
||||||
{
|
{
|
||||||
error = GetLastError();
|
error = GetLastError();
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, lpszUrlNameA, len, NULL, NULL);
|
|
||||||
|
|
||||||
if (lpszFileExtension)
|
if (lpszFileExtension && !(lpszFileExtensionA = heap_strdupWtoA(lpszFileExtension)))
|
||||||
{
|
{
|
||||||
len = WideCharToMultiByte(CP_ACP, 0, lpszFileExtension, -1, NULL, 0, NULL, NULL);
|
error = GetLastError();
|
||||||
lpszFileExtensionA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char));
|
goto cleanup;
|
||||||
if (!lpszFileExtensionA)
|
|
||||||
{
|
|
||||||
error = GetLastError();
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
WideCharToMultiByte(CP_ACP, 0, lpszFileExtension, -1, lpszFileExtensionA, len, NULL, NULL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (URLCache_FindHash(pHeader, lpszUrlNameA, &pHashEntry))
|
if (URLCache_FindHash(pHeader, lpszUrlNameA, &pHashEntry))
|
||||||
|
@ -2619,7 +2602,6 @@ BOOL WINAPI CommitUrlCacheEntryA(
|
||||||
IN LPCSTR lpszOriginalUrl
|
IN LPCSTR lpszOriginalUrl
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
DWORD len;
|
|
||||||
WCHAR *url_name = NULL;
|
WCHAR *url_name = NULL;
|
||||||
WCHAR *local_file_name = NULL;
|
WCHAR *local_file_name = NULL;
|
||||||
WCHAR *original_url = NULL;
|
WCHAR *original_url = NULL;
|
||||||
|
@ -2635,35 +2617,27 @@ BOOL WINAPI CommitUrlCacheEntryA(
|
||||||
debugstr_a(lpszFileExtension),
|
debugstr_a(lpszFileExtension),
|
||||||
debugstr_a(lpszOriginalUrl));
|
debugstr_a(lpszOriginalUrl));
|
||||||
|
|
||||||
len = MultiByteToWideChar(CP_ACP, 0, lpszUrlName, -1, NULL, 0);
|
url_name = heap_strdupAtoW(lpszUrlName);
|
||||||
url_name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
|
|
||||||
if (!url_name)
|
if (!url_name)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
MultiByteToWideChar(CP_ACP, 0, lpszUrlName, -1, url_name, len);
|
|
||||||
|
|
||||||
if (lpszLocalFileName)
|
if (lpszLocalFileName)
|
||||||
{
|
{
|
||||||
len = MultiByteToWideChar(CP_ACP, 0, lpszLocalFileName, -1, NULL, 0);
|
local_file_name = heap_strdupAtoW(lpszLocalFileName);
|
||||||
local_file_name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
|
|
||||||
if (!local_file_name)
|
if (!local_file_name)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
MultiByteToWideChar(CP_ACP, 0, lpszLocalFileName, -1, local_file_name, len);
|
|
||||||
}
|
}
|
||||||
if (lpszFileExtension)
|
if (lpszFileExtension)
|
||||||
{
|
{
|
||||||
len = MultiByteToWideChar(CP_ACP, 0, lpszFileExtension, -1, NULL, 0);
|
file_extension = heap_strdupAtoW(lpszFileExtension);
|
||||||
file_extension = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
|
|
||||||
if (!file_extension)
|
if (!file_extension)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
MultiByteToWideChar(CP_ACP, 0, lpszFileExtension, -1, file_extension, len);
|
|
||||||
}
|
}
|
||||||
if (lpszOriginalUrl)
|
if (lpszOriginalUrl)
|
||||||
{
|
{
|
||||||
len = MultiByteToWideChar(CP_ACP, 0, lpszOriginalUrl, -1, NULL, 0);
|
original_url = heap_strdupAtoW(lpszOriginalUrl);
|
||||||
original_url = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
|
|
||||||
if (!original_url)
|
if (!original_url)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
MultiByteToWideChar(CP_ACP, 0, lpszOriginalUrl, -1, original_url, len);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bSuccess = CommitUrlCacheEntryInternal(url_name, local_file_name, ExpireTime, LastModifiedTime,
|
bSuccess = CommitUrlCacheEntryInternal(url_name, local_file_name, ExpireTime, LastModifiedTime,
|
||||||
|
@ -2709,12 +2683,8 @@ BOOL WINAPI CommitUrlCacheEntryW(
|
||||||
debugstr_w(lpszFileExtension),
|
debugstr_w(lpszFileExtension),
|
||||||
debugstr_w(lpszOriginalUrl));
|
debugstr_w(lpszOriginalUrl));
|
||||||
|
|
||||||
if (!lpHeaderInfo ||
|
if (!lpHeaderInfo || (header_info = heap_strdupWtoA(lpHeaderInfo)))
|
||||||
((len = WideCharToMultiByte(CP_ACP, 0, lpHeaderInfo, -1, NULL, 0, NULL, NULL)) != 0 &&
|
|
||||||
(header_info = HeapAlloc(GetProcessHeap(), 0, sizeof(CHAR) * len)) != 0))
|
|
||||||
{
|
{
|
||||||
if (header_info)
|
|
||||||
WideCharToMultiByte(CP_ACP, 0, lpHeaderInfo, -1, header_info, len, NULL, NULL);
|
|
||||||
if (CommitUrlCacheEntryInternal(lpszUrlName, lpszLocalFileName, ExpireTime, LastModifiedTime,
|
if (CommitUrlCacheEntryInternal(lpszUrlName, lpszLocalFileName, ExpireTime, LastModifiedTime,
|
||||||
CacheEntryType, (LPBYTE)header_info, len, lpszFileExtension, lpszOriginalUrl))
|
CacheEntryType, (LPBYTE)header_info, len, lpszFileExtension, lpszOriginalUrl))
|
||||||
{
|
{
|
||||||
|
@ -2937,19 +2907,16 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName)
|
||||||
struct _HASH_ENTRY * pHashEntry;
|
struct _HASH_ENTRY * pHashEntry;
|
||||||
CACHEFILE_ENTRY * pEntry;
|
CACHEFILE_ENTRY * pEntry;
|
||||||
LPSTR urlA;
|
LPSTR urlA;
|
||||||
int url_len;
|
|
||||||
DWORD error;
|
DWORD error;
|
||||||
|
|
||||||
TRACE("(%s)\n", debugstr_w(lpszUrlName));
|
TRACE("(%s)\n", debugstr_w(lpszUrlName));
|
||||||
|
|
||||||
url_len = WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, NULL, 0, NULL, NULL);
|
urlA = heap_strdupWtoA(lpszUrlName);
|
||||||
urlA = HeapAlloc(GetProcessHeap(), 0, url_len * sizeof(CHAR));
|
|
||||||
if (!urlA)
|
if (!urlA)
|
||||||
{
|
{
|
||||||
SetLastError(ERROR_OUTOFMEMORY);
|
SetLastError(ERROR_OUTOFMEMORY);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, urlA, url_len, NULL, NULL);
|
|
||||||
|
|
||||||
error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer);
|
error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer);
|
||||||
if (error != ERROR_SUCCESS)
|
if (error != ERROR_SUCCESS)
|
||||||
|
@ -3130,14 +3097,12 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryA(LPCSTR lpszUrlSearchPattern,
|
||||||
pEntryHandle->dwMagic = URLCACHE_FIND_ENTRY_HANDLE_MAGIC;
|
pEntryHandle->dwMagic = URLCACHE_FIND_ENTRY_HANDLE_MAGIC;
|
||||||
if (lpszUrlSearchPattern)
|
if (lpszUrlSearchPattern)
|
||||||
{
|
{
|
||||||
int len = MultiByteToWideChar(CP_ACP, 0, lpszUrlSearchPattern, -1, NULL, 0);
|
pEntryHandle->lpszUrlSearchPattern = heap_strdupAtoW(lpszUrlSearchPattern);
|
||||||
pEntryHandle->lpszUrlSearchPattern = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
|
|
||||||
if (!pEntryHandle->lpszUrlSearchPattern)
|
if (!pEntryHandle->lpszUrlSearchPattern)
|
||||||
{
|
{
|
||||||
HeapFree(GetProcessHeap(), 0, pEntryHandle);
|
HeapFree(GetProcessHeap(), 0, pEntryHandle);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
MultiByteToWideChar(CP_ACP, 0, lpszUrlSearchPattern, -1, pEntryHandle->lpszUrlSearchPattern, len);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
pEntryHandle->lpszUrlSearchPattern = NULL;
|
pEntryHandle->lpszUrlSearchPattern = NULL;
|
||||||
|
@ -3171,14 +3136,12 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryW(LPCWSTR lpszUrlSearchPattern,
|
||||||
pEntryHandle->dwMagic = URLCACHE_FIND_ENTRY_HANDLE_MAGIC;
|
pEntryHandle->dwMagic = URLCACHE_FIND_ENTRY_HANDLE_MAGIC;
|
||||||
if (lpszUrlSearchPattern)
|
if (lpszUrlSearchPattern)
|
||||||
{
|
{
|
||||||
int len = strlenW(lpszUrlSearchPattern);
|
pEntryHandle->lpszUrlSearchPattern = heap_strdupW(lpszUrlSearchPattern);
|
||||||
pEntryHandle->lpszUrlSearchPattern = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR));
|
|
||||||
if (!pEntryHandle->lpszUrlSearchPattern)
|
if (!pEntryHandle->lpszUrlSearchPattern)
|
||||||
{
|
{
|
||||||
HeapFree(GetProcessHeap(), 0, pEntryHandle);
|
HeapFree(GetProcessHeap(), 0, pEntryHandle);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
memcpy(pEntryHandle->lpszUrlSearchPattern, lpszUrlSearchPattern, (len + 1) * sizeof(WCHAR));
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
pEntryHandle->lpszUrlSearchPattern = NULL;
|
pEntryHandle->lpszUrlSearchPattern = NULL;
|
||||||
|
|
Loading…
Reference in New Issue