wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : comctl32/tests: Use correct integral type.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 330261b9b4010fb94235721e2c49813f51cad692 URL: https://source.winehq.org/git/wine.git/?a=commit;h=330261b9b4010fb94235721e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:26:47 2022 +0100 comctl32/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/pager.c | 2 +- dlls/comctl32/tests/rebar.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index a4d6a658cda..2ce964f8a27 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -1210,7 +1210,7 @@ static void test_wm_notify(void) DONT_CONVERT_SEND | DONT_CONVERT_RECEIVE}, {&nmtbr, sizeof(nmtbr), NULL, 0, (WCHAR **)&nmtbr.tbButton.iString, NULL, TBN_RESTORE, TBN_RESTORE, DONT_CONVERT_SEND | DONT_CONVERT_RECEIVE}, - {&nmtbdi, sizeof(nmtbdi), &nmtbdi.dwMask, TBNF_TEXT, &nmtbdi.pszText, &nmtbdi.cchText, TBN_GETDISPINFOW, + {&nmtbdi, sizeof(nmtbdi), (UINT*)&nmtbdi.dwMask, TBNF_TEXT, &nmtbdi.pszText, &nmtbdi.cchText, TBN_GETDISPINFOW, TBN_GETDISPINFOW, DONT_CONVERT_SEND | DONT_CONVERT_RECEIVE}, {&nmtb, sizeof(nmtb), NULL, 0, &nmtb.pszText, &nmtb.cchText, TBN_GETBUTTONINFOW, TBN_GETBUTTONINFOA, SEND_EMPTY_IF_NULL | CONVERT_SEND | CONVERT_RECEIVE}, diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 63449d4d457..e868198b4d8 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -195,7 +195,7 @@ static int string_width(const CHAR *s) { typedef struct { RECT rc; - DWORD fStyle; + UINT fStyle; UINT cx; } rbband_result_t;

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 58d4037290f73e048afe7592a1f293c927171f80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58d4037290f73e048afe7592… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Feb 24 19:15:46 2022 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/po/fi.po b/po/fi.po index b121eaa546f..41e57561142 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6950,54 +6950,40 @@ msgid "This network connection does not exist.\n" msgstr "Tätä verkkoyhteyttä ei ole.\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "Keskeytysaikana virheellinen.\n" +msgstr "Kutsu keskeytetty.\n" #: dlls/kernel32/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "Kahva ei kelpaa.\n" +msgstr "Tiedoston kahva ei kelpaa.\n" #: dlls/kernel32/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "Verkko-osoite ei kelpaa.\n" +msgstr "Osoittimen osoite ei kelpaa.\n" #: dlls/kernel32/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "Nimi ei kelpaa.\n" +msgstr "Argumentti ei kelpaa.\n" #: dlls/kernel32/winerror.mc:3778 msgid "Connection reset by peer.\n" msgstr "Vastapuoli nollasi yhteyden.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "Pistettä ei löydy.\n" +msgstr "Isäntää ei löydy.\n" #: dlls/kernel32/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "Attribuuttia ei löydy.\n" +msgstr "Isäntää ei löydy (ei-autoritatiivinen).\n" #: dlls/kernel32/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "On tapahtunut peruuttamaton virhe.\n" +msgstr "Peruuttamaton virhe.\n" #: dlls/kernel32/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "Nimi kelpaa, ei tietuetta.\n" #: dlls/kernel32/winerror.mc:3817 msgid "Not implemented.\n" @@ -18357,8 +18343,8 @@ msgid "" msgstr "" "Jos tätä ongelmaa ei esiinny Windowsin kanssa eikä sitä ole vielä " "raportoitu, voit tallentaa yksityiskohtaisemmat tiedot tiedostoon Tallenna " -"nimellä -kohdassa ja sitten <a href=\"https://wiki.winehq.org/Bugs" -"\">lähettää virheraportin</a> ja liittää tiedoston raporttiin." +"nimellä -kohdassa ja sitten <a href=\"https://wiki.winehq.org/" +"Bugs\">lähettää virheraportin</a> ja liittää tiedoston raporttiin." #: programs/winedbg/winedbg.rc:40 msgid ""

