December 2019 - Wine-Commits

Piotr Caban : msvcrt: Don't depend on how __lc_time_data was allocated in _Getmonths.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: e4f3dea2e835f8791b015dd4e6b7a7e224b2c0ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4f3dea2e835f8791b015dd4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 4 15:30:08 2019 +0100 msvcrt: Don't depend on how __lc_time_data was allocated in _Getmonths. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 617d1fffb3..0e3e55b609 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -530,12 +530,15 @@ MSVCRT_wchar_t* CDECL _W_Getdays(void) char* CDECL _Getmonths(void) { MSVCRT___lc_time_data *cur = get_locinfo()->lc_time_curr; - int i, len, size; + int i, len, size = 0; char *out; TRACE("\n"); - size = cur->str.names.am-cur->str.names.short_mon[0]; + for(i=0; i<12; i++) { + size += strlen(cur->str.names.short_mon[i]) + 1; + size += strlen(cur->str.names.mon[i]) + 1; + } out = MSVCRT_malloc(size+1); if(!out) return NULL;

1 0

Nikolay Sivov : comctl32/listview: Fix LVM_GETITEM for out-of-range iSubItem case.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: 37c3810557b5819cf3bc375be27c4cf090cf02a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37c3810557b5819cf3bc375b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 4 12:55:56 2019 +0300 comctl32/listview: Fix LVM_GETITEM for out-of-range iSubItem case. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44842 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 41 ++++++++++----------- dlls/comctl32/tests/listview.c | 81 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 99 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=37c3810557b5819cf3bc…

1 0

Jeff Smith : msvcrt: Factor out code for creating lc_time_data structure.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: dba7dac4588c5e994d5d7afb388e9997c388c7b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dba7dac4588c5e994d5d7afb… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Dec 4 15:29:55 2019 +0100 msvcrt: Factor out code for creating lc_time_data structure. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 167 +++++++++++++++++++++++++++------------------------ 1 file changed, 87 insertions(+), 80 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index fc41f05da2..6f2a83cc7c 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -910,8 +910,7 @@ static inline BOOL category_needs_update(int cat, int user_cat, return lcid!=locinfo->lc_handle[cat] || cp!=locinfo->lc_id[cat].wCodePage; } -static MSVCRT_pthreadlocinfo create_locinfo(int category, - const char *locale, MSVCRT_pthreadlocinfo old_locinfo) +static MSVCRT___lc_time_data* create_time_data(LCID lcid) { static const DWORD time_data[] = { LOCALE_SABBREVDAYNAME7, LOCALE_SABBREVDAYNAME1, LOCALE_SABBREVDAYNAME2, @@ -930,11 +929,6 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, LOCALE_SSHORTDATE, LOCALE_SLONGDATE, LOCALE_STIMEFORMAT }; - static const char collate[] = "COLLATE="; - static const char ctype[] = "CTYPE="; - static const char monetary[] = "MONETARY="; - static const char numeric[] = "NUMERIC="; - static const char time[] = "TIME="; static const char cloc_short_date[] = "MM/dd/yy"; static const MSVCRT_wchar_t cloc_short_dateW[] = {'M','M','/','d','d','/','y','y',0}; static const char cloc_long_date[] = "dddd, MMMM dd, yyyy"; @@ -942,8 +936,91 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, static const char cloc_time[] = "HH:mm:ss"; static const MSVCRT_wchar_t cloc_timeW[] = {'H','H',':','m','m',':','s','s',0}; + MSVCRT___lc_time_data *cur; + const DWORD flags = lcid ? 0 : LOCALE_NOUSEROVERRIDE; + const LCID lcid_tmp = lcid ? lcid : MAKELCID(LANG_ENGLISH, SORT_DEFAULT); + int i, ret, size; + + size = sizeof(MSVCRT___lc_time_data); + for(i=0; i<ARRAY_SIZE(time_data); i++) { + if(time_data[i]==LOCALE_SSHORTDATE && !lcid) { + size += sizeof(cloc_short_date) + sizeof(cloc_short_dateW); + }else if(time_data[i]==LOCALE_SLONGDATE && !lcid) { + size += sizeof(cloc_long_date) + sizeof(cloc_long_dateW); + }else { + ret = GetLocaleInfoA(lcid_tmp, time_data[i]|flags, NULL, 0); + if(!ret) + return NULL; + size += ret; + + ret = GetLocaleInfoW(lcid_tmp, time_data[i]|flags, NULL, 0); + if(!ret) + return NULL; + size += ret*sizeof(MSVCRT_wchar_t); + } + } +#if _MSVCR_VER >= 110 + size += LCIDToLocaleName(lcid, NULL, 0, 0)*sizeof(MSVCRT_wchar_t); +#endif + + cur = MSVCRT_malloc(size); + if(!cur) + return NULL; + + ret = 0; + for(i=0; i<ARRAY_SIZE(time_data); i++) { + cur->str.str[i] = &cur->data[ret]; + if(time_data[i]==LOCALE_SSHORTDATE && !lcid) { + memcpy(&cur->data[ret], cloc_short_date, sizeof(cloc_short_date)); + ret += sizeof(cloc_short_date); + }else if(time_data[i]==LOCALE_SLONGDATE && !lcid) { + memcpy(&cur->data[ret], cloc_long_date, sizeof(cloc_long_date)); + ret += sizeof(cloc_long_date); + }else if(time_data[i]==LOCALE_STIMEFORMAT && !lcid) { + memcpy(&cur->data[ret], cloc_time, sizeof(cloc_time)); + ret += sizeof(cloc_time); + }else { + ret += GetLocaleInfoA(lcid_tmp, time_data[i]|flags, + &cur->data[ret], size-ret); + } + } + for(i=0; i<ARRAY_SIZE(time_data); i++) { + cur->wstr.wstr[i] = (MSVCRT_wchar_t*)&cur->data[ret]; + if(time_data[i]==LOCALE_SSHORTDATE && !lcid) { + memcpy(&cur->data[ret], cloc_short_dateW, sizeof(cloc_short_dateW)); + ret += sizeof(cloc_short_dateW); + }else if(time_data[i]==LOCALE_SLONGDATE && !lcid) { + memcpy(&cur->data[ret], cloc_long_dateW, sizeof(cloc_long_dateW)); + ret += sizeof(cloc_long_dateW); + }else if(time_data[i]==LOCALE_STIMEFORMAT && !lcid) { + memcpy(&cur->data[ret], cloc_timeW, sizeof(cloc_timeW)); + ret += sizeof(cloc_timeW); + }else { + ret += GetLocaleInfoW(lcid_tmp, time_data[i]|flags, + (MSVCRT_wchar_t*)&cur->data[ret], size-ret)*sizeof(MSVCRT_wchar_t); + } + } +#if _MSVCR_VER >= 110 + cur->locname = (MSVCRT_wchar_t*)&cur->data[ret]; + LCIDToLocaleName(lcid, cur->locname, (size-ret)/sizeof(MSVCRT_wchar_t), 0); +#else + cur->lcid = lcid; +#endif + + return cur; +} + +static MSVCRT_pthreadlocinfo create_locinfo(int category, + const char *locale, MSVCRT_pthreadlocinfo old_locinfo) +{ + static const char collate[] = "COLLATE="; + static const char ctype[] = "CTYPE="; + static const char monetary[] = "MONETARY="; + static const char numeric[] = "NUMERIC="; + static const char time[] = "TIME="; + MSVCRT_pthreadlocinfo locinfo; - LCID lcid[6] = { 0 }, lcid_tmp; + LCID lcid[6] = { 0 }; unsigned short cp[6] = { 0 }; const char *locale_name[6] = { 0 }; int locale_len[6] = { 0 }; @@ -952,7 +1029,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, #if _MSVCR_VER >= 100 MSVCRT_wchar_t wbuf[256]; #endif - int i, ret, size; + int i; TRACE("(%d %s)\n", category, locale); @@ -1588,8 +1665,6 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, locinfo->lc_handle[MSVCRT_LC_TIME] = old_locinfo->lc_handle[MSVCRT_LC_TIME]; locinfo->lc_id[MSVCRT_LC_TIME].wCodePage = old_locinfo->lc_id[MSVCRT_LC_TIME].wCodePage; } else { - DWORD flags = lcid[MSVCRT_LC_TIME] ? 0 : LOCALE_NOUSEROVERRIDE; - if(lcid[MSVCRT_LC_TIME] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_TIME)) { if(!update_threadlocinfo_category(lcid[MSVCRT_LC_TIME], cp[MSVCRT_LC_TIME], locinfo, MSVCRT_LC_TIME)) { @@ -1604,79 +1679,11 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, } else locinfo->lc_category[MSVCRT_LC_TIME].locale = MSVCRT__strdup("C"); - size = sizeof(MSVCRT___lc_time_data); - lcid_tmp = lcid[MSVCRT_LC_TIME] ? lcid[MSVCRT_LC_TIME] : MAKELCID(LANG_ENGLISH, SORT_DEFAULT); - for(i=0; i<ARRAY_SIZE(time_data); i++) { - if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { - size += sizeof(cloc_short_date) + sizeof(cloc_short_dateW); - }else if(time_data[i]==LOCALE_SLONGDATE && !lcid[MSVCRT_LC_TIME]) { - size += sizeof(cloc_long_date) + sizeof(cloc_long_dateW); - }else { - ret = GetLocaleInfoA(lcid_tmp, time_data[i]|flags, NULL, 0); - if(!ret) { - free_locinfo(locinfo); - return NULL; - } - size += ret; - - ret = GetLocaleInfoW(lcid_tmp, time_data[i]|flags, NULL, 0); - if(!ret) { - free_locinfo(locinfo); - return NULL; - } - size += ret*sizeof(MSVCRT_wchar_t); - } - } -#if _MSVCR_VER >= 110 - size += LCIDToLocaleName(lcid[MSVCRT_LC_TIME], NULL, 0, 0)*sizeof(MSVCRT_wchar_t); -#endif - - locinfo->lc_time_curr = MSVCRT_malloc(size); + locinfo->lc_time_curr = create_time_data(lcid[MSVCRT_LC_TIME]); if(!locinfo->lc_time_curr) { free_locinfo(locinfo); return NULL; } - - ret = 0; - for(i=0; i<ARRAY_SIZE(time_data); i++) { - locinfo->lc_time_curr->str.str[i] = &locinfo->lc_time_curr->data[ret]; - if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { - memcpy(&locinfo->lc_time_curr->data[ret], cloc_short_date, sizeof(cloc_short_date)); - ret += sizeof(cloc_short_date); - }else if(time_data[i]==LOCALE_SLONGDATE && !lcid[MSVCRT_LC_TIME]) { - memcpy(&locinfo->lc_time_curr->data[ret], cloc_long_date, sizeof(cloc_long_date)); - ret += sizeof(cloc_long_date); - }else if(time_data[i]==LOCALE_STIMEFORMAT && !lcid[MSVCRT_LC_TIME]) { - memcpy(&locinfo->lc_time_curr->data[ret], cloc_time, sizeof(cloc_time)); - ret += sizeof(cloc_time); - }else { - ret += GetLocaleInfoA(lcid_tmp, time_data[i]|flags, - &locinfo->lc_time_curr->data[ret], size-ret); - } - } - for(i=0; i<ARRAY_SIZE(time_data); i++) { - locinfo->lc_time_curr->wstr.wstr[i] = (MSVCRT_wchar_t*)&locinfo->lc_time_curr->data[ret]; - if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { - memcpy(&locinfo->lc_time_curr->data[ret], cloc_short_dateW, sizeof(cloc_short_dateW)); - ret += sizeof(cloc_short_dateW); - }else if(time_data[i]==LOCALE_SLONGDATE && !lcid[MSVCRT_LC_TIME]) { - memcpy(&locinfo->lc_time_curr->data[ret], cloc_long_dateW, sizeof(cloc_long_dateW)); - ret += sizeof(cloc_long_dateW); - }else if(time_data[i]==LOCALE_STIMEFORMAT && !lcid[MSVCRT_LC_TIME]) { - memcpy(&locinfo->lc_time_curr->data[ret], cloc_timeW, sizeof(cloc_timeW)); - ret += sizeof(cloc_timeW); - }else { - ret += GetLocaleInfoW(lcid_tmp, time_data[i]|flags, - (MSVCRT_wchar_t*)&locinfo->lc_time_curr->data[ret], size-ret)*sizeof(MSVCRT_wchar_t); - } - } -#if _MSVCR_VER >= 110 - locinfo->lc_time_curr->locname = (MSVCRT_wchar_t*)&locinfo->lc_time_curr->data[ret]; - LCIDToLocaleName(lcid[MSVCRT_LC_TIME], locinfo->lc_time_curr->locname, - (size-ret)/sizeof(MSVCRT_wchar_t), 0); -#else - locinfo->lc_time_curr->lcid = lcid[MSVCRT_LC_TIME]; -#endif } return locinfo;

1 0

Gijs Vermeulen : msvcrt: Optimize _strlwr implementation in C locale.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: e44d935cc6747f283528700f4a923a947a740dbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e44d935cc6747f283528700f… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Wed Dec 4 10:04:46 2019 +0100 msvcrt: Optimize _strlwr implementation in C locale. Tests by Ambrož Bizjak. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 24 +++++++++++++++++++++--- dlls/msvcrt/tests/string.c | 8 ++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index fa5f7022c1..b78d93a917 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -56,6 +56,7 @@ char* CDECL MSVCRT__strdup(const char* str) */ int CDECL MSVCRT__strlwr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t locale) { + MSVCRT_pthreadlocinfo locinfo; char *ptr = str; if (!str || !len) @@ -77,10 +78,27 @@ int CDECL MSVCRT__strlwr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t loca return MSVCRT_EINVAL; } - while (*str) + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(!locinfo->lc_handle[MSVCRT_LC_CTYPE]) { - *str = MSVCRT__tolower_l((unsigned char)*str, locale); - str++; + while (*str) + { + if (*str >= 'A' && *str <= 'Z') + *str -= 'A' - 'a'; + str++; + } + } + else + { + while (*str) + { + *str = MSVCRT__tolower_l((unsigned char)*str, locale); + str++; + } } return 0; diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index d14c7f009c..f4c4657791 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2411,6 +2411,9 @@ static void test__strlwr_s(void) ok(!memcmp(buffer, "gorrister\0ELLEN", sizeof("gorrister\0ELLEN")), "Expected the output buffer to be \"gorrister\\0ELLEN\", got \"%s\"\n", buffer); + + ret = p_strlwr_s((char *)"already_lowercase", sizeof("already_lowercase")); + ok(ret == 0, "Expected _strlwr_s to return 0, got %d\n", ret); } static void test_wcsncat_s(void) @@ -3596,6 +3599,7 @@ static void test__memicmp_l(void) static void test__strupr(void) { const char str[] = "123"; + const char *const_p; char str2[4]; char *mem, *p; DWORD prot; @@ -3614,6 +3618,10 @@ static void test__strupr(void) ok(p == mem, "_strupr returned %p\n", p); ok(!strcmp(mem, "123"), "mem = %s\n", mem); + const_p = "ALREADY_UPPERCASE"; + p = _strupr((char *)const_p); + ok(p == const_p, "_strupr returned %p\n", p); + if(!setlocale(LC_ALL, "english")) { VirtualFree(mem, sizeof(str), MEM_RELEASE); win_skip("English locale _strupr tests\n");

1 0

Alexandre Julliard : jscript: Always check for errors in UTF8 conversions.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: 0d0b7a145112b251c417327b8d93396ce24ec445 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d0b7a145112b251c417327b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 4 16:03:21 2019 +0100 jscript: Always check for errors in UTF8 conversions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/global.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 37b222beba..2f7dbcd53f 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -629,7 +629,7 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags if(is_uri_unescaped(*ptr) || is_uri_reserved(*ptr) || *ptr == '#') { len++; }else { - i = WideCharToMultiByte(CP_UTF8, 0, ptr, 1, NULL, 0, NULL, NULL)*3; + i = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, ptr, 1, NULL, 0, NULL, NULL)*3; if(!i) { jsstr_release(str); return throw_uri_error(ctx, JS_E_INVALID_URI_CHAR, NULL); @@ -649,7 +649,7 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags if(is_uri_unescaped(*ptr) || is_uri_reserved(*ptr) || *ptr == '#') { *rptr++ = *ptr; }else { - len = WideCharToMultiByte(CP_UTF8, 0, ptr, 1, buf, sizeof(buf), NULL, NULL); + len = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, ptr, 1, buf, sizeof(buf), NULL, NULL); for(i=0; i<len; i++) { *rptr++ = '%'; *rptr++ = int_to_char((BYTE)buf[i] >> 4); @@ -703,7 +703,7 @@ static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags val += hex_to_int(ptr[i*3+1])<<4; buf[i] = val; - res = MultiByteToWideChar(CP_UTF8, 0, buf, i+1, &out, 1); + res = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, buf, i+1, &out, 1); if(res) break; } @@ -734,7 +734,7 @@ static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags val += hex_to_int(ptr[i*3+1])<<4; buf[i] = val; - res = MultiByteToWideChar(CP_UTF8, 0, buf, i+1, ret, 1); + res = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, buf, i+1, ret, 1); if(res) break; } @@ -780,7 +780,7 @@ static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W if(is_uri_unescaped(*ptr)) len++; else { - size = WideCharToMultiByte(CP_UTF8, 0, ptr, 1, NULL, 0, NULL, NULL); + size = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, ptr, 1, NULL, 0, NULL, NULL); if(!size) { jsstr_release(str); return throw_uri_error(ctx, JS_E_INVALID_URI_CHAR, NULL); @@ -799,7 +799,7 @@ static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W if(is_uri_unescaped(*ptr)) { *ret++ = *ptr; }else { - size = WideCharToMultiByte(CP_UTF8, 0, ptr, 1, buf, sizeof(buf), NULL, NULL); + size = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, ptr, 1, buf, sizeof(buf), NULL, NULL); for(i=0; i<size; i++) { *ret++ = '%'; *ret++ = int_to_char((BYTE)buf[i] >> 4);

1 0

Alexandre Julliard : ntdll: Use the Rtl UTF8 conversion functions.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: f46fa9c92d08c6e656bc22b94e09aa9dbe7d3be9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f46fa9c92d08c6e656bc22b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 3 12:25:54 2019 +0100 ntdll: Use the Rtl UTF8 conversion functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 17 ++++++----------- dlls/ntdll/locale.c | 30 +++++++++++++++++++++--------- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index d5f2f70273..9e7782c1ee 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2834,20 +2834,15 @@ static NTSTATUS parse_manifest( struct actctx_loader* acl, struct assembly_ident } else { - /* let's assume utf-8 for now */ - int len = wine_utf8_mbstowcs( 0, buffer, size, NULL, 0 ); + DWORD len; WCHAR *new_buff; - if (len == -1) - { - FIXME( "utf-8 conversion failed\n" ); - return STATUS_SXS_CANT_GEN_ACTCTX; - } - if (!(new_buff = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) - return STATUS_NO_MEMORY; - wine_utf8_mbstowcs( 0, buffer, size, new_buff, len ); + /* let's assume utf-8 for now */ + RtlUTF8ToUnicodeN( NULL, 0, &len, buffer, size ); + if (!(new_buff = RtlAllocateHeap( GetProcessHeap(), 0, len ))) return STATUS_NO_MEMORY; + RtlUTF8ToUnicodeN( new_buff, len, &len, buffer, size ); xmlbuf.ptr = new_buff; - xmlbuf.end = xmlbuf.ptr + len; + xmlbuf.end = xmlbuf.ptr + len / sizeof(WCHAR); status = parse_manifest_buffer( acl, assembly, ai, &xmlbuf ); RtlFreeHeap( GetProcessHeap(), 0, new_buff ); } diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index d7a6401560..f5faada578 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -636,13 +636,19 @@ void init_locale( HMODULE module ) */ int ntdll_umbstowcs( DWORD flags, const char *src, int srclen, WCHAR *dst, int dstlen ) { -#ifdef __APPLE__ - /* work around broken Mac OS X filesystem that enforces decomposed Unicode */ - flags |= MB_COMPOSITE; + DWORD reslen; + NTSTATUS status; + + if (unix_table) return wine_cp_mbstowcs( unix_table, flags, src, srclen, dst, dstlen ); + + if (!dstlen) dst = NULL; + status = RtlUTF8ToUnicodeN( dst, dstlen * sizeof(WCHAR), &reslen, src, srclen ); + if (status && status != STATUS_SOME_NOT_MAPPED) return 0; + reslen /= sizeof(WCHAR); +#ifdef __APPLE__ /* work around broken Mac OS X filesystem that enforces decomposed Unicode */ + if (reslen && dst) RtlNormalizeString( NormalizationC, dst, reslen, dst, (int *)&reslen ); #endif - return unix_table ? - wine_cp_mbstowcs( unix_table, flags, src, srclen, dst, dstlen ) : - wine_utf8_mbstowcs( flags, src, srclen, dst, dstlen ); + return reslen; } @@ -652,10 +658,16 @@ int ntdll_umbstowcs( DWORD flags, const char *src, int srclen, WCHAR *dst, int d int ntdll_wcstoumbs( DWORD flags, const WCHAR *src, int srclen, char *dst, int dstlen, const char *defchar, int *used ) { - if (unix_table) - return wine_cp_wcstombs( unix_table, flags, src, srclen, dst, dstlen, defchar, used ); + DWORD reslen; + NTSTATUS status; + + if (unix_table) return wine_cp_wcstombs( unix_table, flags, src, srclen, dst, dstlen, defchar, used ); + if (used) *used = 0; /* all chars are valid for UTF-8 */ - return wine_utf8_wcstombs( flags, src, srclen, dst, dstlen ); + if (!dstlen) dst = NULL; + status = RtlUnicodeToUTF8N( dst, dstlen, &reslen, src, srclen * sizeof(WCHAR) ); + if (status && status != STATUS_SOME_NOT_MAPPED) return 0; + return reslen; }

1 0

Alexandre Julliard : kernel32: Move some initialization code to ntdll.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: 331947c993c06b63ccc3adbe5500b24fbf79e3ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=331947c993c06b63ccc3adbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 3 19:54:56 2019 +0100 kernel32: Move some initialization code to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 9 --------- dlls/ntdll/debugtools.c | 2 ++ dlls/ntdll/env.c | 1 + 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 72a93a7fe7..779c13cb54 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -170,20 +170,11 @@ void * CDECL __wine_kernel_init(void) { static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0}; - PEB *peb = NtCurrentTeb()->Peb; - RTL_USER_PROCESS_PARAMETERS *params = peb->ProcessParameters; - - /* Initialize everything */ - - setbuf(stdout,NULL); - setbuf(stderr,NULL); kernel32_handle = GetModuleHandleW(kernel32W); RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter ); LOCALE_Init(); - if (!params->CurrentDirectory.Handle) chdir("/"); /* avoid locking removable devices */ - return start_process_wrapper; } diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index 64355ab3b8..546d527323 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -284,6 +284,8 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ */ void debug_init(void) { + setbuf( stdout, NULL ); + setbuf( stderr, NULL ); ntdll_get_thread_data()->debug_info = &initial_info; init_done = TRUE; } diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index ebeda01ff8..116a57a8e7 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -1546,5 +1546,6 @@ done: RtlInitUnicodeString( &curdir, windows_dir ); RtlSetCurrentDirectory_U( &curdir ); } + if (!params->CurrentDirectory.Handle) chdir("/"); /* avoid locking removable devices */ set_wow64_environment( &params->Environment ); }

