wine-commits December 2021

2 participants
569 discussions

Francois Gouget : testbot/SetWinLocale: Get the keyboard ids from the registry when possible.

by Alexandre Julliard

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) {

2 years, 4 months

Francois Gouget : testbot/SetWinLocale: Check that the locale changes took effect.

by Alexandre Julliard

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);

2 years, 4 months

Piotr Caban : msvcrt: Fix restoring 53-bit precision mode in _control87.

by Alexandre Julliard

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;

2 years, 4 months

Alex Henrie : crypt32/tests: Make pfxdata static.

by Alexandre Julliard

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,

2 years, 4 months

Alex Henrie : api-ms-win-core-windowserrorreporting-l1-1-1: Add DLL.

by Alexandre Julliard

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",

2 years, 4 months

Arkadiusz Hiler : setupapi: Use lowercase device paths.

by Alexandre Julliard

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 {

2 years, 4 months

Arkadiusz Hiler : user32: Uppercase the RawInput device names sans the GUID.

by Alexandre Julliard

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)

2 years, 4 months

Rémi Bernon : faudio: Return PCM format from IXAudio27_GetDeviceDetails.

by Alexandre Julliard

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);

2 years, 4 months

Eric Pouech : kernel32/tests: Test resetting ctrl-c handlers on some console APIs.

by Alexandre Julliard

Module: wine Branch: master Commit: 508e97a2498ac4770ccffb81068126d4fa63efb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=508e97a2498ac4770ccffb81… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 17 14:13:46 2021 +0100 kernel32/tests: Test resetting ctrl-c handlers on some console APIs. AllocConsole(), AttachConsole() and FreeConsole() should reset ctrl handlers' list. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 8b5abfa2da9..e4d9d43f4c4 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -123,6 +123,12 @@ static void resetContent(HANDLE hCon, COORD sbSize, BOOL content) } } +/* dummy console ctrl handler to test reset of ctrl handler's list */ +static BOOL WINAPI mydummych(DWORD event) +{ + return TRUE; +} + static void testCursor(HANDLE hCon, COORD sbSize) { COORD c; @@ -4060,6 +4066,9 @@ static void test_FreeConsole(void) BOOL ret; ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != NULL, "ConsoleHandle is NULL\n"); + ok(!SetConsoleCtrlHandler(mydummych, FALSE), "dummy ctrl handler shouldn't be set\n"); + ret = SetConsoleCtrlHandler(mydummych, TRUE); + ok(ret, "SetConsoleCtrlHandler failed: %u\n", GetLastError()); if (!skip_nt) { unbound_input = create_unbound_handle(FALSE, TRUE); @@ -4169,6 +4178,9 @@ static void test_FreeConsole(void) type = GetFileType(unbound_output); ok(type == FILE_TYPE_CHAR, "GetFileType returned %u\n", type); + todo_wine + ok(!SetConsoleCtrlHandler(mydummych, FALSE), "FreeConsole() should have reset ctrl handlers' list\n"); + CloseHandle(unbound_input); CloseHandle(unbound_output); } @@ -4312,6 +4324,10 @@ static void test_AttachConsole_child(DWORD console_pid) SetStdHandle(STD_ERROR_HANDLE, pipe_out); + ok(!SetConsoleCtrlHandler(mydummych, FALSE), "dummy ctrl handler shouldn't be set\n"); + res = SetConsoleCtrlHandler(mydummych, TRUE); + ok(res, "SetConsoleCtrlHandler failed: %u\n", GetLastError()); + res = AttachConsole(console_pid); ok(res, "AttachConsole failed: %u\n", GetLastError()); @@ -4326,6 +4342,9 @@ static void test_AttachConsole_child(DWORD console_pid) ok(len == 6, "len = %u\n", len); ok(!memcmp(buf, "Parent", 6), "Unexpected console output\n"); + todo_wine + ok(!SetConsoleCtrlHandler(mydummych, FALSE), "AttachConsole() should have reset ctrl handlers' list\n"); + res = FreeConsole(); ok(res, "FreeConsole failed: %u\n", GetLastError()); @@ -4416,6 +4435,9 @@ static void test_AllocConsole_child(void) res = GetConsoleMode(unbound_output, &mode); ok(!res && GetLastError() == ERROR_INVALID_HANDLE, "GetConsoleMode failed: %u\n", GetLastError()); + ok(!SetConsoleCtrlHandler(mydummych, FALSE), "dummy ctrl handler shouldn't be set\n"); + res = SetConsoleCtrlHandler(mydummych, TRUE); + ok(res, "SetConsoleCtrlHandler failed: %u\n", GetLastError()); res = AllocConsole(); ok(res, "AllocConsole failed: %u\n", GetLastError()); @@ -4428,6 +4450,9 @@ static void test_AllocConsole_child(void) res = GetConsoleMode(unbound_output, &mode); ok(res, "GetConsoleMode failed: %u\n", GetLastError()); + todo_wine + ok(!SetConsoleCtrlHandler(mydummych, FALSE), "AllocConsole() should have reset ctrl handlers' list\n"); + FreeConsole(); SetStdHandle(STD_OUTPUT_HANDLE, NULL); SetStdHandle(STD_ERROR_HANDLE, NULL);