1 0

Rémi Bernon : dinput/tests: Add tests for IGamepadStatics_get_Gamepads.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 3c2bb0f87c48faf17adc5f2ae8a1229043b7ee70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c2bb0f87c48faf17adc5f2a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 23 17:49:39 2022 +0100 dinput/tests: Add tests for IGamepadStatics_get_Gamepads. Showing that HID gamepads aren't listed as WGI gamepads. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick8.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index d98faf7d3ee..f01bed08030 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -3271,11 +3271,14 @@ static void test_windows_gaming_input(void) .InputReportByteLength = 8, }; static const WCHAR *controller_class_name = RuntimeClass_Windows_Gaming_Input_RawGameController; + static const WCHAR *gamepad_class_name = RuntimeClass_Windows_Gaming_Input_Gamepad; IRawGameController *raw_controller, *tmp_raw_controller; IVectorView_RawGameController *controllers_view; IRawGameControllerStatics *controller_statics; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + IVectorView_Gamepad *gamepads_view; + IGamepadStatics *gamepad_statics; IGameController *game_controller; UINT32 size; HSTRING str; @@ -3331,6 +3334,21 @@ static void test_windows_gaming_input(void) goto done; } + /* HID gamepads aren't exposed as WGI gamepads on Windows */ + + hr = WindowsCreateString( gamepad_class_name, wcslen( gamepad_class_name ), &str ); + ok( hr == S_OK, "WindowsCreateString returned %#lx\n", hr ); + hr = RoGetActivationFactory( str, &IID_IGamepadStatics, (void **)&gamepad_statics ); + ok( hr == S_OK, "RoGetActivationFactory returned %#lx\n", hr ); + WindowsDeleteString( str ); + hr = IGamepadStatics_get_Gamepads( gamepad_statics, &gamepads_view ); + ok( hr == S_OK, "get_Gamepads returned %#lx\n", hr ); + hr = IVectorView_Gamepad_get_Size( gamepads_view, &size ); + ok( hr == S_OK, "get_Size returned %#lx\n", hr ); + ok( size == 0, "got size %u\n", size ); + IVectorView_Gamepad_Release( gamepads_view ); + IGamepadStatics_Release( gamepad_statics ); + check_runtimeclass( raw_controller, RuntimeClass_Windows_Gaming_Input_RawGameController ); check_interface( raw_controller, &IID_IUnknown, TRUE ); check_interface( raw_controller, &IID_IInspectable, TRUE );

1 0

Rémi Bernon : dinput/tests: Add tests for IRawGameControllerStatics_FromGameController.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: d337f6fbce33947e676b2fa486b7d6f89bf705b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d337f6fbce33947e676b2fa4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 23 17:49:38 2022 +0100 dinput/tests: Add tests for IRawGameControllerStatics_FromGameController. And check the RawGameController IGameController interface. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick8.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 959f91aae78..d98faf7d3ee 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -3272,10 +3272,11 @@ static void test_windows_gaming_input(void) }; static const WCHAR *controller_class_name = RuntimeClass_Windows_Gaming_Input_RawGameController; + IRawGameController *raw_controller, *tmp_raw_controller; IVectorView_RawGameController *controllers_view; IRawGameControllerStatics *controller_statics; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; - IRawGameController *raw_controller; + IGameController *game_controller; UINT32 size; HSTRING str; HRESULT hr; @@ -3339,7 +3340,26 @@ static void test_windows_gaming_input(void) check_interface( raw_controller, &IID_IGameController, TRUE ); check_interface( raw_controller, &IID_IGamepad, FALSE ); + hr = IRawGameController_QueryInterface( raw_controller, &IID_IGameController, (void **)&game_controller ); + ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); + + check_runtimeclass( game_controller, RuntimeClass_Windows_Gaming_Input_RawGameController ); + check_interface( game_controller, &IID_IUnknown, TRUE ); + check_interface( game_controller, &IID_IInspectable, TRUE ); + check_interface( game_controller, &IID_IAgileObject, TRUE ); + check_interface( game_controller, &IID_IRawGameController, TRUE ); + check_interface( game_controller, &IID_IRawGameController2, TRUE ); + check_interface( game_controller, &IID_IGameController, TRUE ); + check_interface( game_controller, &IID_IGamepad, FALSE ); + + hr = IRawGameControllerStatics_FromGameController( controller_statics, game_controller, &tmp_raw_controller ); + ok( hr == S_OK, "FromGameController returned %#lx\n", hr ); + ok( tmp_raw_controller == raw_controller, "got unexpected IGameController interface\n" ); + IRawGameController_Release( tmp_raw_controller ); + + IGameController_Release( game_controller ); IRawGameController_Release( raw_controller ); + IRawGameControllerStatics_Release( controller_statics ); done:

