September 2012 - Wine-commits

Hans Leidekker : wbemprox: Fix a memory leak.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: d8d6821cd49b29736d7a2886df585ee939ccfb7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8d6821cd49b29736d7a2886d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 18 13:11:42 2012 +0200 wbemprox: Fix a memory leak. --- dlls/wbemprox/builtin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5434fc5..54992b3 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -233,7 +233,7 @@ static const struct column col_os[] = { prop_csdversionW, CIM_STRING }, { prop_osarchitectureW, CIM_STRING }, { prop_oslanguageW, CIM_UINT32, VT_I4 }, - { prop_systemdirectoryW, CIM_STRING } + { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_params[] = {

1 0

Hans Leidekker : wbemprox: Add helpers to retrieve the system directory and OS architecture.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 381d30ac17a8cf68099e8fa3e2d0bb7669327d64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=381d30ac17a8cf68099e8fa3e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 18 13:11:59 2012 +0200 wbemprox: Add helpers to retrieve the system directory and OS architecture. --- dlls/wbemprox/builtin.c | 42 ++++++++++++++++++++++++------------------ 1 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 54992b3..4b6ff38 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -831,31 +831,37 @@ static void fill_processor( struct table *table ) table->num_rows = count; } -static void fill_os( struct table *table ) +static const WCHAR *get_osarchitecture(void) { - struct record_operatingsystem *rec; - WCHAR path[MAX_PATH]; SYSTEM_INFO info; + GetNativeSystemInfo( &info ); + if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return os_64bitW; + return os_32bitW; +} +static WCHAR *get_systemdirectory(void) +{ void *redir; + WCHAR *ret; - if (!(table->data = heap_alloc( sizeof(*rec) ))) return; - - rec = (struct record_operatingsystem *)table->data; - rec->caption = os_captionW; - rec->csdversion = os_csdversionW; + if (!(ret = heap_alloc( MAX_PATH * sizeof(WCHAR) ))) return NULL; + Wow64DisableWow64FsRedirection( &redir ); + GetSystemDirectoryW( ret, MAX_PATH ); + Wow64RevertWow64FsRedirection( redir ); + return ret; +} - GetNativeSystemInfo( &info ); - if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) - rec->osarchitecture = os_64bitW; - else - rec->osarchitecture = os_32bitW; +static void fill_os( struct table *table ) +{ + struct record_operatingsystem *rec; - rec->oslanguage = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US ); + if (!(table->data = heap_alloc( sizeof(*rec) ))) return; - Wow64DisableWow64FsRedirection( &redir ); - GetSystemDirectoryW( path, MAX_PATH ); - Wow64RevertWow64FsRedirection( redir ); - rec->systemdirectory = heap_strdupW( path ); + rec = (struct record_operatingsystem *)table->data; + rec->caption = os_captionW; + rec->csdversion = os_csdversionW; + rec->osarchitecture = get_osarchitecture(); + rec->oslanguage = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US ); + rec->systemdirectory = get_systemdirectory(); TRACE("created 1 row\n"); table->num_rows = 1;

