December 2021 - Wine-commits

Francois Gouget : testbot/SetWinLocale: Check that the locale changes took effect.
by Alexandre Julliard 26 Dec '21

26 Dec '21

Module: tools Branch: master Commit: 12134f879ae7b29d12d5e8d8a31ebdf781ca73ad URL: https://source.winehq.org/git/tools.git/?a=commit;h=12134f879ae7b29d12d5e8d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 24 09:44:33 2021 +0100 testbot/SetWinLocale: Check that the locale changes took effect. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 107 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 8d2fb5e..0355d41 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -608,6 +608,62 @@ if ($OptShow) } +# +# Helper to get the LCIDs +# + +my (%WinLCIDs, %WinKeyboardIds); + +sub GetWinKeyboardIds($) +{ + my ($Locale) = @_; + + # Look for that locale's keyboard id. + # Its first component is the locale's LCID. + my $Values = RegGetValues("$HKCU_USER_PROFILE\\$Locale", "*:*"); + foreach my $VName (keys %$Values) + { + next if ($VName !~ /^[0-9A-F]{4}:/); + $WinKeyboardIds{$Locale} = [$VName]; + last; + } + $WinKeyboardIds{$Locale} ||= $Keyboards{$Locale}; + if (!$WinKeyboardIds{$Locale}) + { + FatalError("could not find the $Locale LCID and keyboard ids\n"); + } + + my $WinLCID = uc($WinKeyboardIds{$Locale}->[0]); + $WinLCID =~ s/:.*$//; + $WinLCIDs{$Locale} = $WinLCID; + + # Check our builtin information + if ($Keyboards{$Locale}) + { + my $LCID = uc($Keyboards{$Locale}->[0]); + $LCID =~ s/:.*$//; + if ($LCID ne $WinLCID) + { + FatalError("inconsistent $Locale LCID: expected $LCID, got $WinLCID\n"); + } + } + + return $WinKeyboardIds{$Locale}; +} + +sub GetLCID($) +{ + my ($Locale) = @_; + return undef if (!$Locale); + + GetWinKeyboardIds($Locale) if (!$WinLCIDs{$Locale}); + return $WinLCIDs{$Locale}; +} + +my $LCIDLocale = GetLCID($OptLocale); +my $LCIDSystem = GetLCID($OptSystem); + + # # Generate the intl.cpl configuration # @@ -738,5 +794,56 @@ if ($OptReboot) } } + +# +# Check that all the changes succeeded +# + +my $Success = 1; +sub CheckSetting($$$$;$) +{ + my ($Settings, $VName, $Expected, $For, $IgnoreCase) = @_; + + my $Value = $Settings->{$VName}; + if (defined $Value) + { + if ((!$IgnoreCase and $Value ne $Expected) or + ($IgnoreCase and uc($Value) ne uc($Expected))) + { + Error("expected $VName = $Expected but got $Value $For\n"); + $Success = 0; + } + } +} + +Debug(Elapsed($Start), " Checking the new locale settings\n"); +my $Settings = GetWinSettings($Debug); +ShowWinSettings($Settings) if ($Debug); +if ($OptLocale) +{ + CheckSetting($Settings, "Locale", "0000$LCIDLocale", "for --locale $OptLocale", 1); + CheckSetting($Settings, "LocaleName", $OptLocale, "for --locale $OptLocale"); +} +if ($OptKeyboard) +{ + CheckSetting($Settings, "InputMethod", $Keyboards{$OptKeyboard}->[0], "for --keyboard $OptKeyboard", 1); +} +if ($OptMUI) +{ + CheckSetting($Settings, "PreferredUILanguages", $OptMUI, "for --mui $OptMUI"); +} +if ($OptCountry) +{ + CheckSetting($Settings, "Country", $CountryId, "for --country $OptCountry"); + CheckSetting($Settings, "CountryName", $OptCountry, "for --country $OptCountry"); +} +if ($OptSystem) +{ + CheckSetting($Settings, "SysLanguage", $LCIDSystem, "for --system $OptSystem", 1); + CheckSetting($Settings, "SysLocale", "0000$LCIDSystem", "for --system $OptSystem", 1); +} +exit(1) if (!$Success); + + Debug(Elapsed($Start), " All done!\n"); exit(0);

1 0

Francois Gouget : testbot/SetWinLocale: Get the keyboard ids from the registry when possible.
by Alexandre Julliard 26 Dec '21

26 Dec '21

