March 2011 - Wine-commits - list.winehq.org

Juan Lang : wininet: Test sticky url cache entries.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: f7340864b9b892cebe0173d05a9b032095b5b2cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7340864b9b892cebe0173d05… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Mar 7 17:18:50 2011 -0800 wininet: Test sticky url cache entries. --- dlls/wininet/tests/urlcache.c | 102 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 102 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 2620c04..162d385 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -265,6 +265,8 @@ static void test_urlcacheA(void) broken(lpCacheEntryInfo->CacheEntryType == NORMAL_CACHE_ENTRY /* NT4/W2k */), "expected type NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, got %08x\n", lpCacheEntryInfo->CacheEntryType); + ok(!lpCacheEntryInfo->dwExemptDelta, "expected dwExemptDelta 0, got %d\n", + lpCacheEntryInfo->dwExemptDelta); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); /* A subsequent commit with a different time/type doesn't change the type */ @@ -502,6 +504,106 @@ static void test_urlcacheA(void) /* and the file should be untouched. */ check_file_exists(filenameA); DeleteFileA(filenameA); + + /* Try creating a sticky entry. Unlike non-sticky entries, the filename + * must have been set already. + */ + SetLastError(0xdeadbeef); + ret = CommitUrlCacheEntry(TEST_URL, NULL, filetime_zero, filetime_zero, + STICKY_CACHE_ENTRY, (LPBYTE)ok_header, strlen(ok_header), "html", + NULL); + todo_wine { + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + SetLastError(0xdeadbeef); + ret = CommitUrlCacheEntry(TEST_URL, NULL, filetime_zero, filetime_zero, + NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY, + (LPBYTE)ok_header, strlen(ok_header), "html", NULL); + todo_wine { + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + ret = CreateUrlCacheEntry(TEST_URL, 0, "html", filenameA, 0); + ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + create_and_write_file(filenameA, &zero_byte, sizeof(zero_byte)); + ret = CommitUrlCacheEntry(TEST_URL, filenameA, filetime_zero, filetime_zero, + NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY, + (LPBYTE)ok_header, strlen(ok_header), "html", NULL); + ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); + cbCacheEntryInfo = 0; + SetLastError(0xdeadbeef); + ret = GetUrlCacheEntryInfo(TEST_URL, NULL, &cbCacheEntryInfo); + ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); + ret = GetUrlCacheEntryInfo(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo); + ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); + ok(lpCacheEntryInfo->CacheEntryType & (NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY), + "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %d (0x%08x)\n", + lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); + todo_wine + ok(lpCacheEntryInfo->dwExemptDelta == 86400, + "expected dwExemptDelta 864000, got %d\n", + lpCacheEntryInfo->dwExemptDelta); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + if (pDeleteUrlCacheEntryA) + { + ret = pDeleteUrlCacheEntryA(TEST_URL); + ok(ret, "DeleteUrlCacheEntryA failed with error %d\n", GetLastError()); + /* When explicitly deleting the cache entry, the file is also deleted */ + todo_wine + check_file_not_exists(filenameA); + } + /* Test once again, setting the exempt delta via SetUrlCacheEntryInfo */ + ret = CreateUrlCacheEntry(TEST_URL, 0, "html", filenameA, 0); + ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + create_and_write_file(filenameA, &zero_byte, sizeof(zero_byte)); + ret = CommitUrlCacheEntry(TEST_URL, filenameA, filetime_zero, filetime_zero, + NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY, + (LPBYTE)ok_header, strlen(ok_header), "html", NULL); + ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); + cbCacheEntryInfo = 0; + SetLastError(0xdeadbeef); + ret = GetUrlCacheEntryInfo(TEST_URL, NULL, &cbCacheEntryInfo); + ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); + ret = GetUrlCacheEntryInfo(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo); + ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); + ok(lpCacheEntryInfo->CacheEntryType & (NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY), + "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %d (0x%08x)\n", + lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); + todo_wine + ok(lpCacheEntryInfo->dwExemptDelta == 86400, + "expected dwExemptDelta 864000, got %d\n", + lpCacheEntryInfo->dwExemptDelta); + lpCacheEntryInfo->dwExemptDelta = 0; + ret = SetUrlCacheEntryInfoA(TEST_URL, lpCacheEntryInfo, + CACHE_ENTRY_EXEMPT_DELTA_FC); + ok(ret, "SetUrlCacheEntryInfo failed: %d\n", GetLastError()); + ret = GetUrlCacheEntryInfo(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo); + ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); + ok(!lpCacheEntryInfo->dwExemptDelta, "expected dwExemptDelta 0, got %d\n", + lpCacheEntryInfo->dwExemptDelta); + /* See whether a sticky cache entry has the flag cleared once the exempt + * delta is meaningless. + */ + ok(lpCacheEntryInfo->CacheEntryType & (NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY), + "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %d (0x%08x)\n", + lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + if (pDeleteUrlCacheEntryA) + { + ret = pDeleteUrlCacheEntryA(TEST_URL); + ok(ret, "DeleteUrlCacheEntryA failed with error %d\n", GetLastError()); + todo_wine + check_file_not_exists(filenameA); + } } static void test_FindCloseUrlCache(void)

