March 2021 - Wine-commits - list.winehq.org

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 24e41be13619d6111e7d71da5b114cec4a541f16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24e41be13619d6111e7d71da… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Sun Feb 28 23:29:23 2021 +0100 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/po/nl.po b/po/nl.po index d727b541ffa..a5eaf77f8e8 100644 --- a/po/nl.po +++ b/po/nl.po @@ -13112,11 +13112,11 @@ msgstr "Wine Verkenner" #: programs/explorer/explorer.rc:33 msgid "Start" -msgstr "Opstarten" +msgstr "Start" #: programs/explorer/explorer.rc:34 programs/winefile/winefile.rc:36 msgid "&Run..." -msgstr "&Starten..." +msgstr "&Uitvoeren..." #: programs/fsutil/fsutil.mc:28 msgid "" @@ -16145,10 +16145,10 @@ msgid "" "linked to the Libraries and Graphics tabs to allow you to change system-wide " "or per-application settings in those tabs as well." msgstr "" -"Wine geeft de mogelijkheid om per toepassing de Windows versie in te " -"stellen. Dit tabblad is gekoppeld aan de tabbladen 'Bibliotheken' en " -"'Grafisch' om zowel systeembreed als programmaspecifiek instellingen in deze " -"tabbladen mogelijk te maken." +"Voor elk programma kan Wine apart de Windows versie instellen. Dit tabblad " +"isgekoppeld aan de tabbladen 'Bibliotheken' en 'Grafisch'. Hierdoor kan per " +"programma de standaardinstellingen of programmaspecifieke instellingen " +"gebruikt worden." #: programs/winecfg/winecfg.rc:158 msgid "Add appli&cation..." @@ -16180,7 +16180,7 @@ msgstr "Laat de vensterbeheerder de vensters &beheren" #: programs/winecfg/winecfg.rc:172 msgid "&Emulate a virtual desktop" -msgstr "&Emuleer een virtueel bureaublad" +msgstr "Maak een &virtueel bureaublad" #: programs/winecfg/winecfg.rc:174 msgid "Desktop &size:" @@ -16514,7 +16514,7 @@ msgstr "Automatisch" #: programs/winecfg/winecfg.rc:69 msgid "Local hard disk" -msgstr "Hardeschijf" +msgstr "Harde schijf" #: programs/winecfg/winecfg.rc:70 msgid "Network share" @@ -16526,7 +16526,7 @@ msgstr "Diskettestation" #: programs/winecfg/winecfg.rc:72 msgid "CD-ROM" -msgstr "Cd-rom" +msgstr "CD-ROM" #: programs/winecfg/winecfg.rc:73 msgid "" @@ -16536,7 +16536,7 @@ msgid "" msgstr "" "U kunt geen schijven meer toevoegen.\n" "\n" -"Elke schijf moet een letter van A tot Z hebben dus het kunnen er niet meer " +"Elke schijf moet een letter van A tot Z hebben. Het kunnen er dus niet meer " "dan 26 zijn." #: programs/winecfg/winecfg.rc:74 @@ -16727,8 +16727,8 @@ msgid "" "Database</a> for tips about running this application." msgstr "" "Dit kan veroorzaakt worden door een probleem in het programma of een fout in " -"Wine. U kunt zoeken op <a href=\"https://appdb.winehq.org\">Application " -"Database</a> naar tips voor dit programma." +"Wine. Zoek in de <a href=\"https://appdb.winehq.org\">Programma Database</a> " +"naar tips voor dit programma." #: programs/winedbg/winedbg.rc:62 msgid "Show &Details" @@ -16745,9 +16745,9 @@ msgid "" "button, then <a href=\"https://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" -"Indien dit probleem zich niet voordoet onder Windows en het probleem is nog " -"niet gerapporteerd, dan kunt U gedetailleerde informatie in een bestand " -"opslaan met de \"Opslaan als\" knop. Dit bestand kunt U via <a href=" +"Indien dit probleem zich niet voordoet onder Windows en het probleem nog " +"niet is gerapporteerd, dan kunt u gedetailleerde informatie in een bestand " +"opslaan met de \"Opslaan als\" knop. Dit bestand kunt u via <a href=" "\"https://wiki.winehq.org/Bugs\">file a bug report</a> versturen." #: programs/winedbg/winedbg.rc:40

1 0