Module: tools Branch: master Commit: 12422d941f2da8f9065c39b5e3e16a763fe3b668 URL: https://source.winehq.org/git/tools.git/?a=commit;h=12422d941f2da8f9065c39b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 24 09:44:36 2021 +0100 testbot/SetWinLocale: Get the keyboard ids from the registry when possible. The information is available on Windows 10. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 0355d41..e611966 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -376,7 +376,7 @@ while (@ARGV) } # Check and untaint parameters -my ($KeyboardIds, $CountryId); +my $CountryId; if (!defined $Usage) { if (!defined $OptHostName) @@ -397,18 +397,6 @@ if (!defined $Usage) $OptLocale ||= $OptDefault; $OptSystem ||= $OptDefault; $OptMUI ||= $OptDefault; - $OptKeyboard ||= $OptDefault; - if (defined $OptKeyboard) - { - if (!exists $Keyboards{$OptKeyboard}) - { - # intl.cpl automatically pick the appropriate keyboard but, unlike - # for Windows' initial installation, it does not make it the - # default since the system has a keyboard already. - Warning("unknown keyboard '$OptKeyboard'. Letting intl.cpl use its default.\n"); - } - $KeyboardIds = $Keyboards{$OptKeyboard}; - } if (!defined $OptCountry and defined $OptDefault and $OptDefault =~ /-([A-Z]{2})$/) { @@ -561,7 +549,7 @@ sub GetWinSettings($) $Settings->{Country} = $Values->{Nation}; $Settings->{CountryName} = $Values->{Name}; } - if ($OptKeyboard or $All) + if (($OptKeyboard || $OptDefault) or $All) { $Settings->{InputMethod} = RegGetValue($HKCU_USER_PROFILE, "InputMethodOverride"); } @@ -660,9 +648,32 @@ sub GetLCID($) return $WinLCIDs{$Locale}; } +sub GetKeyboardIds($) +{ + my ($Locale) = @_; + return undef if (!$Locale); + + GetWinKeyboardIds($Locale) if (!$WinKeyboardIds{$Locale}); + return $WinKeyboardIds{$Locale}; +} + my $LCIDLocale = GetLCID($OptLocale); my $LCIDSystem = GetLCID($OptSystem); +my $KeyboardIds = GetKeyboardIds($OptKeyboard || $OptDefault); +if (!$KeyboardIds and ($OptKeyboard or $OptDefault)) +{ + if ($OptKeyboard) + { + FatalError("no known keyboard for the $OptKeyboard locale\n"); + } + # intl.cpl automatically pick the appropriate keyboard but, unlike + # for Windows' initial installation, it does not make it the + # default since the system has a keyboard already. + Warning("no known keyboard for the $OptDefault locale. Letting intl.cpl use its default.\n"); +} +$OptKeyboard ||= $OptDefault; + # # Generate the intl.cpl configuration @@ -824,9 +835,9 @@ if ($OptLocale) CheckSetting($Settings, "Locale", "0000$LCIDLocale", "for --locale $OptLocale", 1); CheckSetting($Settings, "LocaleName", $OptLocale, "for --locale $OptLocale"); } -if ($OptKeyboard) +if ($KeyboardIds) { - CheckSetting($Settings, "InputMethod", $Keyboards{$OptKeyboard}->[0], "for --keyboard $OptKeyboard", 1); + CheckSetting($Settings, "InputMethod", $KeyboardIds->[0], "for --keyboard $OptKeyboard", 1); } if ($OptMUI) {

1 0

Rémi Bernon : faudio: Return PCM format from IXAudio27_GetDeviceDetails.
by Alexandre Julliard 23 Dec '21

23 Dec '21