1 0

Juan Lang : wininet: Implement sticky url cache entries.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 190acb9e2615fd4d42656706e93f9e9664bd2ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=190acb9e2615fd4d42656706e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Mar 9 10:59:07 2011 -0800 wininet: Implement sticky url cache entries. --- dlls/wininet/tests/urlcache.c | 6 ---- dlls/wininet/urlcache.c | 53 ++++++++++++++++++++++++++++++++++------- 2 files changed, 44 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 162d385..92bd2f0 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -512,20 +512,16 @@ static void test_urlcacheA(void) ret = CommitUrlCacheEntry(TEST_URL, NULL, filetime_zero, filetime_zero, STICKY_CACHE_ENTRY, (LPBYTE)ok_header, strlen(ok_header), "html", NULL); - todo_wine { ok(!ret, "expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - } SetLastError(0xdeadbeef); ret = CommitUrlCacheEntry(TEST_URL, NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY, (LPBYTE)ok_header, strlen(ok_header), "html", NULL); - todo_wine { ok(!ret, "expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - } ret = CreateUrlCacheEntry(TEST_URL, 0, "html", filenameA, 0); ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); create_and_write_file(filenameA, &zero_byte, sizeof(zero_byte)); @@ -545,7 +541,6 @@ static void test_urlcacheA(void) ok(lpCacheEntryInfo->CacheEntryType & (NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY), "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %d (0x%08x)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); - todo_wine ok(lpCacheEntryInfo->dwExemptDelta == 86400, "expected dwExemptDelta 864000, got %d\n", lpCacheEntryInfo->dwExemptDelta); @@ -578,7 +573,6 @@ static void test_urlcacheA(void) ok(lpCacheEntryInfo->CacheEntryType & (NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY), "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %d (0x%08x)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); - todo_wine ok(lpCacheEntryInfo->dwExemptDelta == 86400, "expected dwExemptDelta 864000, got %d\n", lpCacheEntryInfo->dwExemptDelta); diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 137ec3c..05e16a8 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2473,6 +2473,11 @@ static BOOL CommitUrlCacheEntryInternal( debugstr_w(lpszFileExtension), debugstr_w(lpszOriginalUrl)); + if (CacheEntryType & STICKY_CACHE_ENTRY && !lpszLocalFileName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } if (lpszOriginalUrl) WARN(": lpszOriginalUrl ignored\n"); @@ -2612,7 +2617,13 @@ static BOOL CommitUrlCacheEntryInternal( pUrlEntry->CacheDir = cDirectory; pUrlEntry->CacheEntryType = CacheEntryType; pUrlEntry->dwHeaderInfoSize = dwHeaderSize; - pUrlEntry->dwExemptDelta = 0; + if (CacheEntryType & STICKY_CACHE_ENTRY) + { + /* Sticky entries have a default exempt time of one day */ + pUrlEntry->dwExemptDelta = 86400; + } + else + pUrlEntry->dwExemptDelta = 0; pUrlEntry->dwHitRate = 0; pUrlEntry->dwOffsetFileExtension = dwOffsetFileExtension; pUrlEntry->dwOffsetHeaderInfo = dwOffsetHeader; @@ -2653,8 +2664,12 @@ static BOOL CommitUrlCacheEntryInternal( { if (pUrlEntry->CacheDir < pHeader->DirectoryCount) pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles++; - pHeader->CacheUsage.QuadPart += file_size.QuadPart; - if (pHeader->CacheUsage.QuadPart > pHeader->CacheLimit.QuadPart) + if (CacheEntryType & STICKY_CACHE_ENTRY) + pHeader->ExemptUsage.QuadPart += file_size.QuadPart; + else + pHeader->CacheUsage.QuadPart += file_size.QuadPart; + if (pHeader->CacheUsage.QuadPart + pHeader->ExemptUsage.QuadPart > + pHeader->CacheLimit.QuadPart) FIXME("file of size %s bytes fills cache\n", wine_dbgstr_longlong(file_size.QuadPart)); } @@ -3032,10 +3047,20 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) if (pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles) pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles--; } - if (pUrlEntry->size.QuadPart < pHeader->CacheUsage.QuadPart) - pHeader->CacheUsage.QuadPart -= pUrlEntry->size.QuadPart; + if (pUrlEntry->CacheEntryType & STICKY_CACHE_ENTRY) + { + if (pUrlEntry->size.QuadPart < pHeader->ExemptUsage.QuadPart) + pHeader->ExemptUsage.QuadPart -= pUrlEntry->size.QuadPart; + else + pHeader->ExemptUsage.QuadPart = 0; + } else - pHeader->CacheUsage.QuadPart = 0; + { + if (pUrlEntry->size.QuadPart < pHeader->CacheUsage.QuadPart) + pHeader->CacheUsage.QuadPart -= pUrlEntry->size.QuadPart; + else + pHeader->CacheUsage.QuadPart = 0; + } URLCache_DeleteEntry(pHeader, pEntry); @@ -3115,10 +3140,20 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) if (pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles) pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles--; } - if (pUrlEntry->size.QuadPart < pHeader->CacheUsage.QuadPart) - pHeader->CacheUsage.QuadPart -= pUrlEntry->size.QuadPart; + if (pUrlEntry->CacheEntryType & STICKY_CACHE_ENTRY) + { + if (pUrlEntry->size.QuadPart < pHeader->ExemptUsage.QuadPart) + pHeader->ExemptUsage.QuadPart -= pUrlEntry->size.QuadPart; + else + pHeader->ExemptUsage.QuadPart = 0; + } else - pHeader->CacheUsage.QuadPart = 0; + { + if (pUrlEntry->size.QuadPart < pHeader->CacheUsage.QuadPart) + pHeader->CacheUsage.QuadPart -= pUrlEntry->size.QuadPart; + else + pHeader->CacheUsage.QuadPart = 0; + } URLCache_DeleteEntry(pHeader, pEntry);

