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

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: 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 : 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(a)_W@std@@SA_NABG0(a)Z(ptr ptr) msvcp90.?eq_int_type@?$char_traits(a)_W@std@@SA_NABG0(a)Z @ cdecl -arch=win64 ?eq_int_type@?$char_traits(a)_W@std@@SA_NAEBG0(a)Z(ptr ptr) msvcp90.?eq_int_type@?$char_traits(a)_W@std@@SA_NAEBG0(a)Z @ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z(ptr ptr ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z -@ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z +@ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z @ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@@Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z @ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@@Z(ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z @ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)II@Z(ptr long long) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)II@Z

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 : 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 : 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

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

Jacek Caban : jscript: Use jsstr_flatten to access string buffer in dispex. c.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: b11d47fc9097e63e12b76260a58dbb52ffd0934e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b11d47fc9097e63e12b76260a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 10:37:31 2013 +0100 jscript: Use jsstr_flatten to access string buffer in dispex.c. --- dlls/jscript/dispex.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 6a0153b..347e7e1 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1524,8 +1524,15 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL jsdisp = iface_to_jsdisp((IUnknown*)disp); if(jsdisp) { dispex_prop_t *prop; + const WCHAR *ptr; + + ptr = jsstr_flatten(name); + if(!ptr) { + jsdisp_release(jsdisp); + return E_OUTOFMEMORY; + } - hres = find_prop_name(jsdisp, string_hash(name->str), name->str, &prop); + hres = find_prop_name(jsdisp, string_hash(ptr), ptr, &prop); if(prop) { hres = delete_prop(prop, ret); }else {

1 0

Jacek Caban : jscript: Use jsstr_flatten to access string buffer in jsutils .c.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 96ace8cbcbb2887eb8e4aa0e2a80bf7244d5918a URL: http://source.winehq.org/git/wine.git/?a=commit;h=96ace8cbcbb2887eb8e4aa0e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 10:38:01 2013 +0100 jscript: Use jsstr_flatten to access string buffer in jsutils.c. --- dlls/jscript/jsutils.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 60260bb..d141378 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -502,16 +502,15 @@ static int hex_to_int(WCHAR c) /* ECMA-262 3rd Edition 9.3.1 */ static HRESULT str_to_number(jsstr_t *str, double *ret) { - const WCHAR *ptr = str->str; + const WCHAR *ptr; BOOL neg = FALSE; DOUBLE d = 0.0; static const WCHAR infinityW[] = {'I','n','f','i','n','i','t','y'}; - if(!ptr) { - *ret = 0; - return S_OK; - } + ptr = jsstr_flatten(str); + if(!ptr) + return E_OUTOFMEMORY; while(isspaceW(*ptr)) ptr++;

1 0

Carlo Bramini : inetcpl.cpl: Minor fix, remove useless code.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: fd7f0517c79af5c60e52182cf12a6390264ad009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7f0517c79af5c60e52182cf… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sat Mar 16 19:53:40 2013 +0100 inetcpl.cpl: Minor fix, remove useless code. --- dlls/inetcpl.cpl/security.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c index 8f46b79..48c4876 100644 --- a/dlls/inetcpl.cpl/security.c +++ b/dlls/inetcpl.cpl/security.c @@ -134,8 +134,7 @@ static void update_zone_info(secdlg_data *sd, DWORD lv_index) SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_ZONE_INFO), za->szDescription); - LoadStringW(hcpl, IDS_SEC_SETTINGS, name, sizeof(name)/sizeof(*name)); - len = lstrlenW(name); + len = LoadStringW(hcpl, IDS_SEC_SETTINGS, name, sizeof(name)/sizeof(*name)); lstrcpynW(&name[len], za->szDisplayName, sizeof(name)/sizeof(*name) - len - 1); TRACE("new title: %s\n", debugstr_w(name));

1 0