Module: wine Branch: master Commit: f6482d1c459218ea837ce2629bbf6ea88e9d0ec2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6482d1c459218ea837ce262… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 23 13:05:20 2021 +0100 faudio: Return PCM format from IXAudio27_GetDeviceDetails. This will be in next FAudio release. This fixes a regression in some games, such as Far Cry 4, where audio doesn't work anymore since the move to FAudio Win32 platform. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 1 - libs/faudio/src/FAudio_platform_win32.c | 27 ++++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index ea7e2ec121a..9821553166e 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -940,7 +940,6 @@ static UINT32 test_DeviceDetails(IXAudio27 *xa) else ok(dd.Role == NotDefaultDevice, "Got wrong role for index %u: 0x%x\n", i, dd.Role); - todo_wine ok(IsEqualGUID(&dd.OutputFormat.SubFormat, &KSDATAFORMAT_SUBTYPE_PCM), "got format %s\n", debugstr_guid(&dd.OutputFormat.SubFormat)); } diff --git a/libs/faudio/src/FAudio_platform_win32.c b/libs/faudio/src/FAudio_platform_win32.c index ccb8d8abbbf..d99bae044a4 100644 --- a/libs/faudio/src/FAudio_platform_win32.c +++ b/libs/faudio/src/FAudio_platform_win32.c @@ -364,13 +364,14 @@ uint32_t FAudio_PlatformGetDeviceDetails( uint32_t index, FAudioDeviceDetails *details ) { + WAVEFORMATEX *format, *obtained; WAVEFORMATEXTENSIBLE *ext; - WAVEFORMATEX *format; IAudioClient *client; IMMDevice *device; uint32_t ret = 0; HRESULT hr; WCHAR *str; + GUID sub; FAudio_memset(details, 0, sizeof(FAudioDeviceDetails)); if (index > 0) return FAUDIO_E_INVALID_CALL; @@ -406,6 +407,28 @@ uint32_t FAudio_PlatformGetDeviceDetails( hr = IAudioClient_GetMixFormat(client, &format); FAudio_assert(!FAILED(hr) && "Failed to get audio client mix format!"); + if (format->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + { + ext = (WAVEFORMATEXTENSIBLE *)format; + sub = ext->SubFormat; + FAudio_memcpy( + &ext->SubFormat, + &DATAFORMAT_SUBTYPE_PCM, + sizeof(GUID) + ); + + hr = IAudioClient_IsFormatSupported(client, AUDCLNT_SHAREMODE_SHARED, format, &obtained); + if (FAILED(hr)) + { + ext->SubFormat = sub; + } + else if (obtained) + { + CoTaskMemFree(format); + format = obtained; + } + } + details->OutputFormat.Format.wFormatTag = format->wFormatTag; details->OutputFormat.Format.nChannels = format->nChannels; details->OutputFormat.Format.nSamplesPerSec = format->nSamplesPerSec; @@ -426,6 +449,8 @@ uint32_t FAudio_PlatformGetDeviceDetails( ); } + CoTaskMemFree(format); + IAudioClient_Release(client); IMMDevice_Release(device);

1 0

Arkadiusz Hiler : user32: Uppercase the RawInput device names sans the GUID.
by Alexandre Julliard 23 Dec '21

23 Dec '21

Module: wine Branch: master Commit: a60c5e696131b47c5d1959adbdad26be53481b8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a60c5e696131b47c5d1959ad… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Thu Dec 23 15:33:08 2021 +0100 user32: Uppercase the RawInput device names sans the GUID. This is a preparation for a patch that changes setupapi to return lowercased device paths, which is the source of RawInput device name here. On Windows RawInput returns mostly uppercase names (except the GUID) and we want to keep that behavior. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index f3dc4ae67de..a774f12231b 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -101,6 +101,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) struct device *device = NULL; UINT32 handle; HANDLE file; + WCHAR *pos; DWORD i, size, type; SetupDiGetDeviceInterfaceDetailW(set, iface, NULL, 0, &size, &device_data); @@ -125,6 +126,9 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) detail->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); SetupDiGetDeviceInterfaceDetailW(set, iface, detail, size, NULL, NULL); + /* upper case everything but the GUID */ + for (pos = detail->DevicePath; *pos && *pos != '{'; pos++) *pos = towupper(*pos); + file = CreateFileW(detail->DevicePath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); if (file == INVALID_HANDLE_VALUE)

1 0

Arkadiusz Hiler : setupapi: Use lowercase device paths.
by Alexandre Julliard 23 Dec '21

23 Dec '21