1 0

Juan Lang : wininet: Implement DeleteUrlCacheEntryA/ W with a helper function.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: cb0a5c91060553a28577cf10e65d948b0842d397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb0a5c91060553a28577cf10e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Mar 9 11:04:42 2011 -0800 wininet: Implement DeleteUrlCacheEntryA/W with a helper function. --- dlls/wininet/urlcache.c | 119 ++++++++++++++++++---------------------------- 1 files changed, 47 insertions(+), 72 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 05e16a8..6e357b0 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2039,6 +2039,47 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( return TRUE; } +static BOOL DeleteUrlCacheEntryInternal(LPURLCACHE_HEADER pHeader, + struct _HASH_ENTRY *pHashEntry) +{ + CACHEFILE_ENTRY * pEntry; + URL_CACHEFILE_ENTRY * pUrlEntry; + + pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); + if (pEntry->dwSignature != URL_SIGNATURE) + { + FIXME("Trying to delete entry of unknown format %s\n", + debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; + if (pUrlEntry->CacheDir < pHeader->DirectoryCount) + { + if (pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles) + pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles--; + } + if (pUrlEntry->CacheEntryType & STICKY_CACHE_ENTRY) + { + if (pUrlEntry->size.QuadPart < pHeader->ExemptUsage.QuadPart) + pHeader->ExemptUsage.QuadPart -= pUrlEntry->size.QuadPart; + else + pHeader->ExemptUsage.QuadPart = 0; + } + else + { + if (pUrlEntry->size.QuadPart < pHeader->CacheUsage.QuadPart) + pHeader->CacheUsage.QuadPart -= pUrlEntry->size.QuadPart; + else + pHeader->CacheUsage.QuadPart = 0; + } + + URLCache_DeleteEntry(pHeader, pEntry); + + URLCache_DeleteEntryFromHash(pHashEntry); + return TRUE; +} + /*********************************************************************** * UnlockUrlCacheEntryFileA (WININET.@) * @@ -3001,9 +3042,8 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) URLCACHECONTAINER * pContainer; LPURLCACHE_HEADER pHeader; struct _HASH_ENTRY * pHashEntry; - CACHEFILE_ENTRY * pEntry; - const URL_CACHEFILE_ENTRY * pUrlEntry; DWORD error; + BOOL ret; TRACE("(%s)\n", debugstr_a(lpszUrlName)); @@ -3032,43 +3072,11 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) return FALSE; } - pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); - if (pEntry->dwSignature != URL_SIGNATURE) - { - URLCacheContainer_UnlockIndex(pContainer, pHeader); - FIXME("Trying to delete entry of unknown format %s\n", - debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } - pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; - if (pUrlEntry->CacheDir < pHeader->DirectoryCount) - { - if (pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles) - pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles--; - } - if (pUrlEntry->CacheEntryType & STICKY_CACHE_ENTRY) - { - if (pUrlEntry->size.QuadPart < pHeader->ExemptUsage.QuadPart) - pHeader->ExemptUsage.QuadPart -= pUrlEntry->size.QuadPart; - else - pHeader->ExemptUsage.QuadPart = 0; - } - else - { - if (pUrlEntry->size.QuadPart < pHeader->CacheUsage.QuadPart) - pHeader->CacheUsage.QuadPart -= pUrlEntry->size.QuadPart; - else - pHeader->CacheUsage.QuadPart = 0; - } - - URLCache_DeleteEntry(pHeader, pEntry); - - URLCache_DeleteEntryFromHash(pHashEntry); + ret = DeleteUrlCacheEntryInternal(pHeader, pHashEntry); URLCacheContainer_UnlockIndex(pContainer, pHeader); - return TRUE; + return ret; } /*********************************************************************** @@ -3080,10 +3088,9 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) URLCACHECONTAINER * pContainer; LPURLCACHE_HEADER pHeader; struct _HASH_ENTRY * pHashEntry; - CACHEFILE_ENTRY * pEntry; - const URL_CACHEFILE_ENTRY * pUrlEntry; LPSTR urlA; DWORD error; + BOOL ret; TRACE("(%s)\n", debugstr_w(lpszUrlName)); @@ -3125,44 +3132,12 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) return FALSE; } - pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); - if (pEntry->dwSignature != URL_SIGNATURE) - { - URLCacheContainer_UnlockIndex(pContainer, pHeader); - FIXME("Trying to delete entry of unknown format %s\n", - debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } - pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; - if (pUrlEntry->CacheDir < pHeader->DirectoryCount) - { - if (pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles) - pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles--; - } - if (pUrlEntry->CacheEntryType & STICKY_CACHE_ENTRY) - { - if (pUrlEntry->size.QuadPart < pHeader->ExemptUsage.QuadPart) - pHeader->ExemptUsage.QuadPart -= pUrlEntry->size.QuadPart; - else - pHeader->ExemptUsage.QuadPart = 0; - } - else - { - if (pUrlEntry->size.QuadPart < pHeader->CacheUsage.QuadPart) - pHeader->CacheUsage.QuadPart -= pUrlEntry->size.QuadPart; - else - pHeader->CacheUsage.QuadPart = 0; - } - - URLCache_DeleteEntry(pHeader, pEntry); - - URLCache_DeleteEntryFromHash(pHashEntry); + ret = DeleteUrlCacheEntryInternal(pHeader, pHashEntry); URLCacheContainer_UnlockIndex(pContainer, pHeader); HeapFree(GetProcessHeap(), 0, urlA); - return TRUE; + return ret; } BOOL WINAPI DeleteUrlCacheContainerA(DWORD d1, DWORD d2)

1 0

Juan Lang : cryptnet: Let DeleteUrlCacheEntryW remove the cache file.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 648b91a9f3cbcbb9594c4e5eb25baf198c95f40f URL: http://source.winehq.org/git/wine.git/?a=commit;h=648b91a9f3cbcbb9594c4e5eb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 12:24:06 2011 -0800 cryptnet: Let DeleteUrlCacheEntryW remove the cache file. --- dlls/cryptnet/cryptnet_main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 26e8fe7..204590f 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -748,7 +748,6 @@ static void CRYPT_CacheURL(LPCWSTR pszURL, const CRYPT_BLOB_ARRAY *pObject, { create = TRUE; DeleteUrlCacheEntryW(pszURL); - DeleteFileW(cacheFileName); } CryptMemFree(info); }

1 0

David Hedberg : msi: Use ordering information to update the correct row.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 599b30833acb4fcda84e8e4272b61e2e47a504a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=599b30833acb4fcda84e8e427… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Thu Mar 10 02:20:56 2011 +0100 msi: Use ordering information to update the correct row. --- dlls/msi/table.c | 3 ++ dlls/msi/tests/db.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index bc05987..80fe3ee 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1776,6 +1776,9 @@ static UINT msi_table_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row) if (row != new_row + 1) return ERROR_FUNCTION_FAILED; + if(tv->order) + new_row = tv->order->reorder[new_row]; + return TABLE_set_row(view, new_row, rec, (1 << tv->num_cols) - 1); } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index de2b9f5..06bd8d1 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -5266,6 +5266,7 @@ static void test_select_markers(void) static void test_viewmodify_update(void) { MSIHANDLE hdb = 0, hview = 0, hrec = 0; + UINT i, test_max, offset, count; const char *query; UINT r; @@ -5432,6 +5433,90 @@ static void test_viewmodify_update(void) r = MsiCloseHandle(hview); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + query = "CREATE TABLE `table2` (`A` INT, `B` INT PRIMARY KEY `A`)"; + r = run_query( hdb, 0, query ); + ok(r == ERROR_SUCCESS, "query failed\n"); + + query = "INSERT INTO `table2` (`A`, `B`) VALUES (?, ?)"; + r = MsiDatabaseOpenView( hdb, query, &hview ); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + + test_max = 100; + offset = 1234; + for(i = 0; i < test_max; i++) + { + + hrec = MsiCreateRecord( 2 ); + MsiRecordSetInteger( hrec, 1, test_max - i ); + MsiRecordSetInteger( hrec, 2, i ); + + r = MsiViewExecute( hview, hrec ); + ok(r == ERROR_SUCCESS, "Got %d\n", r); + + r = MsiCloseHandle( hrec ); + ok(r == ERROR_SUCCESS, "Got %d\n", r); + } + + r = MsiViewClose( hview ); + ok(r == ERROR_SUCCESS, "Got %d\n", r); + r = MsiCloseHandle( hview ); + ok(r == ERROR_SUCCESS, "Got %d\n", r); + + /* Update. */ + query = "SELECT * FROM `table2` ORDER BY `B`"; + r = MsiDatabaseOpenView( hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute( hview, 0 ); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + count = 0; + while (MsiViewFetch( hview, &hrec ) == ERROR_SUCCESS) + { + UINT b = MsiRecordGetInteger( hrec, 2 ); + + r = MsiRecordSetInteger( hrec, 2, b + offset); + ok(r == ERROR_SUCCESS, "Got %d\n", r); + + r = MsiViewModify( hview, MSIMODIFY_UPDATE, hrec ); + ok(r == ERROR_SUCCESS, "Got %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + count++; + } + ok(count == test_max, "Got count %d\n", count); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + /* Recheck. */ + query = "SELECT * FROM `table2` ORDER BY `B`"; + r = MsiDatabaseOpenView( hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute( hview, 0 ); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + count = 0; + while (MsiViewFetch( hview, &hrec ) == ERROR_SUCCESS) + { + UINT a = MsiRecordGetInteger( hrec, 1 ); + UINT b = MsiRecordGetInteger( hrec, 2 ); + ok( ( test_max - a + offset) == b, "Got (%d, %d), expected (%d, %d)\n", + a, b, test_max - a + offset, b); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + count++; + } + ok(count == test_max, "Got count %d\n", count); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + r = MsiCloseHandle( hdb ); ok(r == ERROR_SUCCESS, "MsiOpenDatabase close failed\n"); }

1 0

David Hedberg : msi: Check other sources if install media not present at last used location.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 477702c829ed480d6a48432a1952d641f639aaa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=477702c829ed480d6a48432a1… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Thu Mar 10 02:20:57 2011 +0100 msi: Check other sources if install media not present at last used location. --- dlls/msi/media.c | 45 +++++++++++++++++++++++++++++++++------------ 1 files changed, 33 insertions(+), 12 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 8c4b0f7..37d3530 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -748,23 +748,44 @@ static UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) if (r != ERROR_SUCCESS) return r; - index = 0; - volumesz = MAX_PATH; - promptsz = MAX_PATH; - if (last_type[0] == 'n') { - while (MsiSourceListEnumSourcesW(package->ProductCode, NULL, - package->Context, - MSISOURCETYPE_NETWORK, index++, - volume, &volumesz) == ERROR_SUCCESS) + WCHAR cabinet_file[MAX_PATH]; + BOOL check_all = FALSE; + + while(TRUE) { - if (!strncmpiW(source, volume, strlenW(source))) + index = 0; + volumesz = MAX_PATH; + while (MsiSourceListEnumSourcesW(package->ProductCode, NULL, + package->Context, + MSISOURCETYPE_NETWORK, index++, + volume, &volumesz) == ERROR_SUCCESS) { - lstrcpyW(mi->sourcedir, source); - TRACE("Found network source %s\n", debugstr_w(mi->sourcedir)); - return ERROR_SUCCESS; + if (check_all || !strncmpiW(source, volume, strlenW(source))) + { + lstrcpyW(cabinet_file, volume); + PathAddBackslashW(cabinet_file); + lstrcatW(cabinet_file, mi->cabinet); + + if (GetFileAttributesW(cabinet_file) == INVALID_FILE_ATTRIBUTES) + { + volumesz = MAX_PATH; + if(!check_all) + break; + continue; + } + + lstrcpyW(mi->sourcedir, volume); + TRACE("Found network source %s\n", debugstr_w(mi->sourcedir)); + return ERROR_SUCCESS; + } } + + if (!check_all) + check_all = TRUE; + else + break; } }

1 0

Erich Hoover : user32: Fix GetCursorFrameInfo when passed the proper number of steps.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 86a9f20aa2bf1426732d5e5ece8e2c8c9755e95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=86a9f20aa2bf1426732d5e5ec… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Mar 9 22:56:16 2011 -0700 user32: Fix GetCursorFrameInfo when passed the proper number of steps. --- dlls/user32/cursoricon.c | 29 ++++++-- dlls/user32/tests/cursoricon.c | 146 ++++++++++++++++++++++++++++++++-------- 2 files changed, 139 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=86a9f20aa2bf1426732d5…

1 0

Erich Hoover : user32: Add FIXMEs for unsupported animated cursor data.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 389ffed29324e57f98e470f7d573293aae2864e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=389ffed29324e57f98e470f7d… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Mar 9 22:56:34 2011 -0700 user32: Add FIXMEs for unsupported animated cursor data. --- dlls/user32/cursoricon.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 141bec8..0d73ecb 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -891,6 +891,7 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, HMODULE module, LPCW #define ANI_anih_ID RIFF_FOURCC('a', 'n', 'i', 'h') #define ANI_seq__ID RIFF_FOURCC('s', 'e', 'q', ' ') #define ANI_fram_ID RIFF_FOURCC('f', 'r', 'a', 'm') +#define ANI_rate_ID RIFF_FOURCC('r', 'a', 't', 'e') #define ANI_FLAG_ICON 0x1 #define ANI_FLAG_SEQUENCE 0x2 @@ -996,6 +997,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, riff_chunk_t ACON_chunk = {0}; riff_chunk_t anih_chunk = {0}; riff_chunk_t fram_chunk = {0}; + riff_chunk_t rate_chunk = {0}; const unsigned char *icon_chunk; const unsigned char *icon_data; @@ -1017,6 +1019,19 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, memcpy( &header, anih_chunk.data, sizeof(header) ); dump_ani_header( &header ); + if (!(header.flags & ANI_FLAG_ICON)) + { + FIXME("Raw animated icon/cursor data is not currently supported.\n"); + return 0; + } + + if (header.flags & ANI_FLAG_SEQUENCE) + FIXME("Animated icon/cursor sequence data is not currently supported, frames may appear out of sequence.\n"); + + riff_find_chunk( ANI_rate_ID, 0, &ACON_chunk, &rate_chunk ); + if (rate_chunk.data) + FIXME("Animated icon/cursor multiple frame-frate data not currently supported.\n"); + riff_find_chunk( ANI_fram_ID, ANI_LIST_ID, &ACON_chunk, &fram_chunk ); if (!fram_chunk.data) {

1 0

Erich Hoover : user32: Add preliminary support for reading and storing multi-rate animated cursor data .
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 3e35caa7b2815d2d1bfdca1a893d4a1430d1edbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e35caa7b2815d2d1bfdca1a8… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Mar 9 22:56:40 2011 -0700 user32: Add preliminary support for reading and storing multi-rate animated cursor data. --- dlls/user32/cursoricon.c | 23 +++- dlls/user32/tests/cursoricon.c | 280 +++++++++++++++++++--------------------- 2 files changed, 152 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e35caa7b2815d2d1bfdc…

1 0

Vincent Povirk : gdiplus: Add tests for interpolation mode and make them pass.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: a2631ae1d283481c5b1509876cef202d66f41a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2631ae1d283481c5b1509876… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 3 14:57:19 2011 -0600 gdiplus: Add tests for interpolation mode and make them pass. --- dlls/gdiplus/graphics.c | 12 +++++-- dlls/gdiplus/tests/graphics.c | 70 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e9412c8..4827bb0 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1364,7 +1364,7 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra (*graphics)->owndc = FALSE; (*graphics)->smoothing = SmoothingModeDefault; (*graphics)->compqual = CompositingQualityDefault; - (*graphics)->interpolation = InterpolationModeDefault; + (*graphics)->interpolation = InterpolationModeBilinear; (*graphics)->pixeloffset = PixelOffsetModeDefault; (*graphics)->compmode = CompositingModeSourceOver; (*graphics)->unit = UnitDisplay; @@ -1403,7 +1403,7 @@ GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics) (*graphics)->image = image; (*graphics)->smoothing = SmoothingModeDefault; (*graphics)->compqual = CompositingQualityDefault; - (*graphics)->interpolation = InterpolationModeDefault; + (*graphics)->interpolation = InterpolationModeBilinear; (*graphics)->pixeloffset = PixelOffsetModeDefault; (*graphics)->compmode = CompositingModeSourceOver; (*graphics)->unit = UnitDisplay; @@ -4638,12 +4638,18 @@ GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics *graphics, { TRACE("(%p, %d)\n", graphics, mode); - if(!graphics) + if(!graphics || mode == InterpolationModeInvalid || mode > InterpolationModeHighQualityBicubic) return InvalidParameter; if(graphics->busy) return ObjectBusy; + if (mode == InterpolationModeDefault || mode == InterpolationModeLowQuality) + mode = InterpolationModeBilinear; + + if (mode == InterpolationModeHighQuality) + mode = InterpolationModeHighQualityBicubic; + graphics->interpolation = mode; return Ok; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 275c237..ecdbe93 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3012,6 +3012,75 @@ static void test_string_functions(void) ReleaseDC(hwnd, hdc); } +static void test_get_set_interpolation(void) +{ + GpGraphics *graphics; + HDC hdc = GetDC( hwnd ); + GpStatus status; + InterpolationMode mode; + + ok(hdc != NULL, "Expected HDC to be initialized\n"); + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + status = GdipGetInterpolationMode(NULL, &mode); + expect(InvalidParameter, status); + + if (0) + { + /* Crashes on Windows XP */ + status = GdipGetInterpolationMode(graphics, NULL); + expect(InvalidParameter, status); + } + + status = GdipSetInterpolationMode(NULL, InterpolationModeNearestNeighbor); + expect(InvalidParameter, status); + + /* out of range */ + status = GdipSetInterpolationMode(graphics, InterpolationModeHighQualityBicubic+1); + expect(InvalidParameter, status); + + status = GdipSetInterpolationMode(graphics, InterpolationModeInvalid); + expect(InvalidParameter, status); + + status = GdipGetInterpolationMode(graphics, &mode); + expect(Ok, status); + expect(InterpolationModeBilinear, mode); + + status = GdipSetInterpolationMode(graphics, InterpolationModeNearestNeighbor); + expect(Ok, status); + + status = GdipGetInterpolationMode(graphics, &mode); + expect(Ok, status); + expect(InterpolationModeNearestNeighbor, mode); + + status = GdipSetInterpolationMode(graphics, InterpolationModeDefault); + expect(Ok, status); + + status = GdipGetInterpolationMode(graphics, &mode); + expect(Ok, status); + expect(InterpolationModeBilinear, mode); + + status = GdipSetInterpolationMode(graphics, InterpolationModeLowQuality); + expect(Ok, status); + + status = GdipGetInterpolationMode(graphics, &mode); + expect(Ok, status); + expect(InterpolationModeBilinear, mode); + + status = GdipSetInterpolationMode(graphics, InterpolationModeHighQuality); + expect(Ok, status); + + status = GdipGetInterpolationMode(graphics, &mode); + expect(Ok, status); + expect(InterpolationModeHighQualityBicubic, mode); + + GdipDeleteGraphics(graphics); + + ReleaseDC(hwnd, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3070,6 +3139,7 @@ START_TEST(graphics) test_textcontrast(); test_fromMemoryBitmap(); test_string_functions(); + test_get_set_interpolation(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0