Nikolay Sivov : dwrite/layout: Implement axis values property for the format object.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 1cbc74a3abe142c6ff9cfd8cc6d298ec38d4dd1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cbc74a3abe142c6ff9cfd8c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 1 17:29:39 2021 +0300 dwrite/layout: Implement axis values property for the format object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 79 ++++++++++++++++++++++++++++++++++++++-------- dlls/dwrite/tests/layout.c | 38 +++++++++++++++++++--- include/dwrite_3.idl | 2 +- 3 files changed, 100 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 38be4eeb2da..99048b97a3c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -62,6 +62,9 @@ struct dwrite_textformat_data IDWriteFontCollection *collection; IDWriteFontFallback *fallback; + + DWRITE_FONT_AXIS_VALUE *axis_values; + unsigned int axis_values_count; }; enum layout_range_attr_kind { @@ -328,6 +331,7 @@ static void release_format_data(struct dwrite_textformat_data *data) if (data->trimmingsign) IDWriteInlineObject_Release(data->trimmingsign); heap_free(data->family_name); heap_free(data->locale); + heap_free(data->axis_values); } static inline struct dwrite_textlayout *impl_from_IDWriteTextLayout4(IDWriteTextLayout4 *iface) @@ -465,6 +469,41 @@ static inline HRESULT format_set_linespacing(struct dwrite_textformat_data *form return S_OK; } +static HRESULT format_set_font_axisvalues(struct dwrite_textformat_data *format, + DWRITE_FONT_AXIS_VALUE const *axis_values, unsigned int num_values) +{ + heap_free(format->axis_values); + format->axis_values = NULL; + format->axis_values_count = 0; + + if (num_values) + { + if (!(format->axis_values = heap_calloc(num_values, sizeof(*axis_values)))) + return E_OUTOFMEMORY; + memcpy(format->axis_values, axis_values, num_values * sizeof(*axis_values)); + format->axis_values_count = num_values; + } + + return S_OK; +} + +static HRESULT format_get_font_axisvalues(struct dwrite_textformat_data *format, + DWRITE_FONT_AXIS_VALUE *axis_values, unsigned int num_values) +{ + if (!format->axis_values_count) + { + if (num_values) memset(axis_values, 0, num_values * sizeof(*axis_values)); + return S_OK; + } + + if (num_values < format->axis_values_count) + return E_NOT_SUFFICIENT_BUFFER; + + memcpy(axis_values, format->axis_values, min(num_values, format->axis_values_count) * sizeof(*axis_values)); + + return S_OK; +} + static HRESULT get_fontfallback_from_format(const struct dwrite_textformat_data *format, IDWriteFontFallback **fallback) { *fallback = format->fallback; @@ -4922,24 +4961,30 @@ static HRESULT WINAPI dwritetextformat2_layout_GetLineSpacing(IDWriteTextFormat3 static HRESULT WINAPI dwritetextformat3_layout_SetFontAxisValues(IDWriteTextFormat3 *iface, DWRITE_FONT_AXIS_VALUE const *axis_values, UINT32 num_values) { - FIXME("%p, %p, %u.\n", iface, axis_values, num_values); + struct dwrite_textlayout *layout = impl_layout_from_IDWriteTextFormat3(iface); - return E_NOTIMPL; + TRACE("%p, %p, %u.\n", iface, axis_values, num_values); + + return format_set_font_axisvalues(&layout->format, axis_values, num_values); } static UINT32 WINAPI dwritetextformat3_layout_GetFontAxisValueCount(IDWriteTextFormat3 *iface) { - FIXME("%p.\n", iface); + struct dwrite_textlayout *layout = impl_layout_from_IDWriteTextFormat3(iface); - return 0; + TRACE("%p.\n", iface); + + return layout->format.axis_values_count; } static HRESULT WINAPI dwritetextformat3_layout_GetFontAxisValues(IDWriteTextFormat3 *iface, - DWRITE_FONT_AXIS_VALUE const *axis_values, UINT32 num_values) + DWRITE_FONT_AXIS_VALUE *axis_values, UINT32 num_values) { - FIXME("%p, %p, %u.\n", iface, axis_values, num_values); + struct dwrite_textlayout *layout = impl_layout_from_IDWriteTextFormat3(iface); - return E_NOTIMPL; + TRACE("%p, %p, %u.\n", iface, axis_values, num_values); + + return format_get_font_axisvalues(&layout->format, axis_values, num_values); } static DWRITE_AUTOMATIC_FONT_AXES WINAPI dwritetextformat3_layout_GetAutomaticFontAxes(IDWriteTextFormat3 *iface) @@ -6042,24 +6087,30 @@ static HRESULT WINAPI dwritetextformat2_GetLineSpacing(IDWriteTextFormat3 *iface static HRESULT WINAPI dwritetextformat3_SetFontAxisValues(IDWriteTextFormat3 *iface, DWRITE_FONT_AXIS_VALUE const *axis_values, UINT32 num_values) { - FIXME("%p, %p, %u.\n", iface, axis_values, num_values); + struct dwrite_textformat *format = impl_from_IDWriteTextFormat3(iface); - return E_NOTIMPL; + TRACE("%p, %p, %u.\n", iface, axis_values, num_values); + + return format_set_font_axisvalues(&format->format, axis_values, num_values); } static UINT32 WINAPI dwritetextformat3_GetFontAxisValueCount(IDWriteTextFormat3 *iface) { - FIXME("%p.\n", iface); + struct dwrite_textformat *format = impl_from_IDWriteTextFormat3(iface); - return 0; + TRACE("%p.\n", iface); + + return format->format.axis_values_count; } static HRESULT WINAPI dwritetextformat3_GetFontAxisValues(IDWriteTextFormat3 *iface, - DWRITE_FONT_AXIS_VALUE const *axis_values, UINT32 num_values) + DWRITE_FONT_AXIS_VALUE *axis_values, UINT32 num_values) { - FIXME("%p, %p, %u.\n", iface, axis_values, num_values); + struct dwrite_textformat *format = impl_from_IDWriteTextFormat3(iface); - return E_NOTIMPL; + TRACE("%p, %p, %u.\n", iface, axis_values, num_values); + + return format_get_font_axisvalues(&format->format, axis_values, num_values); } static DWRITE_AUTOMATIC_FONT_AXES WINAPI dwritetextformat3_GetAutomaticFontAxes(IDWriteTextFormat3 *iface) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 43e62a39956..cc4079faa14 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -5894,7 +5894,7 @@ static void test_text_format_axes(void) { IDWriteFontCollection *collection; IDWriteFontCollection2 *collection2; - DWRITE_FONT_AXIS_VALUE axis; + DWRITE_FONT_AXIS_VALUE axes[2]; IDWriteTextFormat3 *format3; DWRITE_FONT_STRETCH stretch; DWRITE_FONT_WEIGHT weight; @@ -5944,9 +5944,9 @@ if (SUCCEEDED(hr)) ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "Unexpected font weight %d.\n", weight); /* Regular properties are not set from axis values. */ - axis.axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; - axis.value = 200.0f; - hr = IDWriteTextFormat3_SetFontAxisValues(format3, &axis, 1); + axes[0].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axes[0].value = 200.0f; + hr = IDWriteTextFormat3_SetFontAxisValues(format3, axes, 1); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); weight = IDWriteTextFormat3_GetFontWeight(format3); @@ -5965,6 +5965,36 @@ if (SUCCEEDED(hr)) count = IDWriteTextFormat3_GetFontAxisValueCount(format3); ok(!count, "Unexpected axis count %u.\n", count); + axes[0].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + hr = IDWriteTextFormat3_GetFontAxisValues(format3, axes, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(axes[0].axisTag == 0 && axes[0].value == 0.0f, "Unexpected value.\n"); + + axes[0].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axes[0].value = 200.0f; + axes[1].axisTag = DWRITE_FONT_AXIS_TAG_WIDTH; + axes[1].value = 2.0f; + hr = IDWriteTextFormat3_SetFontAxisValues(format3, axes, 2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IDWriteTextFormat3_GetFontAxisValueCount(format3); + ok(count == 2, "Unexpected axis count %u.\n", count); + + hr = IDWriteTextFormat3_GetFontAxisValues(format3, axes, 1); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); + + hr = IDWriteTextFormat3_GetFontAxisValues(format3, axes, 0); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); + + hr = IDWriteTextFormat3_GetFontAxisValues(format3, axes, 2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteTextFormat3_SetFontAxisValues(format3, axes, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IDWriteTextFormat3_GetFontAxisValueCount(format3); + ok(!count, "Unexpected axis count %u.\n", count); + IDWriteTextFormat3_Release(format3); IDWriteTextFormat_Release(format); diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 1b10454ec60..0db2de71cf1 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -562,7 +562,7 @@ interface IDWriteTextFormat3 : IDWriteTextFormat2 UINT32 num_values); UINT32 GetFontAxisValueCount(); HRESULT GetFontAxisValues( - DWRITE_FONT_AXIS_VALUE const *axis_values, + DWRITE_FONT_AXIS_VALUE *axis_values, UINT32 num_values); DWRITE_AUTOMATIC_FONT_AXES GetAutomaticFontAxes(); HRESULT SetAutomaticFontAxes(DWRITE_AUTOMATIC_FONT_AXES axes);

1 0

Alexandre Julliard : ntdll: Pass correct pointer to build_module().
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 1e2b060eb15fa5216e9745cf48eb986a7721df61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e2b060eb15fa5216e9745cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 27 17:41:27 2021 +0100 ntdll: Pass correct pointer to build_module(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50731 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 644eee1e9d7..c21c62c10b0 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2325,7 +2325,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, SECTION_IMAGE_INFORMATION image_info = { 0 }; image_info.u.s.WineBuiltin = 1; - if ((status = build_module( load_path, &win_name, &module, &image_info, NULL, flags, pwm ))) + if ((status = build_module( load_path, &win_name, &module, &image_info, NULL, flags, &wm ))) { if (module) unix_funcs->unload_builtin_dll( module ); return status;

1 0

Alexandre Julliard : ntdll: Adjust environment size for dynamic strings.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 5828d7c136cf4c22e1f999929f9e97c91c555123 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5828d7c136cf4c22e1f99992… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 27 17:42:26 2021 +0100 ntdll: Adjust environment size for dynamic strings. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50732 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index f5979a980ea..845abd69a79 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1591,7 +1591,6 @@ void init_startup_info(void) params->AllocationSize = size; params->Size = size; params->Flags = PROCESS_PARAMS_FLAG_NORMALIZED; - params->EnvironmentSize = env_size; params->DebugFlags = info->debug_flags; params->ConsoleHandle = wine_server_ptr_handle( info->console ); params->ConsoleFlags = info->console_flags; @@ -1637,7 +1636,8 @@ void init_startup_info(void) dst += copy_environment( dst, src ); memcpy( dst, dyn_env, dyn_size ); dst += dyn_size / sizeof(WCHAR); - *dst = 0; + *dst++ = 0; + params->EnvironmentSize = (dst - params->Environment) * sizeof(WCHAR); free( dyn_env ); free( info ); NtCurrentTeb()->Peb->ProcessParameters = params;

1 0

Alexandre Julliard : ntdll: Store the Unix codepage in a Wine-specific environment variable.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 0d173e5710c71d90b1228857bfe4b89672d9d911 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d173e5710c71d90b1228857… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 28 11:22:41 2021 +0100 ntdll: Store the Unix codepage in a Wine-specific environment variable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 14 ++++++++------ dlls/ntdll/locale.c | 10 ---------- dlls/ntdll/ntdll.spec | 3 --- dlls/ntdll/unix/env.c | 14 ++++++++++---- 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index d2f71c97ac7..ac473ccd63a 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -42,8 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(nls); #define CALINFO_MAX_YEAR 2029 -extern UINT CDECL __wine_get_unix_codepage(void); - extern const unsigned int collation_table[] DECLSPEC_HIDDEN; static HANDLE kernel32_handle; @@ -568,6 +566,7 @@ struct norm_table }; static NLSTABLEINFO nls_info; +static UINT unix_cp = CP_UTF8; static UINT mac_cp = 10000; static HKEY intl_key; static HKEY nls_key; @@ -713,6 +712,9 @@ void init_locale(void) SIZE_T size; HKEY hkey; + if (GetEnvironmentVariableW( L"WINEUNIXCP", bufferW, ARRAY_SIZE(bufferW) )) + unix_cp = wcstoul( bufferW, NULL, 10 ); + kernel32_handle = GetModuleHandleW( L"kernel32.dll" ); GetLocaleInfoW( LOCALE_SYSTEM_DEFAULT, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, @@ -5532,8 +5534,7 @@ INT WINAPI DECLSPEC_HOTPATCH MultiByteToWideChar( UINT codepage, DWORD flags, co ret = mbstowcs_utf8( flags, src, srclen, dst, dstlen ); break; case CP_UNIXCP: - codepage = __wine_get_unix_codepage(); - if (codepage == CP_UTF8) + if (unix_cp == CP_UTF8) { ret = mbstowcs_utf8( flags, src, srclen, dst, dstlen ); #ifdef __APPLE__ /* work around broken Mac OS X filesystem that enforces decomposed Unicode */ @@ -5541,6 +5542,7 @@ INT WINAPI DECLSPEC_HOTPATCH MultiByteToWideChar( UINT codepage, DWORD flags, co #endif break; } + codepage = unix_cp; /* fall through */ default: ret = mbstowcs_codepage( codepage, flags, src, srclen, dst, dstlen ); @@ -5829,13 +5831,13 @@ INT WINAPI DECLSPEC_HOTPATCH WideCharToMultiByte( UINT codepage, DWORD flags, LP ret = wcstombs_utf8( flags, src, srclen, dst, dstlen, defchar, used ); break; case CP_UNIXCP: - codepage = __wine_get_unix_codepage(); - if (codepage == CP_UTF8) + if (unix_cp == CP_UTF8) { if (used) *used = FALSE; ret = wcstombs_utf8( flags, src, srclen, dst, dstlen, NULL, NULL ); break; } + codepage = unix_cp; /* fall through */ default: ret = wcstombs_codepage( codepage, flags, src, srclen, dst, dstlen, defchar, used ); diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index e4d90a8b1d5..892f3fe9e70 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -652,16 +652,6 @@ int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BO } -/****************************************************************** - * __wine_get_unix_codepage (NTDLL.@) - */ -UINT CDECL __wine_get_unix_codepage(void) -{ - if (!unix_table.CodePage) return CP_UTF8; - return unix_table.CodePage; -} - - static NTSTATUS get_dummy_preferred_ui_language( DWORD flags, LANGID lang, ULONG *count, WCHAR *buffer, ULONG *size ) { diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 185dd6767eb..78f06881832 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1625,9 +1625,6 @@ @ cdecl -syscall wine_get_build_id() @ cdecl -syscall wine_get_host_version(ptr ptr) -# Codepages -@ cdecl __wine_get_unix_codepage() - # Filesystem @ cdecl -syscall wine_nt_to_unix_file_name(ptr ptr ptr long) @ cdecl -syscall wine_unix_to_nt_file_name(str ptr ptr) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 845abd69a79..a8f490e8740 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -544,6 +544,7 @@ static BOOL is_dynamic_env_var( const char *var ) STARTS_WITH( var, "WINEBUILDDIR=" ) || STARTS_WITH( var, "WINECONFIGDIR=" ) || STARTS_WITH( var, "WINEDLLDIR" ) || + STARTS_WITH( var, "WINEUNIXCP=" ) || STARTS_WITH( var, "WINEUSERNAME=" ) || STARTS_WITH( var, "WINEPRELOADRESERVE=" ) || STARTS_WITH( var, "WINELOADERNOEXEC=" ) || @@ -1194,9 +1195,9 @@ static WCHAR *get_dynamic_environment( SIZE_T *size ) SIZE_T alloc, pos = 0; WCHAR *buffer; DWORD i; - char dlldir[22]; + char str[22]; - alloc = 20 * 7; /* 7 variable names */ + alloc = 20 * 8; /* 8 variable names */ if (data_dir) alloc += strlen( data_dir ) + 9; if (home_dir) alloc += strlen( home_dir ) + 9; if (build_dir) alloc += strlen( build_dir ) + 9; @@ -1212,11 +1213,16 @@ static WCHAR *get_dynamic_environment( SIZE_T *size ) if (config_dir) add_path_var( buffer, &pos, "WINECONFIGDIR", config_dir ); for (i = 0; dll_paths[i]; i++) { - sprintf( dlldir, "WINEDLLDIR%u", i ); - add_path_var( buffer, &pos, dlldir, dll_paths[i] ); + sprintf( str, "WINEDLLDIR%u", i ); + add_path_var( buffer, &pos, str, dll_paths[i] ); } if (user_name) append_envA( buffer, &pos, "WINEUSERNAME", user_name ); if (overrides) append_envA( buffer, &pos, "WINEDLLOVERRIDES", overrides ); + if (unix_cp.data) + { + sprintf( str, "%u", unix_cp.data[1] ); + append_envA( buffer, &pos, "WINEUNIXCP", str ); + } assert( pos <= alloc ); *size = pos * sizeof(WCHAR); return buffer;

1 0

Alexandre Julliard : ntdll: Check for existing Unix path name in RtlGetFullPathName_U().
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 45bfa4eec3f52a00f4a92b1d533d5fe39edeec3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=45bfa4eec3f52a00f4a92b1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 28 11:29:17 2021 +0100 ntdll: Check for existing Unix path name in RtlGetFullPathName_U(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 86760f178e1..9d707d883b2 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -543,16 +543,18 @@ static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size) WCHAR *nt_str; SIZE_T buflen; NTSTATUS status; - - unix_name = RtlAllocateHeap( GetProcessHeap(), 0, 3 * wcslen(name) + 1 ); - ntdll_wcstoumbs( name, wcslen(name) + 1, unix_name, 3 * wcslen(name) + 1, FALSE ); - buflen = strlen(unix_name) + 10; - for (;;) + UNICODE_STRING str; + + nt_str = RtlAllocateHeap( GetProcessHeap(), 0, (wcslen(name) + 9) * sizeof(WCHAR) ); + wcscpy( nt_str, L"\\??\\unix" ); + wcscat( nt_str, name ); + RtlInitUnicodeString( &str, nt_str ); + buflen = 3 * wcslen(name) + 1; + unix_name = RtlAllocateHeap( GetProcessHeap(), 0, buflen ); + if (!(status = wine_nt_to_unix_file_name( &str, unix_name, &buflen, FILE_OPEN ))) { - if (!(nt_str = RtlAllocateHeap( GetProcessHeap(), 0, buflen * sizeof(WCHAR) ))) break; + buflen = wcslen(name) + 9; status = wine_unix_to_nt_file_name( unix_name, nt_str, &buflen ); - if (status != STATUS_BUFFER_TOO_SMALL) break; - RtlFreeHeap( GetProcessHeap(), 0, nt_str ); } RtlFreeHeap( GetProcessHeap(), 0, unix_name ); if (!status && buflen > 6 && nt_str[5] == ':')

1 0

Alexandre Julliard : ntdll: Remove no longer needed Unix codepage functions from the PE side.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 65cff869513f8f66655b602ab2bc62e1c3b69c51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65cff869513f8f66655b602a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 28 11:29:46 2021 +0100 ntdll: Remove no longer needed Unix codepage functions from the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 1 - dlls/ntdll/locale.c | 74 ------------------------------------------ dlls/ntdll/ntdll_misc.h | 3 -- dlls/ntdll/unix/env.c | 11 ------- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/unix_private.h | 1 - dlls/ntdll/unixlib.h | 3 +- 7 files changed, 1 insertion(+), 93 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c21c62c10b0..2a6b8467812 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3968,7 +3968,6 @@ static NTSTATUS process_init(void) is_wow64 = !!NtCurrentTeb64(); #endif - init_unix_codepage(); init_user_process_params(); params = peb->ProcessParameters; diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 892f3fe9e70..758789a533c 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -104,7 +104,6 @@ LCID user_lcid = 0, system_lcid = 0; static NLSTABLEINFO nls_info; static HMODULE kernel32_handle; -static CPTABLEINFO unix_table; static struct norm_table *norm_tables[16]; @@ -534,13 +533,6 @@ static unsigned int compose_string( const struct norm_table *info, WCHAR *str, u } -void init_unix_codepage(void) -{ - USHORT *data = unix_funcs->get_unix_codepage_data(); - if (data) RtlInitCodePageTable( data, &unix_table ); -} - - static LCID locale_to_lcid( WCHAR *win_name ) { WCHAR *p; @@ -586,72 +578,6 @@ void init_locale( HMODULE module ) } -/****************************************************************** - * ntdll_umbstowcs - */ -DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) -{ - DWORD reslen; - - if (unix_table.CodePage) - RtlCustomCPToUnicodeN( &unix_table, dst, dstlen * sizeof(WCHAR), &reslen, src, srclen ); - else - RtlUTF8ToUnicodeN( dst, dstlen * sizeof(WCHAR), &reslen, src, srclen ); - return reslen / sizeof(WCHAR); -} - - -/****************************************************************** - * ntdll_wcstoumbs - */ -int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ) -{ - DWORD i, reslen; - - if (!unix_table.CodePage) - RtlUnicodeToUTF8N( dst, dstlen, &reslen, src, srclen * sizeof(WCHAR) ); - else if (!strict) - RtlUnicodeToCustomCPN( &unix_table, dst, dstlen, &reslen, src, srclen * sizeof(WCHAR) ); - else /* do it by hand to make sure every character roundtrips correctly */ - { - if (unix_table.DBCSOffsets) - { - const unsigned short *uni2cp = unix_table.WideCharTable; - for (i = dstlen; srclen && i; i--, srclen--, src++) - { - unsigned short ch = uni2cp[*src]; - if (ch >> 8) - { - if (unix_table.DBCSOffsets[unix_table.DBCSOffsets[ch >> 8] + (ch & 0xff)] != *src) - return -1; - if (i == 1) break; /* do not output a partial char */ - i--; - *dst++ = ch >> 8; - } - else - { - if (unix_table.MultiByteTable[ch] != *src) return -1; - *dst++ = (char)ch; - } - } - reslen = dstlen - i; - } - else - { - const unsigned char *uni2cp = unix_table.WideCharTable; - reslen = min( srclen, dstlen ); - for (i = 0; i < reslen; i++) - { - unsigned char ch = uni2cp[src[i]]; - if (unix_table.MultiByteTable[ch] != src[i]) return -1; - dst[i] = ch; - } - } - } - return reslen; -} - - static NTSTATUS get_dummy_preferred_ui_language( DWORD flags, LANGID lang, ULONG *count, WCHAR *buffer, ULONG *size ) { diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index aebea12e6ba..72340a171c9 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -61,7 +61,6 @@ extern void version_init(void) DECLSPEC_HIDDEN; extern void debug_init(void) DECLSPEC_HIDDEN; extern void actctx_init(void) DECLSPEC_HIDDEN; extern void heap_set_debug_flags( HANDLE handle ) DECLSPEC_HIDDEN; -extern void init_unix_codepage(void) DECLSPEC_HIDDEN; extern void init_locale( HMODULE module ) DECLSPEC_HIDDEN; extern void init_user_process_params(void) DECLSPEC_HIDDEN; extern void CDECL DECLSPEC_NORETURN signal_start_thread( CONTEXT *ctx ) DECLSPEC_HIDDEN; @@ -88,8 +87,6 @@ extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; /* locale */ extern LCID user_lcid, system_lcid; -extern DWORD ntdll_umbstowcs( const char* src, DWORD srclen, WCHAR* dst, DWORD dstlen ) DECLSPEC_HIDDEN; -extern int ntdll_wcstoumbs( const WCHAR* src, DWORD srclen, char* dst, DWORD dstlen, BOOL strict ) DECLSPEC_HIDDEN; extern int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, __ms_va_list args ) DECLSPEC_HIDDEN; extern int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, __ms_va_list args ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index a8f490e8740..84d5ab298a4 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1355,17 +1355,6 @@ static void get_initial_directory( UNICODE_STRING *dir ) } -/************************************************************************* - * get_unix_codepage_data - * - * Return the Unix codepage data. - */ -USHORT * CDECL get_unix_codepage_data(void) -{ - return unix_cp.data; -} - - /************************************************************************* * get_locales * diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index df8d99ce489..21e1e1893c0 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1715,7 +1715,6 @@ static struct unix_funcs unix_funcs = ntdll_sin, ntdll_sqrt, ntdll_tan, - get_unix_codepage_data, get_locales, virtual_release_address_space, load_so_dll, diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 529cb6edb69..d56fc9b0f19 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -100,7 +100,6 @@ extern LONGLONG CDECL fast_RtlGetSystemTimePrecise(void) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; -extern USHORT * CDECL get_unix_codepage_data(void) DECLSPEC_HIDDEN; extern void CDECL get_locales( WCHAR *sys, WCHAR *user ) DECLSPEC_HIDDEN; extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index bd2512030c2..6a7f008ed9c 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 113 +#define NTDLL_UNIXLIB_VERSION 114 struct unix_funcs { @@ -70,7 +70,6 @@ struct unix_funcs double (CDECL *tan)( double d ); /* environment functions */ - USHORT * (CDECL *get_unix_codepage_data)(void); void (CDECL *get_locales)( WCHAR *sys, WCHAR *user ); /* virtual memory functions */

1 0

Alexandre Julliard : ntdll: Store the locales in Wine-specific environment variables.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: ff6a3433c5cc8991b6716c502ad9c69d495bf07f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff6a3433c5cc8991b6716c50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 28 11:30:37 2021 +0100 ntdll: Store the locales in Wine-specific environment variables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 43 ++++++++++++++++++++++++++++++++++++------ dlls/ntdll/locale.c | 36 ----------------------------------- dlls/ntdll/unix/env.c | 19 ++++++------------- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/unix_private.h | 1 - dlls/ntdll/unixlib.h | 5 +---- 6 files changed, 44 insertions(+), 61 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index ac473ccd63a..b746feca639 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -696,6 +696,27 @@ done: } +static LCID locale_to_lcid( WCHAR *win_name ) +{ + WCHAR *p; + LCID lcid; + + if (!RtlLocaleNameToLcid( win_name, &lcid, 0 )) return lcid; + + /* try neutral name */ + if ((p = wcsrchr( win_name, '-' ))) + { + *p = 0; + if (!RtlLocaleNameToLcid( win_name, &lcid, 2 )) + { + if (SUBLANGID(lcid) == SUBLANG_NEUTRAL) + lcid = MAKELANGID( PRIMARYLANGID(lcid), SUBLANG_DEFAULT ); + return lcid; + } + } + return 0; +} + /*********************************************************************** * init_locale */ @@ -704,8 +725,8 @@ void init_locale(void) UINT ansi_cp = 0, oem_cp = 0; USHORT *ansi_ptr, *oem_ptr; void *sort_ptr; - LCID lcid = GetUserDefaultLCID(); - WCHAR bufferW[80]; + LCID user_lcid = 0, system_lcid = 0; + WCHAR bufferW[LOCALE_NAME_MAX_LENGTH]; DYNAMIC_TIME_ZONE_INFORMATION timezone; GEOID geoid = GEOID_NOT_AVAILABLE; DWORD count, dispos, i; @@ -714,6 +735,16 @@ void init_locale(void) if (GetEnvironmentVariableW( L"WINEUNIXCP", bufferW, ARRAY_SIZE(bufferW) )) unix_cp = wcstoul( bufferW, NULL, 10 ); + if (GetEnvironmentVariableW( L"WINELOCALE", bufferW, ARRAY_SIZE(bufferW) )) + system_lcid = locale_to_lcid( bufferW ); + if (GetEnvironmentVariableW( L"WINEUSERLOCALE", bufferW, ARRAY_SIZE(bufferW) )) + user_lcid = locale_to_lcid( bufferW ); + if (!system_lcid) system_lcid = MAKELCID( MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT), SORT_DEFAULT ); + if (!user_lcid) user_lcid = system_lcid; + + NtSetDefaultUILanguage( LANGIDFROMLCID(user_lcid) ); + NtSetDefaultLocale( TRUE, user_lcid ); + NtSetDefaultLocale( FALSE, system_lcid ); kernel32_handle = GetModuleHandleW( L"kernel32.dll" ); @@ -775,11 +806,11 @@ void init_locale(void) count = sizeof(bufferW); if (!RegQueryValueExW( intl_key, L"Locale", NULL, NULL, (BYTE *)bufferW, &count )) { - if (wcstoul( bufferW, NULL, 16 ) == lcid) return; /* already set correctly */ - TRACE( "updating registry, locale changed %s -> %08x\n", debugstr_w(bufferW), lcid ); + if (wcstoul( bufferW, NULL, 16 ) == user_lcid) return; /* already set correctly */ + TRACE( "updating registry, locale changed %s -> %08x\n", debugstr_w(bufferW), user_lcid ); } - else TRACE( "updating registry, locale changed none -> %08x\n", lcid ); - swprintf( bufferW, ARRAY_SIZE(bufferW), L"%08x", lcid ); + else TRACE( "updating registry, locale changed none -> %08x\n", user_lcid ); + swprintf( bufferW, ARRAY_SIZE(bufferW), L"%08x", user_lcid ); RegSetValueExW( intl_key, L"Locale", 0, REG_SZ, (BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR) ); diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 758789a533c..19626a48b72 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -533,48 +533,12 @@ static unsigned int compose_string( const struct norm_table *info, WCHAR *str, u } -static LCID locale_to_lcid( WCHAR *win_name ) -{ - WCHAR *p; - LCID lcid; - - if (!RtlLocaleNameToLcid( win_name, &lcid, 0 )) return lcid; - - /* try neutral name */ - if ((p = wcsrchr( win_name, '-' ))) - { - *p = 0; - if (!RtlLocaleNameToLcid( win_name, &lcid, 2 )) - { - if (SUBLANGID(lcid) == SUBLANG_NEUTRAL) - lcid = MAKELANGID( PRIMARYLANGID(lcid), SUBLANG_DEFAULT ); - return lcid; - } - } - return 0; -} - - /****************************************************************** * init_locale */ void init_locale( HMODULE module ) { - WCHAR system_locale[LOCALE_NAME_MAX_LENGTH]; - WCHAR user_locale[LOCALE_NAME_MAX_LENGTH]; - kernel32_handle = module; - - unix_funcs->get_locales( system_locale, user_locale ); - system_lcid = locale_to_lcid( system_locale ); - user_lcid = locale_to_lcid( user_locale ); - if (!system_lcid) system_lcid = MAKELCID( MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT), SORT_DEFAULT ); - if (!user_lcid) user_lcid = system_lcid; - - NtSetDefaultUILanguage( LANGIDFROMLCID(user_lcid) ); - NtSetDefaultLocale( TRUE, user_lcid ); - NtSetDefaultLocale( FALSE, system_lcid ); - TRACE( "system=%04x user=%04x\n", system_lcid, user_lcid ); } diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 84d5ab298a4..cca334865e4 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -545,6 +545,8 @@ static BOOL is_dynamic_env_var( const char *var ) STARTS_WITH( var, "WINECONFIGDIR=" ) || STARTS_WITH( var, "WINEDLLDIR" ) || STARTS_WITH( var, "WINEUNIXCP=" ) || + STARTS_WITH( var, "WINELOCALE=" ) || + STARTS_WITH( var, "WINEUSERLOCALE=" ) || STARTS_WITH( var, "WINEUSERNAME=" ) || STARTS_WITH( var, "WINEPRELOADRESERVE=" ) || STARTS_WITH( var, "WINELOADERNOEXEC=" ) || @@ -1197,13 +1199,14 @@ static WCHAR *get_dynamic_environment( SIZE_T *size ) DWORD i; char str[22]; - alloc = 20 * 8; /* 8 variable names */ + alloc = 20 * 10; /* 10 variable names */ if (data_dir) alloc += strlen( data_dir ) + 9; if (home_dir) alloc += strlen( home_dir ) + 9; if (build_dir) alloc += strlen( build_dir ) + 9; if (config_dir) alloc += strlen( config_dir ) + 9; if (user_name) alloc += strlen( user_name ); if (overrides) alloc += strlen( overrides ); + alloc += strlen(system_locale) + strlen(user_locale); for (i = 0; dll_paths[i]; i++) alloc += 20 + strlen( dll_paths[i] ) + 9; if (!(buffer = malloc( alloc * sizeof(WCHAR) ))) return NULL; @@ -1223,6 +1226,8 @@ static WCHAR *get_dynamic_environment( SIZE_T *size ) sprintf( str, "%u", unix_cp.data[1] ); append_envA( buffer, &pos, "WINEUNIXCP", str ); } + append_envA( buffer, &pos, "WINELOCALE", system_locale ); + if (strcmp( user_locale, system_locale )) append_envA( buffer, &pos, "WINEUSERLOCALE", user_locale ); assert( pos <= alloc ); *size = pos * sizeof(WCHAR); return buffer; @@ -1355,18 +1360,6 @@ static void get_initial_directory( UNICODE_STRING *dir ) } -/************************************************************************* - * get_locales - * - * Return the system and user locales. Buffers must be at least LOCALE_NAME_MAX_LENGTH chars long. - */ -void CDECL get_locales( WCHAR *sys, WCHAR *user ) -{ - ntdll_umbstowcs( system_locale, strlen(system_locale) + 1, sys, LOCALE_NAME_MAX_LENGTH ); - ntdll_umbstowcs( user_locale, strlen(user_locale) + 1, user, LOCALE_NAME_MAX_LENGTH ); -} - - /*********************************************************************** * build_command_line * diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 21e1e1893c0..b7e1432535d 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1715,7 +1715,6 @@ static struct unix_funcs unix_funcs = ntdll_sin, ntdll_sqrt, ntdll_tan, - get_locales, virtual_release_address_space, load_so_dll, load_builtin_dll, diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index d56fc9b0f19..031f9ed3d33 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -100,7 +100,6 @@ extern LONGLONG CDECL fast_RtlGetSystemTimePrecise(void) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; -extern void CDECL get_locales( WCHAR *sys, WCHAR *user ) DECLSPEC_HIDDEN; extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 6a7f008ed9c..290379a9310 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 114 +#define NTDLL_UNIXLIB_VERSION 115 struct unix_funcs { @@ -69,9 +69,6 @@ struct unix_funcs double (CDECL *sqrt)( double d ); double (CDECL *tan)( double d ); - /* environment functions */ - void (CDECL *get_locales)( WCHAR *sys, WCHAR *user ); - /* virtual memory functions */ void (CDECL *virtual_release_address_space)(void);