1 0

Rémi Bernon : dinput/tests: Add some windows.gaming.input device tests.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: d0248b6c6a673e359106e21863df3fc25b817616 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0248b6c6a673e359106e218… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 23 17:49:37 2022 +0100 dinput/tests: Add some windows.gaming.input device tests. Only works with an XBox gamepad, looks like DInput gamepads aren't exposed as WGI gamepads. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick8.c | 170 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 9c700c00971..959f91aae78 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -31,11 +31,21 @@ #include "dinputd.h" #include "devguid.h" #include "mmsystem.h" +#include "roapi.h" +#include "unknwn.h" +#include "winstring.h" #include "wine/hid.h" #include "dinput_test.h" +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Devices_Haptics +#define WIDL_using_Windows_Gaming_Input +#include "windows.gaming.input.h" + struct check_objects_todos { BOOL type; @@ -3181,6 +3191,165 @@ done: return device != NULL; } +#define check_interface( a, b, c ) check_interface_( __LINE__, a, b, c ) +static void check_interface_( unsigned int line, void *iface_ptr, REFIID iid, BOOL supported ) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected; + IUnknown *unk; + + expected = supported ? S_OK : E_NOINTERFACE; + hr = IUnknown_QueryInterface( iface, iid, (void **)&unk ); + ok_ (__FILE__, line)( hr == expected, "got hr %#lx, expected %#lx.\n", hr, expected ); + if (SUCCEEDED(hr)) IUnknown_Release( unk ); +} + +#define check_runtimeclass( a, b ) check_runtimeclass_( __LINE__, (IInspectable *)a, b ) +static void check_runtimeclass_( int line, IInspectable *inspectable, const WCHAR *class_name ) +{ + const WCHAR *buffer; + UINT32 length; + HSTRING str; + HRESULT hr; + + hr = IInspectable_GetRuntimeClassName( inspectable, &str ); + ok_ (__FILE__, line)( hr == S_OK, "GetRuntimeClassName returned %#lx\n", hr ); + buffer = WindowsGetStringRawBuffer( str, &length ); + ok_ (__FILE__, line)( !wcscmp( buffer, class_name ), "got class name %s\n", debugstr_w(buffer) ); + WindowsDeleteString( str ); +} + +static void test_windows_gaming_input(void) +{ +#include "psh_hid_macros.h" + const unsigned char report_desc[] = { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_GAMEPAD), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_GAMEPAD), + COLLECTION(1, Physical), + USAGE(1, HID_USAGE_GENERIC_X), + USAGE(1, HID_USAGE_GENERIC_Y), + USAGE(1, HID_USAGE_GENERIC_RX), + USAGE(1, HID_USAGE_GENERIC_RY), + USAGE(1, HID_USAGE_GENERIC_Z), + USAGE(1, HID_USAGE_GENERIC_RZ), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 127), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 127), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 6), + INPUT(1, Data|Var|Abs), + + USAGE(1, HID_USAGE_GENERIC_HATSWITCH), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 8), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 8), + REPORT_SIZE(1, 4), + REPORT_COUNT(1, 1), + INPUT(1, Data|Var|Abs|Null), + + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 1), + USAGE_MAXIMUM(1, 12), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 12), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + END_COLLECTION, + }; +#include "pop_hid_macros.h" + + static const HIDP_CAPS hid_caps = + { + .InputReportByteLength = 8, + }; + static const WCHAR *controller_class_name = RuntimeClass_Windows_Gaming_Input_RawGameController; + + IVectorView_RawGameController *controllers_view; + IRawGameControllerStatics *controller_statics; + WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + IRawGameController *raw_controller; + UINT32 size; + HSTRING str; + HRESULT hr; + + GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); + GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); + SetCurrentDirectoryW( tempdir ); + + cleanup_registry_keys(); + + hr = RoInitialize( RO_INIT_MULTITHREADED ); + ok( hr == RPC_E_CHANGED_MODE, "RoInitialize returned %#lx\n", hr ); + + hr = WindowsCreateString( controller_class_name, wcslen( controller_class_name ), &str ); + ok( hr == S_OK, "WindowsCreateString returned %#lx\n", hr ); + hr = RoGetActivationFactory( str, &IID_IRawGameControllerStatics, (void **)&controller_statics ); + ok( hr == S_OK || broken( hr == REGDB_E_CLASSNOTREG ), "RoGetActivationFactory returned %#lx\n", hr ); + WindowsDeleteString( str ); + + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip( "%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w( controller_class_name ) ); + goto done; + } + + hr = IRawGameControllerStatics_get_RawGameControllers( controller_statics, &controllers_view ); + ok( hr == S_OK, "get_RawGameControllers returned %#lx\n", hr ); + hr = IVectorView_RawGameController_get_Size( controllers_view, &size ); + ok( hr == S_OK, "get_Size returned %#lx\n", hr ); + ok( size == 0, "got size %u\n", size ); + + if (!dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 )) goto done; + + hr = IVectorView_RawGameController_get_Size( controllers_view, &size ); + ok( hr == S_OK, "get_Size returned %#lx\n", hr ); + ok( size == 0, "got size %u\n", size ); + IVectorView_RawGameController_Release( controllers_view ); + + hr = IRawGameControllerStatics_get_RawGameControllers( controller_statics, &controllers_view ); + ok( hr == S_OK, "get_RawGameControllers returned %#lx\n", hr ); + hr = IVectorView_RawGameController_get_Size( controllers_view, &size ); + ok( hr == S_OK, "get_Size returned %#lx\n", hr ); + todo_wine + ok( size == 1, "got size %u\n", size ); + hr = IVectorView_RawGameController_GetAt( controllers_view, 0, &raw_controller ); + todo_wine + ok( hr == S_OK, "GetAt returned %#lx\n", hr ); + IVectorView_RawGameController_Release( controllers_view ); + if (hr != S_OK) + { + IRawGameControllerStatics_Release( controller_statics ); + goto done; + } + + check_runtimeclass( raw_controller, RuntimeClass_Windows_Gaming_Input_RawGameController ); + check_interface( raw_controller, &IID_IUnknown, TRUE ); + check_interface( raw_controller, &IID_IInspectable, TRUE ); + check_interface( raw_controller, &IID_IAgileObject, TRUE ); + check_interface( raw_controller, &IID_IRawGameController, TRUE ); + check_interface( raw_controller, &IID_IRawGameController2, TRUE ); + check_interface( raw_controller, &IID_IGameController, TRUE ); + check_interface( raw_controller, &IID_IGamepad, FALSE ); + + IRawGameController_Release( raw_controller ); + IRawGameControllerStatics_Release( controller_statics ); + +done: + pnp_driver_stop(); + cleanup_registry_keys(); + SetCurrentDirectoryW( cwd ); + + RoUninitialize(); +} + START_TEST( joystick8 ) { if (!dinput_test_init()) return; @@ -3200,6 +3369,7 @@ START_TEST( joystick8 ) test_simple_joystick( 0x800 ); test_driving_wheel_axes(); + test_windows_gaming_input(); } CoUninitialize();

