March 2022 - Wine-Commits - list.winehq.org

Nikolay Sivov : opcservices/tests: Use wide strings in test data.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: f859e8b2eb8fa3c3b08d893eadf5b610ff8e5fd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f859e8b2eb8fa3c3b08d893e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 29 09:51:58 2022 +0300 opcservices/tests: Use wide strings in test data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/tests/opcservices.c | 187 +++++++++++++---------------------- 1 file changed, 69 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f859e8b2eb8fa3c3b08d…

1 0

Nikolay Sivov : opcservices: Use CRT allocation functions.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: ea15c212e375fe28d878265f6a9905af766d242d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea15c212e375fe28d878265f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 29 09:51:57 2022 +0300 opcservices: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/compress.c | 19 +++++++-------- dlls/opcservices/factory.c | 6 ++--- dlls/opcservices/opc_private.h | 3 +-- dlls/opcservices/package.c | 54 +++++++++++++++++++++--------------------- dlls/opcservices/uri.c | 20 ++++++++-------- 5 files changed, 50 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea15c212e375fe28d878…

1 0

Alexandre Julliard : kernelbase: Reimplement misc format values in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: 712e4757c6d877bad2902f426195dd3c89ffe23b URL: https://source.winehq.org/git/wine.git/?a=commit;h=712e4757c6d877bad2902f42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:37:29 2022 +0200 kernelbase: Reimplement misc format values in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 3095234bd9b..967757f91e1 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -978,7 +978,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_IMEASURE: - return -1; + return locale_return_number( locale->imeasure, type, buffer, len ); case LOCALE_SDECIMAL: return -1; @@ -1203,7 +1203,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->senglanguage, type, buffer, len ); case LOCALE_IREADINGLAYOUT: - return -1; + return locale_return_number( locale->ireadinglayout, type, buffer, len ); case LOCALE_INEUTRAL: return -1; @@ -1279,7 +1279,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_number( locale_strings[locale->scalendartype + 1], type, buffer, len ); case LOCALE_IPAPERSIZE: - return -1; + return locale_return_number( locale->ipapersize, type, buffer, len ); case LOCALE_IOPTIONALCALENDAR: return locale_return_number( locale_strings[locale->scalendartype + 2], type, buffer, len );

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_ICOUNTRY/IGEOID in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: f0d43939ffead35bafdb2dc46b2402f0d3d2675e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0d43939ffead35bafdb2dc4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:36:46 2022 +0200 kernelbase: Reimplement LOCALE_ICOUNTRY/IGEOID in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 98e0041f901..2a74cab6500 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -923,7 +923,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->snativelangname, type, buffer, len ); case LOCALE_ICOUNTRY: - return -1; + return locale_return_number( locale->icountry, type, buffer, len ); case LOCALE_SLOCALIZEDCOUNTRYNAME: /* FIXME: localization */ @@ -939,7 +939,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_number( locale->idefaultlanguage, type, buffer, len ); case LOCALE_IDEFAULTCOUNTRY: - return -1; + return locale_return_number( locale->icountry, type, buffer, len ); case LOCALE_IDEFAULTCODEPAGE: val = locale->idefaultcodepage == CP_UTF8 ? CP_OEMCP : locale->idefaultcodepage; @@ -1119,7 +1119,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->siso3166ctryname, type, buffer, len ); case LOCALE_IGEOID: - return -1; + return locale_return_number( locale->igeoid, type, buffer, len ); case LOCALE_SNAME: if (SORTIDFROMLCID(lcid)) /* custom sort locale */

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_*CURRNAME/CURRENCY in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: 62cd33e6b0fd60dbd2a12d6734ff821f8ca5187d URL: https://source.winehq.org/git/wine.git/?a=commit;h=62cd33e6b0fd60dbd2a12d67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:36:41 2022 +0200 kernelbase: Reimplement LOCALE_*CURRNAME/CURRENCY in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 8 ++++---- dlls/oleaut32/tests/vartest.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index b3cc0b0d3f0..98e0041f901 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -970,10 +970,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SCURRENCY: - return -1; + return locale_return_string( locale->scurrency, type, buffer, len ); case LOCALE_SINTLSYMBOL: - return -1; + return locale_return_string( locale->sintlsymbol, type, buffer, len ); case LOCALE_SMONDECIMALSEP: return -1; @@ -1241,10 +1241,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SENGCURRNAME: - return -1; + return locale_return_string( locale->sengcurrname, type, buffer, len ); case LOCALE_SNATIVECURRNAME: - return -1; + return locale_return_string( locale->snativecurrname, type, buffer, len ); case LOCALE_ICALENDARTYPE: return -1; diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 03eb566f555..db0562e2d03 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2460,10 +2460,10 @@ static void test_VarParseNumFromStrMisc(void) lcid = MAKELCID(MAKELANGID(LANG_FRENCH,SUBLANG_FRENCH_SWISS),SORT_DEFAULT); WCONVERT(L"3CHF", NUMPRS_CURRENCY|NUMPRS_USE_ALL); /* Windows <= 8.1 uses an old currency symbol: "fr. 5" */ - todo_wine ok(hres == S_OK || broken(hres == DISP_E_TYPEMISMATCH), "returned %08lx\n", hres); + ok(hres == S_OK || broken(hres == DISP_E_TYPEMISMATCH), "returned %08lx\n", hres); if (hres == S_OK) { - todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,4,0,0); + EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,4,0,0); EXPECT2(3,FAILDIG); }