1 0

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.LastBootUptime.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 22454d6341b1937a09dacb4ae8e6ded84f5cc9dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=22454d6341b1937a09dacb4ae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 18 13:12:20 2012 +0200 wbemprox: Implement Win32_OperatingSystem.LastBootUptime. --- dlls/wbemprox/builtin.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 4b6ff38..54de2bb 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -111,6 +111,8 @@ static const WCHAR prop_handleW[] = {'H','a','n','d','l','e',0}; static const WCHAR prop_interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; +static const WCHAR prop_lastbootuptimeW[] = + {'L','a','s','t','B','o','o','t','U','p','T','i','m','e',0}; static const WCHAR prop_macaddressW[] = {'M','A','C','A','d','d','r','e','s','s',0}; static const WCHAR prop_manufacturerW[] = @@ -231,6 +233,7 @@ static const struct column col_os[] = { { prop_captionW, CIM_STRING }, { prop_csdversionW, CIM_STRING }, + { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_osarchitectureW, CIM_STRING }, { prop_oslanguageW, CIM_UINT32, VT_I4 }, { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC } @@ -373,6 +376,7 @@ struct record_operatingsystem { const WCHAR *caption; const WCHAR *csdversion; + const WCHAR *lastbootuptime; const WCHAR *osarchitecture; UINT32 oslanguage; const WCHAR *systemdirectory; @@ -831,6 +835,28 @@ static void fill_processor( struct table *table ) table->num_rows = count; } +static WCHAR *get_lastbootuptime(void) +{ + static const WCHAR fmtW[] = + {'%','0','4','u','%','0','2','u','%','0','2','u','%','0','2','u','%','0','2','u','%','0','2','u', + '.','%','0','6','u','+','0','0','0',0}; + SYSTEMTIME st; + FILETIME ft; + ULARGE_INTEGER ticks; + WCHAR *ret; + + if (!(ret = heap_alloc( 26 * sizeof(WCHAR) ))) return NULL; + GetSystemTime( &st ); + SystemTimeToFileTime( &st, &ft ); + ticks.u.LowPart = ft.dwLowDateTime; + ticks.u.HighPart = ft.dwHighDateTime; + ticks.QuadPart -= GetTickCount64() * 10000; + ft.dwLowDateTime = ticks.u.LowPart; + ft.dwHighDateTime = ticks.u.HighPart; + FileTimeToSystemTime( &ft, &st ); + sprintfW( ret, fmtW, st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds * 1000 ); + return ret; +} static const WCHAR *get_osarchitecture(void) { SYSTEM_INFO info; @@ -859,6 +885,7 @@ static void fill_os( struct table *table ) rec = (struct record_operatingsystem *)table->data; rec->caption = os_captionW; rec->csdversion = os_csdversionW; + rec->lastbootuptime = get_lastbootuptime(); rec->osarchitecture = get_osarchitecture(); rec->oslanguage = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US ); rec->systemdirectory = get_systemdirectory();

1 0

Piotr Caban : wininet: Don't define DELETED_CACHE_ENTRY in public headers.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 7967f8beecf6a44d768365aa7921ba9ea4ae1a14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7967f8beecf6a44d768365aa7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 18 14:43:12 2012 +0200 wininet: Don't define DELETED_CACHE_ENTRY in public headers. --- dlls/wininet/tests/urlcache.c | 4 ++-- dlls/wininet/urlcache.c | 6 ++++-- include/wininet.h | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 02d8d28..12827e9 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -582,8 +582,8 @@ static void test_urlcacheA(void) memset(lpCacheEntryInfo, 0, cbCacheEntryInfo); ret = GetUrlCacheEntryInfo(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo); ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); - ok(lpCacheEntryInfo->CacheEntryType & DELETED_CACHE_ENTRY, - "CacheEntryType hasn't DELETED_CACHE_ENTRY set, (flags %08x)\n", + ok(lpCacheEntryInfo->CacheEntryType & 0x400000, + "CacheEntryType hasn't PENDING_DELETE_CACHE_ENTRY set, (flags %08x)\n", lpCacheEntryInfo->CacheEntryType); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index e958d00..0536093 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -79,6 +79,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); #define HASHTABLE_REDR 5 #define HASHTABLE_FLAG_BITS 5 +#define PENDING_DELETE_CACHE_ENTRY 0x00400000 + #define DWORD_SIG(a,b,c,d) (a | (b << 8) | (c << 16) | (d << 24)) #define URL_SIGNATURE DWORD_SIG('U','R','L',' ') #define REDR_SIGNATURE DWORD_SIG('R','E','D','R') @@ -2193,7 +2195,7 @@ static BOOL DeleteUrlCacheEntryInternal(LPURLCACHE_HEADER pHeader, { /* FIXME: implement timeout object unlocking */ TRACE("Trying to delete locked entry\n"); - pUrlEntry->CacheEntryType |= DELETED_CACHE_ENTRY; + pUrlEntry->CacheEntryType |= PENDING_DELETE_CACHE_ENTRY; SetLastError(ERROR_SHARING_VIOLATION); return FALSE; } @@ -2294,7 +2296,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileA( if (!pUrlEntry->dwUseCount) { URLCache_HashEntrySetFlags(pHashEntry, HASHTABLE_URL); - if (pUrlEntry->CacheEntryType & DELETED_CACHE_ENTRY) + if (pUrlEntry->CacheEntryType & PENDING_DELETE_CACHE_ENTRY) DeleteUrlCacheEntryInternal(pHeader, pHashEntry); } diff --git a/include/wininet.h b/include/wininet.h index c7a428a..51d9864 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1497,7 +1497,6 @@ INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LP #define EDITED_CACHE_ENTRY 0x00000008 #define COOKIE_CACHE_ENTRY 0x00100000 #define URLHISTORY_CACHE_ENTRY 0x00200000 -#define DELETED_CACHE_ENTRY 0x00400000 #define TRACK_OFFLINE_CACHE_ENTRY 0x00000010 #define TRACK_ONLINE_CACHE_ENTRY 0x00000020 #define SPARSE_CACHE_ENTRY 0x00010000