1 0

Rémi Bernon : dinput/tests: Add some windows.gaming.input hotplug tests.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 7e7c0ed9c5fc1482e2ff26a791a5e7dab6435097 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e7c0ed9c5fc1482e2ff26a7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 23 17:49:36 2022 +0100 dinput/tests: Add some windows.gaming.input hotplug tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/Makefile.in | 2 +- dlls/dinput/tests/hotplug.c | 244 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 245 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e7c0ed9c5fc1482e2ff…

1 0

Huw Davies : winealsa: Move get_current_padding to the unixlib.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 45f1cbe476b27443d62cb73bb085cb89784b9648 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45f1cbe476b27443d62cb73b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 23 09:08:23 2022 +0000 winealsa: Move get_current_padding to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsa.c | 14 ++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 12 +++++------- dlls/winealsa.drv/unixlib.h | 8 ++++++++ 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index c40c87bca31..c73490ebfe6 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1271,6 +1271,19 @@ static NTSTATUS get_latency(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_current_padding(void *args) +{ + struct get_current_padding_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + /* padding is solely updated at callback time in shared mode */ + *params->padding = stream->held_frames; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1280,4 +1293,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_mix_format, get_buffer_size, get_latency, + get_current_padding, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index b8fc6802e28..a4ab0e179d1 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -871,7 +871,7 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, UINT32 *out) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct get_current_padding_params params; TRACE("(%p)->(%p)\n", This, out); @@ -881,16 +881,14 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - alsa_lock(stream); + params.stream = This->stream; + params.padding = out; - /* padding is solely updated at callback time in shared mode */ - *out = stream->held_frames; - - alsa_unlock(stream); + ALSA_CALL(get_current_padding, &params); TRACE("pad: %u\n", *out); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index e51d3d3d510..2484fca8c90 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -122,6 +122,13 @@ struct get_latency_params REFERENCE_TIME *latency; }; +struct get_current_padding_params +{ + struct alsa_stream *stream; + HRESULT result; + UINT32 *padding; +}; + enum alsa_funcs { alsa_get_endpoint_ids, @@ -131,6 +138,7 @@ enum alsa_funcs alsa_get_mix_format, alsa_get_buffer_size, alsa_get_latency, + alsa_get_current_padding, }; extern unixlib_handle_t alsa_handle;

