October 2007 - Wine-Commits

Juan Lang : wininet: Don't assume lpBuffersIn is not NULL.
by Alexandre Julliard Oct. 23, 2007

Oct. 23, 2007

Module: wine Branch: master Commit: d857c04c95d6441e2c422161b6af3fb4b4be5275 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d857c04c95d6441e2c422161b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 22 10:23:54 2007 -0700 wininet: Don't assume lpBuffersIn is not NULL. --- dlls/wininet/http.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 70239f7..f496733 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2182,9 +2182,12 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET hRequest, } else { - ret = HTTP_HttpSendRequestW(lpwhr, lpBuffersIn->lpcszHeader, lpBuffersIn->dwHeadersLength, - lpBuffersIn->lpvBuffer, lpBuffersIn->dwBufferLength, - lpBuffersIn->dwBufferTotal, FALSE); + if (lpBuffersIn) + ret = HTTP_HttpSendRequestW(lpwhr, lpBuffersIn->lpcszHeader, lpBuffersIn->dwHeadersLength, + lpBuffersIn->lpvBuffer, lpBuffersIn->dwBufferLength, + lpBuffersIn->dwBufferTotal, FALSE); + else + ret = HTTP_HttpSendRequestW(lpwhr, NULL, 0, NULL, 0, 0, FALSE); } WININET_Release(&lpwhr->hdr);

1 0

Juan Lang : wininet: Implement RetrieveUrlCacheEntryFileW.
by Alexandre Julliard Oct. 23, 2007

Oct. 23, 2007