Module: wine Branch: master Commit: 30a026d2454b2de93257e9eb895573ce8c56dc05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30a026d2454b2de93257e9eb… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Thu Dec 23 15:33:09 2021 +0100 setupapi: Use lowercase device paths. Some games are doing case sensitive matches on the device paths obtained from Setup API and expect them to be lowercase. This fixes Virginia not being able to discover DualShock 4. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 2 +- dlls/setupapi/devinst.c | 3 +++ dlls/setupapi/tests/devinst.c | 13 +++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index a1308606f98..081dcf2dc74 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -100,7 +100,7 @@ static BOOL CALLBACK enum_callback(const DIDEVICEINSTANCEW *instance, void *cont joystick->num_effects = 0; IDirectInputDevice8_GetProperty(joystick->device, DIPROP_GUIDANDPATH, &prop_guid_path.diph); - joystick->is_xinput = wcsstr(prop_guid_path.wszPath, L"&IG_") != NULL; + joystick->is_xinput = wcsstr(prop_guid_path.wszPath, L"&ig_") != NULL; if (joystick->forcefeedback) data->num_ff++; diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 29cfbbeb87f..ecc0b58ca5c 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -407,6 +407,9 @@ static LPWSTR SETUPDI_CreateSymbolicLinkPath(LPCWSTR instanceId, lstrcpyW(ret + printed + 1, ReferenceString); } } + + CharLowerW(ret); + return ret; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 6f02acb9589..35823788605 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1025,6 +1025,18 @@ static void test_register_device_info(void) SetupDiDestroyDeviceInfoList(set); } +static void check_all_lower_case(int line, const char* str) +{ + const char *cur; + + for (cur = str; *cur; cur++) + { + BOOL is_lower = (tolower(*cur) == *cur); + ok_(__FILE__, line)(is_lower, "Expected device path to be all lowercase but got %s.\n", str); + if (!is_lower) break; + } +} + static void check_device_iface_(int line, HDEVINFO set, SP_DEVINFO_DATA *device, const GUID *class, int index, DWORD flags, const char *path) { @@ -1046,6 +1058,7 @@ static void check_device_iface_(int line, HDEVINFO set, SP_DEVINFO_DATA *device, ret = SetupDiGetDeviceInterfaceDetailA(set, &iface, detail, sizeof(buffer), NULL, NULL); ok_(__FILE__, line)(ret, "Failed to get interface detail, error %#x.\n", GetLastError()); ok_(__FILE__, line)(!strcasecmp(detail->DevicePath, path), "Got unexpected path %s.\n", detail->DevicePath); + check_all_lower_case(line, detail->DevicePath); } else {

1 0

Alex Henrie : api-ms-win-core-windowserrorreporting-l1-1-1: Add DLL.
by Alexandre Julliard 23 Dec '21

23 Dec '21

Module: wine Branch: master Commit: b45ac3a0b8a007de631534085ef489f8574b98f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b45ac3a0b8a007de63153408… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 23 00:46:12 2021 -0700 api-ms-win-core-windowserrorreporting-l1-1-1: Add DLL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51923 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-windowserrorreporting-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-windowserrorreporting-l1-1-1.spec | 10 ++++++++++ tools/make_specfiles | 1 + 5 files changed, 15 insertions(+) diff --git a/configure b/configure index 69159422456..0ae2849d14f 100755 --- a/configure +++ b/configure @@ -1084,6 +1084,7 @@ enable_api_ms_win_core_version_l1_1_1 enable_api_ms_win_core_version_private_l1_1_0 enable_api_ms_win_core_versionansi_l1_1_0 enable_api_ms_win_core_windowserrorreporting_l1_1_0 +enable_api_ms_win_core_windowserrorreporting_l1_1_1 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_1 enable_api_ms_win_core_winrt_errorprivate_l1_1_1 @@ -21546,6 +21547,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-version-l1-1-1 enable_api_ms_win_co wine_fn_config_makefile dlls/api-ms-win-core-version-private-l1-1-0 enable_api_ms_win_core_version_private_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-versionansi-l1-1-0 enable_api_ms_win_core_versionansi_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-windowserrorreporting-l1-1-0 enable_api_ms_win_core_windowserrorreporting_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-windowserrorreporting-l1-1-1 enable_api_ms_win_core_windowserrorreporting_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-winrt-error-l1-1-1 enable_api_ms_win_core_winrt_error_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-winrt-errorprivate-l1-1-1 enable_api_ms_win_core_winrt_errorprivate_l1_1_1 diff --git a/configure.ac b/configure.ac index c1eb2f99a8c..9b2c111119f 100644 --- a/configure.ac +++ b/configure.ac @@ -2470,6 +2470,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-private-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-versionansi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-windowserrorreporting-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-windowserrorreporting-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-error-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-errorprivate-l1-1-1) diff --git a/dlls/api-ms-win-core-windowserrorreporting-l1-1-1/Makefile.in b/dlls/api-ms-win-core-windowserrorreporting-l1-1-1/Makefile.in new file mode 100644 index 00000000000..dc0b525273e --- /dev/null +++ b/dlls/api-ms-win-core-windowserrorreporting-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-windowserrorreporting-l1-1-1.dll diff --git a/dlls/api-ms-win-core-windowserrorreporting-l1-1-1/api-ms-win-core-windowserrorreporting-l1-1-1.spec b/dlls/api-ms-win-core-windowserrorreporting-l1-1-1/api-ms-win-core-windowserrorreporting-l1-1-1.spec new file mode 100644 index 00000000000..8201b14cfb8 --- /dev/null +++ b/dlls/api-ms-win-core-windowserrorreporting-l1-1-1/api-ms-win-core-windowserrorreporting-l1-1-1.spec @@ -0,0 +1,10 @@ +@ stub GetApplicationRecoveryCallback +@ stdcall GetApplicationRestartSettings(long ptr ptr ptr) kernel32.GetApplicationRestartSettings +@ stdcall WerRegisterFile(wstr long long) kernel32.WerRegisterFile +@ stdcall WerRegisterMemoryBlock(ptr long) kernel32.WerRegisterMemoryBlock +@ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) kernel32.WerRegisterRuntimeExceptionModule +@ stdcall WerUnregisterFile(wstr) kernel32.WerUnregisterFile +@ stdcall WerUnregisterMemoryBlock(ptr) kernel32.WerUnregisterMemoryBlock +@ stdcall WerUnregisterRuntimeExceptionModule(wstr ptr) kernel32.WerUnregisterRuntimeExceptionModule +@ stub WerpNotifyLoadStringResource +@ stub WerpNotifyUseStringResource diff --git a/tools/make_specfiles b/tools/make_specfiles index 49a032ef14c..b5e6443dd3c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -300,6 +300,7 @@ my @dll_groups = "api-ms-win-core-datetime-l1-1-0", "api-ms-win-core-datetime-l1-1-1", "api-ms-win-core-windowserrorreporting-l1-1-0", + "api-ms-win-core-windowserrorreporting-l1-1-1", "api-ms-win-core-wow64-l1-1-0", "api-ms-win-core-wow64-l1-1-1", "api-ms-win-core-xstate-l2-1-0",

