March 2008 - Wine-Commits - list.winehq.org

Huw Davies : gdi32: Factor out FreeType initialization into a separate function.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: e0693a18134be876625425ae1d18bfafe1466d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0693a18134be876625425ae1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 12 13:45:13 2008 +0000 gdi32: Factor out FreeType initialization into a separate function. --- dlls/gdi32/freetype.c | 76 +++++++++++++++++++++++++++---------------------- 1 files changed, 42 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 765ac82..aef9024 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2163,28 +2163,9 @@ static void update_font_info(void) FIXME("there is no font defaults for codepages %u,%u\n", ansi_cp, oem_cp); } -/************************************************************* - * WineEngInit - * - * Initialize FreeType library and create a list of available faces - */ -BOOL WineEngInit(void) -{ - static const WCHAR dot_fonW[] = {'.','f','o','n','\0'}; - static const WCHAR pathW[] = {'P','a','t','h',0}; - HKEY hkey; - DWORD valuelen, datalen, i = 0, type, dlen, vlen; - LPVOID data; - WCHAR windowsdir[MAX_PATH]; - char *unixname; - HANDLE font_mutex; - const char *data_dir; - - TRACE("\n"); - - /* update locale dependent font info in registry */ - update_font_info(); +static BOOL init_freetype(void) +{ ft_handle = wine_dlopen(SONAME_LIBFREETYPE, RTLD_NOW, NULL, 0); if(!ft_handle) { WINE_MESSAGE( @@ -2219,7 +2200,7 @@ BOOL WineEngInit(void) LOAD_FUNCPTR(FT_Vector_Transform) #undef LOAD_FUNCPTR - /* Don't warn if this one is missing */ + /* Don't warn if these ones are missing */ pFT_Library_Version = wine_dlsym(ft_handle, "FT_Library_Version", NULL, 0); pFT_Load_Sfnt_Table = wine_dlsym(ft_handle, "FT_Load_Sfnt_Table", NULL, 0); pFT_Get_First_Char = wine_dlsym(ft_handle, "FT_Get_First_Char", NULL, 0); @@ -2241,11 +2222,10 @@ BOOL WineEngInit(void) ft_handle = NULL; return FALSE; } - FT_Version.major=FT_Version.minor=FT_Version.patch=-1; + FT_Version.major = FT_Version.minor = FT_Version.patch = -1; if (pFT_Library_Version) - { pFT_Library_Version(library,&FT_Version.major,&FT_Version.minor,&FT_Version.patch); - } + if (FT_Version.major<=0) { FT_Version.major=2; @@ -2257,6 +2237,43 @@ BOOL WineEngInit(void) ((FT_Version.minor << 8) & 0x00ff00) | ((FT_Version.patch ) & 0x0000ff); + return TRUE; + +sym_not_found: + WINE_MESSAGE( + "Wine cannot find certain functions that it needs inside the FreeType\n" + "font library. To enable Wine to use TrueType fonts please upgrade\n" + "FreeType to at least version 2.0.5.\n" + "http://www.freetype.org\n"); + wine_dlclose(ft_handle, NULL, 0); + ft_handle = NULL; + return FALSE; +} + +/************************************************************* + * WineEngInit + * + * Initialize FreeType library and create a list of available faces + */ +BOOL WineEngInit(void) +{ + static const WCHAR dot_fonW[] = {'.','f','o','n','\0'}; + static const WCHAR pathW[] = {'P','a','t','h',0}; + HKEY hkey; + DWORD valuelen, datalen, i = 0, type, dlen, vlen; + LPVOID data; + WCHAR windowsdir[MAX_PATH]; + char *unixname; + HANDLE font_mutex; + const char *data_dir; + + TRACE("\n"); + + /* update locale dependent font info in registry */ + update_font_info(); + + if(!init_freetype()) return FALSE; + if((font_mutex = CreateMutexW(NULL, FALSE, font_mutex_nameW)) == NULL) { ERR("Failed to create font mutex\n"); return FALSE; @@ -2385,15 +2402,6 @@ BOOL WineEngInit(void) ReleaseMutex(font_mutex); return TRUE; -sym_not_found: - WINE_MESSAGE( - "Wine cannot find certain functions that it needs inside the FreeType\n" - "font library. To enable Wine to use TrueType fonts please upgrade\n" - "FreeType to at least version 2.0.5.\n" - "http://www.freetype.org\n"); - wine_dlclose(ft_handle, NULL, 0); - ft_handle = NULL; - return FALSE; }

1 0

Rob Shearman : wininet: The URL in CommitUrlCacheEntryInternal shouldn' t be restricted to MAX_PATH chars in length.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: fee165ae47781e1a1ff9f6bbb4f56166c2d5c43b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee165ae47781e1a1ff9f6bbb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 12 16:40:58 2008 +0000 wininet: The URL in CommitUrlCacheEntryInternal shouldn't be restricted to MAX_PATH chars in length. Dynamically allocate it and consolidate cleanup at the end of the function. --- dlls/wininet/urlcache.c | 51 ++++++++++++++++++++++++++++++---------------- 1 files changed, 33 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 2f24b15..4ef881f 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2216,9 +2216,11 @@ static BOOL WINAPI CommitUrlCacheEntryInternal( DWORD dwFileSizeLow = 0; DWORD dwFileSizeHigh = 0; BYTE cDirectory = 0; + int len; char achFile[MAX_PATH]; - char achUrl[MAX_PATH]; + LPSTR lpszUrlNameA = NULL; char *pchLocalFileName = 0; + DWORD error = ERROR_SUCCESS; TRACE("(%s, %s, ..., ..., %x, %p, %d, %s, %s)\n", debugstr_w(lpszUrlName), @@ -2264,17 +2266,23 @@ static BOOL WINAPI CommitUrlCacheEntryInternal( if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; - WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, achUrl, -1, NULL, NULL); + len = WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, NULL, 0, NULL, NULL); + lpszUrlNameA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); + if (!lpszUrlNameA) + { + error = GetLastError(); + goto cleanup; + } + WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, lpszUrlNameA, len, NULL, NULL); - if (URLCache_FindHash(pHeader, achUrl, &pHashEntry)) + if (URLCache_FindHash(pHeader, lpszUrlNameA, &pHashEntry)) { - URLCacheContainer_UnlockIndex(pContainer, pHeader); FIXME("entry already in cache - don't know what to do!\n"); /* * SetLastError(ERROR_FILE_NOT_FOUND); * return FALSE; */ - return TRUE; + goto cleanup; } if (lpszLocalFileName) @@ -2283,10 +2291,9 @@ static BOOL WINAPI CommitUrlCacheEntryInternal( if (strncmpW(lpszLocalFileName, pContainer->path, lstrlenW(pContainer->path))) { - URLCacheContainer_UnlockIndex(pContainer, pHeader); ERR("path %s must begin with cache content path %s\n", debugstr_w(lpszLocalFileName), debugstr_w(pContainer->path)); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + error = ERROR_INVALID_PARAMETER; + goto cleanup; } /* skip container path prefix */ @@ -2306,18 +2313,18 @@ static BOOL WINAPI CommitUrlCacheEntryInternal( if (!bFound) { - URLCacheContainer_UnlockIndex(pContainer, pHeader); ERR("cache directory not found in path %s\n", debugstr_w(lpszLocalFileName)); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + error = ERROR_INVALID_PARAMETER; + goto cleanup; } lpszLocalFileName += (DIR_LENGTH + 1); /* "1234WXYZ\" */ } - dwBytesNeeded = DWORD_ALIGN(dwBytesNeeded + strlen(achUrl) + 1); + dwBytesNeeded = DWORD_ALIGN(dwBytesNeeded + strlen(lpszUrlNameA) + 1); if (lpszLocalFileName) { + len = WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, NULL, 0, NULL, NULL); dwOffsetLocalFileName = dwBytesNeeded; dwBytesNeeded = DWORD_ALIGN(dwBytesNeeded + strlen(pchLocalFileName) + 1); } @@ -2336,10 +2343,9 @@ static BOOL WINAPI CommitUrlCacheEntryInternal( if (!URLCache_FindFirstFreeEntry(pHeader, dwBytesNeeded / BLOCKSIZE, &pEntry)) { - URLCacheContainer_UnlockIndex(pContainer, pHeader); ERR("no free entries\n"); - SetLastError(ERROR_DISK_FULL); - return FALSE; + error = ERROR_DISK_FULL; + goto cleanup; } /* FindFirstFreeEntry fills in blocks used */ @@ -2375,22 +2381,31 @@ static BOOL WINAPI CommitUrlCacheEntryInternal( pUrlEntry->dwUnknown8 = 0; - strcpy((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, achUrl); + strcpy((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, lpszUrlNameA); if (dwOffsetLocalFileName) strcpy((LPSTR)((LPBYTE)pUrlEntry + dwOffsetLocalFileName), pchLocalFileName + DIR_LENGTH + 1); if (dwOffsetHeader) memcpy((LPBYTE)pUrlEntry + dwOffsetHeader, lpHeaderInfo, dwHeaderSize); - if (!URLCache_AddEntryToHash(pHeader, achUrl, (DWORD)((LPBYTE)pUrlEntry - (LPBYTE)pHeader))) + if (!URLCache_AddEntryToHash(pHeader, lpszUrlNameA, (DWORD)((LPBYTE)pUrlEntry - (LPBYTE)pHeader))) { URLCache_DeleteEntry(pHeader, &pUrlEntry->CacheFileEntry); URLCacheContainer_UnlockIndex(pContainer, pHeader); + HeapFree(GetProcessHeap(), 0, lpszUrlNameA); return FALSE; } +cleanup: URLCacheContainer_UnlockIndex(pContainer, pHeader); + HeapFree(GetProcessHeap(), 0, lpszUrlNameA); - return TRUE; + if (error == ERROR_SUCCESS) + return TRUE; + else + { + SetLastError(error); + return FALSE; + } } /***********************************************************************

1 0

Rob Shearman : wininet: Support the lpszFileExtension "reserved" parameter being passed into CommitUrlCacheEntryA.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: 716ecc42f90f732ef968fa9e49499368ad176cf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=716ecc42f90f732ef968fa9e4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 12 16:41:35 2008 +0000 wininet: Support the lpszFileExtension "reserved" parameter being passed into CommitUrlCacheEntryA. Store it in the URL cache entry and allow it to be retrieved by RetrieveUrlCacheEntryFile and other functions. --- dlls/wininet/tests/urlcache.c | 3 +- dlls/wininet/urlcache.c | 132 ++++++++++++++++++++++++++--------------- 2 files changed, 87 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=716ecc42f90f732ef968f…

1 0

Rob Shearman : wininet: Make some pointers const in URL cache functions.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: c46279ced7991c2c46ea6bf2b59e42f8bbfb1485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c46279ced7991c2c46ea6bf2b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 12 13:44:58 2008 +0000 wininet: Make some pointers const in URL cache functions. --- dlls/wininet/urlcache.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index c722b50..90c0d58 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1467,8 +1467,8 @@ BOOL WINAPI GetUrlCacheEntryInfoA( { LPURLCACHE_HEADER pHeader; struct _HASH_ENTRY * pHashEntry; - CACHEFILE_ENTRY * pEntry; - URL_CACHEFILE_ENTRY * pUrlEntry; + const CACHEFILE_ENTRY * pEntry; + const URL_CACHEFILE_ENTRY * pUrlEntry; URLCACHECONTAINER * pContainer; TRACE("(%s, %p, %p)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize); @@ -1490,7 +1490,7 @@ BOOL WINAPI GetUrlCacheEntryInfoA( return FALSE; } - pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); + pEntry = (const CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); if (pEntry->dwSignature != URL_SIGNATURE) { URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -1499,7 +1499,7 @@ BOOL WINAPI GetUrlCacheEntryInfoA( return FALSE; } - pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; + pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; TRACE("Found URL: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); if (pUrlEntry->dwOffsetHeaderInfo) TRACE("Header info: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); @@ -1532,8 +1532,8 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, { LPURLCACHE_HEADER pHeader; struct _HASH_ENTRY * pHashEntry; - CACHEFILE_ENTRY * pEntry; - URL_CACHEFILE_ENTRY * pUrlEntry; + const CACHEFILE_ENTRY * pEntry; + const URL_CACHEFILE_ENTRY * pUrlEntry; URLCACHECONTAINER * pContainer; TRACE("(%s, %p, %p)\n", debugstr_w(lpszUrl), lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize); @@ -1555,7 +1555,7 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, return FALSE; } - pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); + pEntry = (const CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); if (pEntry->dwSignature != URL_SIGNATURE) { URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -1564,7 +1564,7 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, return FALSE; } - pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; + pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; TRACE("Found URL: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); TRACE("Header info: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); @@ -3272,8 +3272,8 @@ BOOL WINAPI IsUrlCacheEntryExpiredA( LPCSTR url, DWORD dwFlags, FILETIME* pftLas { LPURLCACHE_HEADER pHeader; struct _HASH_ENTRY * pHashEntry; - CACHEFILE_ENTRY * pEntry; - URL_CACHEFILE_ENTRY * pUrlEntry; + const CACHEFILE_ENTRY * pEntry; + const URL_CACHEFILE_ENTRY * pUrlEntry; URLCACHECONTAINER * pContainer; TRACE("(%s, %08x, %p)\n", debugstr_a(url), dwFlags, pftLastModified); @@ -3295,7 +3295,7 @@ BOOL WINAPI IsUrlCacheEntryExpiredA( LPCSTR url, DWORD dwFlags, FILETIME* pftLas return FALSE; } - pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); + pEntry = (const CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); if (pEntry->dwSignature != URL_SIGNATURE) { URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -3304,7 +3304,7 @@ BOOL WINAPI IsUrlCacheEntryExpiredA( LPCSTR url, DWORD dwFlags, FILETIME* pftLas return FALSE; } - pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; + pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; DosDateTimeToFileTime(pUrlEntry->wExpiredDate, pUrlEntry->wExpiredTime, pftLastModified); @@ -3325,8 +3325,8 @@ BOOL WINAPI IsUrlCacheEntryExpiredW( LPCWSTR url, DWORD dwFlags, FILETIME* pftLa { LPURLCACHE_HEADER pHeader; struct _HASH_ENTRY * pHashEntry; - CACHEFILE_ENTRY * pEntry; - URL_CACHEFILE_ENTRY * pUrlEntry; + const CACHEFILE_ENTRY * pEntry; + const URL_CACHEFILE_ENTRY * pUrlEntry; URLCACHECONTAINER * pContainer; TRACE("(%s, %08x, %p)\n", debugstr_w(url), dwFlags, pftLastModified); @@ -3348,7 +3348,7 @@ BOOL WINAPI IsUrlCacheEntryExpiredW( LPCWSTR url, DWORD dwFlags, FILETIME* pftLa return FALSE; } - pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); + pEntry = (const CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); if (pEntry->dwSignature != URL_SIGNATURE) { URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -3357,7 +3357,7 @@ BOOL WINAPI IsUrlCacheEntryExpiredW( LPCWSTR url, DWORD dwFlags, FILETIME* pftLa return FALSE; } - pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; + pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; DosDateTimeToFileTime(pUrlEntry->wExpiredDate, pUrlEntry->wExpiredTime, pftLastModified);

1 0

Rob Shearman : wininet: Implement FindFirstUrlCacheEntry{A, W}, FindNextUrlCacheEntryA and FindCloseUrlCache.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: 7fde7aef7810205ff2a6c1586dc5b00154448c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fde7aef7810205ff2a6c1586… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 12 13:29:00 2008 +0000 wininet: Implement FindFirstUrlCacheEntry{A, W}, FindNextUrlCacheEntryA and FindCloseUrlCache. --- dlls/wininet/urlcache.c | 307 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 281 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7fde7aef7810205ff2a6c…

1 0

Rob Shearman : wininet: Add tests for some URL cache functions.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: 99e7f7ab6e0a371f530c479b1b5b1e9158c2e652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e7f7ab6e0a371f530c479b1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 12 13:28:04 2008 +0000 wininet: Add tests for some URL cache functions. --- dlls/wininet/tests/Makefile.in | 3 +- dlls/wininet/tests/urlcache.c | 87 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/Makefile.in b/dlls/wininet/tests/Makefile.in index 078f37c..ba8f662 100644 --- a/dlls/wininet/tests/Makefile.in +++ b/dlls/wininet/tests/Makefile.in @@ -10,7 +10,8 @@ CTESTS = \ generated.c \ http.c \ internet.c \ - url.c + url.c \ + urlcache.c @MAKE_TEST_RULES@ diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c new file mode 100644 index 0000000..cf1cb22 --- /dev/null +++ b/dlls/wininet/tests/urlcache.c @@ -0,0 +1,87 @@ +/* + * URL Cache Tests + * + * Copyright 2008 Robert Shearman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> + +#include "windef.h" +#include "winbase.h" +#include "wininet.h" + +#include "wine/test.h" + +#define TEST_URL "http://urlcachetest.winehq.org/index.html" + +static void test_urlcacheA(void) +{ + BOOL ret; + char filename[MAX_PATH + 1]; + HANDLE hFile; + DWORD written; + BYTE zero_byte = 0; + LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo; + DWORD cbCacheEntryInfo; + static const FILETIME filetime_zero; + + ret = CreateUrlCacheEntry(TEST_URL, 0, "html", filename, 0); + ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + + hFile = CreateFileA(filename, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA failed with error %d\n", GetLastError()); + + ret = WriteFile(hFile, &zero_byte, sizeof(zero_byte), &written, NULL); + ok(ret, "WriteFile failed with error %d\n", GetLastError()); + + CloseHandle(hFile); + + ret = CommitUrlCacheEntry(TEST_URL, filename, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY, NULL, 0, NULL, NULL); + ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); + + cbCacheEntryInfo = 0; + ret = RetrieveUrlCacheEntryFile(TEST_URL, NULL, &cbCacheEntryInfo, 0); + ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "RetrieveUrlCacheEntryFile should have set last error to ERROR_INSUFFICIENT_BUFFER instead of %d\n", GetLastError()); + + lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); + ret = RetrieveUrlCacheEntryFile(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo, 0); + ok(ret, "RetrieveUrlCacheEntryFile failed with error %d\n", GetLastError()); + + ok(lpCacheEntryInfo->dwStructSize == sizeof(*lpCacheEntryInfo), "lpCacheEntryInfo->dwStructSize was %d\n", lpCacheEntryInfo->dwStructSize); + ok(!strcmp(lpCacheEntryInfo->lpszSourceUrlName, TEST_URL), "lpCacheEntryInfo->lpszSourceUrlName should be %s instead of %s\n", TEST_URL, lpCacheEntryInfo->lpszSourceUrlName); + + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + + ret = UnlockUrlCacheEntryFile(TEST_URL, 0); + ok(ret, "UnlockUrlCacheEntryFile failed with error %d\n", GetLastError()); + + ret = DeleteUrlCacheEntry(TEST_URL); + ok(ret, "DeleteUrlCacheEntry failed with error %d\n", GetLastError()); + + ret = DeleteFile(filename); + todo_wine + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "local file should no longer exist\n"); +} + +START_TEST(urlcache) +{ + test_urlcacheA(); +}

1 0

Rob Shearman : wininet: Only clear authentication header if the connection has authentication information .
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: ebaa4d987d16dcca0470c62b0913b981a92dbd29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebaa4d987d16dcca0470c62b0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 12 13:27:46 2008 +0000 wininet: Only clear authentication header if the connection has authentication information. --- dlls/wininet/http.c | 63 ++++++++++++++++++++++++-------------------------- 1 files changed, 30 insertions(+), 33 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 64d527b..da5d2da 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1186,49 +1186,46 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin ) * * Insert or delete the authorization field in the request header. */ -static BOOL HTTP_InsertAuthorization( LPWININETHTTPREQW lpwhr, struct HttpAuthInfo *pAuthInfo, LPCWSTR header, BOOL first ) +static BOOL HTTP_InsertAuthorization( LPWININETHTTPREQW lpwhr, struct HttpAuthInfo *pAuthInfo, LPCWSTR header ) { - WCHAR *authorization = NULL; - DWORD flags; - - if (pAuthInfo && pAuthInfo->auth_data_len) + if (pAuthInfo) { static const WCHAR wszSpace[] = {' ',0}; static const WCHAR wszBasic[] = {'B','a','s','i','c',0}; unsigned int len; + WCHAR *authorization = NULL; - /* scheme + space + base64 encoded data (3/2/1 bytes data -> 4 bytes of characters) */ - len = strlenW(pAuthInfo->scheme)+1+((pAuthInfo->auth_data_len+2)*4)/3; - authorization = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)); - if (!authorization) - return FALSE; + if (pAuthInfo->auth_data_len) + { + /* scheme + space + base64 encoded data (3/2/1 bytes data -> 4 bytes of characters) */ + len = strlenW(pAuthInfo->scheme)+1+((pAuthInfo->auth_data_len+2)*4)/3; + authorization = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)); + if (!authorization) + return FALSE; - strcpyW(authorization, pAuthInfo->scheme); - strcatW(authorization, wszSpace); - HTTP_EncodeBase64(pAuthInfo->auth_data, - pAuthInfo->auth_data_len, - authorization+strlenW(authorization)); + strcpyW(authorization, pAuthInfo->scheme); + strcatW(authorization, wszSpace); + HTTP_EncodeBase64(pAuthInfo->auth_data, + pAuthInfo->auth_data_len, + authorization+strlenW(authorization)); - /* clear the data as it isn't valid now that it has been sent to the - * server, unless it's Basic authentication which doesn't do - * connection tracking */ - if (strcmpiW(pAuthInfo->scheme, wszBasic)) - { - HeapFree(GetProcessHeap(), 0, pAuthInfo->auth_data); - pAuthInfo->auth_data = NULL; - pAuthInfo->auth_data_len = 0; + /* clear the data as it isn't valid now that it has been sent to the + * server, unless it's Basic authentication which doesn't do + * connection tracking */ + if (strcmpiW(pAuthInfo->scheme, wszBasic)) + { + HeapFree(GetProcessHeap(), 0, pAuthInfo->auth_data); + pAuthInfo->auth_data = NULL; + pAuthInfo->auth_data_len = 0; + } } - } - TRACE("Inserting authorization: %s\n", debugstr_w(authorization)); + TRACE("Inserting authorization: %s\n", debugstr_w(authorization)); - /* make sure not to overwrite any caller supplied authorization header */ - flags = HTTP_ADDHDR_FLAG_REQ; - flags |= first ? HTTP_ADDHDR_FLAG_ADD_IF_NEW : HTTP_ADDHDR_FLAG_REPLACE; + HTTP_ProcessHeader(lpwhr, header, authorization, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); - HTTP_ProcessHeader(lpwhr, header, authorization, flags); - - HeapFree(GetProcessHeap(), 0, authorization); + HeapFree(GetProcessHeap(), 0, authorization); + } return TRUE; } @@ -3076,8 +3073,8 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, lpwhr->hdr.dwFlags & INTERNET_FLAG_KEEP_CONNECTION ? szKeepAlive : szClose, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); - HTTP_InsertAuthorization(lpwhr, lpwhr->pAuthInfo, szAuthorization, !loop_next); - HTTP_InsertAuthorization(lpwhr, lpwhr->pProxyAuthInfo, szProxy_Authorization, !loop_next); + HTTP_InsertAuthorization(lpwhr, lpwhr->pAuthInfo, szAuthorization); + HTTP_InsertAuthorization(lpwhr, lpwhr->pProxyAuthInfo, szProxy_Authorization); /* add the headers the caller supplied */ if( lpszHeaders && dwHeaderLength )

1 0

Rob Shearman : wininet: Add tests for Find{First, Next}UrlCacheEntryA functions.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: 4041c2015b5fb38c164aab328ea7468d2ff2d47d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4041c2015b5fb38c164aab328… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 12 13:29:47 2008 +0000 wininet: Add tests for Find{First,Next}UrlCacheEntryA functions. --- dlls/wininet/tests/urlcache.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index cf1cb22..572420a 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -39,7 +39,10 @@ static void test_urlcacheA(void) BYTE zero_byte = 0; LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo; DWORD cbCacheEntryInfo; + DWORD cbCacheEntryInfoSaved; static const FILETIME filetime_zero; + HANDLE hEnumHandle; + BOOL found = FALSE; ret = CreateUrlCacheEntry(TEST_URL, 0, "html", filename, 0); ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); @@ -73,6 +76,44 @@ static void test_urlcacheA(void) ret = UnlockUrlCacheEntryFile(TEST_URL, 0); ok(ret, "UnlockUrlCacheEntryFile failed with error %d\n", GetLastError()); + + /* test Find*UrlCacheEntry functions */ + cbCacheEntryInfo = 0; + hEnumHandle = FindFirstUrlCacheEntry(NULL, NULL, &cbCacheEntryInfo); + ok(!hEnumHandle, "FindFirstUrlCacheEntry should have failed\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "FindFirstUrlCacheEntry should have set last error to ERROR_INSUFFICIENT_BUFFER instead of %d\n", GetLastError()); + lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo * sizeof(char)); + cbCacheEntryInfoSaved = cbCacheEntryInfo; + hEnumHandle = FindFirstUrlCacheEntry(NULL, lpCacheEntryInfo, &cbCacheEntryInfo); + ok(hEnumHandle != NULL, "FindFirstUrlCacheEntry failed with error %d\n", GetLastError()); + while (TRUE) + { + if (!strcmp(lpCacheEntryInfo->lpszSourceUrlName, TEST_URL)) + { + found = TRUE; + break; + } + cbCacheEntryInfo = cbCacheEntryInfoSaved; + ret = FindNextUrlCacheEntry(hEnumHandle, lpCacheEntryInfo, &cbCacheEntryInfo); + if (!ret) + { + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + lpCacheEntryInfo = HeapReAlloc(GetProcessHeap(), 0, lpCacheEntryInfo, cbCacheEntryInfo); + cbCacheEntryInfoSaved = cbCacheEntryInfo; + ret = FindNextUrlCacheEntry(hEnumHandle, lpCacheEntryInfo, &cbCacheEntryInfo); + } + } + ok(ret, "FindNextUrlCacheEntry failed with error %d\n", GetLastError()); + if (!ret) + break; + } + ok(found, "committed url cache entry not found during enumeration\n"); + + ret = FindCloseUrlCache(hEnumHandle); + ok(ret, "FindCloseUrlCache failed with error %d\n", GetLastError()); + + ret = DeleteUrlCacheEntry(TEST_URL); ok(ret, "DeleteUrlCacheEntry failed with error %d\n", GetLastError());

1 0

Rob Shearman : wininet: Use LIST_FOR_EACH_ENTRY in URLCacheContainers_FindContainerW instead of LIST_FOR_EACH and LIST_ENTRY .
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: f1af593988fb35bd03192e7e2d0a1f4182dbf7ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1af593988fb35bd03192e7e2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 12 13:44:14 2008 +0000 wininet: Use LIST_FOR_EACH_ENTRY in URLCacheContainers_FindContainerW instead of LIST_FOR_EACH and LIST_ENTRY. --- dlls/wininet/urlcache.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 7cb2f3c..c722b50 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -583,13 +583,12 @@ void URLCacheContainers_DeleteAll(void) static BOOL URLCacheContainers_FindContainerW(LPCWSTR lpwszUrl, URLCACHECONTAINER ** ppContainer) { - struct list * cursor; + URLCACHECONTAINER * pContainer; TRACE("searching for prefix for URL: %s\n", debugstr_w(lpwszUrl)); - LIST_FOR_EACH(cursor, &UrlContainers) + LIST_FOR_EACH_ENTRY(pContainer, &UrlContainers, URLCACHECONTAINER, entry) { - URLCACHECONTAINER * pContainer = LIST_ENTRY(cursor, URLCACHECONTAINER, entry); int prefix_len = strlenW(pContainer->cache_prefix); if (!strncmpW(pContainer->cache_prefix, lpwszUrl, prefix_len)) {

1 0

Rob Shearman : wininet: Move URL cache hash entry validation to a separate function.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: 160bc043438745ecbe1fdff7a1574bafffa992dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=160bc043438745ecbe1fdff7a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 12 13:29:10 2008 +0000 wininet: Move URL cache hash entry validation to a separate function. --- dlls/wininet/urlcache.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 6d7b3e2..7cb2f3c 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1142,6 +1142,13 @@ static inline HASH_CACHEFILE_ENTRY * URLCache_HashEntryFromOffset(LPCURLCACHE_HE return (HASH_CACHEFILE_ENTRY *)((LPBYTE)pHeader + dwOffset); } +static inline BOOL URLCache_IsHashEntryValid(LPCURLCACHE_HEADER pHeader, const HASH_CACHEFILE_ENTRY *pHashEntry) +{ + /* check pHashEntry located within acceptable bounds in the URL cache mapping */ + return ((DWORD)((LPBYTE)pHashEntry - (LPBYTE)pHeader) >= ENTRY_START_OFFSET) && + ((DWORD)((LPBYTE)pHashEntry - (LPBYTE)pHeader) < pHeader->dwFileSize); +} + static BOOL URLCache_FindHash(LPCURLCACHE_HEADER pHeader, LPCSTR lpszUrl, struct _HASH_ENTRY ** ppHashEntry) { /* structure of hash table: @@ -1164,7 +1171,7 @@ static BOOL URLCache_FindHash(LPCURLCACHE_HEADER pHeader, LPCSTR lpszUrl, struct key = (key / HASHTABLE_NUM_ENTRIES) * HASHTABLE_NUM_ENTRIES; for (pHashEntry = URLCache_HashEntryFromOffset(pHeader, pHeader->dwOffsetFirstHashTable); - ((DWORD)((LPBYTE)pHashEntry - (LPBYTE)pHeader) >= ENTRY_START_OFFSET) && ((DWORD)((LPBYTE)pHashEntry - (LPBYTE)pHeader) < pHeader->dwFileSize); + URLCache_IsHashEntryValid(pHeader, pHashEntry); pHashEntry = URLCache_HashEntryFromOffset(pHeader, pHashEntry->dwAddressNext)) { int i; @@ -1277,7 +1284,7 @@ static BOOL URLCache_AddEntryToHash(LPURLCACHE_HEADER pHeader, LPCSTR lpszUrl, D key = (key / HASHTABLE_NUM_ENTRIES) * HASHTABLE_NUM_ENTRIES; for (pHashEntry = URLCache_HashEntryFromOffset(pHeader, pHeader->dwOffsetFirstHashTable); - ((DWORD)((LPBYTE)pHashEntry - (LPBYTE)pHeader) >= ENTRY_START_OFFSET) && ((DWORD)((LPBYTE)pHashEntry - (LPBYTE)pHeader) < pHeader->dwFileSize); + URLCache_IsHashEntryValid(pHeader, pHashEntry); pHashEntry = URLCache_HashEntryFromOffset(pHeader, pHashEntry->dwAddressNext)) { int i;

1 0