April 2013 - Wine-Commits - list.winehq.org

Piotr Caban : cryptnet: Handle SystemTimeToFileTime failure in HTTP_RetrieveEncodedObjectW.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: c3a23a99a2357a6fb007d5d513091ee61e7943e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3a23a99a2357a6fb007d5d51… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 15:06:05 2013 +0200 cryptnet: Handle SystemTimeToFileTime failure in HTTP_RetrieveEncodedObjectW. --- dlls/cryptnet/cryptnet_main.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index ddfdbce..da66e66 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -957,18 +957,12 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, if (ret && !(dwRetrievalFlags & CRYPT_DONT_CACHE_RESULT)) { SYSTEMTIME st; + FILETIME ft; DWORD len = sizeof(st); - if (HttpQueryInfoW(hHttp, - HTTP_QUERY_EXPIRES | HTTP_QUERY_FLAG_SYSTEMTIME, &st, - &len, NULL)) - { - FILETIME ft; - - SystemTimeToFileTime(&st, &ft); - CRYPT_CacheURL(pszURL, pObject, dwRetrievalFlags, - ft); - } + if (HttpQueryInfoW(hHttp, HTTP_QUERY_EXPIRES | HTTP_QUERY_FLAG_SYSTEMTIME, + &st, &len, NULL) && SystemTimeToFileTime(&st, &ft)) + CRYPT_CacheURL(pszURL, pObject, dwRetrievalFlags, ft); } InternetCloseHandle(hHttp); }

1 0

