October 2022 - Wine-Commits

Piotr Caban : comctl32: Add helper for getting template from HPROPSHEETPAGE.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: e270a104239dc1ad30e660ff5f53699a01a057e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/e270a104239dc1ad30e660ff5f5369… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 26 14:48:23 2022 +0200 comctl32: Add helper for getting template from HPROPSHEETPAGE. --- dlls/comctl32/propsheet.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 62374a96ae9..3f004dfe294 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -416,6 +416,11 @@ static HICON HPSP_get_icon(HPROPSHEETPAGE hpsp) return ret; } +static LRESULT HPSP_get_template(HPROPSHEETPAGE hpsp) +{ + return (LRESULT)hpsp->psp.u.pszTemplate; +} + static HWND HPSP_create_page(HPROPSHEETPAGE hpsp, DLGTEMPLATE *template, HWND parent) { HWND hwnd; @@ -517,7 +522,7 @@ static INT PROPSHEET_FindPageByResId(const PropSheetInfo * psInfo, LRESULT resId for (i = 0; i < psInfo->nPages; i++) { /* Fixme: if resource ID is a string shall we use strcmp ??? */ - if (psInfo->proppage[i].hpage->psp.u.pszTemplate == (LPVOID)resId) + if (HPSP_get_template(psInfo->proppage[i].hpage) == resId) break; } @@ -2624,7 +2629,7 @@ static LRESULT PROPSHEET_IdToIndex(HWND hwndDlg, int iPageId) PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); TRACE("(%p, %d)\n", hwndDlg, iPageId); for (index = 0; index < psInfo->nPages; index++) { - if (psInfo->proppage[index].hpage->psp.u.pszTemplate == MAKEINTRESOURCEW(iPageId)) + if (HPSP_get_template(psInfo->proppage[index].hpage) == iPageId) return index; } @@ -2637,17 +2642,20 @@ static LRESULT PROPSHEET_IdToIndex(HWND hwndDlg, int iPageId) static LRESULT PROPSHEET_IndexToId(HWND hwndDlg, int iPageIndex) { PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); - LPCPROPSHEETPAGEW psp; + HPROPSHEETPAGE hpsp; + LRESULT template; + TRACE("(%p, %d)\n", hwndDlg, iPageIndex); + if (iPageIndex<0 || iPageIndex>=psInfo->nPages) { WARN("%d out of range.\n", iPageIndex); return 0; } - psp = &psInfo->proppage[iPageIndex].hpage->psp; - if (psp->dwFlags & PSP_DLGINDIRECT || !IS_INTRESOURCE(psp->u.pszTemplate)) { + hpsp = psInfo->proppage[iPageIndex].hpage; + template = HPSP_get_template(hpsp); + if (HPSP_get_flags(hpsp) & PSP_DLGINDIRECT || !IS_INTRESOURCE(template)) return 0; - } - return (LRESULT)psp->u.pszTemplate; + return template; } /******************************************************************************

1 0

Piotr Caban : comctl32: Add helper for setting header subtitle in HPROPSHEETPAGE.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: 831950882c3b5e7c94f238cd55be25c2e256b7e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/831950882c3b5e7c94f238cd55be25… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 26 15:43:35 2022 +0200 comctl32: Add helper for setting header subtitle in HPROPSHEETPAGE. --- dlls/comctl32/propsheet.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 48b6625c53e..d713385eec1 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -448,6 +448,14 @@ static void HPSP_set_header_title(HPROPSHEETPAGE hpsp, const WCHAR *title) hpsp->psp.dwFlags |= PSP_USEHEADERTITLE; } +static void HPSP_set_header_subtitle(HPROPSHEETPAGE hpsp, const WCHAR *subtitle) +{ + if (!IS_INTRESOURCE(hpsp->psp.pszHeaderTitle)) + Free((void *)hpsp->psp.pszHeaderTitle); + + hpsp->psp.pszHeaderTitle = heap_strdupW(subtitle); + hpsp->psp.dwFlags |= PSP_USEHEADERSUBTITLE; +} #define add_flag(a) if (dwFlags & a) {strcat(string, #a );strcat(string," ");} /****************************************************************************** @@ -2534,20 +2542,13 @@ static void PROPSHEET_SetHeaderTitleA(HWND hwndDlg, UINT page_index, const char static void PROPSHEET_SetHeaderSubTitleW(HWND hwndDlg, UINT page_index, const WCHAR *subtitle) { PropSheetInfo *psInfo = GetPropW(hwndDlg, PropSheetInfoStr); - PROPSHEETPAGEW *page; TRACE("(%p, %u, %s)\n", hwndDlg, page_index, debugstr_w(subtitle)); if (page_index >= psInfo->nPages) return; - page = &psInfo->proppage[page_index].hpage->psp; - - if (!IS_INTRESOURCE(page->pszHeaderSubTitle)) - Free((void *)page->pszHeaderSubTitle); - - page->pszHeaderSubTitle = heap_strdupW(subtitle); - page->dwFlags |= PSP_USEHEADERSUBTITLE; + HPSP_set_header_subtitle(psInfo->proppage[page_index].hpage, subtitle); } /******************************************************************************

1 0

Gabriel Ivăncescu : mshtml: Move the Persist interfaces out of basedoc.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: 07bf1d73046099e099074067a4da6397f88917e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/07bf1d73046099e099074067a4da63… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 17 21:20:02 2022 +0300 mshtml: Move the Persist interfaces out of basedoc. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/editor.c | 2 +- dlls/mshtml/htmldoc.c | 45 ++- dlls/mshtml/mshtml_private.h | 21 +- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/persist.c | 928 +++++++++++++++++++++++++++++++------------ 6 files changed, 726 insertions(+), 274 deletions(-)

1 0

Alistair Leslie-Hughes : crypt32: Only report Unimplemented decoder when not found in external dll.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: 42bd5ea4c4c4c42af872b5a6a12e6109fc3e2ddf URL: https://gitlab.winehq.org/wine/wine/-/commit/42bd5ea4c4c4c42af872b5a6a12e61… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Aug 28 12:22:30 2021 +1000 crypt32: Only report Unimplemented decoder when not found in external dll. Some applications spam this fixme. fixme:cryptasn:CRYPT_GetBuiltinDecoder Unsupported decoder for lpszStructType 1.3.6.1.4.1.311.2.1.4 This OID is supported in wintrust.dll which crypt32 uses, so this console fixme doesn't make sense. The fixme will only appear if no support for the requested decoder is available. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53800 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/crypt32/decode.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 22e15360cf3..b834c9828b6 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -6805,7 +6805,7 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, decodeFunc = CRYPT_AsnDecodeOCSPBasicResponse; break; default: - FIXME("Unimplemented decoder for lpszStructType OID %d\n", LOWORD(lpszStructType)); + break; } } else if (!strcmp(lpszStructType, szOID_CERT_EXTENSIONS)) @@ -6862,8 +6862,6 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, decodeFunc = CRYPT_AsnDecodeCTL; else if (!strcmp(lpszStructType, szOID_ECC_PUBLIC_KEY)) decodeFunc = CRYPT_AsnDecodeObjectIdentifier; - else - FIXME("Unsupported decoder for lpszStructType %s\n", lpszStructType); return decodeFunc; } @@ -6942,6 +6940,13 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, debugstr_a(lpszStructType)); decodeFunc = CRYPT_LoadDecoderExFunc(dwCertEncodingType, lpszStructType, &hFunc); + if (!decodeFunc) + { + if (IS_INTOID(lpszStructType)) + FIXME("Unimplemented decoder for lpszStructType OID %d\n", LOWORD(lpszStructType)); + else + FIXME("Unsupported decoder for lpszStructType %s\n", lpszStructType); + } } if (decodeFunc) ret = decodeFunc(dwCertEncodingType, lpszStructType, pbEncoded,

1 0

Alex Henrie : include: Move strto[iu]max(_l) from stdlib.h to inttypes.h.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: 5235526b1601e9d8461dd3f590c8ffaa2f581c10 URL: https://gitlab.winehq.org/wine/wine/-/commit/5235526b1601e9d8461dd3f590c8ff… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 18 21:38:39 2022 -0600 include: Move strto[iu]max(_l) from stdlib.h to inttypes.h. Needed to compile PuTTY. --- include/msvcrt/inttypes.h | 5 +++++ include/msvcrt/stdlib.h | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/msvcrt/inttypes.h b/include/msvcrt/inttypes.h index dd30bc97c85..d6ad4868d05 100644 --- a/include/msvcrt/inttypes.h +++ b/include/msvcrt/inttypes.h @@ -234,6 +234,11 @@ typedef struct { #define SCNuPTR "u" #endif +_ACRTIMP __int64 __cdecl strtoimax(const char*,char**,int); +_ACRTIMP __int64 __cdecl strtoimax_l(const char*,char**,int,_locale_t); +_ACRTIMP unsigned __int64 __cdecl strtoumax(const char*,char**,int); +_ACRTIMP unsigned __int64 __cdecl strtoumax_l(const char*,char**,int,_locale_t); + #ifdef __cplusplus } #endif diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index f7acdda73cb..a6e1c7eee02 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -229,10 +229,6 @@ _ACRTIMP __msvcrt_long __cdecl strtol(const char*,char**,int); _ACRTIMP __msvcrt_ulong __cdecl strtoul(const char*,char**,int); _ACRTIMP __int64 __cdecl _strtoll_l(const char*,char**,int,_locale_t); _ACRTIMP unsigned __int64 __cdecl _strtoull_l(const char*,char**,int,_locale_t); -_ACRTIMP __int64 __cdecl strtoimax(const char*,char**,int); -_ACRTIMP __int64 __cdecl strtoimax_l(const char*,char**,int,_locale_t); -_ACRTIMP unsigned __int64 __cdecl strtoumax(const char*,char**,int); -_ACRTIMP unsigned __int64 __cdecl strtoumax_l(const char*,char**,int,_locale_t); _ACRTIMP __int64 __cdecl _strtoi64(const char*,char**,int); _ACRTIMP __int64 __cdecl _strtoi64_l(const char*,char**,int,_locale_t); _ACRTIMP unsigned __int64 __cdecl _strtoui64(const char*,char**,int);

1 0

Rémi Bernon : winex11.drv: Use session BaseNamedObjects for display_device_init mutex.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: 9062314aedb940a00ce1e44317b73d6c498cafa3 URL: https://gitlab.winehq.org/wine/wine/-/commit/9062314aedb940a00ce1e44317b73d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 19 01:21:36 2022 +0200 winex11.drv: Use session BaseNamedObjects for display_device_init mutex. The mutex is also used in user32, gdi32, and winevulkan, where it is opened through kernel32, which opens it from the session directory. Note that this was also not even using the global BaseNamedObjects and was silently failing to open the mutex. --- dlls/winex11.drv/x11drv_main.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 7f9ada291a0..497e270ee8a 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -1009,14 +1009,19 @@ NTSTATUS CDECL X11DRV_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDP static HANDLE get_display_device_init_mutex(void) { - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t'}; - UNICODE_STRING name = { sizeof(init_mutexW), sizeof(init_mutexW), (WCHAR *)init_mutexW }; + WCHAR bufferW[256]; + UNICODE_STRING name = {.Buffer = bufferW}; OBJECT_ATTRIBUTES attr; - HANDLE mutex = 0; + char buffer[256]; + HANDLE mutex; + + snprintf( buffer, ARRAY_SIZE(buffer), "\\Sessions\\%u\\BaseNamedObjects\\display_device_init", + NtCurrentTeb()->Peb->SessionId ); + name.Length = name.MaximumLength = asciiz_to_unicode( bufferW, buffer ); InitializeObjectAttributes( &attr, &name, OBJ_OPENIF, NULL, NULL ); - NtCreateMutant( &mutex, MUTEX_ALL_ACCESS, &attr, FALSE ); - if (mutex) NtWaitForSingleObject( mutex, FALSE, NULL ); + if (NtCreateMutant( &mutex, MUTEX_ALL_ACCESS, &attr, FALSE ) < 0) return 0; + NtWaitForSingleObject( mutex, FALSE, NULL ); return mutex; }

1 0

Gabriel Ivăncescu : mshtml: Move the OleObj interfaces out of basedoc.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: da4a45cdaf59c6a5dc5ce691bb469bea66f9a135 URL: https://gitlab.winehq.org/wine/wine/-/commit/da4a45cdaf59c6a5dc5ce691bb469b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 17 21:20:03 2022 +0300 mshtml: Move the OleObj interfaces out of basedoc. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/editor.c | 4 +- dlls/mshtml/htmldoc.c | 68 +- dlls/mshtml/mshtml_private.h | 28 +- dlls/mshtml/oleobj.c | 1424 ++++++++++++++++++++++++++++++------------ dlls/mshtml/persist.c | 6 +- dlls/mshtml/pluginhost.c | 2 +- dlls/mshtml/view.c | 9 +- 7 files changed, 1105 insertions(+), 436 deletions(-)

1 0

Zebediah Figura : wined3d: Do not enforce GL map access for resources with WINED3D_RESOURCE_ACCESS_CPU.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: ebbcc10b0593948657b8e684c3a9be8ace1a5d25 URL: https://gitlab.winehq.org/wine/wine/-/commit/ebbcc10b0593948657b8e684c3a9be… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 19 13:21:32 2022 -0500 wined3d: Do not enforce GL map access for resources with WINED3D_RESOURCE_ACCESS_CPU. d3d maps of such resources will map the CPU copy, and uploads and downloads use glBufferSubData() and glGetBufferSubData() respectively. There is no need to map the BO. This improves performance of Indivisible on NVidia GPUs. The game uses a d3d9 MANAGED buffer for streaming vertex data, which results in poor performance on NVidia when using GL_MAP_READ_BIT | GL_MAP_PERSISTENT_BIT. With this change we use neither. This change should only affect managed resources, i.e. those with both CPU and GPU access. We never create a BO for CPU-only resources. --- dlls/wined3d/resource.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 08edce3630c..c32c9580ae9 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -379,10 +379,13 @@ GLbitfield wined3d_resource_gl_storage_flags(const struct wined3d_resource *reso if (resource->usage & WINED3DUSAGE_DYNAMIC) flags |= GL_CLIENT_STORAGE_BIT; - if (access & WINED3D_RESOURCE_ACCESS_MAP_W) - flags |= GL_MAP_WRITE_BIT; - if (access & WINED3D_RESOURCE_ACCESS_MAP_R) - flags |= GL_MAP_READ_BIT; + if (!(access & WINED3D_RESOURCE_ACCESS_CPU)) + { + if (access & WINED3D_RESOURCE_ACCESS_MAP_W) + flags |= GL_MAP_WRITE_BIT; + if (access & WINED3D_RESOURCE_ACCESS_MAP_R) + flags |= GL_MAP_READ_BIT; + } return flags; }

1 0

Alexandre Julliard : nls: Allow specifying a locale's native digits.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: 4172c0482626b56c76fd1e5e362a3711594a25e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/4172c0482626b56c76fd1e5e362a37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 19 12:33:39 2022 +0200 nls: Allow specifying a locale's native digits. Inspired by a patch from Nikolay Sivov. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53770 --- nls/locale.nls | Bin 738990 -> 738786 bytes tools/make_unicode | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/nls/locale.nls b/nls/locale.nls index 8ee39e44222..9ad47b1872e 100644 Binary files a/nls/locale.nls and b/nls/locale.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index 12076252e3d..165afe53b62 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -479,7 +479,7 @@ my @locales = { name => "ar-AE", lcid => 0x00003801, sabbrevlangname => "ARU" }, { name => "ar-BH", lcid => 0x00003c01, sabbrevlangname => "ARH" }, { name => "ar-DJ" }, - { name => "ar-DZ", lcid => 0x00001401, sabbrevlangname => "ARG" }, + { name => "ar-DZ", lcid => 0x00001401, sabbrevlangname => "ARG", nativedigits => "0123456789" }, { name => "ar-EG", lcid => 0x00000c01, sabbrevlangname => "ARE" }, { name => "ar-EH" }, { name => "ar-ER" }, @@ -489,8 +489,8 @@ my @locales = { name => "ar-KM" }, { name => "ar-KW", lcid => 0x00003401, sabbrevlangname => "ARK" }, { name => "ar-LB", lcid => 0x00003001, sabbrevlangname => "ARB" }, - { name => "ar-LY", lcid => 0x00001001, sabbrevlangname => "ARL" }, - { name => "ar-MA", lcid => 0x00001801, sabbrevlangname => "ARM" }, + { name => "ar-LY", lcid => 0x00001001, sabbrevlangname => "ARL", nativedigits => "0123456789" }, + { name => "ar-MA", lcid => 0x00001801, sabbrevlangname => "ARM", nativedigits => "0123456789" }, { name => "ar-MR" }, { name => "ar-OM", lcid => 0x00002001, sabbrevlangname => "ARO" }, { name => "ar-PS" }, @@ -501,7 +501,7 @@ my @locales = { name => "ar-SS" }, { name => "ar-SY", lcid => 0x00002801, sabbrevlangname => "ARS" }, { name => "ar-TD" }, - { name => "ar-TN", lcid => 0x00001c01, sabbrevlangname => "ART" }, + { name => "ar-TN", lcid => 0x00001c01, sabbrevlangname => "ART", nativedigits => "0123456789" }, { name => "ar-YE", lcid => 0x00002401, sabbrevlangname => "ARY" }, { name => "arn", lcid => 0x0000007a, oemcp => 850, ebcdiccp => 20284, slist => ",", dir => "seed", sabbrevlangname => "MPD", sopentypelang => "MAP" }, { name => "arn-CL", lcid => 0x0000047a, dir => "seed" }, @@ -622,7 +622,7 @@ my @locales = { name => "dsb-DE", lcid => 0x0000082e }, { name => "dua" }, { name => "dua-CM" }, - { name => "dv", lcid => 0x00000065, slist => "\x{060c}", group => 13, dir => "seed" }, + { name => "dv", lcid => 0x00000065, slist => "\x{060c}", group => 13, dir => "seed", nativedigits => "0123456789" }, { name => "dv-MV", lcid => 0x00000465, dir => "seed" }, { name => "dyo" }, { name => "dyo-SN" }, @@ -961,7 +961,7 @@ my @locales = { name => "jgo-CM" }, { name => "jmc" }, { name => "jmc-TZ" }, - { name => "jv", oemcp => 850 }, + { name => "jv", oemcp => 850, nativedigits => "0123456789" }, { name => "jv-ID", alias => "jv-Latn-ID" }, ## name => "jv-Java" }, ## name => "jv-Java-ID" }, @@ -1087,7 +1087,7 @@ my @locales = { name => "mn-Cyrl", lcid => 0x00007850, file => "mn", sabbrevlangname => "MNN" }, { name => "mn-Cyrl-MN", alias => "mn-MN" }, { name => "mn-MN", lcid => 0x00000450, sparent => "mn-Cyrl", group => 5 }, - { name => "mn-Mong", lcid => 0x00007c50, oemcp => 65001, slist => ",", group => 15, dir => "seed", sabbrevlangname => "MNG" }, + { name => "mn-Mong", lcid => 0x00007c50, oemcp => 65001, slist => ",", group => 15, dir => "seed", sabbrevlangname => "MNG", nativedigits => "0123456789" }, { name => "mn-Mong-CN", lcid => 0x00000850, dir => "seed" }, { name => "mn-Mong-MN", lcid => 0x00000c50, dir => "seed", sabbrevlangname => "MNM" }, { name => "mni", lcid => 0x00000058, slist => ",", sabbrevlangname => "ZZZ" }, @@ -1416,7 +1416,7 @@ my @locales = ## name => "tzm-Arab-MA", lcid => 0x0000045f }, ## name => "tzm-Tfng", lcid => 0x0000785f }, ## name => "tzm-Tfng-MA", lcid => 0x0000105f }, - { name => "ug", lcid => 0x00000080, oemcp => 720, slist => ",", group => 13, sopentypelang => "UYG" }, + { name => "ug", lcid => 0x00000080, oemcp => 720, slist => ",", group => 13, sopentypelang => "UYG", nativedigits => "0123456789" }, { name => "ug-Arab", alias => "ug" }, { name => "ug-Arab-CN", alias => "ug-CN" }, { name => "ug-CN", lcid => 0x00000480 }, @@ -1482,7 +1482,7 @@ my @locales = { name => "zgh-MA", alias => "zgh-Tfng-MA" }, { name => "zgh-Tfng", file => "zgh" }, { name => "zgh-Tfng-MA", file => "zgh_MA" }, - { name => "zh", lcid => 0x00007804, ireadinglayout => 2, oemcp => 936, slist => ",", sscripts => "Hani Hans", sabbrevlangname => "CHS", sopentypelang => "ZHS" }, + { name => "zh", lcid => 0x00007804, ireadinglayout => 2, oemcp => 936, slist => ",", sscripts => "Hani Hans", sabbrevlangname => "CHS", sopentypelang => "ZHS", nativedigits => "0123456789" }, { name => "zh-CN", lcid => 0x00000804, file => "zh_Hans_CN", sparent => "zh-Hans" }, { name => "zh-CN_phoneb", lcid => 0x00050804, alias => "zh-CN" }, { name => "zh-CN_stroke", lcid => 0x00020804, alias => "zh-CN" }, @@ -1490,8 +1490,8 @@ my @locales = { name => "zh-Hans-CN", alias => "zh-CN" }, { name => "zh-Hans-CN-u-co-phonebk", alias => "zh-CN_phoneb" }, { name => "zh-Hans-CN-u-co-stroke", alias => "zh-CN_stroke" }, - { name => "zh-Hans-HK", slist => ";" }, - { name => "zh-Hans-MO", slist => ";" }, + { name => "zh-Hans-HK", slist => ";", nativedigits => "" }, + { name => "zh-Hans-MO", slist => ";", nativedigits => "" }, { name => "zh-Hans-SG", alias => "zh-SG" }, { name => "zh-Hans-SG-u-co-phonebk", alias => "zh-SG_phoneb" }, { name => "zh-Hans-SG-u-co-stroke", alias => "zh-SG_stroke" }, @@ -4726,7 +4726,7 @@ sub build_locale_data() my ($icurrency, $inegcurr) = parse_currency_format( $sname, $currencyformat ); my ($ipospercent, $inegpercent) = parse_percent_format( $percentformat ); my $native_numbering = loc_query( $loc, "/ldml/numbers/otherNumberingSystems/native" ); - my @snativedigits = split //, xml_query( $numbers, "/supplementalData/numberingSystems/numberingSystem[\@id='$native_numbering']/\@digits" ); + my @snativedigits = split //, (locale_entry( $loc, "nativedigits", "" ) || xml_query( $numbers, "/supplementalData/numberingSystems/numberingSystem[\@id='$native_numbering']/\@digits" )); my $digitsubstitution = !(ord($snativedigits[0]) >= 0x600 && ord($snativedigits[0]) <= 0x6ff); my $measure = defined xml_query( $suppl, "/supplementalData/measurementData/measurementSystem[\@type='US' and $territory_match]" ); my $papersize = defined xml_query( $suppl, "/supplementalData/measurementData/paperSize[\@type='US-Letter' and $territory_match]" );

1 0

Gabriel Ivăncescu : mshtml: Move the IOleCommandTarget interface out of basedoc.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: 6c706e02aeb6a2233a7b0b5c7af253e88e893b0a URL: https://gitlab.winehq.org/wine/wine/-/commit/6c706e02aeb6a2233a7b0b5c7af253… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 17 21:20:02 2022 +0300 mshtml: Move the IOleCommandTarget interface out of basedoc. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/editor.c | 2 +- dlls/mshtml/htmldoc.c | 11 ++-- dlls/mshtml/mshtml_private.h | 6 ++- dlls/mshtml/olecmd.c | 126 +++++++++++++++++++++++++++++++------------ dlls/mshtml/view.c | 2 +- 5 files changed, 105 insertions(+), 42 deletions(-)

1 0