1 0

Alex Henrie : crypt32/tests: Make pfxdata static.
by Alexandre Julliard 23 Dec '21

23 Dec '21

Module: wine Branch: master Commit: 4fd80941f81addd220bfe1bff858b8138ee1bd00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fd80941f81addd220bfe1bf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 23 02:28:05 2021 -0700 crypt32/tests: Make pfxdata static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/store.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 46c9102686d..852cedaa1fe 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -3038,7 +3038,7 @@ static void test_I_UpdateStore(void) CertCloseStore(store2, 0); } -const BYTE pfxdata[] = +static const BYTE pfxdata[] = { 0x30, 0x82, 0x0b, 0x1d, 0x02, 0x01, 0x03, 0x30, 0x82, 0x0a, 0xe3, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82,

1 0

Piotr Caban : msvcrt: Fix restoring 53-bit precision mode in _control87.
by Alexandre Julliard 23 Dec '21

23 Dec '21

Module: wine Branch: master Commit: 7555573dc547c7204e0454dde02b31ca8a7a1e90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7555573dc547c7204e0454dd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 23 19:35:10 2021 +0100 msvcrt: Fix restoring 53-bit precision mode in _control87. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52260 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 414c948d025..14afad5fb45 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5328,7 +5328,7 @@ static void _setfp( unsigned int *cw, unsigned int cw_mask, *cw = (flags & ~cw_mask) | (*cw & cw_mask); TRACE("x86 update cw %08x to %08x\n", flags, *cw); - newcw &= ~0x1e3f; + newcw &= ~0x1f3f; if (*cw & _EM_INVALID) newcw |= 0x1; if (*cw & _EM_DENORMAL) newcw |= 0x2; if (*cw & _EM_ZERODIVIDE) newcw |= 0x4;

1 0

Chilung Chan : po: Update Traditional Chinese translation.
by Alexandre Julliard 23 Dec '21

23 Dec '21

Module: wine Branch: master Commit: fbefa039f1ba23b2d793d86f2e5a6904d7979d01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbefa039f1ba23b2d793d86f… Author: Chilung Chan <eason066(a)gmail.com> Date: Thu Dec 23 14:31:03 2021 +0800 po: Update Traditional Chinese translation. Signed-off-by: Chilung Chan <eason066(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_TW.po | 94 +++++++++++++++++++++++++++++-------------------------------- 1 file changed, 44 insertions(+), 50 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index d4d05db3298..16c22e456a4 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-12-13 13:32+0800\n" +"PO-Revision-Date: 2021-12-23 14:09+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -257,7 +257,7 @@ msgstr "應用程式" msgid "" "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " "entry for this program from the registry?" -msgstr "無法執行移除程式 '%s'。您想將這個移除程式從註冊表中移除嗎?" +msgstr "無法執行移除程式 '%s'。您想將這個移除程式從登錄中移除嗎?" #: dlls/appwiz.cpl/appwiz.rc:36 msgid "Not specified" @@ -4774,7 +4774,7 @@ msgstr "不存在的權杖。\n" #: dlls/kernel32/winerror.mc:1063 msgid "Registry corrupt.\n" -msgstr "註冊表損毀。\n" +msgstr "登錄損毀。\n" #: dlls/kernel32/winerror.mc:1068 msgid "Invalid key.\n" @@ -4782,47 +4782,47 @@ msgstr "無效的索引鍵。\n" #: dlls/kernel32/winerror.mc:1073 msgid "Can't open registry key.\n" -msgstr "無法開啟註冊表索引鍵。\n" +msgstr "無法開啟登錄機碼。\n" #: dlls/kernel32/winerror.mc:1078 msgid "Can't read registry key.\n" -msgstr "無法讀取註冊表索引鍵。\n" +msgstr "無法讀取登錄機碼。\n" #: dlls/kernel32/winerror.mc:1083 msgid "Can't write registry key.\n" -msgstr "無法寫入註冊表索引鍵。\n" +msgstr "無法寫入登錄機碼。\n" #: dlls/kernel32/winerror.mc:1088 msgid "Registry has been recovered.\n" -msgstr "註冊表已復原。\n" +msgstr "登錄已復原。\n" #: dlls/kernel32/winerror.mc:1093 msgid "Registry is corrupt.\n" -msgstr "註冊表損毀。\n" +msgstr "登錄損毀。\n" #: dlls/kernel32/winerror.mc:1098 msgid "I/O to registry failed.\n" -msgstr "註冊表 I/O 時失敗。\n" +msgstr "I/O 至登錄時失敗。\n" #: dlls/kernel32/winerror.mc:1103 msgid "Not registry file.\n" -msgstr "非註冊表檔案。\n" +msgstr "非登錄檔案。\n" #: dlls/kernel32/winerror.mc:1108 msgid "Key deleted.\n" -msgstr "索引鍵已刪除。\n" +msgstr "已刪除機碼。\n" #: dlls/kernel32/winerror.mc:1113 msgid "No registry log space.\n" -msgstr "沒有註冊表記錄檔空間。\n" +msgstr "沒有登錄記錄檔空間。\n" #: dlls/kernel32/winerror.mc:1118 msgid "Registry key has subkeys.\n" -msgstr "註冊表索引鍵有子項。\n" +msgstr "登錄機碼有子項。\n" #: dlls/kernel32/winerror.mc:1123 msgid "Subkey must be volatile.\n" -msgstr "子項必須是可變的。\n" +msgstr "子機碼必須是可變的。\n" #: dlls/kernel32/winerror.mc:1128 msgid "Notify change request in progress.\n" @@ -8020,7 +8020,7 @@ msgstr "新資料夾" #: dlls/msi/msi.rc:91 msgid "Allocating registry space" -msgstr "正在分配註冊表空間" +msgstr "正在分配登錄空間" #: dlls/msi/msi.rc:92 msgid "Searching for installed applications" @@ -10464,22 +10464,16 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) 都柏林，愛丁堡，里斯本，倫敦" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Sudan Standard Time" msgid "South Sudan Standard Time" -msgstr "蘇丹標準時間" +msgstr "南蘇丹標準時間" #: dlls/tzres/tzres.rc:343 -#, fuzzy -#| msgid "Sudan Daylight Time" msgid "South Sudan Daylight Time" -msgstr "蘇丹夏令時間" +msgstr "南蘇丹夏令時間" #: dlls/tzres/tzres.rc:344 -#, fuzzy -#| msgid "(UTC+02:00) Jerusalem" msgid "(UTC+02:00) Juba" -msgstr "(UTC+02:00) 耶路撒冷" +msgstr "(UTC+02:00) 朱巴" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" @@ -13355,7 +13349,7 @@ msgid "" msgstr "" "PATH 顯示或變更 cmd 的搜尋路徑。\n" "\n" -"輸入 PATH 將會顯示目前的路徑設定 (根據註冊表\n" +"輸入 PATH 將會顯示目前的路徑設定 (根據登錄\n" "進行初始化)。要變更設定就在\n" "PATH 命令之後緊接新的值。\n" "\n" @@ -14765,7 +14759,7 @@ msgstr "系統設定(&S)" #: programs/oleview/oleview.rc:36 msgid "&Run the Registry Editor" -msgstr "執行註冊表編輯器(&R)" +msgstr "執行登錄檔編輯器(&R)" #: programs/oleview/oleview.rc:42 msgid "&CoCreateInstance Flag" @@ -14877,7 +14871,7 @@ msgid "" "These settings change only registry values.\n" "They have no effect on Wine performance." msgstr "" -"這些設定只改變註冊表內的值。\n" +"這些設定只改變登錄內的值。\n" "它對 Wine 的性能沒有影響。" #: programs/oleview/oleview.rc:180 @@ -14942,7 +14936,7 @@ msgstr "變更本機分散式 COM 設定" #: programs/oleview/oleview.rc:108 msgid "Run the Wine registry editor" -msgstr "執行 Wine 註冊表編輯器" +msgstr "執行 Wine 登錄檔編輯器" #: programs/oleview/oleview.rc:109 msgid "Quit the application. Prompts to save changes" @@ -15047,7 +15041,7 @@ msgstr "介面" #: programs/oleview/oleview.rc:140 msgid "Registry" -msgstr "註冊表" +msgstr "登錄" #: programs/oleview/oleview.rc:141 msgid "Implementation" @@ -15313,7 +15307,7 @@ msgstr "輸入 \"REG %1 /?\" 以取得說明。\n" #: programs/reg/reg.rc:181 msgid "reg: Unable to access or create the specified registry key\n" -msgstr "reg: 無法存取或建立指定的註冊表鍵\n" +msgstr "reg: 無法存取或建立指定的登錄機碼\n" #: programs/reg/reg.rc:116 msgid "reg: The operation completed successfully\n" @@ -15321,7 +15315,7 @@ msgstr "reg: 操作成功完成\n" #: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" -msgstr "reg: 註冊表操作已經取消\n" +msgstr "reg: 登錄操作已經取消\n" #: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" @@ -15412,7 +15406,7 @@ msgid "" msgstr "" "REG ADD <機碼> [/v 值名稱 | /ve] [/t 類型] [/s 分隔符號] [/d 資料] [/f]\n" "\n" -" 新增一個機碼到註冊表，或新增值到給定的登錄機碼。\n" +" 新增一個機碼到登錄，或新增值到給定的登錄機碼。\n" "\n" " <機碼>\n" " 要新增的機碼，如果指定了 [/v] 或 [/ve]，\n" @@ -15438,7 +15432,7 @@ msgstr "" " 登錄值。\n" "\n" " /t <類型>\n" -" 要新增到註冊表的資料類型。如果指定了 [/t]，\n" +" 要新增到登錄的資料類型。如果指定了 [/t]，\n" " <類型> 必須是下列的其中一個:\n" "\n" " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" @@ -15665,7 +15659,7 @@ msgid "" msgstr "" "REG IMPORT <檔案>\n" "\n" -" 從給定的檔案匯入機碼、值和資料到註冊表。\n" +" 從給定的檔案匯入機碼、值和資料到登錄。\n" "\n" " <檔案>\n" " 要匯入的登錄檔案的名稱和路徑。\n" @@ -15849,7 +15843,7 @@ msgstr "搜尋完成。相符項目的數目: %1!d!\n" #: programs/regedit/regedit.rc:34 msgid "&Registry" -msgstr "註冊表(&R)" +msgstr "登錄檔(&R)" #: programs/regedit/regedit.rc:36 msgid "&Import Registry File..." @@ -15921,7 +15915,7 @@ msgstr "移除我的最愛(&R)..." #: programs/regedit/regedit.rc:80 msgid "&About Registry Editor" -msgstr "關於註冊表編輯器(&A)" +msgstr "關於登錄檔編輯器(&A)" #: programs/regedit/regedit.rc:89 programs/regedit/regedit.rc:96 #: programs/regedit/regedit.rc:230 @@ -15934,7 +15928,7 @@ msgstr "修改二進位資料(&B)..." #: programs/regedit/regedit.rc:267 msgid "Export registry" -msgstr "匯出註冊表" +msgstr "要匯出的登錄" #: programs/regedit/regedit.rc:269 msgid "S&elected branch:" @@ -16016,28 +16010,28 @@ msgstr "編輯多字串" #: programs/regedit/regedit.rc:159 msgid "Contains commands for working with the whole registry" -msgstr "含有與註冊表有關的全部指令" +msgstr "包含登錄工作相關的全部命令" #: programs/regedit/regedit.rc:160 msgid "Contains commands for editing values or keys" -msgstr "含有與編輯數值有關的全部指令" +msgstr "包含編輯機碼或值的命令" #: programs/regedit/regedit.rc:161 msgid "Contains commands for customizing the registry window" -msgstr "含有與自訂註冊表視窗有關的全部指令" +msgstr "包含自訂登錄視窗的命令" #: programs/regedit/regedit.rc:162 msgid "Contains commands for accessing frequently used keys" -msgstr "含有與使用常用索引鍵有關的全部指令" +msgstr "包含使用常用的機碼的命令" #: programs/regedit/regedit.rc:163 msgid "" "Contains commands for displaying Help and information about Registry Editor" -msgstr "含有顯示登錄編輯程式說明及資訊的命令" +msgstr "包含顯示登錄編輯程式說明及資訊的命令" #: programs/regedit/regedit.rc:164 msgid "Contains commands for creating new keys or values" -msgstr "含有與建立新值有關的全部指令" +msgstr "包含建立新機碼或值的指令" #: programs/regedit/regedit.rc:149 msgid "Data" @@ -16045,7 +16039,7 @@ msgstr "資料" #: programs/regedit/regedit.rc:154 msgid "Registry Editor" -msgstr "註冊表編輯器" +msgstr "登錄檔編輯器" #: programs/regedit/regedit.rc:221 msgid "Import Registry File" @@ -16114,7 +16108,7 @@ msgstr "無法重新命名選定的登錄值" #: programs/regedit/regedit.rc:255 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "%1 所包含的機碼和值已成功新增至註冊表。" +msgstr "%1 所包含的機碼和值已成功新增至登錄。" #: programs/regedit/regedit.rc:256 msgid "Unable to import %1. The specified file is not a valid registry file." @@ -16270,7 +16264,7 @@ msgstr "regedit: 該列有錯誤的語法。\n" #: programs/regedit/regedit.rc:187 msgid "Quits the Registry Editor" -msgstr "結束註冊表編輯器" +msgstr "結束登錄檔編輯器" #: programs/regedit/regedit.rc:188 msgid "Adds keys to the favorites list" @@ -16334,19 +16328,19 @@ msgstr "新增一個新的 32 位元值" #: programs/regedit/regedit.rc:177 msgid "Imports a text file into the registry" -msgstr "將純文字檔案匯入註冊表" +msgstr "將純文字檔案匯入登錄" #: programs/regedit/regedit.rc:179 msgid "Exports all or part of the registry to a text file" -msgstr "將註冊表匯出到純文字檔案" +msgstr "將登錄匯出到純文字檔案" #: programs/regedit/regedit.rc:180 msgid "Prints all or part of the registry" -msgstr "列印註冊表的全部或部分" +msgstr "列印登錄的全部或部分" #: programs/regedit/regedit.rc:181 msgid "Opens Registry Editor Help" -msgstr "開啟註冊表編輯器的說明" +msgstr "開啟登錄檔編輯器的說明" #: programs/regedit/regedit.rc:182 msgid "Displays program information, version number and copyright"

1 0

Zebediah Figura : winegstreamer: Allow specifying flipped video via negative height.
by Alexandre Julliard 23 Dec '21

23 Dec '21

Module: wine Branch: master Commit: c5a9373dbed9bb53e7739dfb6d2a1a2a5818871b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5a9373dbed9bb53e7739dfb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 23 00:35:12 2021 -0600 winegstreamer: Allow specifying flipped video via negative height. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50668 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/unixlib.h | 2 +- dlls/winegstreamer/wg_parser.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 90101893541..82bb534b938 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -63,7 +63,7 @@ struct wg_format WG_VIDEO_FORMAT_CINEPAK, } format; - uint32_t width, height; + int32_t width, height; uint32_t fps_n, fps_d; } video; struct diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index c3c9051a174..0178538fa81 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -450,7 +450,7 @@ static GstCaps *wg_format_to_caps_video(const struct wg_format *format) if ((video_format = wg_video_format_to_gst(format->u.video.format)) == GST_VIDEO_FORMAT_UNKNOWN) return NULL; - gst_video_info_set_format(&info, video_format, format->u.video.width, format->u.video.height); + gst_video_info_set_format(&info, video_format, format->u.video.width, abs(format->u.video.height)); if ((caps = gst_video_info_to_caps(&info))) { /* Clear some fields that shouldn't prevent us from connecting. */ @@ -497,7 +497,7 @@ static bool wg_format_compare(const struct wg_format *a, const struct wg_format /* Do not compare FPS. */ return a->u.video.format == b->u.video.format && a->u.video.width == b->u.video.width - && a->u.video.height == b->u.video.height; + && abs(a->u.video.height) == abs(b->u.video.height); } assert(0); @@ -611,6 +611,8 @@ static NTSTATUS wg_parser_stream_enable(void *args) if (format->major_type == WG_MAJOR_TYPE_VIDEO) { + bool flip = (format->u.video.height < 0); + switch (format->u.video.format) { case WG_VIDEO_FORMAT_BGRA: @@ -618,7 +620,7 @@ static NTSTATUS wg_parser_stream_enable(void *args) case WG_VIDEO_FORMAT_BGR: case WG_VIDEO_FORMAT_RGB15: case WG_VIDEO_FORMAT_RGB16: - gst_util_set_object_arg(G_OBJECT(stream->flip), "method", "vertical-flip"); + flip = !flip; break; case WG_VIDEO_FORMAT_AYUV: @@ -630,9 +632,10 @@ static NTSTATUS wg_parser_stream_enable(void *args) case WG_VIDEO_FORMAT_YVYU: case WG_VIDEO_FORMAT_UNKNOWN: case WG_VIDEO_FORMAT_CINEPAK: - gst_util_set_object_arg(G_OBJECT(stream->flip), "method", "none"); break; } + + gst_util_set_object_arg(G_OBJECT(stream->flip), "method", flip ? "vertical-flip" : "none"); } gst_pad_push_event(stream->my_sink, gst_event_new_reconfigure());

1 0