Dmitry Timoshkov : wineps.drv: Add support for TrueType composite glyph transforms.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: a0b4ce601730a43f67de149fd9c66464a6f9ad1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b4ce601730a43f67de149fd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 1 19:47:01 2013 +0900 wineps.drv: Add support for TrueType composite glyph transforms. --- dlls/wineps.drv/type1.c | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c index 01c9c7e..6855019 100644 --- a/dlls/wineps.drv/type1.c +++ b/dlls/wineps.drv/type1.c @@ -423,7 +423,7 @@ static BOOL append_complex_glyph(HDC hdc, const BYTE *data, glyph_outline *outli const BYTE *ptr = data; WORD flags, index; short arg1, arg2; - WORD scale_xx = 1 << 14, scale_xy = 0, scale_yx = 0, scale_yy = 1 << 14; + FLOAT scale_xx = 1, scale_xy = 0, scale_yx = 0, scale_yy = 1; WORD start_pt, end_pt; ptr += 10; @@ -447,37 +447,44 @@ static BOOL append_complex_glyph(HDC hdc, const BYTE *data, glyph_outline *outli } if(flags & WE_HAVE_A_SCALE) { - scale_xx = scale_yy = get_be_word(ptr); + scale_xx = scale_yy = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; } else if(flags & WE_HAVE_AN_X_AND_Y_SCALE) { - scale_xx = get_be_word(ptr); + scale_xx = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; - scale_yy = get_be_word(ptr); + scale_yy = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; } else if(flags & WE_HAVE_A_TWO_BY_TWO) { - scale_xx = get_be_word(ptr); + scale_xx = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; - scale_xy = get_be_word(ptr); + scale_xy = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; - scale_yx = get_be_word(ptr); + scale_yx = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; - scale_yy = get_be_word(ptr); + scale_yy = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; } - if ((flags & (WE_HAVE_A_SCALE | WE_HAVE_AN_X_AND_Y_SCALE | WE_HAVE_A_TWO_BY_TWO)) && - (scale_xx != 1 << 14 || scale_yy != 1 << 14 || scale_xy || scale_yx)) - FIXME( "unhandled scaling %x,%x,%x,%x of glyph %x\n", - scale_xx, scale_xy, scale_yx, scale_yy, index ); - start_pt = pts_in_outline(outline); append_glyph_outline(hdc, index, outline); end_pt = pts_in_outline(outline); + if (flags & (WE_HAVE_A_SCALE | WE_HAVE_AN_X_AND_Y_SCALE | WE_HAVE_A_TWO_BY_TWO)) + { + WORD i; + TRACE("transform %f,%f,%f,%f of glyph %x\n", scale_xx, scale_xy, scale_yx, scale_yy, index); + for (i = start_pt; i < end_pt; i++) + { + LONG x = outline->pts[i].x, y = outline->pts[i].y; + outline->pts[i].x = x * scale_xx + y * scale_yx; + outline->pts[i].y = x * scale_xy + y * scale_yy; + } + } + if((flags & ARGS_ARE_XY_VALUES) == 0) { WORD orig_pt = arg1, new_pt = arg2;

1 0

Alexandre Julliard : winebuild: Check for delayed import before the library is parsed, in case the real module name is different.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 2467c06a30e96f1b6f400b99af190a2a2033f5bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2467c06a30e96f1b6f400b99a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 1 14:32:36 2013 +0200 winebuild: Check for delayed import before the library is parsed, in case the real module name is different. --- tools/winebuild/import.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 3756c75..f533989 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -226,6 +226,7 @@ static int read_import_lib( struct import *imp ) struct stat stat; struct import *prev_imp; DLLSPEC *spec = imp->spec; + int delayed = is_delayed_import( spec->file_name ); f = open_input_file( NULL, imp->full_name ); fstat( fileno(f), &stat ); @@ -244,7 +245,7 @@ static int read_import_lib( struct import *imp ) return 0; /* the same file was already loaded, ignore this one */ } - if (is_delayed_import( spec->file_name )) + if (delayed) { imp->delay = 1; nb_delayed++;

1 0

Piotr Caban : wininet: Use short path name when container path can' t be converted to CP_ACP.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 96fb659ba924fb811e000a6f6147a7882c8872a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96fb659ba924fb811e000a6f6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:12:30 2013 +0200 wininet: Use short path name when container path can't be converted to CP_ACP. --- dlls/wininet/urlcache.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index d92a7d6..2167036 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -770,6 +770,7 @@ static void cache_containers_init(void) WCHAR wszCachePath[MAX_PATH]; WCHAR wszMutexName[MAX_PATH]; int path_len, suffix_len; + BOOL def_char; if (!SHGetSpecialFolderPathW(NULL, wszCachePath, DefaultContainerData[i].nFolder, TRUE)) { @@ -797,6 +798,20 @@ static void cache_containers_init(void) wszCachePath[path_len + suffix_len + 2] = '\0'; } + if (!WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, wszCachePath, path_len, + NULL, 0, NULL, &def_char) || def_char) + { + WCHAR tmp[MAX_PATH]; + + /* cannot convert path to ANSI code page */ + if (!(path_len = GetShortPathNameW(wszCachePath, tmp, MAX_PATH)) || + !WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, tmp, path_len, + NULL, 0, NULL, &def_char) || def_char) + ERR("Can't create container path accessible by ANSI functions\n"); + else + memcpy(wszCachePath, tmp, (path_len+1)*sizeof(WCHAR)); + } + cache_containers_add(DefaultContainerData[i].cache_prefix, wszCachePath, DefaultContainerData[i].default_entry_type, wszMutexName); }

1 0

