February 2021 - Wine-Commits

Rémi Bernon : widl: Remove useless find_type_or_error2 helper.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: wine Branch: master Commit: b3f807a14253d9464f5cc3ce6ec9aabf10166073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3f807a14253d9464f5cc3ce… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 4 17:43:39 2021 +0100 widl: Remove useless find_type_or_error2 helper. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 480552e3723..328829cc0da 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -76,7 +76,6 @@ static warning_list_t *append_warning(warning_list_t *, int); static type_t *reg_typedefs(decl_spec_t *decl_spec, var_list_t *names, attr_list_t *attrs); static type_t *find_type_or_error(const char *name, int t); -static type_t *find_type_or_error2(char *name, int t); static var_t *reg_const(var_t *var); @@ -1015,7 +1014,7 @@ interfacedef: interfacehdr inherit | interfacehdr ':' aIDENTIFIER '{' import int_statements '}' semicolon_opt { $$ = $1; - type_interface_define($$, find_type_or_error2($3, 0), $6); + type_interface_define($$, find_type_or_error($3, 0), $6); } | dispinterfacedef semicolon_opt { $$ = $1; } ; @@ -1255,7 +1254,7 @@ acf_int_statement acf_interface : acf_attributes tINTERFACE aKNOWNTYPE '{' acf_int_statements '}' - { type_t *iface = find_type_or_error2($3, 0); + { type_t *iface = find_type_or_error($3, 0); if (type_get_type(iface) != TYPE_INTERFACE) error_loc("%s is not an interface\n", iface->name); iface->attrs = append_attr_list(iface->attrs, $1); @@ -2105,13 +2104,6 @@ static type_t *find_type_or_error(const char *name, int t) return type; } -static type_t *find_type_or_error2(char *name, int t) -{ - type_t *tp = find_type_or_error(name, t); - free(name); - return tp; -} - int is_type(const char *name) { return find_type(name, current_namespace, 0) != NULL ||

1 0

Arkadiusz Hiler : mmdevapi: Add SpatialAudio tests.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: wine Branch: master Commit: 3cdf1fa9281ab75a22ab97566a8f9626a74d298f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cdf1fa9281ab75a22ab9756… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Thu Feb 4 16:09:57 2021 +0200 mmdevapi: Add SpatialAudio tests. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/Makefile.in | 3 +- dlls/mmdevapi/tests/mmdevenum.c | 1 + dlls/mmdevapi/tests/spatialaudio.c | 445 +++++++++++++++++++++++++++++++++++++ 3 files changed, 448 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3cdf1fa9281ab75a22ab…

1 0

Nikolay Sivov : dwrite/layout: Implement desired orientation get/set methods.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: wine Branch: master Commit: fdc56196ef4ed9fbafb759b38f78adf6e9a33eee URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdc56196ef4ed9fbafb759b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 4 13:19:47 2021 +0300 dwrite/layout: Implement desired orientation get/set methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 52 +++++++++++++++++++++++++++++++++------------- dlls/dwrite/tests/layout.c | 24 +++++++++++++++++++++ 2 files changed, 62 insertions(+), 14 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index b68daf0345b..a24752c9bff 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -492,6 +492,19 @@ static HRESULT format_set_optical_alignment(struct dwrite_textformat_data *forma return S_OK; } +static HRESULT format_set_vertical_orientation(struct dwrite_textformat_data *format, + DWRITE_VERTICAL_GLYPH_ORIENTATION orientation, BOOL *changed) +{ + if ((UINT32)orientation > DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED) + return E_INVALIDARG; + + if (changed) + *changed = format->vertical_orientation != orientation; + + format->vertical_orientation = orientation; + return S_OK; +} + static BOOL is_run_rtl(const struct layout_effective_run *run) { return run->run->u.regular.run.bidiLevel & 1; @@ -3957,6 +3970,21 @@ static HRESULT WINAPI dwritetextlayout2_GetMetrics(IDWriteTextLayout4 *iface, DW return hr; } +static HRESULT layout_set_vertical_orientation(struct dwrite_textlayout *layout, + DWRITE_VERTICAL_GLYPH_ORIENTATION orientation) +{ + BOOL changed; + HRESULT hr; + + if (FAILED(hr = format_set_vertical_orientation(&layout->format, orientation, &changed))) + return hr; + + if (changed) + layout->recompute = RECOMPUTE_EVERYTHING; + + return S_OK; +} + static HRESULT WINAPI dwritetextlayout2_SetVerticalGlyphOrientation(IDWriteTextLayout4 *iface, DWRITE_VERTICAL_GLYPH_ORIENTATION orientation) { @@ -3964,11 +3992,7 @@ static HRESULT WINAPI dwritetextlayout2_SetVerticalGlyphOrientation(IDWriteTextL TRACE("%p, %d.\n", iface, orientation); - if ((UINT32)orientation > DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED) - return E_INVALIDARG; - - layout->format.vertical_orientation = orientation; - return S_OK; + return layout_set_vertical_orientation(layout, orientation); } static DWRITE_VERTICAL_GLYPH_ORIENTATION WINAPI dwritetextlayout2_GetVerticalGlyphOrientation(IDWriteTextLayout4 *iface) @@ -4591,16 +4615,20 @@ static HRESULT WINAPI dwritetextformat_layout_GetLocaleName(IDWriteTextFormat3 * static HRESULT WINAPI dwritetextformat1_layout_SetVerticalGlyphOrientation(IDWriteTextFormat3 *iface, DWRITE_VERTICAL_GLYPH_ORIENTATION orientation) { - FIXME("%p, %d: stub\n", iface, orientation); + struct dwrite_textlayout *layout = impl_layout_from_IDWriteTextFormat3(iface); - return E_NOTIMPL; + TRACE("%p, %d.\n", iface, orientation); + + return layout_set_vertical_orientation(layout, orientation); } static DWRITE_VERTICAL_GLYPH_ORIENTATION WINAPI dwritetextformat1_layout_GetVerticalGlyphOrientation(IDWriteTextFormat3 *iface) { - FIXME("%p: stub\n", iface); + struct dwrite_textlayout *layout = impl_layout_from_IDWriteTextFormat3(iface); - return DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT; + TRACE("%p.\n", iface); + + return layout->format.vertical_orientation; } static HRESULT WINAPI dwritetextformat1_layout_SetLastLineWrapping(IDWriteTextFormat3 *iface, @@ -5709,11 +5737,7 @@ static HRESULT WINAPI dwritetextformat1_SetVerticalGlyphOrientation(IDWriteTextF TRACE("%p, %d.\n", iface, orientation); - if ((UINT32)orientation > DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED) - return E_INVALIDARG; - - format->format.vertical_orientation = orientation; - return S_OK; + return format_set_vertical_orientation(&format->format, orientation, NULL); } static DWRITE_VERTICAL_GLYPH_ORIENTATION WINAPI dwritetextformat1_GetVerticalGlyphOrientation(IDWriteTextFormat3 *iface) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index eb47997f22f..6f06e842493 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2708,6 +2708,7 @@ static void test_SetVerticalGlyphOrientation(void) { DWRITE_VERTICAL_GLYPH_ORIENTATION orientation; IDWriteTextLayout2 *layout2; + IDWriteTextFormat1 *format1; IDWriteTextFormat *format; IDWriteTextLayout *layout; IDWriteFactory *factory; @@ -2738,6 +2739,29 @@ static void test_SetVerticalGlyphOrientation(void) hr = IDWriteTextLayout2_SetVerticalGlyphOrientation(layout2, DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED+1); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteTextLayout2_QueryInterface(layout2, &IID_IDWriteTextFormat1, (void **)&format1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + orientation = IDWriteTextFormat1_GetVerticalGlyphOrientation(format1); + ok(orientation == DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT, "Unexpected orientation %d.\n", orientation); + + hr = IDWriteTextLayout2_SetVerticalGlyphOrientation(layout2, DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + orientation = IDWriteTextLayout2_GetVerticalGlyphOrientation(layout2); + ok(orientation == DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED, "Unexpected orientation %d.\n", orientation); + + orientation = IDWriteTextFormat1_GetVerticalGlyphOrientation(format1); + ok(orientation == DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED, "Unexpected orientation %d.\n", orientation); + + hr = IDWriteTextFormat1_SetVerticalGlyphOrientation(format1, DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + orientation = IDWriteTextLayout2_GetVerticalGlyphOrientation(layout2); + ok(orientation == DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT, "Unexpected orientation %d.\n", orientation); + + IDWriteTextFormat1_Release(format1); + IDWriteTextLayout2_Release(layout2); IDWriteFactory_Release(factory); }

1 0

Byeongsik Jeon : po: Update Korean translation.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: wine Branch: master Commit: 4d483cd855ce80476c2f6c9f89524fc430e07286 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d483cd855ce80476c2f6c9f… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Thu Feb 4 15:15:58 2021 +0900 po: Update Korean translation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ko.po | 252 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 125 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d483cd855ce80476c2f…

1 0

André Hentschel : include: Make sure __int64 is correctly defined on PPC64.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: wine Branch: master Commit: 97420c87bbb58aca61eefefabf5297bd31188e89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97420c87bbb58aca61eefefa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 31 18:34:12 2021 +0100 include: Make sure __int64 is correctly defined on PPC64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/port.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/port.h b/include/wine/port.h index 9c2eb7277bf..15d1ed6315c 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -85,7 +85,7 @@ typedef int ssize_t; #else /* _WIN32 */ #ifndef __int64 -# if defined(__x86_64__) || defined(__aarch64__) || defined(_WIN64) +# if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__) || defined(_WIN64) # define __int64 long # else # define __int64 long long

1 0

Alexandre Julliard : libwine: Don't define obsolete functions on non-x86 platforms.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: wine Branch: master Commit: c90ab917d15ee30570c2a690451aa06360cf85f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c90ab917d15ee30570c2a690… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 4 15:14:24 2021 +0100 libwine: Don't define obsolete functions on non-x86 platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/asm.h | 2 +- libs/wine/port.c | 23 ----------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index b9dae95dc6d..51f04548731 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -175,7 +175,7 @@ #endif /* __i386__ */ -#if defined(__GNUC__) && !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) #define __ASM_OBSOLETE(func) __asm__( ".symver " #func "_obsolete," #func "@WINE_1.0" ) #else #undef __ASM_OBSOLETE diff --git a/libs/wine/port.c b/libs/wine/port.c index 8e56ada52aa..ee804f414a0 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -104,29 +104,6 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack_obsolete, __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") __ASM_CFI(".cfi_same_value %rbp\n\t") "ret") -#elif defined(__arm__) && defined(__GNUC__) -__ASM_GLOBAL_FUNC( wine_call_on_stack_obsolete, - "push {r4,LR}\n\t" /* save return address on stack */ - "mov r4, sp\n\t" /* store old sp in local var */ - "mov sp, r2\n\t" /* stack */ - "mov r2, r0\n\t" /* func -> scratch register */ - "mov r0, r1\n\t" /* arg */ - "blx r2\n\t" /* call func */ - "mov sp, r4\n\t" /* restore old sp from local var */ - "pop {r4,PC}") /* fetch return address into pc */ -#elif defined(__aarch64__) && defined(__GNUC__) -__ASM_GLOBAL_FUNC( wine_call_on_stack_obsolete, - "stp x29, x30, [sp,#-32]!\n\t" /* save return address on stack */ - "str x19, [sp,#16]\n\t" /* save register on stack */ - "mov x19, sp\n\t" /* store old sp in local var */ - "mov sp, x2\n\t" /* stack */ - "mov x2, x0\n\t" /* func -> scratch register */ - "mov x0, x1\n\t" /* arg */ - "blr x2\n\t" /* call func */ - "mov sp, x19\n\t" /* restore old sp from local var */ - "ldr x19, [sp,#16]\n\t" /* restore register from stack */ - "ldp x29, x30, [sp],#32\n\t" /* restore return address */ - "ret") /* return */ #endif /***********************************************************************

1 0

Andrew Eikum : mmdevapi: Implement SpatialAudio features.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: wine Branch: master Commit: 7e64247a6ef3664a603bd9d2dd47f46d24713f9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e64247a6ef3664a603bd9d2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Feb 4 16:09:56 2021 +0200 mmdevapi: Implement SpatialAudio features. This makes car radio / ambient noises audible in Cyberpunk 2077. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/Makefile.in | 3 +- dlls/mmdevapi/audiovolume.c | 1 + dlls/mmdevapi/devenum.c | 5 + dlls/mmdevapi/main.c | 1 + dlls/mmdevapi/mmdevapi.h | 1 + dlls/mmdevapi/spatialaudio.c | 988 +++++++++++++++++++++++++++++++++++++++++ include/spatialaudioclient.idl | 121 +++++ 7 files changed, 1119 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e64247a6ef3664a603b…

1 0

Alexandre Julliard : ntdll: Fix loading of section table in get_cor_header().
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: wine Branch: master Commit: 80898bfee0139bbb5d1c2efda25fc101f61d386b URL: https://source.winehq.org/git/wine.git/?a=commit;h=80898bfee0139bbb5d1c2efd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 4 11:47:51 2021 +0100 ntdll: Fix loading of section table in get_cor_header(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50613 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 464b69427d5..458f79a9197 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2040,7 +2040,7 @@ static BOOL get_cor_header( HANDLE file, const SECTION_IMAGE_INFORMATION *info, va = nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; size = nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; if (!va || size < sizeof(*cor)) return FALSE; - offset.QuadPart = offsetof( IMAGE_NT_HEADERS32, OptionalHeader ) + nt.FileHeader.SizeOfOptionalHeader; + offset.QuadPart += offsetof( IMAGE_NT_HEADERS32, OptionalHeader ) + nt.FileHeader.SizeOfOptionalHeader; count = min( 96, nt.FileHeader.NumberOfSections ); if (NtReadFile( file, 0, NULL, NULL, &io, &sec, count * sizeof(*sec), &offset, NULL )) return FALSE; if (io.Information != count * sizeof(*sec)) return FALSE;

1 0

Michael Müller : kernel32: Update sr-Latn locale definition.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: wine Branch: master Commit: 3b3dfda59951b0f42e297f2b9a31ded04a98d4b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b3dfda59951b0f42e297f2b… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 3 17:48:36 2021 -0600 kernel32: Update sr-Latn locale definition. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/srl.nls | 14 +++++++------- dlls/kernel32/tests/locale.c | 4 +--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/nls/srl.nls b/dlls/kernel32/nls/srl.nls index 948b5e11a2b..516bb512aae 100644 --- a/dlls/kernel32/nls/srl.nls +++ b/dlls/kernel32/nls/srl.nls @@ -66,7 +66,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_ITLZERO "0" LOCALE_S1159 "" LOCALE_S2359 "" - LOCALE_SABBREVCTRYNAME "SRB" + LOCALE_SABBREVCTRYNAME "SCG" LOCALE_SABBREVDAYNAME1 "pon" LOCALE_SABBREVDAYNAME2 "uto" LOCALE_SABBREVDAYNAME3 "sre" @@ -88,7 +88,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_SABBREVMONTHNAME11 "nov" LOCALE_SABBREVMONTHNAME12 "dec" LOCALE_SABBREVMONTHNAME13 "" - LOCALE_SCOUNTRY "Serbia" + LOCALE_SCOUNTRY "Serbia and Montenegro (Former)" LOCALE_SCURRENCY "Din." LOCALE_SDATE "." LOCALE_SDAYNAME1 "ponedeljak" @@ -99,12 +99,12 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_SDAYNAME6 "subota" LOCALE_SDAYNAME7 "nedelja" LOCALE_SDECIMAL "," - LOCALE_SENGCOUNTRY "Serbia" + LOCALE_SENGCOUNTRY "Serbia and Montenegro (Former)" LOCALE_SENGCURRNAME "Serbian Dinar" LOCALE_SENGLANGUAGE "Serbian (Latin)" LOCALE_SGROUPING "3;0" - LOCALE_SINTLSYMBOL "RSD" - LOCALE_SISO3166CTRYNAME "RS" + LOCALE_SINTLSYMBOL "CSD" + LOCALE_SISO3166CTRYNAME "CS" LOCALE_SISO639LANGNAME "sr" LOCALE_SLANGUAGE "Serbian (Latin)" LOCALE_SLIST ";" @@ -126,9 +126,9 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_SMONTHNAME12 "decembar" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." - LOCALE_SNAME "sr-Latn-RS" + LOCALE_SNAME "sr-Latn-CS" LOCALE_SNAN "NaN" - LOCALE_SNATIVECTRYNAME "Srbija" + LOCALE_SNATIVECTRYNAME "Srbija i Crna Gora (Bivši)" LOCALE_SNATIVECURRNAME "dinar" LOCALE_SNATIVEDIGITS "0123456789" LOCALE_SNATIVEDISPLAYNAME "srpski (Srbija)" diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b354f759335..55566d3e703 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2768,7 +2768,6 @@ struct neutralsublang_name_t { WCHAR name[3]; WCHAR sname[16]; LCID lcid; - int todo; }; static const struct neutralsublang_name_t neutralsublang_names[] = { @@ -2782,7 +2781,7 @@ static const struct neutralsublang_name_t neutralsublang_names[] = { { {'m','s',0}, {'m','s','-','M','Y',0}, MAKELCID(MAKELANGID(LANG_MALAY, SUBLANG_MALAY_MALAYSIA), SORT_DEFAULT) }, { {'n','l',0}, {'n','l','-','N','L',0}, MAKELCID(MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH), SORT_DEFAULT) }, { {'p','t',0}, {'p','t','-','B','R',0}, MAKELCID(MAKELANGID(LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN), SORT_DEFAULT) }, - { {'s','r',0}, {'s','r','-','L','a','t','n','-','R','S',0}, MAKELCID(MAKELANGID(LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN), SORT_DEFAULT), 1 }, + { {'s','r',0}, {'s','r','-','L','a','t','n','-','R','S',0}, MAKELCID(MAKELANGID(LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN), SORT_DEFAULT) }, { {'s','v',0}, {'s','v','-','S','E',0}, MAKELCID(MAKELANGID(LANG_SWEDISH, SUBLANG_SWEDISH), SORT_DEFAULT) }, { {'u','z',0}, {'u','z','-','L','a','t','n','-','U','Z',0}, MAKELCID(MAKELANGID(LANG_UZBEK, SUBLANG_UZBEK_LATIN), SORT_DEFAULT) }, { {'z','h',0}, {'z','h','-','C','N',0}, MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT) }, @@ -2977,7 +2976,6 @@ static void test_LocaleNameToLCID(void) status = pRtlLocaleNameToLcid( ptr->sname, &lcid, 0 ); ok( !status || broken(ptr->lcid == MAKELANGID(LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN)), /* vista */ "%s failed error %x\n", wine_dbgstr_w(ptr->name), status ); - todo_wine_if(ptr->todo) if (!status) ok( lcid == ptr->lcid, "%s: got wrong lcid 0x%04x, expected 0x%04x\n", wine_dbgstr_w(ptr->name), lcid, ptr->lcid ); }

1 0

Zebediah Figura : ntdll: Map LANG_SERBIAN_NEUTRAL in RtlLocaleNameToLcid().
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: wine Branch: master Commit: db3e08770fe9bfb6f06a71761e48a40fe9764058 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db3e08770fe9bfb6f06a7176… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 3 17:48:35 2021 -0600 ntdll: Map LANG_SERBIAN_NEUTRAL in RtlLocaleNameToLcid(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 10 +++------- dlls/ntdll/locale.c | 3 +++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 0f409abe3e2..b354f759335 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2861,14 +2861,12 @@ static void test_LocaleNameToLCID(void) for (ptr = neutralsublang_names; *ptr->name; ptr++) { lcid = pLocaleNameToLCID(ptr->name, 0); - todo_wine_if (ptr->todo) - ok(lcid == ptr->lcid, "%s: got wrong lcid 0x%04x, expected 0x%04x\n", - wine_dbgstr_w(ptr->name), lcid, ptr->lcid); + ok(lcid == ptr->lcid, "%s: got wrong lcid 0x%04x, expected 0x%04x\n", + wine_dbgstr_w(ptr->name), lcid, ptr->lcid); *buffer = 0; ret = pLCIDToLocaleName(lcid, buffer, ARRAY_SIZE(buffer), 0); ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(ptr->name), ret); - todo_wine_if (ptr->todo) ok(!lstrcmpW(ptr->sname, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(ptr->name), wine_dbgstr_w(buffer)); @@ -2974,7 +2972,6 @@ static void test_LocaleNameToLCID(void) status = pRtlLocaleNameToLcid( ptr->name, &lcid, 2 ); ok( !status || broken(ptr->lcid == MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED)), /* vista */ "%s failed error %x\n", wine_dbgstr_w(ptr->name), status ); - todo_wine_if(ptr->todo) if (!status) ok( lcid == expect, "%s: got wrong lcid 0x%04x, expected 0x%04x\n", wine_dbgstr_w(ptr->name), lcid, expect ); status = pRtlLocaleNameToLcid( ptr->sname, &lcid, 0 ); @@ -4824,8 +4821,7 @@ static void test_GetLocaleInfoEx(void) { val = 0; pGetLocaleInfoEx(ptr->name, LOCALE_ILANGUAGE|LOCALE_RETURN_NUMBER, (WCHAR*)&val, sizeof(val)/sizeof(WCHAR)); - todo_wine_if (ptr->todo) - ok(val == ptr->lcid, "%s: got wrong lcid 0x%04x, expected 0x%04x\n", wine_dbgstr_w(ptr->name), val, ptr->lcid); + ok(val == ptr->lcid, "%s: got wrong lcid 0x%04x, expected 0x%04x\n", wine_dbgstr_w(ptr->name), val, ptr->lcid); bufferW[0] = 0; ret = pGetLocaleInfoEx(ptr->name, LOCALE_SNAME, bufferW, ARRAY_SIZE(bufferW)); ok(ret == lstrlenW(bufferW)+1, "%s: got ret value %d\n", wine_dbgstr_w(ptr->name), ret); diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 3979f41089b..e4d90a8b1d5 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1358,6 +1358,9 @@ NTSTATUS WINAPI RtlLocaleNameToLcid( const WCHAR *name, LCID *lcid, ULONG flags case MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_HONGKONG ): *lcid = MAKELCID( 0x7c04, SORT_DEFAULT ); break; + case MAKELANGID( LANG_SERBIAN, SUBLANG_NEUTRAL ): + *lcid = LANG_SERBIAN_NEUTRAL; + break; default: *lcid = MAKELANGID( PRIMARYLANGID(id), SUBLANG_NEUTRAL ); break;

1 0