Module: wine Branch: master Commit: d448a2ad9b0bc4180be9052ad84c24e46d59a5ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d448a2ad9b0bc4180be9052ad… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 22 10:16:27 2007 -0700 wininet: Implement RetrieveUrlCacheEntryFileW. --- dlls/wininet/urlcache.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 56 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index e7131f3..e895cd7 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1692,13 +1692,68 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( IN DWORD dwReserved ) { + LPURLCACHE_HEADER pHeader; + struct _HASH_ENTRY * pHashEntry; + CACHEFILE_ENTRY * pEntry; + URL_CACHEFILE_ENTRY * pUrlEntry; + URLCACHECONTAINER * pContainer; + TRACE("(%s, %p, %p, 0x%08x)\n", debugstr_w(lpszUrlName), lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize, dwReserved); - return FALSE; + if (!URLCacheContainers_FindContainerW(lpszUrlName, &pContainer)) + return FALSE; + + if (!URLCacheContainer_OpenIndex(pContainer)) + return FALSE; + + if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) + return FALSE; + + if (!URLCache_FindHashW(pHeader, lpszUrlName, &pHashEntry)) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + TRACE("entry %s not found!\n", debugstr_w(lpszUrlName)); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); + if (pEntry->dwSignature != URL_SIGNATURE) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPSTR)&pEntry->dwSignature, sizeof(DWORD))); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; + TRACE("Found URL: %s\n", (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); + TRACE("Header info: %s\n", (LPBYTE)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); + + pUrlEntry->dwHitRate++; + pUrlEntry->dwUseCount++; + URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); + + if (!URLCache_CopyEntry( + pContainer, + pHeader, + (LPINTERNET_CACHE_ENTRY_INFOA)lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, + pUrlEntry, + TRUE /* UNICODE */)) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + return FALSE; + } + TRACE("Local File Name: %s\n", debugstr_w(lpCacheEntryInfo->lpszLocalFileName)); + + URLCacheContainer_UnlockIndex(pContainer, pHeader); + + return TRUE; } /***********************************************************************

1 0

Hans Leidekker : advapi32: Remove tests for the sha context structure.
by Alexandre Julliard Oct. 23, 2007

Oct. 23, 2007

Module: wine Branch: master Commit: 35c0511d2b7daa8a25bc3bf97edf1f515623e9eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=35c0511d2b7daa8a25bc3bf97… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Oct 22 16:32:36 2007 +0200 advapi32: Remove tests for the sha context structure. --- dlls/advapi32/tests/crypt_sha.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/advapi32/tests/crypt_sha.c b/dlls/advapi32/tests/crypt_sha.c index e8cd557..cfdaf99 100644 --- a/dlls/advapi32/tests/crypt_sha.c +++ b/dlls/advapi32/tests/crypt_sha.c @@ -33,8 +33,6 @@ typedef struct { UCHAR Buffer[64]; } SHA_CTX, *PSHA_CTX; -#define ctxcmp(a,b) memcmp((char*)a, (char*)b, FIELD_OFFSET(SHA_CTX, Buffer)) - static void test_sha_ctx(void) { FARPROC pA_SHAInit, pA_SHAUpdate, pA_SHAFinal; @@ -45,9 +43,6 @@ static void test_sha_ctx(void) ULONG test_buffer_size = strlen(test_buffer); HMODULE hmod; SHA_CTX ctx; - SHA_CTX ctx_initialized = {{0, 0, 0, 0, 0}, {0x67452301, 0xefcdab89, 0x98badcfe, 0x10325476, 0xc3d2e1f0}, {0, 0}}; - SHA_CTX ctx_update1 = {{0, 0, 0, 0, 0}, {0xdbe5eba8, 0x6b4335ca, 0xf7c94abe, 0xc9f34e31, 0x311023f0}, {0, 0x67}}; - SHA_CTX ctx_update2 = {{0, 0, 0, 0, 0}, {0x5ecc818d, 0x52498169, 0xf6758559, 0xd035a164, 0x871dd125}, {0, 0xce}}; ULONG result[5]; ULONG result_correct[5] = {0xe014f93, 0xe09791ec, 0x6dcf96c8, 0x8e9385fc, 0x1611c1bb}; @@ -64,16 +59,9 @@ static void test_sha_ctx(void) RtlZeroMemory(&ctx, sizeof(ctx)); pA_SHAInit(&ctx); - ok(!ctxcmp(&ctx, &ctx_initialized), "invalid initialization\n"); - pA_SHAUpdate(&ctx, test_buffer, test_buffer_size); - ok(!ctxcmp(&ctx, &ctx_update1), "update doesn't work correctly\n"); - pA_SHAUpdate(&ctx, test_buffer, test_buffer_size); - ok(!ctxcmp(&ctx, &ctx_update2), "update doesn't work correctly\n"); - pA_SHAFinal(&ctx, result); - ok(!ctxcmp(&ctx, &ctx_initialized), "context hasn't been reinitialized\n"); ok(!memcmp(result, result_correct, sizeof(result)), "incorrect result\n"); }

1 0

Hans Leidekker : gdi32: Remove a test that expects the break character to equal ascii space.
by Alexandre Julliard Oct. 23, 2007

Oct. 23, 2007

Module: wine Branch: master Commit: d21c5044c6670a84a83e590183c51d0c2d2474ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d21c5044c6670a84a83e59018… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Oct 22 17:37:33 2007 +0200 gdi32: Remove a test that expects the break character to equal ascii space. --- dlls/gdi32/tests/font.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index d7e378d..33dd3f8 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1571,8 +1571,6 @@ static void test_text_metrics(const LOGFONTA *lf) test_char = min(last_unicode_char, 255); ok(tmA.tmLastChar == test_char, "A: tmLastChar for %s %02x != %02x\n", font_name, tmA.tmLastChar, test_char); - ok(tmA.tmBreakChar == 0x20, "A: tmBreakChar for %s %02x != 0x20\n", - font_name, tmA.tmBreakChar); } SetLastError(0xdeadbeef);

1 0

Juan Lang : wininet: Introduce a URLCache_FindHashW, and use it rather than URLCache_FindEntryInHashW.
by Alexandre Julliard Oct. 23, 2007

Oct. 23, 2007

Module: wine Branch: master Commit: 601b6835ed4ceeb5b3781a3bd47408382fea49b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=601b6835ed4ceeb5b3781a3bd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 22 10:15:22 2007 -0700 wininet: Introduce a URLCache_FindHashW, and use it rather than URLCache_FindEntryInHashW. --- dlls/wininet/urlcache.c | 29 +++++++++++------------------ 1 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 269b5ed..9b72f1d 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1163,20 +1163,8 @@ static BOOL URLCache_FindHash(LPCURLCACHE_HEADER pHeader, LPCSTR lpszUrl, struct return FALSE; } -/*********************************************************************** - * URLCache_FindEntryInHashW (Internal) - * - * Searches all the hash tables in the index for the given URL and - * returns the entry, if it was found, in ppEntry - * - * RETURNS - * TRUE if the entry was found - * FALSE if the entry could not be found - * - */ -static BOOL URLCache_FindEntryInHashW(LPCURLCACHE_HEADER pHeader, LPCWSTR lpszUrl, CACHEFILE_ENTRY ** ppEntry) +static BOOL URLCache_FindHashW(LPCURLCACHE_HEADER pHeader, LPCWSTR lpszUrl, struct _HASH_ENTRY ** ppHashEntry) { - struct _HASH_ENTRY * pHashEntry; LPSTR urlA; int url_len; BOOL ret; @@ -1189,8 +1177,7 @@ static BOOL URLCache_FindEntryInHashW(LPCURLCACHE_HEADER pHeader, LPCWSTR lpszUr return FALSE; } WideCharToMultiByte(CP_ACP, 0, lpszUrl, -1, urlA, url_len, NULL, NULL); - if ((ret = URLCache_FindHash(pHeader, urlA, &pHashEntry))) - *ppEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); + ret = URLCache_FindHash(pHeader, urlA, ppHashEntry); HeapFree(GetProcessHeap(), 0, urlA); return ret; } @@ -1441,6 +1428,7 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, LPDWORD lpdwCacheEntryInfoBufferSize) { LPURLCACHE_HEADER pHeader; + struct _HASH_ENTRY * pHashEntry; CACHEFILE_ENTRY * pEntry; URL_CACHEFILE_ENTRY * pUrlEntry; URLCACHECONTAINER * pContainer; @@ -1456,7 +1444,7 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; - if (!URLCache_FindEntryInHashW(pHeader, lpszUrl, &pEntry)) + if (!URLCache_FindHashW(pHeader, lpszUrl, &pHashEntry)) { URLCacheContainer_UnlockIndex(pContainer, pHeader); WARN("entry %s not found!\n", debugstr_w(lpszUrl)); @@ -1464,6 +1452,7 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, return FALSE; } + pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); if (pEntry->dwSignature != URL_SIGNATURE) { URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -1586,6 +1575,7 @@ BOOL WINAPI SetUrlCacheEntryInfoA( BOOL WINAPI SetUrlCacheEntryInfoW(LPCWSTR lpszUrl, LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, DWORD dwFieldControl) { LPURLCACHE_HEADER pHeader; + struct _HASH_ENTRY * pHashEntry; CACHEFILE_ENTRY * pEntry; URLCACHECONTAINER * pContainer; @@ -1600,7 +1590,7 @@ BOOL WINAPI SetUrlCacheEntryInfoW(LPCWSTR lpszUrl, LPINTERNET_CACHE_ENTRY_INFOW if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; - if (!URLCache_FindEntryInHashW(pHeader, lpszUrl, &pEntry)) + if (!URLCache_FindHashW(pHeader, lpszUrl, &pHashEntry)) { URLCacheContainer_UnlockIndex(pContainer, pHeader); WARN("entry %s not found!\n", debugstr_w(lpszUrl)); @@ -1608,6 +1598,7 @@ BOOL WINAPI SetUrlCacheEntryInfoW(LPCWSTR lpszUrl, LPINTERNET_CACHE_ENTRY_INFOW return FALSE; } + pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); if (pEntry->dwSignature != URL_SIGNATURE) { URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -2975,6 +2966,7 @@ BOOL WINAPI IsUrlCacheEntryExpiredA( LPCSTR url, DWORD dwFlags, FILETIME* pftLas BOOL WINAPI IsUrlCacheEntryExpiredW( LPCWSTR url, DWORD dwFlags, FILETIME* pftLastModified ) { LPURLCACHE_HEADER pHeader; + struct _HASH_ENTRY * pHashEntry; CACHEFILE_ENTRY * pEntry; URL_CACHEFILE_ENTRY * pUrlEntry; URLCACHECONTAINER * pContainer; @@ -2990,7 +2982,7 @@ BOOL WINAPI IsUrlCacheEntryExpiredW( LPCWSTR url, DWORD dwFlags, FILETIME* pftLa if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; - if (!URLCache_FindEntryInHashW(pHeader, url, &pEntry)) + if (!URLCache_FindHashW(pHeader, url, &pHashEntry)) { URLCacheContainer_UnlockIndex(pContainer, pHeader); TRACE("entry %s not found!\n", debugstr_w(url)); @@ -2998,6 +2990,7 @@ BOOL WINAPI IsUrlCacheEntryExpiredW( LPCWSTR url, DWORD dwFlags, FILETIME* pftLa return FALSE; } + pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); if (pEntry->dwSignature != URL_SIGNATURE) { URLCacheContainer_UnlockIndex(pContainer, pHeader);

1 0

Juan Lang : wininet: Use URLCache_FindHash rather than URLCache_FindEntryInHash.
by Alexandre Julliard Oct. 23, 2007

Oct. 23, 2007

Module: wine Branch: master Commit: af61cbdd03c5d99d7f62890918e01266c5d8ea4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=af61cbdd03c5d99d7f6289091… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 22 10:14:57 2007 -0700 wininet: Use URLCache_FindHash rather than URLCache_FindEntryInHash. --- dlls/wininet/urlcache.c | 53 ++++++++++++++++++++-------------------------- 1 files changed, 23 insertions(+), 30 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 9887994..269b5ed 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1164,28 +1164,6 @@ static BOOL URLCache_FindHash(LPCURLCACHE_HEADER pHeader, LPCSTR lpszUrl, struct } /*********************************************************************** - * URLCache_FindEntryInHash (Internal) - * - * Searches all the hash tables in the index for the given URL and - * returns the entry, if it was found, in ppEntry - * - * RETURNS - * TRUE if the entry was found - * FALSE if the entry could not be found - * - */ -static BOOL URLCache_FindEntryInHash(LPCURLCACHE_HEADER pHeader, LPCSTR lpszUrl, CACHEFILE_ENTRY ** ppEntry) -{ - struct _HASH_ENTRY * pHashEntry; - if (URLCache_FindHash(pHeader, lpszUrl, &pHashEntry)) - { - *ppEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); - return TRUE; - } - return FALSE; -} - -/*********************************************************************** * URLCache_FindEntryInHashW (Internal) * * Searches all the hash tables in the index for the given URL and @@ -1398,6 +1376,7 @@ BOOL WINAPI GetUrlCacheEntryInfoA( ) { LPURLCACHE_HEADER pHeader; + struct _HASH_ENTRY * pHashEntry; CACHEFILE_ENTRY * pEntry; URL_CACHEFILE_ENTRY * pUrlEntry; URLCACHECONTAINER * pContainer; @@ -1413,7 +1392,7 @@ BOOL WINAPI GetUrlCacheEntryInfoA( if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; - if (!URLCache_FindEntryInHash(pHeader, lpszUrlName, &pEntry)) + if (!URLCache_FindHash(pHeader, lpszUrlName, &pHashEntry)) { URLCacheContainer_UnlockIndex(pContainer, pHeader); WARN("entry %s not found!\n", debugstr_a(lpszUrlName)); @@ -1421,6 +1400,7 @@ BOOL WINAPI GetUrlCacheEntryInfoA( return FALSE; } + pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); if (pEntry->dwSignature != URL_SIGNATURE) { URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -1558,6 +1538,7 @@ BOOL WINAPI SetUrlCacheEntryInfoA( DWORD dwFieldControl) { LPURLCACHE_HEADER pHeader; + struct _HASH_ENTRY * pHashEntry; CACHEFILE_ENTRY * pEntry; URLCACHECONTAINER * pContainer; @@ -1572,7 +1553,7 @@ BOOL WINAPI SetUrlCacheEntryInfoA( if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; - if (!URLCache_FindEntryInHash(pHeader, lpszUrlName, &pEntry)) + if (!URLCache_FindHash(pHeader, lpszUrlName, &pHashEntry)) { URLCacheContainer_UnlockIndex(pContainer, pHeader); WARN("entry %s not found!\n", debugstr_a(lpszUrlName)); @@ -1580,6 +1561,7 @@ BOOL WINAPI SetUrlCacheEntryInfoA( return FALSE; } + pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); if (pEntry->dwSignature != URL_SIGNATURE) { URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -1656,6 +1638,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( ) { LPURLCACHE_HEADER pHeader; + struct _HASH_ENTRY * pHashEntry; CACHEFILE_ENTRY * pEntry; URL_CACHEFILE_ENTRY * pUrlEntry; URLCACHECONTAINER * pContainer; @@ -1675,7 +1658,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; - if (!URLCache_FindEntryInHash(pHeader, lpszUrlName, &pEntry)) + if (!URLCache_FindHash(pHeader, lpszUrlName, &pHashEntry)) { URLCacheContainer_UnlockIndex(pContainer, pHeader); TRACE("entry %s not found!\n", lpszUrlName); @@ -1683,6 +1666,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( return FALSE; } + pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); if (pEntry->dwSignature != URL_SIGNATURE) { URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -1741,6 +1725,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileA( ) { LPURLCACHE_HEADER pHeader; + struct _HASH_ENTRY * pHashEntry; CACHEFILE_ENTRY * pEntry; URL_CACHEFILE_ENTRY * pUrlEntry; URLCACHECONTAINER * pContainer; @@ -1763,7 +1748,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileA( if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; - if (!URLCache_FindEntryInHash(pHeader, lpszUrlName, &pEntry)) + if (!URLCache_FindHash(pHeader, lpszUrlName, &pHashEntry)) { URLCacheContainer_UnlockIndex(pContainer, pHeader); TRACE("entry %s not found!\n", lpszUrlName); @@ -1771,6 +1756,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileA( return FALSE; } + pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); if (pEntry->dwSignature != URL_SIGNATURE) { URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -2021,6 +2007,7 @@ static BOOL WINAPI CommitUrlCacheEntryInternal( { URLCACHECONTAINER * pContainer; LPURLCACHE_HEADER pHeader; + struct _HASH_ENTRY * pHashEntry; CACHEFILE_ENTRY * pEntry; URL_CACHEFILE_ENTRY * pUrlEntry; DWORD dwBytesNeeded = DWORD_ALIGN(sizeof(*pUrlEntry)); @@ -2079,7 +2066,7 @@ static BOOL WINAPI CommitUrlCacheEntryInternal( WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, achUrl, -1, NULL, NULL); - if (URLCache_FindEntryInHash(pHeader, achUrl, &pEntry)) + if (URLCache_FindHash(pHeader, achUrl, &pHashEntry)) { URLCacheContainer_UnlockIndex(pContainer, pHeader); FIXME("entry already in cache - don't know what to do!\n"); @@ -2492,6 +2479,7 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) { URLCACHECONTAINER * pContainer; LPURLCACHE_HEADER pHeader; + struct _HASH_ENTRY * pHashEntry; CACHEFILE_ENTRY * pEntry; TRACE("(%s)\n", debugstr_a(lpszUrlName)); @@ -2505,7 +2493,7 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; - if (!URLCache_FindEntryInHash(pHeader, lpszUrlName, &pEntry)) + if (!URLCache_FindHash(pHeader, lpszUrlName, &pHashEntry)) { URLCacheContainer_UnlockIndex(pContainer, pHeader); TRACE("entry %s not found!\n", lpszUrlName); @@ -2513,6 +2501,7 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) return FALSE; } + pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); URLCache_DeleteEntry(pHeader, pEntry); URLCache_DeleteEntryFromHash(pHeader, lpszUrlName); @@ -2530,6 +2519,7 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) { URLCACHECONTAINER * pContainer; LPURLCACHE_HEADER pHeader; + struct _HASH_ENTRY * pHashEntry; CACHEFILE_ENTRY * pEntry; LPSTR urlA; int url_len; @@ -2561,7 +2551,7 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) return FALSE; } - if (!URLCache_FindEntryInHash(pHeader, urlA, &pEntry)) + if (!URLCache_FindHash(pHeader, urlA, &pHashEntry)) { URLCacheContainer_UnlockIndex(pContainer, pHeader); TRACE("entry %s not found!\n", debugstr_a(urlA)); @@ -2570,6 +2560,7 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) return FALSE; } + pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); URLCache_DeleteEntry(pHeader, pEntry); URLCache_DeleteEntryFromHash(pHeader, urlA); @@ -2931,6 +2922,7 @@ DWORD WINAPI DeleteIE3Cache(HWND hWnd, HINSTANCE hInst, LPSTR lpszCmdLine, int n BOOL WINAPI IsUrlCacheEntryExpiredA( LPCSTR url, DWORD dwFlags, FILETIME* pftLastModified ) { LPURLCACHE_HEADER pHeader; + struct _HASH_ENTRY * pHashEntry; CACHEFILE_ENTRY * pEntry; URL_CACHEFILE_ENTRY * pUrlEntry; URLCACHECONTAINER * pContainer; @@ -2946,7 +2938,7 @@ BOOL WINAPI IsUrlCacheEntryExpiredA( LPCSTR url, DWORD dwFlags, FILETIME* pftLas if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; - if (!URLCache_FindEntryInHash(pHeader, url, &pEntry)) + if (!URLCache_FindHash(pHeader, url, &pHashEntry)) { URLCacheContainer_UnlockIndex(pContainer, pHeader); TRACE("entry %s not found!\n", url); @@ -2954,6 +2946,7 @@ BOOL WINAPI IsUrlCacheEntryExpiredA( LPCSTR url, DWORD dwFlags, FILETIME* pftLas return FALSE; } + pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); if (pEntry->dwSignature != URL_SIGNATURE) { URLCacheContainer_UnlockIndex(pContainer, pHeader);

1 0

Juan Lang : wininet: Pass hash entry directly to URLCache_HashEntrySetUse rather than searching for it again .
by Alexandre Julliard Oct. 23, 2007

Oct. 23, 2007

Module: wine Branch: master Commit: 9949926441e3061e8ae457c2a17d82c29c9a43d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9949926441e3061e8ae457c2a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 22 10:15:44 2007 -0700 wininet: Pass hash entry directly to URLCache_HashEntrySetUse rather than searching for it again. --- dlls/wininet/urlcache.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 9b72f1d..1010a58 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1193,15 +1193,10 @@ static BOOL URLCache_FindHashW(LPCURLCACHE_HEADER pHeader, LPCWSTR lpszUrl, stru * FALSE if the entry could not be found * */ -static BOOL URLCache_HashEntrySetUse(LPCURLCACHE_HEADER pHeader, LPCSTR lpszUrl, DWORD dwUseCount) +static BOOL URLCache_HashEntrySetUse(struct _HASH_ENTRY * pHashEntry, DWORD dwUseCount) { - struct _HASH_ENTRY * pHashEntry; - if (URLCache_FindHash(pHeader, lpszUrl, &pHashEntry)) - { - pHashEntry->dwHashKey = dwUseCount | (DWORD)(pHashEntry->dwHashKey / HASHTABLE_NUM_ENTRIES) * HASHTABLE_NUM_ENTRIES; - return TRUE; - } - return FALSE; + pHashEntry->dwHashKey = dwUseCount | (DWORD)(pHashEntry->dwHashKey / HASHTABLE_NUM_ENTRIES) * HASHTABLE_NUM_ENTRIES; + return TRUE; } /*********************************************************************** @@ -1672,7 +1667,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( pUrlEntry->dwHitRate++; pUrlEntry->dwUseCount++; - URLCache_HashEntrySetUse(pHeader, lpszUrlName, pUrlEntry->dwUseCount); + URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); if (!URLCache_CopyEntry(pContainer, pHeader, lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize, pUrlEntry, FALSE)) { @@ -1764,7 +1759,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileA( return FALSE; } pUrlEntry->dwUseCount--; - URLCache_HashEntrySetUse(pHeader, lpszUrlName, pUrlEntry->dwUseCount); + URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); URLCacheContainer_UnlockIndex(pContainer, pHeader);

1 0

Juan Lang : wininet: Implement UnlockUrlCacheEntryFileW.
by Alexandre Julliard Oct. 23, 2007

Oct. 23, 2007

Module: wine Branch: master Commit: 922dc7b627399006ff376cb553db9cb00ecef3a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=922dc7b627399006ff376cb55… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 22 10:16:07 2007 -0700 wininet: Implement UnlockUrlCacheEntryFileW. --- dlls/wininet/urlcache.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 1010a58..e7131f3 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1772,7 +1772,59 @@ BOOL WINAPI UnlockUrlCacheEntryFileA( */ BOOL WINAPI UnlockUrlCacheEntryFileW( LPCWSTR lpszUrlName, DWORD dwReserved ) { - FIXME("(%s, 0x%08x)\n", debugstr_w(lpszUrlName), dwReserved); + LPURLCACHE_HEADER pHeader; + struct _HASH_ENTRY * pHashEntry; + CACHEFILE_ENTRY * pEntry; + URL_CACHEFILE_ENTRY * pUrlEntry; + URLCACHECONTAINER * pContainer; + + TRACE("(%s, 0x%08x)\n", debugstr_w(lpszUrlName), dwReserved); + + if (dwReserved) + { + ERR("dwReserved != 0\n"); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!URLCacheContainers_FindContainerW(lpszUrlName, &pContainer)) + return FALSE; + + if (!URLCacheContainer_OpenIndex(pContainer)) + return FALSE; + + if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) + return FALSE; + + if (!URLCache_FindHashW(pHeader, lpszUrlName, &pHashEntry)) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + TRACE("entry %s not found!\n", debugstr_w(lpszUrlName)); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); + if (pEntry->dwSignature != URL_SIGNATURE) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPSTR)&pEntry->dwSignature, sizeof(DWORD))); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; + + if (pUrlEntry->dwUseCount == 0) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + return FALSE; + } + pUrlEntry->dwUseCount--; + URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); + + URLCacheContainer_UnlockIndex(pContainer, pHeader); + return TRUE; }

1 0

Alexander Nicolaysen Sørnes : Use standard error page when not logged in on the queued items page
by Chris Morgan Oct. 23, 2007

Oct. 23, 2007

Module: appdb Branch: master Commit: b7189e4f5973266a71426b82b816270931c4d403 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b7189e4f5973266a71426b82… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Oct 23 01:40:46 2007 +0200 Use standard error page when not logged in on the queued items page --- queueditems.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/queueditems.php b/queueditems.php index 51435c5..4a226bc 100644 --- a/queueditems.php +++ b/queueditems.php @@ -11,7 +11,7 @@ require_once(BASE."include/appData.php"); $oUser = new User($_SESSION['current']->iUserId); if(!$oUser->isLoggedIn()) - util_show_error_page_and_exit("You need to log in to view your queued items."); + util_show_error_page_and_exit(); apidb_header("View Your Queued Items");

1 0

Alexander Nicolaysen Sørnes : objectManager: Cache object before checking if previewing should be allowed
by Chris Morgan Oct. 22, 2007

Oct. 22, 2007

Module: appdb Branch: master Commit: c33d8a382e8a2748929ac2a186636f561cecbe72 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c33d8a382e8a2748929ac2a1… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Oct 22 18:28:48 2007 +0200 objectManager: Cache object before checking if previewing should be allowed --- include/objectManager.php | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 249dc69..d888f05 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -331,6 +331,8 @@ class ObjectManager else $oObject->outputEditor(); + $this->oObject = $oObject; + /* if this is a queue add a dialog for replying to the submitter of the queued entry */ if($this->bIsQueue || ($oObject->objectGetSubmitterId() && $oObject->objectGetSubmitterId() != $_SESSION['current']->iUserId)) @@ -778,6 +780,7 @@ class ObjectManager else $oObject->outputEditor(); + $this->oObject = $oObject; echo "<div align=\"center\">"; echo "<input type=\"submit\" class=\"button\" value=\"Submit\" ". "name=\"sSubmit\" />\n"; @@ -790,7 +793,7 @@ class ObjectManager private function handle_preview_button() { - $oObject = new $this->sClass($this->iId); + $oObject = $this->getObject(); if(!method_exists($oObject, "objectShowPreview")) return;

1 0