Piotr Caban : wininet: Store urlcache container prefix as ANSI string.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: e4e79e7183bc3edd8dd3579c46158fab1e30babf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4e79e7183bc3edd8dd3579c4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:12:13 2013 +0200 wininet: Store urlcache container prefix as ANSI string. --- dlls/wininet/internet.h | 15 +++++++++ dlls/wininet/urlcache.c | 77 ++++++++++++++++++++++++----------------------- 2 files changed, 54 insertions(+), 38 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 2dc1c6c..c423fb6 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -142,6 +142,21 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) return ret; } +static inline char *heap_strdupA(const char *str) +{ + char *ret = NULL; + + if(str) { + DWORD size = strlen(str)+1; + + ret = heap_alloc(size); + if(ret) + memcpy(ret, str, size); + } + + return ret; +} + static inline LPWSTR heap_strndupW(LPCWSTR str, UINT max_len) { LPWSTR ret; diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index fd41953..d92a7d6 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -193,7 +193,7 @@ typedef struct typedef struct { struct list entry; /* part of a list */ - LPWSTR cache_prefix; /* string that has to be prefixed for this container to be used */ + char *cache_prefix; /* string that has to be prefixed for this container to be used */ LPWSTR path; /* path to url container directory */ HANDLE mapping; /* handle of file mapping */ DWORD file_size; /* size of file when mapping was opened */ @@ -204,7 +204,7 @@ typedef struct typedef struct { DWORD magic; - LPWSTR url_search_pattern; + char *url_search_pattern; DWORD container_idx; DWORD hash_table_idx; DWORD hash_entry_idx; @@ -810,70 +810,71 @@ static void cache_containers_free(void) ); } -static DWORD cache_containers_findW(LPCWSTR lpwszUrl, cache_container **ppContainer) +static DWORD cache_containers_find(const char *url, cache_container **ret) { - cache_container *pContainer; + cache_container *container; - TRACE("searching for prefix for URL: %s\n", debugstr_w(lpwszUrl)); + TRACE("searching for prefix for URL: %s\n", debugstr_a(url)); - if(!lpwszUrl) + if(!url) return ERROR_INVALID_PARAMETER; - LIST_FOR_EACH_ENTRY(pContainer, &UrlContainers, cache_container, entry) + LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) { - int prefix_len = strlenW(pContainer->cache_prefix); - if (!strncmpW(pContainer->cache_prefix, lpwszUrl, prefix_len)) - { - TRACE("found container with prefix %s for URL %s\n", debugstr_w(pContainer->cache_prefix), debugstr_w(lpwszUrl)); - *ppContainer = pContainer; + int prefix_len = strlen(container->cache_prefix); + + if(!strncmp(container->cache_prefix, url, prefix_len)) { + TRACE("found container with prefix %s\n", debugstr_a(container->cache_prefix)); + *ret = container; return ERROR_SUCCESS; } } + ERR("no container found\n"); return ERROR_FILE_NOT_FOUND; } -static DWORD cache_containers_findA(LPCSTR lpszUrl, cache_container **ppContainer) +static DWORD cache_containers_findW(LPCWSTR url, cache_container **container) { - LPWSTR url = NULL; + char *encoded_url = NULL; DWORD ret; - if (lpszUrl && !(url = heap_strdupAtoW(lpszUrl))) + if (url && !(encoded_url = heap_strdupWtoA(url))) return ERROR_OUTOFMEMORY; - ret = cache_containers_findW(url, ppContainer); - heap_free(url); + ret = cache_containers_find(encoded_url, container); + heap_free(encoded_url); return ret; } -static BOOL cache_containers_enum(LPCWSTR lpwszSearchPattern, DWORD dwIndex, cache_container **ppContainer) +static BOOL cache_containers_enum(char *search_pattern, DWORD index, cache_container **ret) { DWORD i = 0; - cache_container *pContainer; + cache_container *container; - TRACE("searching for prefix: %s\n", debugstr_w(lpwszSearchPattern)); + TRACE("searching for prefix: %s\n", debugstr_a(search_pattern)); /* non-NULL search pattern only returns one container ever */ - if (lpwszSearchPattern && dwIndex > 0) + if (search_pattern && index > 0) return FALSE; - LIST_FOR_EACH_ENTRY(pContainer, &UrlContainers, cache_container, entry) + LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) { - if (lpwszSearchPattern) + if (search_pattern) { - if (!strcmpW(pContainer->cache_prefix, lpwszSearchPattern)) + if (!strcmp(container->cache_prefix, search_pattern)) { - TRACE("found container with prefix %s\n", debugstr_w(pContainer->cache_prefix)); - *ppContainer = pContainer; + TRACE("found container with prefix %s\n", debugstr_a(container->cache_prefix)); + *ret = container; return TRUE; } } else { - if (i == dwIndex) + if (i == index) { - TRACE("found container with prefix %s\n", debugstr_w(pContainer->cache_prefix)); - *ppContainer = pContainer; + TRACE("found container with prefix %s\n", debugstr_a(container->cache_prefix)); + *ret = container; return TRUE; } } @@ -1168,7 +1169,7 @@ static DWORD cache_container_clean_index(cache_container *container, urlcache_he urlcache_header *header = *file_view; DWORD ret; - TRACE("(%s %s)\n", debugstr_w(container->cache_prefix), debugstr_w(container->path)); + TRACE("(%s %s)\n", debugstr_a(container->cache_prefix), debugstr_w(container->path)); if(urlcache_clean_leaked_entries(container, header)) return ERROR_SUCCESS; @@ -1766,7 +1767,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( if (dwFlags & ~GET_INSTALLED_ENTRY) FIXME("ignoring unsupported flags: %x\n", dwFlags); - error = cache_containers_findA(lpszUrl, &pContainer); + error = cache_containers_find(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -1992,7 +1993,7 @@ BOOL WINAPI SetUrlCacheEntryInfoA( TRACE("(%s, %p, 0x%08x)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, dwFieldControl); - error = cache_containers_findA(lpszUrlName, &pContainer); + error = cache_containers_find(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -2124,7 +2125,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( return FALSE; } - error = cache_containers_findA(lpszUrlName, &pContainer); + error = cache_containers_find(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -2658,7 +2659,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileA( return FALSE; } - error = cache_containers_findA(lpszUrlName, &pContainer); + error = cache_containers_find(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -3639,7 +3640,7 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) TRACE("(%s)\n", debugstr_a(lpszUrlName)); - error = cache_containers_findA(lpszUrlName, &pContainer); + error = cache_containers_find(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -3857,7 +3858,7 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryA(LPCSTR lpszUrlSearchPattern, pEntryHandle->magic = URLCACHE_FIND_ENTRY_HANDLE_MAGIC; if (lpszUrlSearchPattern) { - pEntryHandle->url_search_pattern = heap_strdupAtoW(lpszUrlSearchPattern); + pEntryHandle->url_search_pattern = heap_strdupA(lpszUrlSearchPattern); if (!pEntryHandle->url_search_pattern) { heap_free(pEntryHandle); @@ -3896,7 +3897,7 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryW(LPCWSTR lpszUrlSearchPattern, pEntryHandle->magic = URLCACHE_FIND_ENTRY_HANDLE_MAGIC; if (lpszUrlSearchPattern) { - pEntryHandle->url_search_pattern = heap_strdupW(lpszUrlSearchPattern); + pEntryHandle->url_search_pattern = heap_strdupWtoA(lpszUrlSearchPattern); if (!pEntryHandle->url_search_pattern) { heap_free(pEntryHandle); @@ -4282,7 +4283,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 (cache_containers_findA(url, &pContainer)) + if (cache_containers_find(url, &pContainer)) { memset(pftLastModified, 0, sizeof(*pftLastModified)); return TRUE;

1 0

Jacek Caban : mshtml: Fixed builtin getter call with arguments.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 8c0c09e4c707b41b4e5fd5492adfae41d577f7c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c0c09e4c707b41b4e5fd5492… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 1 11:50:29 2013 +0200 mshtml: Fixed builtin getter call with arguments. --- dlls/mshtml/dispex.c | 4 ++-- dlls/mshtml/tests/jstest.html | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 38d9df4..d70ae2d 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1216,7 +1216,7 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD if(FAILED(hres)) return hres; - if(flags != (DISPATCH_PROPERTYGET|DISPATCH_METHOD)) { + if(flags != (DISPATCH_PROPERTYGET|DISPATCH_METHOD) || dp->cArgs) { if(V_VT(&v) != VT_DISPATCH) { FIXME("Not a function %s\n", debugstr_variant(&v)); VariantClear(&v); @@ -1228,7 +1228,7 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD }else if(res) { *res = v; }else { - IDispatch_Release(V_DISPATCH(&v)); + VariantClear(&v); } } } diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index ebf2861..4185112 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -137,6 +137,8 @@ function test_getter_call() { e.onmousedown = function(x) { this.onmousedown_called = x; }; e.onmousedown("test"); ok(e.onmousedown_called === "test", "e.onmousedown_called = " + e.onmousedown_called); + + ok(document.all("divid").tagName === "DIV", "document.all('divid').tagName = " + document.all("divid").tagName); } function test_arg_conv() {

1 0

Andrew Talbot : krnl386.exe16: Constify a variable.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 08254df3168e376394f137c79414d6419e827d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08254df3168e376394f137c79… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 30 22:41:53 2013 +0000 krnl386.exe16: Constify a variable. --- dlls/krnl386.exe16/dosexe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.c b/dlls/krnl386.exe16/dosexe.c index 9797c86..ff96554 100644 --- a/dlls/krnl386.exe16/dosexe.c +++ b/dlls/krnl386.exe16/dosexe.c @@ -238,7 +238,7 @@ static BOOL MZ_DoLoadImage( HANDLE hFile, LPCSTR filename, OverlayBlock *oblk, W if ( !ReadFile(hFile,&mz_header,sizeof(mz_header),&len,NULL) || len != sizeof(mz_header) || mz_header.e_magic != IMAGE_DOS_SIGNATURE) { - char *p = strrchr( filename, '.' ); + const char *p = strrchr( filename, '.' ); if (!p || strcasecmp( p, ".com" )) /* check for .COM extension */ { SetLastError(ERROR_BAD_FORMAT);

1 0

Jactry Zeng : msvcrt: Add missing declarations for _wcsncoll, _wcsncoll_l, _wcsicoll_l, _wcsnicoll_l and wcscoll_l.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 8c53b6fde4927daabe4a9c7d32ecc07009e73b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c53b6fde4927daabe4a9c7d3… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sun Mar 31 03:42:29 2013 +0800 msvcrt: Add missing declarations for _wcsncoll, _wcsncoll_l, _wcsicoll_l, _wcsnicoll_l and wcscoll_l. --- include/msvcrt/wchar.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 028e2cb..27f673c 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -401,12 +401,17 @@ int __cdecl wctomb(char*,wchar_t); #ifndef _WSTRING_DEFINED #define _WSTRING_DEFINED +int __cdecl _wcscoll_l(const wchar_t*,const wchar_t*,_locale_t); wchar_t* __cdecl _wcsdup(const wchar_t*); int __cdecl _wcsicmp(const wchar_t*,const wchar_t*); int __cdecl _wcsicoll(const wchar_t*,const wchar_t*); +int __cdecl _wcsicoll_l(const wchar_t*,const wchar_t*,_locale_t); wchar_t* __cdecl _wcslwr(wchar_t*); +int __cdecl _wcsncoll(const wchar_t*,const wchar_t*,size_t); +int __cdecl _wcsncoll_l(const wchar_t*,const wchar_t*,size_t,_locale_t); int __cdecl _wcsnicmp(const wchar_t*,const wchar_t*,size_t); int __cdecl _wcsnicoll(const wchar_t*,const wchar_t*,size_t); +int __cdecl _wcsnicoll_l(const wchar_t*,const wchar_t*,size_t,_locale_t); wchar_t* __cdecl _wcsnset(wchar_t*,wchar_t,size_t); wchar_t* __cdecl _wcsrev(wchar_t*); wchar_t* __cdecl _wcsset(wchar_t*,wchar_t);

1 0

Jactry Zeng : msvcrt: Added _wcscoll_l implementation.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: dafa7611e9e77158f9fa17632066775a4811b5b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dafa7611e9e77158f9fa17632… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat Mar 30 22:34:31 2013 +0800 msvcrt: Added _wcscoll_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 18 ++++++++++++++++-- 6 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6476571..ab52ff7 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1477,7 +1477,7 @@ @ cdecl _wchmod(wstr long) msvcrt._wchmod @ extern _wcmdln msvcrt._wcmdln @ cdecl _wcreat(wstr long) msvcrt._wcreat -@ stub _wcscoll_l +@ cdecl _wcscoll_l(wstr wstr ptr) msvcrt._wcscoll_l @ cdecl _wcsdup(wstr) msvcrt._wcsdup @ cdecl _wcserror(long) msvcrt._wcserror @ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c8c99f1..7776dee 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1840,7 +1840,7 @@ @ extern _wcmdln msvcrt._wcmdln @ cdecl _wcreat(wstr long) msvcrt._wcreat @ stub _wcreate_locale -@ stub _wcscoll_l +@ cdecl _wcscoll_l(wstr wstr ptr) msvcrt._wcscoll_l @ cdecl _wcsdup(wstr) msvcrt._wcsdup @ cdecl _wcserror(long) msvcrt._wcserror @ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index cd83405..e635e96 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1137,7 +1137,7 @@ @ cdecl _wchmod(wstr long) msvcrt._wchmod @ extern _wcmdln msvcrt._wcmdln @ cdecl _wcreat(wstr long) msvcrt._wcreat -@ stub _wcscoll_l +@ cdecl _wcscoll_l(wstr wstr ptr) msvcrt._wcscoll_l @ cdecl _wcsdup(wstr) msvcrt._wcsdup @ cdecl _wcserror(long) msvcrt._wcserror @ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 6d19a3d..9bcdccb 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1131,7 +1131,7 @@ @ cdecl _wchmod(wstr long) msvcrt._wchmod @ extern _wcmdln msvcrt._wcmdln @ cdecl _wcreat(wstr long) msvcrt._wcreat -@ stub _wcscoll_l +@ cdecl _wcscoll_l(wstr wstr ptr) msvcrt._wcscoll_l @ cdecl _wcsdup(wstr) msvcrt._wcsdup @ cdecl _wcserror(long) msvcrt._wcserror @ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 89d9028..30ac113 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1095,7 +1095,7 @@ @ cdecl _wchmod(wstr long) MSVCRT__wchmod @ extern _wcmdln MSVCRT__wcmdln @ cdecl _wcreat(wstr long) MSVCRT__wcreat -# stub _wcscoll_l(wstr wstr ptr) +@ cdecl _wcscoll_l(wstr wstr ptr) MSVCRT__wcscoll_l @ cdecl _wcsdup(wstr) MSVCRT__wcsdup # stub _wcsdup_dbg(wstr long str long) @ cdecl _wcserror(long) MSVCRT__wcserror diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 511a814..9d45a24 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1038,12 +1038,26 @@ int CDECL MSVCRT_swprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, } /********************************************************************* + * _wcscoll_l (MSVCRT.@) + */ +int CDECL MSVCRT__wcscoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadlocinfo locinfo; + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, -1, str2, -1)-CSTR_EQUAL; +} + +/********************************************************************* * wcscoll (MSVCRT.@) */ int CDECL MSVCRT_wcscoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 ) { - return CompareStringW(get_locinfo()->lc_handle[MSVCRT_LC_COLLATE], - 0, str1, -1, str2, -1)-CSTR_EQUAL; + return MSVCRT__wcscoll_l(str1, str2, NULL); } /*********************************************************************

1 0

Piotr Caban : wininet: Fixed buffer size check in urlcache_create_file_pathA.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: a59210a6e8012cc8d44b6162479cf0d5f3a3b2fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59210a6e8012cc8d44b61624… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:14:13 2013 +0200 wininet: Fixed buffer size check in urlcache_create_file_pathA. --- dlls/wininet/urlcache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 2167036..5efa614 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1065,7 +1065,7 @@ static BOOL urlcache_create_file_pathA( dir_len = 0; nRequired = (path_len + dir_len + file_name_len) * sizeof(char); - if (nRequired < *lpBufferSize) + if (nRequired <= *lpBufferSize) { WideCharToMultiByte(CP_ACP, 0, pContainer->path, -1, szPath, path_len, NULL, NULL); if(dir_len) {

1 0