wine-commits March 2013

wine-commits@winehq.org

2 participants
531 discussions

Jacek Caban : jscript: Added jsstr_flatten helper and use it to access string buffer in date.c.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: e3d940334f24a15b967b88fa0cbbfe095dccc1f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3d940334f24a15b967b88fa0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 10:36:58 2013 +0100 jscript: Added jsstr_flatten helper and use it to access string buffer in date.c. --- dlls/jscript/date.c | 4 +++- dlls/jscript/jsstr.h | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 3d67248..d40d80f 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2054,7 +2054,9 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { DWORD lcid_en; input_len = jsstr_length(input_str); - input = input_str->str; + input = jsstr_flatten(input_str); + if(!input) + return E_OUTOFMEMORY; for(i=0; i<input_len; i++) { if(input[i] == '(') nest_level++; diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index 709d1c6..09893fa 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -53,6 +53,12 @@ static inline jsstr_t *jsstr_addref(jsstr_t *str) return str; } +/* This will be failable in the future. */ +static inline const WCHAR *jsstr_flatten(jsstr_t *str) +{ + return str->str; +} + static inline BOOL jsstr_eq(jsstr_t *str1, jsstr_t *str2) { unsigned len = jsstr_length(str1);

1 0

Piotr Caban : msvcrt20: Match parameters list with function we' re forwarding to.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 16668e82fe869c2fea9e2641f0f7ddaadfce0277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16668e82fe869c2fea9e2641f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 10:02:45 2013 +0100 msvcrt20: Match parameters list with function we're forwarding to. --- dlls/msvcrt20/msvcrt20.spec | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index b2293ee..b166ada 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -1141,7 +1141,7 @@ @ cdecl _swab(str str long) msvcrt._swab @ extern _sys_errlist msvcrt._sys_errlist @ extern _sys_nerr msvcrt._sys_nerr -@ cdecl _tccpy(str str) msvcrt._mbccpy +@ cdecl _tccpy(ptr str) msvcrt._mbccpy @ cdecl _tclen(ptr) msvcrt._mbclen @ cdecl _tcschr(str long) msvcrt._mbschr @ cdecl _tcsclen(str) msvcrt._mbslen @@ -1156,19 +1156,19 @@ @ cdecl _tcsnccat(str str long) msvcrt._mbsncat @ cdecl _tcsnccmp(str str long) msvcrt._mbsncmp @ cdecl _tcsnccnt(str long) msvcrt._mbsnccnt -@ cdecl _tcsnccpy(str str long) msvcrt._mbsncpy +@ cdecl _tcsnccpy(ptr str long) msvcrt._mbsncpy @ cdecl _tcsncicmp(str str long) msvcrt._mbsnicmp @ cdecl _tcsncmp(str str long) msvcrt._mbsnbcmp @ cdecl _tcsncpy(ptr str long) msvcrt._mbsnbcpy -@ cdecl _tcsncset(str long long) msvcrt._mbsnset +@ cdecl _tcsncset(ptr long long) msvcrt._mbsnset @ cdecl _tcsnextc(str) msvcrt._mbsnextc @ cdecl _tcsnicmp(str str long) msvcrt._mbsnbicmp @ cdecl _tcsninc(str long) msvcrt._mbsninc -@ cdecl _tcsnset(str long long) msvcrt._mbsnbset +@ cdecl _tcsnset(ptr long long) msvcrt._mbsnbset @ cdecl _tcspbrk(str str) msvcrt._mbspbrk @ cdecl _tcsrchr(str long) msvcrt._mbsrchr @ cdecl _tcsrev(str) msvcrt._mbsrev -@ cdecl _tcsset(str long) msvcrt._mbsset +@ cdecl _tcsset(ptr long) msvcrt._mbsset @ cdecl _tcsspn(str str) msvcrt._mbsspn @ cdecl _tcsspnp(str str) msvcrt._mbsspnp @ cdecl _tcsstr(str str) msvcrt._mbsstr

1 0

Piotr Caban : msvcrt: Match architecture with function we're forwarding to.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 607316df5f3d2cc5a13b4c6d2216bc757e93b85e URL: http://source.winehq.org/git/wine.git/?a=commit;h=607316df5f3d2cc5a13b4c6d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 10:01:59 2013 +0100 msvcrt: Match architecture with function we're forwarding to. --- dlls/msvcr100/msvcr100.spec | 48 +++++++++++++++++++++--------------------- dlls/msvcr110/msvcr110.spec | 48 +++++++++++++++++++++--------------------- dlls/msvcr80/msvcr80.spec | 44 +++++++++++++++++++------------------- dlls/msvcr90/msvcr90.spec | 44 +++++++++++++++++++------------------- 4 files changed, 92 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=607316df5f3d2cc5a13b4…

1 0

Piotr Caban : msvcp: Match parameters list and architecture with function we're forwarding to.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 78ea6a75929970db9664fcd4416f8f46550d8762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ea6a75929970db9664fcd44… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 10:00:00 2013 +0100 msvcp: Match parameters list and architecture with function we're forwarding to. --- dlls/msvcp60/msvcp60.spec | 18 ++++---- dlls/msvcp70/msvcp70.spec | 90 ++++++++++++++++++++++---------------------- 2 files changed, 54 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78ea6a75929970db9664f…

1 0

Piotr Caban : msvcp80: Fixed typo in spec file.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: cd8571af529fad961e1cfd6a22d2884b9f8caa28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8571af529fad961e1cfd6a2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:59:10 2013 +0100 msvcp80: Fixed typo in spec file. --- dlls/msvcp80/msvcp80.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 9d34087..e9a5b6a 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -3739,7 +3739,7 @@ @ cdecl -arch=win32 ?eq_int_type@?$char_traits@_W@std@@SA_NABG0@Z(ptr ptr) msvcp90.?eq_int_type@?$char_traits@_W@std@@SA_NABG0@Z @ cdecl -arch=win64 ?eq_int_type@?$char_traits@_W@std@@SA_NAEBG0@Z(ptr ptr) msvcp90.?eq_int_type@?$char_traits@_W@std@@SA_NAEBG0@Z @ thiscall -arch=win32 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V32@0@Z(ptr ptr ptr ptr ptr ptr) msvcp90.?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@0@Z -@ cdecl -arch=win64 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V32@0@Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V32@0@Z +@ cdecl -arch=win64 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V32@0@Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@0@Z @ thiscall -arch=win32 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V32@@Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z @ cdecl -arch=win64 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V32@@Z(ptr ptr ptr) msvcp90.?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z @ thiscall -arch=win32 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@II@Z(ptr long long) msvcp90.?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@II@Z

1 0

Piotr Caban : wininet: Reorder functions to avoid urlcache_create_hash_table forward declaration.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 2bcd8a3fae434bc7435ef147e1f0a56dba6bcbb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bcd8a3fae434bc7435ef147e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:53:48 2013 +0100 wininet: Reorder functions to avoid urlcache_create_hash_table forward declaration. --- dlls/wininet/urlcache.c | 310 +++++++++++++++++++++++------------------------ 1 files changed, 154 insertions(+), 156 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2bcd8a3fae434bc7435ef…

1 0

Piotr Caban : wininet: Rename URLCacheContainers_* functions to cache_containers_*.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 21b84e7ac94fea09fc6c4e33ed0310d125445515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21b84e7ac94fea09fc6c4e33e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:53:37 2013 +0100 wininet: Rename URLCacheContainers_* functions to cache_containers_*. --- dlls/wininet/urlcache.c | 50 +++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 117eb9c..3ae6a16 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -531,7 +531,7 @@ static void cache_container_close_index(cache_container *pContainer) pContainer->mapping = NULL; } -static BOOL URLCacheContainers_AddContainer(LPCWSTR cache_prefix, +static BOOL cache_containers_add(LPCWSTR cache_prefix, LPCWSTR path, DWORD default_entry_type, LPWSTR mutex_name) { cache_container *pContainer = heap_alloc(sizeof(cache_container)); @@ -590,7 +590,7 @@ static void cache_container_delete_container(cache_container *pContainer) heap_free(pContainer); } -static void URLCacheContainers_CreateDefaults(void) +static void cache_containers_init(void) { static const WCHAR UrlSuffix[] = {'C','o','n','t','e','n','t','.','I','E','5',0}; static const WCHAR UrlPrefix[] = {0}; @@ -644,12 +644,12 @@ static void URLCacheContainers_CreateDefaults(void) wszCachePath[path_len + suffix_len + 2] = '\0'; } - URLCacheContainers_AddContainer(DefaultContainerData[i].cache_prefix, wszCachePath, + cache_containers_add(DefaultContainerData[i].cache_prefix, wszCachePath, DefaultContainerData[i].default_entry_type, wszMutexName); } } -static void URLCacheContainers_DeleteAll(void) +static void cache_containers_free(void) { while(!list_empty(&UrlContainers)) cache_container_delete_container( @@ -657,7 +657,7 @@ static void URLCacheContainers_DeleteAll(void) ); } -static DWORD URLCacheContainers_FindContainerW(LPCWSTR lpwszUrl, cache_container **ppContainer) +static DWORD cache_containers_findW(LPCWSTR lpwszUrl, cache_container **ppContainer) { cache_container *pContainer; @@ -680,7 +680,7 @@ static DWORD URLCacheContainers_FindContainerW(LPCWSTR lpwszUrl, cache_container return ERROR_FILE_NOT_FOUND; } -static DWORD URLCacheContainers_FindContainerA(LPCSTR lpszUrl, cache_container **ppContainer) +static DWORD cache_containers_findA(LPCSTR lpszUrl, cache_container **ppContainer) { LPWSTR url = NULL; DWORD ret; @@ -688,12 +688,12 @@ static DWORD URLCacheContainers_FindContainerA(LPCSTR lpszUrl, cache_container * if (lpszUrl && !(url = heap_strdupAtoW(lpszUrl))) return ERROR_OUTOFMEMORY; - ret = URLCacheContainers_FindContainerW(url, ppContainer); + ret = cache_containers_findW(url, ppContainer); heap_free(url); return ret; } -static BOOL URLCacheContainers_Enum(LPCWSTR lpwszSearchPattern, DWORD dwIndex, cache_container **ppContainer) +static BOOL cache_containers_enum(LPCWSTR lpwszSearchPattern, DWORD dwIndex, cache_container **ppContainer) { DWORD i = 0; cache_container *pContainer; @@ -1768,7 +1768,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( if (dwFlags & ~GET_INSTALLED_ENTRY) FIXME("ignoring unsupported flags: %x\n", dwFlags); - error = URLCacheContainers_FindContainerA(lpszUrl, &pContainer); + error = cache_containers_findA(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -1911,7 +1911,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExW( if (dwFlags) FIXME("ignoring unsupported flags: %x\n", dwFlags); - error = URLCacheContainers_FindContainerW(lpszUrl, &pContainer); + error = cache_containers_findW(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -1994,7 +1994,7 @@ BOOL WINAPI SetUrlCacheEntryInfoA( TRACE("(%s, %p, 0x%08x)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, dwFieldControl); - error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer); + error = cache_containers_findA(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -2051,7 +2051,7 @@ BOOL WINAPI SetUrlCacheEntryInfoW(LPCWSTR lpszUrl, LPINTERNET_CACHE_ENTRY_INFOW TRACE("(%s, %p, 0x%08x)\n", debugstr_w(lpszUrl), lpCacheEntryInfo, dwFieldControl); - error = URLCacheContainers_FindContainerW(lpszUrl, &pContainer); + error = cache_containers_findW(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -2126,7 +2126,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( return FALSE; } - error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer); + error = cache_containers_findA(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -2224,7 +2224,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( return FALSE; } - error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); + error = cache_containers_findW(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -2660,7 +2660,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileA( return FALSE; } - error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer); + error = cache_containers_findA(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -2736,7 +2736,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileW( LPCWSTR lpszUrlName, DWORD dwReserved ) return FALSE; } - error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); + error = cache_containers_findW(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -2929,7 +2929,7 @@ BOOL WINAPI CreateUrlCacheEntryW( szFile[0] = 0; } - error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); + error = cache_containers_findW(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -3117,7 +3117,7 @@ static BOOL urlcache_entry_commit( file_size.u.LowPart = file_attr.nFileSizeLow; file_size.u.HighPart = file_attr.nFileSizeHigh; - error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); + error = cache_containers_findW(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -3641,7 +3641,7 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) TRACE("(%s)\n", debugstr_a(lpszUrlName)); - error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer); + error = cache_containers_findA(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -3695,7 +3695,7 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) return FALSE; } - error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); + error = cache_containers_findW(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { heap_free(urlA); @@ -3934,7 +3934,7 @@ static BOOL urlcache_find_next_entry( return FALSE; } - for (; URLCacheContainers_Enum(pEntryHandle->url_search_pattern, pEntryHandle->container_idx, &pContainer); + for (; cache_containers_enum(pEntryHandle->url_search_pattern, pEntryHandle->container_idx, &pContainer); pEntryHandle->container_idx++, pEntryHandle->hash_table_idx = 0) { urlcache_header *pHeader; @@ -4284,7 +4284,7 @@ BOOL WINAPI IsUrlCacheEntryExpiredA( LPCSTR url, DWORD dwFlags, FILETIME* pftLas FIXME("unknown flags 0x%08x\n", dwFlags); /* Any error implies that the URL is expired, i.e. not in the cache */ - if (URLCacheContainers_FindContainerA(url, &pContainer)) + if (cache_containers_findA(url, &pContainer)) { memset(pftLastModified, 0, sizeof(*pftLastModified)); return TRUE; @@ -4352,7 +4352,7 @@ BOOL WINAPI IsUrlCacheEntryExpiredW( LPCWSTR url, DWORD dwFlags, FILETIME* pftLa FIXME("unknown flags 0x%08x\n", dwFlags); /* Any error implies that the URL is expired, i.e. not in the cache */ - if (URLCacheContainers_FindContainerW(url, &pContainer)) + if (cache_containers_findW(url, &pContainer)) { memset(pftLastModified, 0, sizeof(*pftLastModified)); return TRUE; @@ -4468,7 +4468,7 @@ BOOL init_urlcache(void) return FALSE; } - URLCacheContainers_CreateDefaults(); + cache_containers_init(); return TRUE; } @@ -4480,7 +4480,7 @@ void free_urlcache(void) CloseHandle(free_cache_running); CloseHandle(dll_unload_event); - URLCacheContainers_DeleteAll(); + cache_containers_free(); } /***********************************************************************

1 0

Piotr Caban : wininet: Rename URLCache_* functions to urlcache_*.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 4e624561ca809ca90b88cf29f203dcfe567a98cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e624561ca809ca90b88cf29f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:53:23 2013 +0100 wininet: Rename URLCache_* functions to urlcache_*. --- dlls/wininet/urlcache.c | 296 +++++++++++++++++++++++------------------------ 1 files changed, 144 insertions(+), 152 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e624561ca809ca90b88c…

1 0

Piotr Caban : wininet: Rename URLCacheFindEntryHandle to find_handle.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 33725537c1ce2cd34b253506eab972414573e9c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33725537c1ce2cd34b253506e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:53:13 2013 +0100 wininet: Rename URLCacheFindEntryHandle to find_handle. --- dlls/wininet/urlcache.c | 79 +++++++++++++++++++++++------------------------ 1 files changed, 39 insertions(+), 40 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 188d77c..1c54a7f 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -100,6 +100,8 @@ static const char urlcache_ver[] = "0.2012001"; #define DWORD_ALIGN(x) ( (DWORD)(((DWORD)(x)+sizeof(DWORD)-1)/sizeof(DWORD))*sizeof(DWORD) ) +#define URLCACHE_FIND_ENTRY_HANDLE_MAGIC 0xF389ABCD + typedef struct { DWORD signature; @@ -195,6 +197,14 @@ typedef struct DWORD default_entry_type; } cache_container; +typedef struct +{ + DWORD magic; + LPWSTR url_search_pattern; + DWORD container_idx; + DWORD hash_table_idx; + DWORD hash_entry_idx; +} find_handle; /* List of all containers available */ static struct list UrlContainers = LIST_INIT(UrlContainers); @@ -3839,17 +3849,6 @@ HANDLE WINAPI FindFirstUrlCacheEntryExW( return NULL; } -#define URLCACHE_FIND_ENTRY_HANDLE_MAGIC 0xF389ABCD - -typedef struct URLCacheFindEntryHandle -{ - DWORD dwMagic; - LPWSTR lpszUrlSearchPattern; - DWORD dwContainerIndex; - DWORD dwHashTableIndex; - DWORD dwHashEntryIndex; -} URLCacheFindEntryHandle; - /*********************************************************************** * FindFirstUrlCacheEntryA (WININET.@) * @@ -3857,7 +3856,7 @@ typedef struct URLCacheFindEntryHandle INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryA(LPCSTR lpszUrlSearchPattern, LPINTERNET_CACHE_ENTRY_INFOA lpFirstCacheEntryInfo, LPDWORD lpdwFirstCacheEntryInfoBufferSize) { - URLCacheFindEntryHandle *pEntryHandle; + find_handle *pEntryHandle; TRACE("(%s, %p, %p)\n", debugstr_a(lpszUrlSearchPattern), lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize); @@ -3865,21 +3864,21 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryA(LPCSTR lpszUrlSearchPattern, if (!pEntryHandle) return NULL; - pEntryHandle->dwMagic = URLCACHE_FIND_ENTRY_HANDLE_MAGIC; + pEntryHandle->magic = URLCACHE_FIND_ENTRY_HANDLE_MAGIC; if (lpszUrlSearchPattern) { - pEntryHandle->lpszUrlSearchPattern = heap_strdupAtoW(lpszUrlSearchPattern); - if (!pEntryHandle->lpszUrlSearchPattern) + pEntryHandle->url_search_pattern = heap_strdupAtoW(lpszUrlSearchPattern); + if (!pEntryHandle->url_search_pattern) { heap_free(pEntryHandle); return NULL; } } else - pEntryHandle->lpszUrlSearchPattern = NULL; - pEntryHandle->dwContainerIndex = 0; - pEntryHandle->dwHashTableIndex = 0; - pEntryHandle->dwHashEntryIndex = 0; + pEntryHandle->url_search_pattern = NULL; + pEntryHandle->container_idx = 0; + pEntryHandle->hash_table_idx = 0; + pEntryHandle->hash_entry_idx = 0; if (!FindNextUrlCacheEntryA(pEntryHandle, lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize)) { @@ -3896,7 +3895,7 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryA(LPCSTR lpszUrlSearchPattern, INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryW(LPCWSTR lpszUrlSearchPattern, LPINTERNET_CACHE_ENTRY_INFOW lpFirstCacheEntryInfo, LPDWORD lpdwFirstCacheEntryInfoBufferSize) { - URLCacheFindEntryHandle *pEntryHandle; + find_handle *pEntryHandle; TRACE("(%s, %p, %p)\n", debugstr_w(lpszUrlSearchPattern), lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize); @@ -3904,21 +3903,21 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryW(LPCWSTR lpszUrlSearchPattern, if (!pEntryHandle) return NULL; - pEntryHandle->dwMagic = URLCACHE_FIND_ENTRY_HANDLE_MAGIC; + pEntryHandle->magic = URLCACHE_FIND_ENTRY_HANDLE_MAGIC; if (lpszUrlSearchPattern) { - pEntryHandle->lpszUrlSearchPattern = heap_strdupW(lpszUrlSearchPattern); - if (!pEntryHandle->lpszUrlSearchPattern) + pEntryHandle->url_search_pattern = heap_strdupW(lpszUrlSearchPattern); + if (!pEntryHandle->url_search_pattern) { heap_free(pEntryHandle); return NULL; } } else - pEntryHandle->lpszUrlSearchPattern = NULL; - pEntryHandle->dwContainerIndex = 0; - pEntryHandle->dwHashTableIndex = 0; - pEntryHandle->dwHashEntryIndex = 0; + pEntryHandle->url_search_pattern = NULL; + pEntryHandle->container_idx = 0; + pEntryHandle->hash_table_idx = 0; + pEntryHandle->hash_entry_idx = 0; if (!FindNextUrlCacheEntryW(pEntryHandle, lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize)) { @@ -3934,17 +3933,17 @@ static BOOL FindNextUrlCacheEntryInternal( LPDWORD lpdwNextCacheEntryInfoBufferSize, BOOL unicode) { - URLCacheFindEntryHandle *pEntryHandle = (URLCacheFindEntryHandle *)hEnumHandle; + find_handle *pEntryHandle = (find_handle*)hEnumHandle; cache_container *pContainer; - if (pEntryHandle->dwMagic != URLCACHE_FIND_ENTRY_HANDLE_MAGIC) + if (pEntryHandle->magic != URLCACHE_FIND_ENTRY_HANDLE_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - for (; URLCacheContainers_Enum(pEntryHandle->lpszUrlSearchPattern, pEntryHandle->dwContainerIndex, &pContainer); - pEntryHandle->dwContainerIndex++, pEntryHandle->dwHashTableIndex = 0) + for (; URLCacheContainers_Enum(pEntryHandle->url_search_pattern, pEntryHandle->container_idx, &pContainer); + pEntryHandle->container_idx++, pEntryHandle->hash_table_idx = 0) { urlcache_header *pHeader; entry_hash_table *pHashTableEntry; @@ -3960,12 +3959,12 @@ static BOOL FindNextUrlCacheEntryInternal( if (!(pHeader = cache_container_lock_index(pContainer))) return FALSE; - for (; URLCache_EnumHashTables(pHeader, &pEntryHandle->dwHashTableIndex, &pHashTableEntry); - pEntryHandle->dwHashTableIndex++, pEntryHandle->dwHashEntryIndex = 0) + for (; URLCache_EnumHashTables(pHeader, &pEntryHandle->hash_table_idx, &pHashTableEntry); + pEntryHandle->hash_table_idx++, pEntryHandle->hash_entry_idx = 0) { const struct hash_entry *pHashEntry = NULL; - for (; URLCache_EnumHashTableEntries(pHeader, pHashTableEntry, &pEntryHandle->dwHashEntryIndex, &pHashEntry); - pEntryHandle->dwHashEntryIndex++) + for (; URLCache_EnumHashTableEntries(pHeader, pHashTableEntry, &pEntryHandle->hash_entry_idx, &pHashEntry); + pEntryHandle->hash_entry_idx++) { const entry_url *pUrlEntry; const entry_header *pEntry = (const entry_header*)((LPBYTE)pHeader + pHashEntry->offset); @@ -3998,7 +3997,7 @@ static BOOL FindNextUrlCacheEntryInternal( /* increment the current index so that next time the function * is called the next entry is returned */ - pEntryHandle->dwHashEntryIndex++; + pEntryHandle->hash_entry_idx++; cache_container_unlock_index(pContainer, pHeader); return TRUE; } @@ -4046,18 +4045,18 @@ BOOL WINAPI FindNextUrlCacheEntryW( */ BOOL WINAPI FindCloseUrlCache(HANDLE hEnumHandle) { - URLCacheFindEntryHandle *pEntryHandle = (URLCacheFindEntryHandle *)hEnumHandle; + find_handle *pEntryHandle = (find_handle*)hEnumHandle; TRACE("(%p)\n", hEnumHandle); - if (!pEntryHandle || pEntryHandle->dwMagic != URLCACHE_FIND_ENTRY_HANDLE_MAGIC) + if (!pEntryHandle || pEntryHandle->magic != URLCACHE_FIND_ENTRY_HANDLE_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - pEntryHandle->dwMagic = 0; - heap_free(pEntryHandle->lpszUrlSearchPattern); + pEntryHandle->magic = 0; + heap_free(pEntryHandle->url_search_pattern); heap_free(pEntryHandle); return TRUE; }

1 0

Piotr Caban : wininet: Rename URLCACHECONTAINER to cache_container.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 299739d07f648088db8d52527e529b53a133d283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=299739d07f648088db8d52527… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:53:03 2013 +0100 wininet: Rename URLCACHECONTAINER to cache_container. --- dlls/wininet/urlcache.c | 160 +++++++++++++++++++++++----------------------- 1 files changed, 80 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=299739d07f648088db8d5…

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2013