1 0

Alexandre Julliard : user32: Forward string calls to kernelbase.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: aa827393311987319998a5dc1860e4696d495114 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa827393311987319998a5dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 3 08:53:44 2019 +0100 user32: Forward string calls to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 2 +- dlls/user32/lstr.c | 321 ------------------------------------------------ dlls/user32/resource.c | 3 +- dlls/user32/user32.spec | 44 +++---- 4 files changed, 24 insertions(+), 346 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa827393311987319998…

1 0

Nikolay Sivov : comctl32/tests: Merge header items test with existing function.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: 8f9e1ae705e26589c24927a78847efaf80f2a30a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f9e1ae705e26589c24927a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 4 12:55:55 2019 +0300 comctl32/tests: Merge header items test with existing function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 48cd614380..dc923c0b6e 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1546,6 +1546,19 @@ static void test_columns(void) "get subitem text after column added", FALSE); DestroyWindow(hwnd); + + /* Columns are not created right away. */ + hwnd = create_listview_control(LVS_REPORT); + ok(hwnd != NULL, "Failed to create a listview window.\n"); + + insert_item(hwnd, 0); + + header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "Expected header handle.\n"); + rc = SendMessageA(header, HDM_GETITEMCOUNT, 0, 0); + ok(!rc, "Unexpected column count.\n"); + + DestroyWindow(hwnd); } /* test setting imagelist between WM_NCCREATE and WM_CREATE */ @@ -3939,25 +3952,6 @@ static void test_getitemposition(void) DestroyWindow(hwnd); } -static void test_columnscreation(void) -{ - HWND hwnd, header; - DWORD r; - - hwnd = create_listview_control(LVS_REPORT); - ok(hwnd != NULL, "failed to create a listview window\n"); - - insert_item(hwnd, 0); - - /* headers columns aren't created automatically */ - header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); - ok(IsWindow(header), "Expected header handle\n"); - r = SendMessageA(header, HDM_GETITEMCOUNT, 0, 0); - expect(0, r); - - DestroyWindow(hwnd); -} - static void test_getitemrect(void) { HWND hwnd; @@ -6577,7 +6571,6 @@ START_TEST(listview) test_hittest(); test_getviewrect(); test_getitemposition(); - test_columnscreation(); test_editbox(); test_notifyformat(); test_indentation(); @@ -6632,7 +6625,6 @@ START_TEST(listview) test_ownerdata(); test_norecompute(); test_nosortheader(); - test_columnscreation(); test_indentation(); test_finditem(); test_hover();

1 0

João Diogo Ferreira : kernel32: Make GetUserGeoID() always succeed if geoclass is valid.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: a31dec5fa9cf148d6ac6aed4c3afc2882170a8e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a31dec5fa9cf148d6ac6aed4… Author: João Diogo Ferreira <devilj(a)outlook.pt> Date: Mon Dec 2 21:39:52 2019 +0000 kernel32: Make GetUserGeoID() always succeed if geoclass is valid. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46196 Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 5b196be2d5..cd9f7fac2f 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2810,7 +2810,7 @@ static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) */ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) { - GEOID ret = GEOID_NOT_AVAILABLE; + GEOID ret = 39070; static const WCHAR geoW[] = {'G','e','o',0}; static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; @@ -2831,7 +2831,7 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) break; default: WARN("Unknown geoclass %d\n", geoclass); - return ret; + return GEOID_NOT_AVAILABLE; } if (!(hkey = create_registry_key())) return ret;

1 0