1 0

Ziqing Hui : include: Add defines for ID2D1GradientMesh.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: 64150d55dddd392c9a188bdc103fc5fd1f94d68e URL: https://source.winehq.org/git/wine.git/?a=commit;h=64150d55dddd392c9a188bdc… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Mar 29 17:23:42 2022 +0800 include: Add defines for ID2D1GradientMesh. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_3.idl | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index 93c273816e2..5fbb9c4629c 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -39,6 +39,42 @@ typedef struct D2D1_INK_BEZIER_SEGMENT D2D1_INK_POINT point3; } D2D1_INK_BEZIER_SEGMENT; +typedef enum D2D1_PATCH_EDGE_MODE +{ + D2D1_PATCH_EDGE_MODE_ALIASED = 0x0, + D2D1_PATCH_EDGE_MODE_ANTIALIASED = 0x1, + D2D1_PATCH_EDGE_MODE_ALIASED_INFLATED = 0x2, + D2D1_PATCH_EDGE_MODE_FORCE_DWORD = 0xffffffff +} D2D1_PATCH_EDGE_MODE; + +typedef struct D2D1_GRADIENT_MESH_PATCH +{ + D2D1_POINT_2F point00; + D2D1_POINT_2F point01; + D2D1_POINT_2F point02; + D2D1_POINT_2F point03; + D2D1_POINT_2F point10; + D2D1_POINT_2F point11; + D2D1_POINT_2F point12; + D2D1_POINT_2F point13; + D2D1_POINT_2F point20; + D2D1_POINT_2F point21; + D2D1_POINT_2F point22; + D2D1_POINT_2F point23; + D2D1_POINT_2F point30; + D2D1_POINT_2F point31; + D2D1_POINT_2F point32; + D2D1_POINT_2F point33; + D2D1_COLOR_F color00; + D2D1_COLOR_F color03; + D2D1_COLOR_F color30; + D2D1_COLOR_F color33; + D2D1_PATCH_EDGE_MODE topEdgeMode; + D2D1_PATCH_EDGE_MODE leftEdgeMode; + D2D1_PATCH_EDGE_MODE bottomEdgeMode; + D2D1_PATCH_EDGE_MODE rightEdgeMode; +} D2D1_GRADIENT_MESH_PATCH; + [ object, uuid(bae8b344-23fc-4071-8cb5-d05d6f073848), @@ -102,3 +138,18 @@ interface ID2D1Ink : ID2D1Resource [out] D2D1_RECT_F *bounds ); }; + +[ + object, + uuid(f292e401-c050-4cde-83d7-04962d3b23c2), + local, +] +interface ID2D1GradientMesh : ID2D1Resource +{ + UINT32 GetPatchCount(); + HRESULT GetPatches( + [in] UINT32 start_index, + [out] D2D1_GRADIENT_MESH_PATCH *patches, + [in] UINT32 patch_count + ); +};