1 0

Henri Verbeet : vkd3d-shader: Keep track of declared SPIR-V output components.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: vkd3d Branch: master Commit: 6d032f6d1c1269d8e622f2d30975537246a2f92b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6d032f6d1c1269d8e622f2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 26 15:14:53 2021 +0100 vkd3d-shader: Keep track of declared SPIR-V output components. Much like we do for input components, for much of the same reasons. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 93 +++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 56 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1448d3b..a7361aa 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4657,6 +4657,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler enum vkd3d_shader_component_type component_type; const struct vkd3d_spirv_builtin *builtin; const struct vkd3d_shader_phase *phase; + struct vkd3d_symbol *symbol = NULL; struct vkd3d_symbol reg_symbol; SpvStorageClass storage_class; struct rb_entry *entry = NULL; @@ -4692,6 +4693,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler component_type = builtin->component_type; if (!builtin->spirv_array_size) output_component_count = builtin->component_count; + component_idx = 0; } else { @@ -4717,23 +4719,24 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler vkd3d_symbol_make_register(&reg_symbol, reg); - if (compiler->output_info[signature_idx].id) - { - id = compiler->output_info[signature_idx].id; - if (compiler->output_info[signature_idx].array_element_mask) - { - use_private_variable = true; - write_mask = VKD3DSP_WRITEMASK_ALL; - entry = rb_get(&compiler->symbol_table, &reg_symbol); - } - } - else if (!use_private_variable && (entry = rb_get(&compiler->symbol_table, &reg_symbol))) + if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) { - id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; + symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); + id = symbol->id; } - else + + if (!symbol || ~symbol->info.reg.dcl_mask & signature_element->mask) { - if (builtin) + if (compiler->output_info[signature_idx].id) + { + id = compiler->output_info[signature_idx].id; + if (compiler->output_info[signature_idx].array_element_mask) + { + use_private_variable = true; + write_mask = VKD3DSP_WRITEMASK_ALL; + } + } + else if (builtin) { if (phase) id = vkd3d_dxbc_compiler_emit_shader_phase_builtin_variable(compiler, phase, builtin); @@ -4745,9 +4748,6 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler calculate_sysval_array_mask(compiler, shader_signature, sysval); vkd3d_dxbc_compiler_emit_register_execution_mode(compiler, &dst->reg); - - if (component_idx) - FIXME("Unhandled component index %u.\n", component_idx); } else { @@ -4778,25 +4778,22 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationPatch, NULL, 0); vkd3d_dxbc_compiler_decorate_xfb_output(compiler, id, output_component_count, signature_element); - } - - compiler->output_info[signature_idx].id = id; - compiler->output_info[signature_idx].component_type = component_type; - if (use_private_variable) - storage_class = SpvStorageClassPrivate; + compiler->output_info[signature_idx].id = id; + compiler->output_info[signature_idx].component_type = component_type; + } - if (entry) - var_id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; - else if (!use_private_variable) - var_id = id; - else if (is_patch_constant) - var_id = compiler->hs.patch_constants_id; - else - var_id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, - storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE); - if (!entry) + if (!symbol) { + var_id = id; + if (use_private_variable) + storage_class = SpvStorageClassPrivate; + if (is_patch_constant) + var_id = compiler->hs.patch_constants_id; + else if (use_private_variable) + var_id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, + storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE); + vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, use_private_variable ? VKD3D_SHADER_COMPONENT_FLOAT : component_type, write_mask); reg_symbol.info.reg.is_aggregate = use_private_variable ? is_patch_constant : array_size; @@ -4816,6 +4813,11 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler if (!is_patch_constant) vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); } + else + { + symbol->info.reg.dcl_mask |= signature_element->mask; + var_id = symbol->id; + } if (use_private_variable) { @@ -6100,33 +6102,12 @@ static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *c } } - if (phase->type == VKD3DSIH_HS_FORK_PHASE || phase->type == VKD3DSIH_HS_JOIN_PHASE) - { - signature = compiler->patch_constant_signature; - - memset(&reg, 0, sizeof(reg)); - reg.idx[1].offset = ~0u; - - for (i = 0; i < signature->element_count; ++i) - { - const struct vkd3d_shader_signature_element *e = &signature->elements[i]; - - reg.type = VKD3DSPR_OUTPUT; - reg.idx[0].offset = e->register_index; - vkd3d_symbol_make_register(&reg_symbol, &reg); - - if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) - { - rb_remove(&compiler->symbol_table, entry); - vkd3d_symbol_free(entry, NULL); - } - } - } - if (phase->instance_count) { + memset(&reg, 0, sizeof(reg)); reg.type = phase->type == VKD3DSIH_HS_FORK_PHASE ? VKD3DSPR_FORKINSTID : VKD3DSPR_JOININSTID; reg.idx[0].offset = ~0u; + reg.idx[1].offset = ~0u; vkd3d_symbol_make_register(&reg_symbol, &reg); if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) {

1 0

Francois Gouget : testbot/TestWTBS: Improve the error checking documentation.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: tools Branch: master Commit: 0dcfca843ad0a87d95ff69a39f9ecba6c3cfa006 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0dcfca843ad0a87d95ff69a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 1 16:26:18 2021 +0100 testbot/TestWTBS: Improve the error checking documentation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 5069355..85eb0e8 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -657,14 +657,23 @@ n 0 comm.c:2210: Test failed: WTBS Simulate an unreported test failure g 0 tests.report.Report validation errors n 0 kernel32:comm has unaccounted for failure messages -This checks that the 'comm.c' failure appears in the 'kernel32' group -of the reports of all test tasks; that the TestBot issues a report consistency -failure as well; and that no other new error is present. If no preexisting -errors are expected, that is if test unit produces no failure when run outside -the test suite, then one could also issue the following check: +This checks that the 'comm.c' failure appears in the 'kernel32' group of the +reports of all test tasks; that the TestBot issues a report consistency +failure as well; that no other new error is present in either group; and that +there are no other error groups. + +If no preexisting errors are expected, that is if the test unit produces no +failure when run outside the test suite, then one could also issue the +following check: p tests.TestFailures 2 +Note that if there is no group directive this test is skipped. So to check that +there is no error one would declare an empty group such as below, though a +'TestFailures 0' check seems like a clearer and better approach. + +g 0 tests.report.kernel32 + Finally, note that while the error directives are inherited by subcategories, they are not merged. So if if both win and win32 have error-matching directives, win32 will not inherit anything from the win category.

1 0