1 0

Piotr Caban : wininet: Delete file when cache entry is deleted.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 359ed3382442db00c2bf55dc958629d812e3e6be URL: http://source.winehq.org/git/wine.git/?a=commit;h=359ed3382442db00c2bf55dc9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 18 14:43:23 2012 +0200 wininet: Delete file when cache entry is deleted. --- dlls/wininet/tests/urlcache.c | 5 ----- dlls/wininet/urlcache.c | 19 +++++++++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 12827e9..4238c60 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -481,7 +481,6 @@ static void test_urlcacheA(void) SetLastError(0xdeadbeef); ret = DeleteFile(filenameA); - todo_wine ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "local file should no longer exist\n"); /* Creating two entries with the same URL */ @@ -537,7 +536,6 @@ static void test_urlcacheA(void) { ret = pDeleteUrlCacheEntryA(TEST_URL); ok(ret, "DeleteUrlCacheEntryA failed with error %d\n", GetLastError()); - todo_wine check_file_not_exists(filenameA); todo_wine check_file_not_exists(filenameA1); @@ -595,7 +593,6 @@ static void test_urlcacheA(void) /* By unlocking the already-deleted cache entry, the file associated * with it is deleted.. */ - todo_wine check_file_not_exists(filenameA); /* (just in case, delete file) */ DeleteFileA(filenameA); @@ -692,7 +689,6 @@ static void test_urlcacheA(void) 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 */ @@ -760,7 +756,6 @@ static void test_urlcacheA(void) { ret = pDeleteUrlCacheEntryA(TEST_URL); ok(ret, "DeleteUrlCacheEntryA failed with error %d\n", GetLastError()); - todo_wine check_file_not_exists(filenameA); } } diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 0536093..1b62fda 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2175,11 +2175,13 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( return TRUE; } -static BOOL DeleteUrlCacheEntryInternal(LPURLCACHE_HEADER pHeader, - struct _HASH_ENTRY *pHashEntry) +static BOOL DeleteUrlCacheEntryInternal(const URLCACHECONTAINER * pContainer, + LPURLCACHE_HEADER pHeader, struct _HASH_ENTRY *pHashEntry) { CACHEFILE_ENTRY * pEntry; URL_CACHEFILE_ENTRY * pUrlEntry; + WCHAR path[MAX_PATH]; + LONG path_size = sizeof(path); pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); if (pEntry->dwSignature != URL_SIGNATURE) @@ -2220,8 +2222,13 @@ static BOOL DeleteUrlCacheEntryInternal(LPURLCACHE_HEADER pHeader, pHeader->CacheUsage.QuadPart = 0; } - URLCache_DeleteEntry(pHeader, pEntry); + if (pUrlEntry->dwOffsetLocalName && URLCache_LocalFileNameToPathW(pContainer, pHeader, + (LPCSTR)pUrlEntry+pUrlEntry->dwOffsetLocalName, pUrlEntry->CacheDir, path, &path_size)) + { + DeleteFileW(path); + } + URLCache_DeleteEntry(pHeader, pEntry); URLCache_DeleteEntryFromHash(pHashEntry); return TRUE; } @@ -2297,7 +2304,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileA( { URLCache_HashEntrySetFlags(pHashEntry, HASHTABLE_URL); if (pUrlEntry->CacheEntryType & PENDING_DELETE_CACHE_ENTRY) - DeleteUrlCacheEntryInternal(pHeader, pHashEntry); + DeleteUrlCacheEntryInternal(pContainer, pHeader, pHashEntry); } URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -3241,7 +3248,7 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) return FALSE; } - ret = DeleteUrlCacheEntryInternal(pHeader, pHashEntry); + ret = DeleteUrlCacheEntryInternal(pContainer, pHeader, pHashEntry); URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -3301,7 +3308,7 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) return FALSE; } - ret = DeleteUrlCacheEntryInternal(pHeader, pHashEntry); + ret = DeleteUrlCacheEntryInternal(pContainer, pHeader, pHashEntry); URLCacheContainer_UnlockIndex(pContainer, pHeader); heap_free(urlA);