2 years, 4 months

Paul Gofman : ntdll: Always try searching apiset DLLs in the default directories.

by Alexandre Julliard

Module: wine Branch: master Commit: aee405e2cb045458a0c23fad90a5721e282c23a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aee405e2cb045458a0c23fad… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 20 18:07:33 2021 +0300 ntdll: Always try searching apiset DLLs in the default directories. This is a temporary workaround until we have a correct apisets implementation. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 23 +++++++++++++++++++++++ dlls/ntdll/loader.c | 12 ++++++++++++ 2 files changed, 35 insertions(+) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 2ee23595f55..8ec3a5433ee 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -466,6 +466,7 @@ static void testLoadLibraryEx(void) static void test_LoadLibraryEx_search_flags(void) { + static const char apiset_dll[] = "api-ms-win-shcore-obsolete-l1-1-0.dll"; static const struct { int add_dirs[4]; @@ -684,6 +685,28 @@ static void test_LoadLibraryEx_search_flags(void) for (k = 0; tests[j].add_dirs[k]; k++) pRemoveDllDirectory( cookies[k] ); } + mod = GetModuleHandleA( apiset_dll ); + if (mod) + { + win_skip( "%s already referenced, skipping test.\n", apiset_dll ); + } + else + { + mod = LoadLibraryA( apiset_dll ); + if (mod) + { + FreeLibrary(mod); + mod = LoadLibraryExA( apiset_dll, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + ok( !!mod, "Got NULL module, error %u.\n", GetLastError() ); + ok( !!GetModuleHandleA( apiset_dll ), "Got NULL handle.\n" ); + ret = FreeLibrary( mod ); + ok( ret, "FreeLibrary failed, error %u.\n", GetLastError() ); + } + else + { + win_skip( "%s not found, skipping test.\n", apiset_dll ); + } + } done: for (i = 1; i <= 6; i++) { diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c8f3d83947f..362e1c66be5 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2905,6 +2905,16 @@ done: return status; } +/*********************************************************************** + * is_apiset_dll_name + * + */ +static BOOL is_apiset_dll_name( const WCHAR *name ) +{ + static const WCHAR name_prefix[] = L"api-ms-win-"; + + return !wcsnicmp( name, name_prefix, ARRAY_SIZE(name_prefix) - 1 ); +} /*********************************************************************** * find_dll_file @@ -2948,6 +2958,8 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, UNI if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH) { status = search_dll_file( load_path, libname, nt_name, pwm, mapping, image_info, id ); + if (status == STATUS_DLL_NOT_FOUND && load_path && is_apiset_dll_name( libname )) + status = search_dll_file( NULL, libname, nt_name, pwm, mapping, image_info, id ); if (status == STATUS_DLL_NOT_FOUND) status = find_builtin_without_file( libname, nt_name, pwm, mapping, image_info, id ); }

2 years, 4 months

← Newer
1
2
3
4
5
6
7
8
...
57
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2021