1 0

Huw Davies : winealsa: Move get_latency to the unixlib.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 5516e83f9aceaa7887dc1d2cb207dafc7c56501f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5516e83f9aceaa7887dc1d2c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 23 09:08:22 2022 +0000 winealsa: Move get_latency to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsa.c | 22 ++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 20 +++++--------------- dlls/winealsa.drv/unixlib.h | 8 ++++++++ 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index cc0f9166d1a..c40c87bca31 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1250,6 +1250,27 @@ static NTSTATUS get_buffer_size(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_latency(void *args) +{ + struct get_latency_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + /* Hide some frames in the ALSA buffer. Allows us to return GetCurrentPadding=0 + * yet have enough data left to play (as if it were in native's mixer). Add: + * + mmdevapi_period such that at the end of it, ALSA still has data; + * + EXTRA_SAFE (~4ms) to allow for late callback invocation / fluctuation; + * + alsa_period such that ALSA always has at least one period to play. */ + if(stream->flow == eRender) + *params->latency = muldiv(stream->hidden_frames, 10000000, stream->fmt->nSamplesPerSec); + else + *params->latency = muldiv(stream->alsa_period_frames, 10000000, stream->fmt->nSamplesPerSec) + + stream->mmdev_period_rt; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1258,4 +1279,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = is_format_supported, get_mix_format, get_buffer_size, + get_latency, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 46fd2b3aef5..b8fc6802e28 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -849,7 +849,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, REFERENCE_TIME *latency) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct get_latency_params params; TRACE("(%p)->(%p)\n", This, latency); @@ -859,22 +859,12 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - alsa_lock(stream); - - /* Hide some frames in the ALSA buffer. Allows us to return GetCurrentPadding=0 - * yet have enough data left to play (as if it were in native's mixer). Add: - * + mmdevapi_period such that at the end of it, ALSA still has data; - * + EXTRA_SAFE (~4ms) to allow for late callback invocation / fluctuation; - * + alsa_period such that ALSA always has at least one period to play. */ - if(stream->flow == eRender) - *latency = MulDiv(stream->hidden_frames, 10000000, stream->fmt->nSamplesPerSec); - else - *latency = MulDiv(stream->alsa_period_frames, 10000000, stream->fmt->nSamplesPerSec) - + stream->mmdev_period_rt; + params.stream = This->stream; + params.latency = latency; - alsa_unlock(stream); + ALSA_CALL(get_latency, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index e079b88cbde..e51d3d3d510 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -115,6 +115,13 @@ struct get_buffer_size_params UINT32 *size; }; +struct get_latency_params +{ + struct alsa_stream *stream; + HRESULT result; + REFERENCE_TIME *latency; +}; + enum alsa_funcs { alsa_get_endpoint_ids, @@ -123,6 +130,7 @@ enum alsa_funcs alsa_is_format_supported, alsa_get_mix_format, alsa_get_buffer_size, + alsa_get_latency, }; extern unixlib_handle_t alsa_handle;

1 0

Huw Davies : winealsa: Move get_buffer_size to the unixlib.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 413b3c59e5a401797a584cd4ead127c5b697d789 URL: https://source.winehq.org/git/wine.git/?a=commit;h=413b3c59e5a401797a584cd4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 23 09:08:21 2022 +0000 winealsa: Move get_buffer_size to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsa.c | 31 +++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 11 +++++------ dlls/winealsa.drv/unixlib.h | 8 ++++++++ 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index f79a655780c..cc0f9166d1a 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -160,6 +160,24 @@ static int muldiv( int a, int b, int c ) return ret; } +static void alsa_lock(struct alsa_stream *stream) +{ + pthread_mutex_lock(&stream->lock); +} + +static void alsa_unlock(struct alsa_stream *stream) +{ + pthread_mutex_unlock(&stream->lock); +} + +static NTSTATUS alsa_unlock_result(struct alsa_stream *stream, + HRESULT *result, HRESULT value) +{ + *result = value; + alsa_unlock(stream); + return STATUS_SUCCESS; +} + static BOOL alsa_try_open(const char *devnode, EDataFlow flow) { snd_pcm_t *handle; @@ -1220,6 +1238,18 @@ exit: return STATUS_SUCCESS; } +static NTSTATUS get_buffer_size(void *args) +{ + struct get_buffer_size_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + *params->size = stream->bufsize_frames; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1227,4 +1257,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = release_stream, is_format_supported, get_mix_format, + get_buffer_size, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index a1477dbe850..46fd2b3aef5 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -827,7 +827,7 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, UINT32 *out) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct get_buffer_size_params params; TRACE("(%p)->(%p)\n", This, out); @@ -837,13 +837,12 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - alsa_lock(stream); - - *out = stream->bufsize_frames; + params.stream = This->stream; + params.size = out; - alsa_unlock(stream); + ALSA_CALL(get_buffer_size, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 771f189bca4..e079b88cbde 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -108,6 +108,13 @@ struct get_mix_format_params HRESULT result; }; +struct get_buffer_size_params +{ + struct alsa_stream *stream; + HRESULT result; + UINT32 *size; +}; + enum alsa_funcs { alsa_get_endpoint_ids, @@ -115,6 +122,7 @@ enum alsa_funcs alsa_release_stream, alsa_is_format_supported, alsa_get_mix_format, + alsa_get_buffer_size, }; extern unixlib_handle_t alsa_handle;

1 0

Zebediah Figura : wined3d: Accelerate texture DISCARD maps as well.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 125f5b72100d2a0f82f118b857349ff6915a661f URL: https://source.winehq.org/git/wine.git/?a=commit;h=125f5b72100d2a0f82f118b8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 23 20:21:42 2022 -0600 wined3d: Accelerate texture DISCARD maps as well. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 76 +++++++++++++++++++++++++++-------------------- dlls/wined3d/adapter_vk.c | 54 +++++++++++++++++++-------------- dlls/wined3d/cs.c | 9 +++--- dlls/wined3d/texture.c | 33 ++++++++++++++++++++ 4 files changed, 113 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=125f5b72100d2a0f82f1…

1 0

Jump to page:

2025

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 February 2022