1 0

Piotr Caban : wininet: Unlock urlcache entries that were locked for over a day.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 6935b7c73b0368f4c2e9252019ecd7a9f6223c04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6935b7c73b0368f4c2e925201… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 18 14:43:44 2012 +0200 wininet: Unlock urlcache entries that were locked for over a day. --- dlls/wininet/urlcache.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 1b62fda..e1d189e 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1553,6 +1553,38 @@ static BOOL URLCache_DeleteCacheDirectory(LPCWSTR lpszPath) } /*********************************************************************** + * URLCache_IsLocked (Internal) + * + * Checks if entry is locked. Unlocks it if possible. + */ +static BOOL URLCache_IsLocked(struct _HASH_ENTRY *hash_entry, URL_CACHEFILE_ENTRY *url_entry) +{ + FILETIME cur_time; + ULARGE_INTEGER acc_time, time; + + if ((hash_entry->dwHashKey & ((1<<HASHTABLE_FLAG_BITS)-1)) != HASHTABLE_LOCK) + return FALSE; + + GetSystemTimeAsFileTime(&cur_time); + time.u.LowPart = cur_time.dwLowDateTime; + time.u.HighPart = cur_time.dwHighDateTime; + + acc_time.u.LowPart = url_entry->LastAccessTime.dwLowDateTime; + acc_time.u.HighPart = url_entry->LastAccessTime.dwHighDateTime; + + time.QuadPart -= acc_time.QuadPart; + + /* check if entry was locked for at least a day */ + if(time.QuadPart > (ULONGLONG)24*60*60*10000000) { + URLCache_HashEntrySetFlags(hash_entry, HASHTABLE_URL); + url_entry->dwUseCount = 0; + return FALSE; + } + + return TRUE; +} + +/*********************************************************************** * FreeUrlCacheSpaceW (WININET.@) * * Frees up some cache. @@ -2193,9 +2225,8 @@ static BOOL DeleteUrlCacheEntryInternal(const URLCACHECONTAINER * pContainer, } pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; - if ((pHashEntry->dwHashKey & ((1<<HASHTABLE_FLAG_BITS)-1)) == HASHTABLE_LOCK) + if(URLCache_IsLocked(pHashEntry, pUrlEntry)) { - /* FIXME: implement timeout object unlocking */ TRACE("Trying to delete locked entry\n"); pUrlEntry->CacheEntryType |= PENDING_DELETE_CACHE_ENTRY; SetLastError(ERROR_SHARING_VIOLATION); @@ -2736,11 +2767,11 @@ static BOOL CommitUrlCacheEntryInternal( if (URLCache_FindHash(pHeader, lpszUrlNameA, &pHashEntry)) { - if ((pHashEntry->dwHashKey & ((1<<HASHTABLE_FLAG_BITS)-1)) == HASHTABLE_LOCK) + URL_CACHEFILE_ENTRY *pUrlEntry = (URL_CACHEFILE_ENTRY*)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); + if (URLCache_IsLocked(pHashEntry, pUrlEntry)) { - /* FIXME: implement timeout object unlocking */ - FIXME("Trying to overwrite locked entry\n"); - SetLastError(ERROR_SHARING_VIOLATION); + TRACE("Trying to overwrite locked entry\n"); + error = ERROR_SHARING_VIOLATION; goto cleanup; }

1 0

Piotr Caban : wininet: Added support for cache entries overwriting.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 8f2b0fdf526ef9e53af0fc5a4cc601d9b70b4af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f2b0fdf526ef9e53af0fc5a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 18 14:44:14 2012 +0200 wininet: Added support for cache entries overwriting. --- dlls/wininet/tests/urlcache.c | 14 ++++---------- dlls/wininet/urlcache.c | 20 +++++++++----------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 4238c60..443caf0 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -363,7 +363,7 @@ static void test_urlcacheA(void) create_and_write_file(filenameA, &zero_byte, sizeof(zero_byte)); - ret = CommitUrlCacheEntry(TEST_URL1, NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, NULL, 0, "html", NULL); + ret = CommitUrlCacheEntry(TEST_URL1, NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY, NULL, 0, "html", NULL); ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); cbCacheEntryInfo = 0; ret = GetUrlCacheEntryInfo(TEST_URL1, NULL, &cbCacheEntryInfo); @@ -377,6 +377,7 @@ static void test_urlcacheA(void) "expected zero ExpireTime\n"); ok(!memcmp(&lpCacheEntryInfo->LastModifiedTime, &filetime_zero, sizeof(FILETIME)), "expected zero LastModifiedTime\n"); + todo_wine ok(lpCacheEntryInfo->CacheEntryType == (NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY) || broken(lpCacheEntryInfo->CacheEntryType == NORMAL_CACHE_ENTRY /* NT4/W2k */), "expected type NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, got %08x\n", @@ -401,32 +402,27 @@ static void test_urlcacheA(void) ret = GetUrlCacheEntryInfo(TEST_URL1, lpCacheEntryInfo2, &cbCacheEntryInfo); ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); /* but it does change the time.. */ - todo_wine ok(memcmp(&lpCacheEntryInfo2->ExpireTime, &filetime_zero, sizeof(FILETIME)), "expected positive ExpireTime\n"); - todo_wine ok(memcmp(&lpCacheEntryInfo2->LastModifiedTime, &filetime_zero, sizeof(FILETIME)), "expected positive LastModifiedTime\n"); + todo_wine ok(lpCacheEntryInfo2->CacheEntryType == (NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY) || broken(lpCacheEntryInfo2->CacheEntryType == NORMAL_CACHE_ENTRY /* NT4/W2k */), "expected type NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, got %08x\n", lpCacheEntryInfo2->CacheEntryType); /* and set the headers. */ - todo_wine ok(lpCacheEntryInfo2->dwHeaderInfoSize == 19, "expected headers size 19, got %d\n", lpCacheEntryInfo2->dwHeaderInfoSize); /* Hit rate gets incremented by 1 */ - todo_wine ok((lpCacheEntryInfo->dwHitRate + 1) == lpCacheEntryInfo2->dwHitRate, "HitRate not incremented by one on commit\n"); /* Last access time should be updated */ - todo_wine ok(!(lpCacheEntryInfo->LastAccessTime.dwHighDateTime == lpCacheEntryInfo2->LastAccessTime.dwHighDateTime && lpCacheEntryInfo->LastAccessTime.dwLowDateTime == lpCacheEntryInfo2->LastAccessTime.dwLowDateTime), "Last accessed time was not updated by commit\n"); /* File extension should be unset */ - todo_wine ok(lpCacheEntryInfo2->lpszFileExtension == NULL, "Fileextension isn't unset: %s\n", lpCacheEntryInfo2->lpszFileExtension); @@ -519,16 +515,15 @@ static void test_urlcacheA(void) ret = GetUrlCacheEntryInfo(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo); ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); /* with the previous entry type retained.. */ + todo_wine ok(lpCacheEntryInfo->CacheEntryType & NORMAL_CACHE_ENTRY, "expected cache entry type NORMAL_CACHE_ENTRY, got %d (0x%08x)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); /* and the headers overwritten.. */ - todo_wine ok(!lpCacheEntryInfo->dwHeaderInfoSize, "expected headers size 0, got %d\n", lpCacheEntryInfo->dwHeaderInfoSize); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); /* and the previous filename shouldn't exist. */ - todo_wine check_file_not_exists(filenameA); check_file_exists(filenameA1); @@ -537,7 +532,6 @@ static void test_urlcacheA(void) ret = pDeleteUrlCacheEntryA(TEST_URL); ok(ret, "DeleteUrlCacheEntryA failed with error %d\n", GetLastError()); check_file_not_exists(filenameA); - todo_wine check_file_not_exists(filenameA1); /* Just in case, clean up files */ DeleteFileA(filenameA1); diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index e1d189e..2b0ebf4 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2693,6 +2693,8 @@ static BOOL CommitUrlCacheEntryInternal( LPSTR lpszUrlNameA = NULL; LPSTR lpszFileExtensionA = NULL; char *pchLocalFileName = 0; + DWORD hit_rate = 0; + DWORD exempt_delta = 0; DWORD error; TRACE("(%s, %s, ..., ..., %x, %p, %d, %s, %s)\n", @@ -2775,12 +2777,9 @@ static BOOL CommitUrlCacheEntryInternal( goto cleanup; } - FIXME("entry already in cache - don't know what to do!\n"); -/* - * SetLastError(ERROR_FILE_NOT_FOUND); - * return FALSE; - */ - goto cleanup; + hit_rate = pUrlEntry->dwHitRate; + exempt_delta = pUrlEntry->dwExemptDelta; + DeleteUrlCacheEntryInternal(pContainer, pHeader, pHashEntry); } if (lpszLocalFileName) @@ -2861,14 +2860,13 @@ static BOOL CommitUrlCacheEntryInternal( pUrlEntry->CacheDir = cDirectory; pUrlEntry->CacheEntryType = CacheEntryType; pUrlEntry->dwHeaderInfoSize = dwHeaderSize; - if (CacheEntryType & STICKY_CACHE_ENTRY) + if ((CacheEntryType & STICKY_CACHE_ENTRY) && !exempt_delta) { /* Sticky entries have a default exempt time of one day */ - pUrlEntry->dwExemptDelta = 86400; + exempt_delta = 86400; } - else - pUrlEntry->dwExemptDelta = 0; - pUrlEntry->dwHitRate = 0; + pUrlEntry->dwExemptDelta = exempt_delta; + pUrlEntry->dwHitRate = hit_rate+1; pUrlEntry->dwOffsetFileExtension = dwOffsetFileExtension; pUrlEntry->dwOffsetHeaderInfo = dwOffsetHeader; pUrlEntry->dwOffsetLocalName = dwOffsetLocalFileName;

1 0

Piotr Caban : wininet: Set entry type based on container type.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 65034ce2a45fbd2280364cb5836e397d9175b616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65034ce2a45fbd2280364cb58… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 18 14:44:31 2012 +0200 wininet: Set entry type based on container type. --- dlls/wininet/tests/urlcache.c | 3 --- dlls/wininet/urlcache.c | 17 +++++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 443caf0..8c5c988 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -377,7 +377,6 @@ static void test_urlcacheA(void) "expected zero ExpireTime\n"); ok(!memcmp(&lpCacheEntryInfo->LastModifiedTime, &filetime_zero, sizeof(FILETIME)), "expected zero LastModifiedTime\n"); - todo_wine ok(lpCacheEntryInfo->CacheEntryType == (NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY) || broken(lpCacheEntryInfo->CacheEntryType == NORMAL_CACHE_ENTRY /* NT4/W2k */), "expected type NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, got %08x\n", @@ -406,7 +405,6 @@ static void test_urlcacheA(void) "expected positive ExpireTime\n"); ok(memcmp(&lpCacheEntryInfo2->LastModifiedTime, &filetime_zero, sizeof(FILETIME)), "expected positive LastModifiedTime\n"); - todo_wine ok(lpCacheEntryInfo2->CacheEntryType == (NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY) || broken(lpCacheEntryInfo2->CacheEntryType == NORMAL_CACHE_ENTRY /* NT4/W2k */), "expected type NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, got %08x\n", @@ -515,7 +513,6 @@ static void test_urlcacheA(void) ret = GetUrlCacheEntryInfo(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo); ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); /* with the previous entry type retained.. */ - todo_wine ok(lpCacheEntryInfo->CacheEntryType & NORMAL_CACHE_ENTRY, "expected cache entry type NORMAL_CACHE_ENTRY, got %d (0x%08x)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 2b0ebf4..04ffd90 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -186,6 +186,7 @@ typedef struct _URLCACHECONTAINER HANDLE hMapping; /* handle of file mapping */ DWORD file_size; /* size of file when mapping was opened */ HANDLE hMutex; /* handle of mutex */ + DWORD default_entry_type; } URLCACHECONTAINER; @@ -475,7 +476,8 @@ static void URLCacheContainer_CloseIndex(URLCACHECONTAINER * pContainer) pContainer->hMapping = NULL; } -static BOOL URLCacheContainers_AddContainer(LPCWSTR cache_prefix, LPCWSTR path, LPWSTR mutex_name) +static BOOL URLCacheContainers_AddContainer(LPCWSTR cache_prefix, + LPCWSTR path, DWORD default_entry_type, LPWSTR mutex_name) { URLCACHECONTAINER * pContainer = heap_alloc(sizeof(URLCACHECONTAINER)); int cache_prefix_len = strlenW(cache_prefix); @@ -487,6 +489,7 @@ static BOOL URLCacheContainers_AddContainer(LPCWSTR cache_prefix, LPCWSTR path, pContainer->hMapping = NULL; pContainer->file_size = 0; + pContainer->default_entry_type = default_entry_type; pContainer->path = heap_strdupW(path); if (!pContainer->path) @@ -545,11 +548,12 @@ void URLCacheContainers_CreateDefaults(void) int nFolder; /* CSIDL_* constant */ const WCHAR * shpath_suffix; /* suffix on path returned by SHGetSpecialFolderPath */ const WCHAR * cache_prefix; /* prefix used to reference the container */ + DWORD default_entry_type; } DefaultContainerData[] = { - { CSIDL_INTERNET_CACHE, UrlSuffix, UrlPrefix }, - { CSIDL_HISTORY, HistorySuffix, HistoryPrefix }, - { CSIDL_COOKIES, CookieSuffix, CookiePrefix }, + { CSIDL_INTERNET_CACHE, UrlSuffix, UrlPrefix, NORMAL_CACHE_ENTRY }, + { CSIDL_HISTORY, HistorySuffix, HistoryPrefix, URLHISTORY_CACHE_ENTRY }, + { CSIDL_COOKIES, CookieSuffix, CookiePrefix, COOKIE_CACHE_ENTRY }, }; DWORD i; @@ -585,7 +589,8 @@ void URLCacheContainers_CreateDefaults(void) wszCachePath[path_len + suffix_len + 2] = '\0'; } - URLCacheContainers_AddContainer(DefaultContainerData[i].cache_prefix, wszCachePath, wszMutexName); + URLCacheContainers_AddContainer(DefaultContainerData[i].cache_prefix, wszCachePath, + DefaultContainerData[i].default_entry_type, wszMutexName); } } @@ -2858,7 +2863,7 @@ static BOOL CommitUrlCacheEntryInternal( url_entry_offset = (LPBYTE)pUrlEntry - (LPBYTE)pHeader; pUrlEntry->CacheFileEntry.dwSignature = URL_SIGNATURE; pUrlEntry->CacheDir = cDirectory; - pUrlEntry->CacheEntryType = CacheEntryType; + pUrlEntry->CacheEntryType = CacheEntryType | pContainer->default_entry_type; pUrlEntry->dwHeaderInfoSize = dwHeaderSize; if ((CacheEntryType & STICKY_CACHE_ENTRY) && !exempt_delta) {

1 0

Piotr Caban : wininet/tests: Remove all temporary files.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 95a4f3dd6d6d2fee277c2bd035acd1d9287095db URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a4f3dd6d6d2fee277c2bd03… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 18 14:44:51 2012 +0200 wininet/tests: Remove all temporary files. --- dlls/wininet/tests/urlcache.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 8c5c988..4118220 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -358,6 +358,8 @@ static void test_urlcacheA(void) ret = CreateUrlCacheEntry(TEST_URL, 0, "html", filenameA1, 0); ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + check_file_exists(filenameA1); + DeleteFileA(filenameA1); ok(lstrcmpiA(filenameA, filenameA1), "expected a different file name\n");

1 0

Erich Hoover : ddraw: Convert calls to DirectDrawEnumerate into DirectDrawEnumerateEx.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 83b02573cc498176c222dd877aabb53597846335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83b02573cc498176c222dd877… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Sep 17 14:17:40 2012 -0600 ddraw: Convert calls to DirectDrawEnumerate into DirectDrawEnumerateEx. --- dlls/ddraw/main.c | 52 ++++++++++++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 24 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 61e8ec9..e98b533 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -46,6 +46,22 @@ static HINSTANCE instance; /* value of ForceRefreshRate */ DWORD force_refresh_rate = 0; +/* Structure for converting DirectDrawEnumerateA to DirectDrawEnumerateExA */ +struct callback_info +{ + LPDDENUMCALLBACKA callback; + void *context; +}; + +/* Enumeration callback for converting DirectDrawEnumerateA to DirectDrawEnumerateExA */ +static HRESULT CALLBACK enum_callback(GUID *guid, char *description, char *driver_name, + void *context, HMONITOR monitor) +{ + const struct callback_info *info = context; + + return info->callback(guid, description, driver_name, info->context); +} + /* Handle table functions */ BOOL ddraw_handle_table_init(struct ddraw_handle_table *t, UINT initial_size) { @@ -336,27 +352,15 @@ DirectDrawCreateEx(GUID *guid, * * ***********************************************************************/ -HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback, void *Context) +HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA callback, void *context) { - TRACE("callback %p, context %p.\n", Callback, Context); - - TRACE(" Enumerating default DirectDraw HAL interface\n"); - /* We only have one driver */ - __TRY - { - static CHAR driver_desc[] = "DirectDraw HAL", - driver_name[] = "display"; + struct callback_info info; - Callback(NULL, driver_desc, driver_name, Context); - } - __EXCEPT_PAGE_FAULT - { - return DDERR_INVALIDPARAMS; - } - __ENDTRY + TRACE("callback %p, context %p.\n", callback, context); - TRACE(" End of enumeration\n"); - return DD_OK; + info.callback = callback; + info.context = context; + return DirectDrawEnumerateExA(enum_callback, &info, 0x0); } /*********************************************************************** @@ -368,17 +372,17 @@ HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback, void *Context) * The Flag member is not supported right now. * ***********************************************************************/ -HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA Callback, void *Context, DWORD Flags) +HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *context, DWORD flags) { - TRACE("callback %p, context %p, flags %#x.\n", Callback, Context, Flags); + TRACE("callback %p, context %p, flags %#x.\n", callback, context, flags); - if (Flags & ~(DDENUM_ATTACHEDSECONDARYDEVICES | + if (flags & ~(DDENUM_ATTACHEDSECONDARYDEVICES | DDENUM_DETACHEDSECONDARYDEVICES | DDENUM_NONDISPLAYDEVICES)) return DDERR_INVALIDPARAMS; - if (Flags) - FIXME("flags 0x%08x not handled\n", Flags); + if (flags) + FIXME("flags 0x%08x not handled\n", flags); TRACE("Enumerating default DirectDraw HAL interface\n"); @@ -389,7 +393,7 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA Callback, void *Contex driver_name[] = "display"; /* QuickTime expects the description "DirectDraw HAL" */ - Callback(NULL, driver_desc, driver_name, Context, 0); + callback(NULL, driver_desc, driver_name, context, 0); } __EXCEPT_PAGE_FAULT {

1 0