1 0

Ziqing Hui : d2d1: Fix a typo.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: 16abbb4ae8c5231999f8731eac6c6bd7cd2f9436 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16abbb4ae8c5231999f8731e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Mar 29 17:23:39 2022 +0800 d2d1: Fix a typo. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/factory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 737864df69c..3d3393e5f0c 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -597,7 +597,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_GetEffectProperties(ID2D1Factory2 * return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_ID2D1Factory1_CreateDevice(ID2D1Factory2 *iface, IDXGIDevice *dxgi_device, +static HRESULT STDMETHODCALLTYPE d2d_factory_ID2D1Factory2_CreateDevice(ID2D1Factory2 *iface, IDXGIDevice *dxgi_device, ID2D1Device1 **device) { FIXME("iface %p, dxgi_device %p, device %p stub!\n", iface, dxgi_device, device); @@ -634,7 +634,7 @@ static const struct ID2D1Factory2Vtbl d2d_factory_vtbl = d2d_factory_UnregisterEffect, d2d_factory_GetRegisteredEffects, d2d_factory_GetEffectProperties, - d2d_factory_ID2D1Factory1_CreateDevice, + d2d_factory_ID2D1Factory2_CreateDevice, }; static HRESULT STDMETHODCALLTYPE d2d_factory_mt_QueryInterface(ID2D1Multithread *iface, REFIID iid, void **out)

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_SSORTNAME in GetLocaleInfoW/Ex.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: 6549f1f3d2f5aadb7f2a19680076b5606d9663ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=6549f1f3d2f5aadb7f2a1968… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 20:33:32 2022 +0200 kernelbase: Reimplement LOCALE_SSORTNAME in GetLocaleInfoW/Ex. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 8cb2120357c..31a81fc167c 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -925,11 +925,88 @@ static int locale_return_strarray_concat( DWORD pos, LCTYPE type, WCHAR *buffer, } +/* FIXME: hardcoded, sortname is apparently not available in locale.nls */ +static const WCHAR *get_locale_sortname( LCID lcid ) +{ + switch (PRIMARYLANGID( lcid )) + { + case LANG_CHINESE: + switch (SORTIDFROMLCID( lcid )) + { + case SORT_CHINESE_PRCP: + switch (SUBLANGID( lcid )) + { + case SUBLANG_CHINESE_TRADITIONAL: + case SUBLANG_CHINESE_HONGKONG: + case 0x1f: + return L"Stroke Count"; + default: + return L"Pronunciation"; + } + case SORT_CHINESE_UNICODE: return L"Unicode"; + case SORT_CHINESE_PRC: return L"Stroke Count"; + case SORT_CHINESE_BOPOMOFO: return L"Bopomofo"; + case SORT_CHINESE_RADICALSTROKE: return L"Radical/Stroke"; + case 5: return L"Surname"; + } + break; + + case LANG_GEORGIAN: + if (SORTIDFROMLCID( lcid ) == SORT_GEORGIAN_MODERN) return L"Modern"; + return L"Traditional"; + + case LANG_GERMAN: + switch (SUBLANGID( lcid )) + { + case SUBLANG_NEUTRAL: + case SUBLANG_DEFAULT: + if (SORTIDFROMLCID( lcid ) == SORT_GERMAN_PHONE_BOOK) return L"Phone Book (DIN)"; + return L"Dictionary"; + } + break; + + case LANG_HUNGARIAN: + if (SORTIDFROMLCID( lcid ) == SORT_HUNGARIAN_TECHNICAL) return L"Technical"; + break; + + case LANG_INVARIANT: + if (SORTIDFROMLCID( lcid ) == SORT_INVARIANT_MATH) return L"Default"; + return L"Maths Alphanumerics"; + + case LANG_JAPANESE: + switch (SORTIDFROMLCID( lcid )) + { + case SORT_JAPANESE_XJIS: return L"XJIS"; + case SORT_JAPANESE_UNICODE: return L"Unicode"; + case SORT_JAPANESE_RADICALSTROKE: return L"Radical/Stroke"; + } + break; + + case LANG_KOREAN: + if (SORTIDFROMLCID( lcid ) == SORT_KOREAN_UNICODE) return L"Unicode"; + return L"Dictionary"; + + case LANG_SPANISH: + switch (SUBLANGID( lcid )) + { + case SUBLANG_NEUTRAL: + case SUBLANG_SPANISH_MODERN: + return L"International"; + case SUBLANG_DEFAULT: + return L"Traditional"; + } + break; + } + return L"Default"; +} + + /* get locale information from the locale.nls file */ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE type, WCHAR *buffer, int len ) { static const WCHAR spermille[] = { 0x2030, 0 }; /* this one seems hardcoded */ + const WCHAR *sort; UINT val; if (locale != user_locale) type |= LOCALE_NOUSEROVERRIDE; @@ -1312,7 +1389,8 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_number( locale->idefaultebcdiccodepage, type, buffer, len ); case LOCALE_SSORTNAME: - return -1; + sort = get_locale_sortname( lcid ); + return locale_return_data( sort, wcslen(sort) + 1, type, buffer, len ); case LOCALE_IDIGITSUBSTITUTION: return locale_return_number( locale->idigitsubstitution, type, buffer, len );

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_*PERCENT in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: 9ef9d0293ad84b40d93f2bcd18e52534f51fb57d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ef9d0293ad84b40d93f2bcd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:36:30 2022 +0200 kernelbase: Reimplement LOCALE_*PERCENT in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 3eb598be505..e3960c1e74e 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -900,6 +900,7 @@ static int locale_return_strarray( DWORD pos, WORD idx, LCTYPE type, WCHAR *buff static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE type, WCHAR *buffer, int len ) { + static const WCHAR spermille[] = { 0x2030, 0 }; /* this one seems hardcoded */ UINT val; if (locale != user_locale) type |= LOCALE_NOUSEROVERRIDE; @@ -1185,16 +1186,16 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->snativedisplayname, type, buffer, len ); case LOCALE_INEGATIVEPERCENT: - return -1; + return locale_return_number( locale->inegativepercent, type, buffer, len ); case LOCALE_IPOSITIVEPERCENT: - return -1; + return locale_return_number( locale->ipositivepercent, type, buffer, len ); case LOCALE_SPERCENT: - return -1; + return locale_return_string( locale->spercent, type, buffer, len ); case LOCALE_SPERMILLE: - return -1; + return locale_return_data( spermille, ARRAY_SIZE(spermille), type, buffer, len ); case LOCALE_SMONTHDAY: return -1;

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_*INFINITY/NAN in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: 17928e6a0146e9024339e04414ab813a933a10a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17928e6a0146e9024339e044… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:36:20 2022 +0200 kernelbase: Reimplement LOCALE_*INFINITY/NAN in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 4b205aed9af..3eb598be505 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1151,13 +1151,13 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->siso3166ctryname2, type, buffer, len ); case LOCALE_SNAN: - return -1; + return locale_return_string( locale->snan, type, buffer, len ); case LOCALE_SPOSINFINITY: - return -1; + return locale_return_string( locale->sposinfinity, type, buffer, len ); case LOCALE_SNEGINFINITY: - return -1; + return locale_return_string( locale->sneginfinity, type, buffer, len ); case LOCALE_SSCRIPTS: return -1;

1 0