- Wine-Devel - list.winehq.org

[PATCH 1/4] winemac.drv: Simplify control flow in copy_display_modes.
by Tim Clem March 22, 2022

March 22, 2022

Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- dlls/winemac.drv/display.c | 107 ++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 55 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 2ac8f32fa18a..a54e78c22376 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -620,74 +620,71 @@ static CFArrayRef copy_display_modes(CGDirectDisplayID display) count = CFArrayGetCount(modes); for (i = 0; i < count; i++) { - BOOL better = TRUE; - CGDisplayModeRef new_mode = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); - BOOL new_is_original = display_mode_matches_descriptor(new_mode, desc); + CFStringRef pixel_encoding; + size_t width_points, height_points; + size_t old_width_pixels, old_height_pixels, new_width_pixels, new_height_pixels; + BOOL old_size_same, new_size_same; + CGDisplayModeRef old_mode, new_mode = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); + BOOL old_is_original, new_is_original = display_mode_matches_descriptor(new_mode, desc); CFDictionaryRef key = create_mode_dict(new_mode, new_is_original); /* If a given mode is the user's default, then always list it in preference to any similar modes that may exist. */ if (new_is_original) - better = TRUE; - else - { - CFStringRef pixel_encoding = CGDisplayModeCopyPixelEncoding(new_mode); - CGDisplayModeRef old_mode; + goto better; - if (pixel_encoding) + pixel_encoding = CGDisplayModeCopyPixelEncoding(new_mode); + if (pixel_encoding) + { + BOOL bpp30 = CFEqual(pixel_encoding, CFSTR(kIO30BitDirectPixels)); + CFRelease(pixel_encoding); + if (bpp30) { - BOOL bpp30 = CFEqual(pixel_encoding, CFSTR(kIO30BitDirectPixels)); - CFRelease(pixel_encoding); - if (bpp30) - { - /* This is an odd pixel encoding. It seems it's only returned - when using kCGDisplayShowDuplicateLowResolutionModes. It's - 32bpp in terms of the actual raster layout, but it's 10 - bits per component. I think that no Windows program is - likely to need it and they will probably be confused by it. - Skip it. */ - CFRelease(key); - continue; - } + /* This is an odd pixel encoding. It seems it's only returned + when using kCGDisplayShowDuplicateLowResolutionModes. It's + 32bpp in terms of the actual raster layout, but it's 10 + bits per component. I think that no Windows program is + likely to need it and they will probably be confused by it. + Skip it. */ + goto next; } + } - old_mode = (CGDisplayModeRef)CFDictionaryGetValue(modes_by_size, key); - if (old_mode) - { - BOOL old_is_original = display_mode_matches_descriptor(old_mode, desc); + old_mode = (CGDisplayModeRef)CFDictionaryGetValue(modes_by_size, key); + if (!old_mode) + goto better; - if (old_is_original) - better = FALSE; - else - { - /* Otherwise, prefer a mode whose pixel size equals its point size over one which - is scaled. */ - size_t width_points = CGDisplayModeGetWidth(new_mode); - size_t height_points = CGDisplayModeGetHeight(new_mode); - size_t new_width_pixels = CGDisplayModeGetPixelWidth(new_mode); - size_t new_height_pixels = CGDisplayModeGetPixelHeight(new_mode); - size_t old_width_pixels = CGDisplayModeGetPixelWidth(old_mode); - size_t old_height_pixels = CGDisplayModeGetPixelHeight(old_mode); - BOOL new_size_same = (new_width_pixels == width_points && new_height_pixels == height_points); - BOOL old_size_same = (old_width_pixels == width_points && old_height_pixels == height_points); - - if (new_size_same && !old_size_same) - better = TRUE; - else if (!new_size_same && old_size_same) - better = FALSE; - else - { - /* Otherwise, prefer the mode with the smaller pixel size. */ - if (old_width_pixels < new_width_pixels || old_height_pixels < new_height_pixels) - better = FALSE; - } - } - } + /* Prefer the original mode over any similar mode. */ + old_is_original = display_mode_matches_descriptor(old_mode, desc); + if (old_is_original) + goto next; + + /* Otherwise, prefer a mode whose pixel size equals its point size over one which + is scaled. */ + width_points = CGDisplayModeGetWidth(new_mode); + height_points = CGDisplayModeGetHeight(new_mode); + new_width_pixels = CGDisplayModeGetPixelWidth(new_mode); + new_height_pixels = CGDisplayModeGetPixelHeight(new_mode); + old_width_pixels = CGDisplayModeGetPixelWidth(old_mode); + old_height_pixels = CGDisplayModeGetPixelHeight(old_mode); + new_size_same = (new_width_pixels == width_points && new_height_pixels == height_points); + old_size_same = (old_width_pixels == width_points && old_height_pixels == height_points); + + if (new_size_same && !old_size_same) + goto better; + else if (!new_size_same && old_size_same) + goto next; + else + { + /* Otherwise, prefer the mode with the smaller pixel size. */ + if (old_width_pixels < new_width_pixels || old_height_pixels < new_height_pixels) + goto next; } - if (better) - CFDictionarySetValue(modes_by_size, key, new_mode); +better: + CFDictionarySetValue(modes_by_size, key, new_mode); +next: CFRelease(key); } -- 2.34.1

4 7

[PATCH] comctl32/tests: Use correct width and height in create_bitmap() helper.
by Zhiyi Zhang March 22, 2022

March 22, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index e7e3582ec35..8033a33e9cd 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -948,8 +948,8 @@ static HBITMAP create_bitmap(INT cx, INT cy, COLORREF color, const char *comment memset(&bmi, 0, sizeof(bmi)); bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); - bmi.bmiHeader.biHeight = cx; - bmi.bmiHeader.biWidth = cy; + bmi.bmiHeader.biWidth = cx; + bmi.bmiHeader.biHeight = cy; bmi.bmiHeader.biBitCount = 24; bmi.bmiHeader.biPlanes = 1; bmi.bmiHeader.biCompression = BI_RGB; @@ -1156,7 +1156,7 @@ static void test_imagelist_storage(void) himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 0, 32); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 1, 32, ILC_COLOR24, "init 0 grow 32"); - hbm = create_bitmap(BMP_CX * 9, BMP_CX, 0, "9"); + hbm = create_bitmap(BMP_CX, BMP_CX * 9, 0, "9"); ret = pImageList_Add(himl, hbm, NULL); ok(ret == 0, "ImageList_Add returned %d, expected 0\n", ret); check_iml_data(himl, BMP_CX, BMP_CX, 1, 34, 32, ILC_COLOR24, "add 1 x 9"); @@ -1167,7 +1167,7 @@ static void test_imagelist_storage(void) himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 4, 4); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, ILC_COLOR24, "init 4 grow 4"); - hbm = create_bitmap(BMP_CX, BMP_CX * 9, 0, "9"); + hbm = create_bitmap(BMP_CX * 9, BMP_CX, 0, "9"); ret = pImageList_Add(himl, hbm, NULL); ok(ret == 0, "ImageList_Add returned %d, expected 0\n", ret); check_iml_data(himl, BMP_CX, BMP_CX, 9, 15, 4, ILC_COLOR24, "add 9 x 1"); -- 2.32.0

1 0

[PATCH v2 3/3] sc: Don't silently fail when something doesn't work as expected in a few more places.
by Dmitry Timoshkov March 22, 2022

March 22, 2022

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/sc/sc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index a925f2cc999..5202980f32f 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -295,7 +295,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (parse_failure_params( argc - 3, argv + 3, &sfa )) { ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_FAILURE_ACTIONS, &sfa ); - if (!ret) WINE_TRACE("failed to set service failure actions %lu\n", GetLastError()); + if (!ret) WINE_ERR("failed to set service failure actions %lu\n", GetLastError()); HeapFree( GetProcessHeap(), 0, sfa.lpsaActions ); } else @@ -310,7 +310,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (service) { ret = DeleteService( service ); - if (!ret) WINE_TRACE("failed to delete service %lu\n", GetLastError()); + if (!ret) WINE_ERR("failed to delete service %lu\n", GetLastError()); CloseServiceHandle( service ); } else WINE_ERR("failed to open service %lu\n", GetLastError()); @@ -321,7 +321,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (service) { ret = StartServiceW( service, argc - 3, argv + 3 ); - if (!ret) WINE_TRACE("failed to start service %lu\n", GetLastError()); + if (!ret) WINE_ERR("failed to start service %lu\n", GetLastError()); else query_service( manager, argv[2] ); CloseServiceHandle( service ); } @@ -333,7 +333,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (service) { ret = ControlService( service, SERVICE_CONTROL_STOP, &status ); - if (!ret) WINE_TRACE("failed to stop service %lu\n", GetLastError()); + if (!ret) WINE_ERR("failed to stop service %lu\n", GetLastError()); else query_service( manager, argv[2] ); CloseServiceHandle( service ); } -- 2.35.1

1 0

[PATCH v2 2/3] sc: Print service status after 'start' and 'stop' commands.
by Dmitry Timoshkov March 22, 2022

March 22, 2022

Like Windows 10 sc.exe does. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/sc/sc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 50451accf73..a925f2cc999 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -322,6 +322,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) { ret = StartServiceW( service, argc - 3, argv + 3 ); if (!ret) WINE_TRACE("failed to start service %lu\n", GetLastError()); + else query_service( manager, argv[2] ); CloseServiceHandle( service ); } else WINE_ERR("failed to open service %lu\n", GetLastError()); @@ -333,6 +334,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) { ret = ControlService( service, SERVICE_CONTROL_STOP, &status ); if (!ret) WINE_TRACE("failed to stop service %lu\n", GetLastError()); + else query_service( manager, argv[2] ); CloseServiceHandle( service ); } else WINE_ERR("failed to open service %lu\n", GetLastError()); -- 2.35.1

1 0

[PATCH v2 1/3] sc: Add support for the 'query' command.
by Dmitry Timoshkov March 22, 2022

March 22, 2022

Output is modelled on behaviour observed under the Windows 10. v2: Fix the typos. Add a helper to use in the next patch. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/sc/sc.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 4e642874237..50451accf73 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -175,6 +175,58 @@ static void usage( void ) exit( 1 ); } +static const WCHAR *service_type_string( DWORD type ) +{ + switch (type) + { + case SERVICE_WIN32_OWN_PROCESS: return L"WIN32_OWN_PROCESS"; + case SERVICE_WIN32_SHARE_PROCESS: return L"WIN32_SHARE_PROCESS"; + case SERVICE_WIN32: return L"WIN32"; + default: return L""; + } +} + +static const WCHAR *service_state_string( DWORD state ) +{ + static const WCHAR * const state_str[] = { L"", L"STOPPED", L"START_PENDING", + L"STOP_PENDING", L"RUNNING", L"CONTINUE_PENDING", L"PAUSE_PENDING", L"PAUSED" }; + + if (state <= ARRAY_SIZE( state_str )) return state_str[ state ]; + return L""; +} + +static BOOL query_service( SC_HANDLE manager, const WCHAR *name ) +{ + SC_HANDLE service; + SERVICE_STATUS status; + BOOL ret = FALSE; + + service = OpenServiceW( manager, name, SERVICE_QUERY_STATUS ); + if (service) + { + ret = QueryServiceStatus( service, &status ); + if (!ret) + WINE_ERR("failed to query service status %lu\n", GetLastError()); + else + printf( "SERVICE_NAME: %ws\n" + " TYPE : %lx %ws\n" + " STATE : %lx %ws\n" + " WIN32_EXIT_CODE : %lu (0x%lx)\n" + " SERVICE_EXIT_CODE : %lu (0x%lx)\n" + " CHECKPOINT : 0x%lx\n" + " WAIT_HINT : 0x%lx\n", + name, status.dwServiceType, service_type_string( status.dwServiceType ), + status.dwCurrentState, service_state_string( status.dwCurrentState ), + status.dwWin32ExitCode, status.dwWin32ExitCode, + status.dwServiceSpecificExitCode, status.dwServiceSpecificExitCode, + status.dwCheckPoint, status.dwWaitHint ); + CloseServiceHandle( service ); + } + else WINE_ERR("failed to open service %lu\n", GetLastError()); + + return ret; +} + int __cdecl wmain( int argc, const WCHAR *argv[] ) { SC_HANDLE manager, service; @@ -285,6 +337,10 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_ERR("failed to open service %lu\n", GetLastError()); } + else if (!wcsicmp( argv[1], L"query" )) + { + ret = query_service( manager, argv[2] ); + } else if (!wcsicmp( argv[1], L"sdset" )) { WINE_FIXME("SdSet command not supported, faking success\n"); -- 2.35.1

1 0

[PATCH vkd3d 1/8] tests: Add support for running shader tests with a custom vertex shader.
by Zebediah Figura March 22, 2022

March 22, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- tests/shader_runner.c | 15 +++++++++++++++ tests/shader_runner.h | 1 + tests/shader_runner_d3d11.c | 2 +- tests/shader_runner_d3d12.c | 38 +++++++++++++++++++++++++------------ 4 files changed, 43 insertions(+), 13 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 910e6ecdc..033fee0a6 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -80,6 +80,7 @@ enum parse_state STATE_SAMPLER, STATE_SHADER_INVALID_PIXEL, STATE_SHADER_PIXEL, + STATE_SHADER_VERTEX, STATE_TEXTURE, STATE_TEST, }; @@ -501,6 +502,14 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const shader_source_size = 0; break; + case STATE_SHADER_VERTEX: + free(runner->vs_source); + runner->vs_source = shader_source; + shader_source = NULL; + shader_source_len = 0; + shader_source_size = 0; + break; + case STATE_SHADER_INVALID_PIXEL: { ID3D10Blob *blob = NULL, *errors = NULL; @@ -639,6 +648,10 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const { state = STATE_PREPROC_INVALID; } + else if (!strcmp(line, "[vertex shader]\n")) + { + state = STATE_SHADER_VERTEX; + } vkd3d_test_set_context("Section %.*s, line %u", strlen(line) - 1, line, line_number); } @@ -654,6 +667,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const case STATE_PREPROC_INVALID: case STATE_SHADER_INVALID_PIXEL: case STATE_SHADER_PIXEL: + case STATE_SHADER_VERTEX: { size_t len = strlen(line); @@ -682,6 +696,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const } } + free(runner->vs_source); free(runner->ps_source); for (i = 0; i < runner->texture_count; ++i) { diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 26fa2367b..43ded8534 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -72,6 +72,7 @@ struct shader_runner { const struct shader_runner_ops *ops; + char *vs_source; char *ps_source; enum shader_model minimum_shader_model; diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index c077718c9..fb73f80e9 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -434,7 +434,7 @@ static void d3d11_runner_draw_quad(struct shader_runner *r) if (!runner->vs) { - ID3D10Blob *vs_code = compile_shader(vs_source, "vs_4_0"); + ID3D10Blob *vs_code = compile_shader(runner->r.vs_source ? runner->r.vs_source : vs_source, "vs_4_0"); hr = ID3D11Device_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), ID3D10Blob_GetBufferSize(vs_code), NULL, &runner->vs); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 4f077b382..e124922fa 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -52,22 +52,23 @@ static struct d3d12_shader_runner *d3d12_shader_runner(struct shader_runner *r) return CONTAINING_RECORD(r, struct d3d12_shader_runner, r); } -static ID3D10Blob *compile_shader(const char *source, enum shader_model shader_model) +static ID3D10Blob *compile_shader(const char *source, const char *type, enum shader_model shader_model) { ID3D10Blob *blob = NULL, *errors = NULL; + char profile[7]; HRESULT hr; static const char *const shader_models[] = { - [SHADER_MODEL_2_0] = "ps_4_0", - [SHADER_MODEL_4_0] = "ps_4_0", - [SHADER_MODEL_4_1] = "ps_4_1", - [SHADER_MODEL_5_0] = "ps_5_0", - [SHADER_MODEL_5_1] = "ps_5_1", + [SHADER_MODEL_2_0] = "4_0", + [SHADER_MODEL_4_0] = "4_0", + [SHADER_MODEL_4_1] = "4_1", + [SHADER_MODEL_5_0] = "5_0", + [SHADER_MODEL_5_1] = "5_1", }; - hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", - shader_models[shader_model], 0, 0, &blob, &errors); + sprintf(profile, "%s_%s", type, shader_models[shader_model]); + hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", profile, 0, 0, &blob, &errors); ok(hr == S_OK, "Failed to compile shader, hr %#x.\n", hr); if (errors) { @@ -132,17 +133,23 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) ID3D12CommandQueue *queue = test_context->queue; D3D12_STATIC_SAMPLER_DESC static_samplers[1]; ID3D12Device *device = test_context->device; + ID3D10Blob *vs_code = NULL, *ps_code; static const float clear_color[4]; + D3D12_SHADER_BYTECODE vs, ps; unsigned int uniform_index; - D3D12_SHADER_BYTECODE ps; ID3D12PipelineState *pso; - ID3D10Blob *ps_code; HRESULT hr; size_t i; - if (!(ps_code = compile_shader(runner->r.ps_source, runner->r.minimum_shader_model))) + if (!(ps_code = compile_shader(runner->r.ps_source, "ps", runner->r.minimum_shader_model))) return; + if (runner->r.vs_source && !(vs_code = compile_shader(runner->r.vs_source, "vs", runner->r.minimum_shader_model))) + { + ID3D10Blob_Release(ps_code); + return; + } + root_signature_desc.NumParameters = 0; root_signature_desc.pParameters = root_params; root_signature_desc.NumStaticSamplers = 0; @@ -202,10 +209,17 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) hr = create_root_signature(device, &root_signature_desc, &test_context->root_signature); ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + if (vs_code) + { + vs.pShaderBytecode = ID3D10Blob_GetBufferPointer(vs_code); + vs.BytecodeLength = ID3D10Blob_GetBufferSize(vs_code); + } ps.pShaderBytecode = ID3D10Blob_GetBufferPointer(ps_code); ps.BytecodeLength = ID3D10Blob_GetBufferSize(ps_code); pso = create_pipeline_state(device, test_context->root_signature, - test_context->render_target_desc.Format, NULL, &ps, NULL); + test_context->render_target_desc.Format, vs_code ? &vs : NULL, &ps, NULL); + if (vs_code) + ID3D10Blob_Release(vs_code); ID3D10Blob_Release(ps_code); if (!pso) return; -- 2.35.1

2 15

[PATCH 1/5] dinput/tests: Introduce a new Wine Test Bus driver.
by Rémi Bernon March 22, 2022

March 22, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/Makefile.in | 4 + dlls/dinput/tests/dinput_test.h | 2 + dlls/dinput/tests/driver_bus.c | 294 ++++++++++++++++++++++++++++++ dlls/dinput/tests/driver_bus.spec | 1 + dlls/dinput/tests/hid.c | 90 ++++++++- 5 files changed, 382 insertions(+), 9 deletions(-) create mode 100644 dlls/dinput/tests/driver_bus.c create mode 100644 dlls/dinput/tests/driver_bus.spec diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in index c1b887f8dcb..013235c77d9 100644 --- a/dlls/dinput/tests/Makefile.in +++ b/dlls/dinput/tests/Makefile.in @@ -3,6 +3,8 @@ IMPORTS = dinput dinput8 ole32 version user32 advapi32 hid uuid crypt32 newdev driver_IMPORTS = winecrt0 ntoskrnl hal hidclass driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native +driver_bus_IMPORTS = winecrt0 ntoskrnl hal +driver_bus_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native SOURCES = \ device.c \ @@ -10,6 +12,8 @@ SOURCES = \ dinput.c \ driver.c \ driver.spec \ + driver_bus.c \ + driver_bus.spec \ force_feedback.c \ hid.c \ hotplug.c \ diff --git a/dlls/dinput/tests/dinput_test.h b/dlls/dinput/tests/dinput_test.h index c0027c07094..cb1c42a7e86 100644 --- a/dlls/dinput/tests/dinput_test.h +++ b/dlls/dinput/tests/dinput_test.h @@ -54,6 +54,8 @@ extern BOOL localized; /* object names get translated */ BOOL hid_device_start(void); void hid_device_stop(void); +BOOL bus_device_start(void); +void bus_device_stop(void); void cleanup_registry_keys(void); diff --git a/dlls/dinput/tests/driver_bus.c b/dlls/dinput/tests/driver_bus.c new file mode 100644 index 00000000000..aad7f3e2889 --- /dev/null +++ b/dlls/dinput/tests/driver_bus.c @@ -0,0 +1,294 @@ +/* + * Plug and Play test driver + * + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" + +#include "wine/list.h" + +#include "initguid.h" +#include "driver_hid.h" + +typedef ULONG PNP_DEVICE_STATE; +#define PNP_DEVICE_REMOVED 8 + +struct device +{ + KSPIN_LOCK lock; + PNP_DEVICE_STATE state; +}; + +static inline struct device *impl_from_DEVICE_OBJECT( DEVICE_OBJECT *device ) +{ + return (struct device *)device->DeviceExtension; +} + +struct func_device +{ + struct device base; + DEVICE_OBJECT *pdo; /* lower PDO */ + UNICODE_STRING control_iface; +}; + +static inline struct func_device *fdo_from_DEVICE_OBJECT( DEVICE_OBJECT *device ) +{ + struct device *impl = impl_from_DEVICE_OBJECT( device ); + return CONTAINING_RECORD( impl, struct func_device, base ); +} + +#ifdef __ASM_USE_FASTCALL_WRAPPER +extern void *WINAPI wrap_fastcall_func1( void *func, const void *a ); +__ASM_STDCALL_FUNC( wrap_fastcall_func1, 8, + "popl %ecx\n\t" + "popl %eax\n\t" + "xchgl (%esp),%ecx\n\t" + "jmp *%eax" ); +#define call_fastcall_func1( func, a ) wrap_fastcall_func1( func, a ) +#else +#define call_fastcall_func1( func, a ) func( a ) +#endif + +static ULONG_PTR get_device_relations( DEVICE_OBJECT *device, DEVICE_RELATIONS *previous, + ULONG count, DEVICE_OBJECT **devices ) +{ + DEVICE_RELATIONS *relations; + ULONG new_count = count; + + if (previous) new_count += previous->Count; + if (!(relations = ExAllocatePool( PagedPool, offsetof( DEVICE_RELATIONS, Objects[new_count] ) ))) + { + ok( 0, "Failed to allocate memory\n" ); + return (ULONG_PTR)previous; + } + + if (!previous) relations->Count = 0; + else + { + memcpy( relations, previous, offsetof( DEVICE_RELATIONS, Objects[previous->Count] ) ); + ExFreePool( previous ); + } + + while (count--) + { + call_fastcall_func1( ObfReferenceObject, *devices ); + relations->Objects[relations->Count++] = *devices++; + } + + return (ULONG_PTR)relations; +} + +static NTSTATUS fdo_pnp( DEVICE_OBJECT *device, IRP *irp ) +{ + struct func_device *impl = fdo_from_DEVICE_OBJECT( device ); + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); + ULONG code = stack->MinorFunction; + PNP_DEVICE_STATE state; + NTSTATUS status; + KIRQL irql; + + if (winetest_debug > 1) trace( "%s: device %p, code %#lx %s\n", __func__, device, code, debugstr_pnp(code) ); + + switch (code) + { + case IRP_MN_START_DEVICE: + case IRP_MN_CANCEL_REMOVE_DEVICE: + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_SURPRISE_REMOVAL: + case IRP_MN_REMOVE_DEVICE: + state = (code == IRP_MN_START_DEVICE || code == IRP_MN_CANCEL_REMOVE_DEVICE) ? 0 : PNP_DEVICE_REMOVED; + KeAcquireSpinLock( &impl->base.lock, &irql ); + impl->base.state = state; + KeReleaseSpinLock( &impl->base.lock, irql ); + IoSetDeviceInterfaceState( &impl->control_iface, state != PNP_DEVICE_REMOVED ); + if (code != IRP_MN_REMOVE_DEVICE) status = STATUS_SUCCESS; + else + { + IoSkipCurrentIrpStackLocation( irp ); + status = IoCallDriver( impl->pdo, irp ); + IoDetachDevice( impl->pdo ); + RtlFreeUnicodeString( &impl->control_iface ); + IoDeleteDevice( device ); + if (winetest_debug > 1) trace( "Deleted Bus FDO %p from PDO %p, status %#lx\n", impl, impl->pdo, status ); + return status; + } + break; + case IRP_MN_QUERY_PNP_DEVICE_STATE: + KeAcquireSpinLock( &impl->base.lock, &irql ); + irp->IoStatus.Information = impl->base.state; + KeReleaseSpinLock( &impl->base.lock, irql ); + status = STATUS_SUCCESS; + break; + case IRP_MN_QUERY_DEVICE_RELATIONS: + { + DEVICE_RELATION_TYPE type = stack->Parameters.QueryDeviceRelations.Type; + switch (type) + { + case BusRelations: + if (winetest_debug > 1) trace( "fdo_pnp IRP_MN_QUERY_DEVICE_RELATIONS BusRelations\n" ); + ok( !irp->IoStatus.Information, "got unexpected BusRelations relations\n" ); + irp->IoStatus.Information = get_device_relations( device, (void *)irp->IoStatus.Information, 0, NULL ); + if (!irp->IoStatus.Information) status = STATUS_NO_MEMORY; + else status = STATUS_SUCCESS; + break; + case RemovalRelations: + if (winetest_debug > 1) trace( "fdo_pnp IRP_MN_QUERY_DEVICE_RELATIONS RemovalRelations\n" ); + ok( !irp->IoStatus.Information, "got unexpected RemovalRelations relations\n" ); + irp->IoStatus.Information = get_device_relations( device, (void *)irp->IoStatus.Information, + 1, &impl->pdo ); + if (!irp->IoStatus.Information) status = STATUS_NO_MEMORY; + else status = STATUS_SUCCESS; + break; + default: + ok( 0, "got unexpected IRP_MN_QUERY_DEVICE_RELATIONS type %#x\n", type ); + status = irp->IoStatus.Status; + break; + } + break; + } + case IRP_MN_QUERY_CAPABILITIES: + { + DEVICE_CAPABILITIES *caps = stack->Parameters.DeviceCapabilities.Capabilities; + caps->EjectSupported = TRUE; + caps->Removable = TRUE; + caps->SilentInstall = TRUE; + caps->SurpriseRemovalOK = TRUE; + status = STATUS_SUCCESS; + break; + } + default: + if (winetest_debug > 1) trace( "fdo_pnp code %#lx %s, not implemented!\n", code, debugstr_pnp(code) ); + status = irp->IoStatus.Status; + break; + } + + irp->IoStatus.Status = status; + IoSkipCurrentIrpStackLocation( irp ); + return IoCallDriver( impl->pdo, irp ); +} + +static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) +{ + return fdo_pnp( device, irp ); +} + +static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); + ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; + + if (winetest_debug > 1) trace( "%s: device %p, code %#lx %s\n", __func__, device, code, debugstr_ioctl(code) ); + ok( 0, "unexpected call\n" ); + + irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_NOT_SUPPORTED; +} + +static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); + ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; + + if (winetest_debug > 1) trace( "%s: device %p, code %#lx %s\n", __func__, device, code, debugstr_ioctl(code) ); + ok( 0, "unexpected call\n" ); + + irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_NOT_SUPPORTED; +} + +static NTSTATUS WINAPI driver_add_device( DRIVER_OBJECT *driver, DEVICE_OBJECT *device ) +{ + struct func_device *impl; + DEVICE_OBJECT *child; + NTSTATUS status; + + if (winetest_debug > 1) trace( "%s: driver %p, device %p\n", __func__, driver, device ); + + if ((status = IoCreateDevice( driver, sizeof(struct func_device), NULL, FILE_DEVICE_BUS_EXTENDER, 0, FALSE, &child ))) + { + ok( 0, "Failed to create FDO, status %#lx.\n", status ); + return status; + } + + impl = (struct func_device *)child->DeviceExtension; + KeInitializeSpinLock( &impl->base.lock ); + impl->pdo = device; + + status = IoRegisterDeviceInterface( impl->pdo, &control_class, NULL, &impl->control_iface ); + ok( !status, "IoRegisterDeviceInterface returned %#lx\n", status ); + + if (winetest_debug > 1) trace( "Created Bus FDO %p for PDO %p\n", child, device ); + + IoAttachDeviceToDeviceStack( child, device ); + child->Flags &= ~DO_DEVICE_INITIALIZING; + + return STATUS_SUCCESS; +} + +static NTSTATUS WINAPI driver_create( DEVICE_OBJECT *device, IRP *irp ) +{ + if (winetest_debug > 1) trace( "%s: device %p, irp %p\n", __func__, device, irp ); + + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_SUCCESS; +} + +static NTSTATUS WINAPI driver_close( DEVICE_OBJECT *device, IRP *irp ) +{ + if (winetest_debug > 1) trace( "%s: device %p, irp %p\n", __func__, device, irp ); + + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_SUCCESS; +} + +static void WINAPI driver_unload( DRIVER_OBJECT *driver ) +{ + if (winetest_debug > 1) trace( "%s: driver %p\n", __func__, driver ); + winetest_cleanup(); +} + +NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *registry ) +{ + NTSTATUS status; + + if ((status = winetest_init())) return status; + if (winetest_debug > 1) trace( "%s: driver %p\n", __func__, driver ); + + driver->DriverExtension->AddDevice = driver_add_device; + driver->DriverUnload = driver_unload; + driver->MajorFunction[IRP_MJ_PNP] = driver_pnp; + driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = driver_ioctl; + driver->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = driver_internal_ioctl; + driver->MajorFunction[IRP_MJ_CREATE] = driver_create; + driver->MajorFunction[IRP_MJ_CLOSE] = driver_close; + + return STATUS_SUCCESS; +} diff --git a/dlls/dinput/tests/driver_bus.spec b/dlls/dinput/tests/driver_bus.spec new file mode 100644 index 00000000000..ad33444716a --- /dev/null +++ b/dlls/dinput/tests/driver_bus.spec @@ -0,0 +1 @@ +# nothing here yet diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 6203f67bb25..bcaf949eb9c 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -315,6 +315,7 @@ static const char inf_text[] = "[mfg_section.NT" EXT "]\n" "Wine test root driver=device_section,test_hardware_id\n" + "Wine Test Bus Device=bus_section,WINETEST\\BUS\n" "[device_section.NT" EXT "]\n" "CopyFiles=file_section\n" @@ -322,14 +323,23 @@ static const char inf_text[] = "[device_section.NT" EXT ".Services]\n" "AddService=winetest,0x2,svc_section\n" + "[bus_section.NT" EXT "]\n" + "CopyFiles=file_section\n" + + "[bus_section.NT" EXT ".Services]\n" + "AddService=winetest_bus,0x2,bus_service\n" + "[file_section]\n" "winetest.sys\n" + "winetest_bus.sys\n" "[SourceDisksFiles]\n" "winetest.sys=1\n" + "winetest_bus.sys=1\n" "[SourceDisksNames]\n" "1=,winetest.sys\n" + "1=,winetest_bus.sys\n" "[DestinationDirs]\n" "DefaultDestDir=12\n" @@ -341,6 +351,14 @@ static const char inf_text[] = "ErrorControl=1\n" "LoadOrderGroup=WinePlugPlay\n" "DisplayName=\"winetest bus driver\"\n" + + "[bus_service]\n" + "ServiceBinary=%12%\\winetest_bus.sys\n" + "ServiceType=1\n" + "StartType=3\n" + "ErrorControl=1\n" + "LoadOrderGroup=WinePlugPlay\n" + "DisplayName=\"Wine Test Bus Driver\"\n" "; they don't sleep anymore, on the beach\n"; static void add_file_to_catalog( HANDLE catalog, const WCHAR *file ) @@ -415,9 +433,9 @@ static void unload_driver( SC_HANDLE service ) CloseServiceHandle( service ); } -static void pnp_driver_stop(void) +static void pnp_driver_stop( BOOL bus ) { - const WCHAR *service_name = L"winetest"; + const WCHAR *service_name = bus ? L"winetest_bus" : L"winetest"; SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)}; WCHAR path[MAX_PATH], dest[MAX_PATH], *filepart; SC_HANDLE manager, service; @@ -484,9 +502,13 @@ static void pnp_driver_stop(void) ok( ret, "Failed to delete file, error %lu\n", GetLastError() ); ret = DeleteFileW( L"winetest.sys" ); ok( ret, "Failed to delete file, error %lu\n", GetLastError() ); + ret = DeleteFileW( L"winetest_bus.sys" ); + ok( ret, "Failed to delete file, error %lu\n", GetLastError() ); /* Windows 10 apparently deletes the image in SetupUninstallOEMInf(). */ ret = DeleteFileW( L"C:/windows/system32/drivers/winetest.sys" ); ok( ret || GetLastError() == ERROR_FILE_NOT_FOUND, "Failed to delete file, error %lu\n", GetLastError() ); + ret = DeleteFileW( L"C:/windows/system32/drivers/winetest_bus.sys" ); + ok( ret || GetLastError() == ERROR_FILE_NOT_FOUND, "Failed to delete file, error %lu\n", GetLastError() ); } static BOOL find_hid_device_path( WCHAR *device_path ) @@ -525,12 +547,13 @@ static BOOL find_hid_device_path( WCHAR *device_path ) return ret; } -static BOOL pnp_driver_start(void) +static BOOL pnp_driver_start( BOOL bus ) { static const WCHAR hardware_id[] = L"test_hardware_id\0"; + static const WCHAR bus_hardware_id[] = L"WINETEST\\BUS"; + const WCHAR *service_name = bus ? L"winetest_bus" : L"winetest"; SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)}; WCHAR path[MAX_PATH], filename[MAX_PATH]; - const WCHAR *service_name = L"winetest"; SC_HANDLE manager, service; const CERT_CONTEXT *cert; int old_mute_threshold; @@ -546,6 +569,10 @@ static BOOL pnp_driver_start(void) ret = MoveFileExW( filename, L"winetest.sys", MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING ); ok( ret, "failed to move file, error %lu\n", GetLastError() ); + load_resource( L"driver_bus.dll", filename ); + ret = MoveFileExW( filename, L"winetest_bus.sys", MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING ); + ok( ret, "failed to move file, error %lu\n", GetLastError() ); + f = fopen( "winetest.inf", "w" ); ok( !!f, "failed to open winetest.inf: %s\n", strerror( errno ) ); fputs( inf_text, f ); @@ -557,6 +584,7 @@ static BOOL pnp_driver_start(void) ok( catalog != INVALID_HANDLE_VALUE, "Failed to create catalog, error %lu\n", GetLastError() ); add_file_to_catalog( catalog, L"winetest.sys" ); + add_file_to_catalog( catalog, L"winetest_bus.sys" ); add_file_to_catalog( catalog, L"winetest.inf" ); ret = CryptCATPersistStore( catalog ); @@ -572,6 +600,8 @@ static BOOL pnp_driver_start(void) ok( ret, "Failed to delete file, error %lu\n", GetLastError() ); ret = DeleteFileW( L"winetest.inf" ); ok( ret, "Failed to delete file, error %lu\n", GetLastError() ); + ret = DeleteFileW( L"winetest_bus.sys" ); + ok( ret, "Failed to delete file, error %lu\n", GetLastError() ); ret = DeleteFileW( L"winetest.sys" ); ok( ret, "Failed to delete file, error %lu\n", GetLastError() ); winetest_mute_threshold = old_mute_threshold; @@ -586,8 +616,9 @@ static BOOL pnp_driver_start(void) ret = SetupDiCreateDeviceInfoW( set, L"root\\winetest\\0", &GUID_NULL, NULL, NULL, 0, &device ); ok( ret, "failed to create device, error %#lx\n", GetLastError() ); - ret = SetupDiSetDeviceRegistryPropertyW( set, &device, SPDRP_HARDWAREID, (const BYTE *)hardware_id, - sizeof(hardware_id) ); + ret = SetupDiSetDeviceRegistryPropertyW( set, &device, SPDRP_HARDWAREID, + bus ? (const BYTE *)bus_hardware_id : (const BYTE *)hardware_id, + bus ? sizeof(bus_hardware_id) : sizeof(hardware_id) ); ok( ret, "failed to create set hardware ID, error %lu\n", GetLastError() ); ret = SetupDiCallClassInstaller( DIF_REGISTERDEVICE, set, &device ); @@ -598,7 +629,8 @@ static BOOL pnp_driver_start(void) GetFullPathNameW( L"winetest.inf", ARRAY_SIZE(path), path, NULL ); - ret = UpdateDriverForPlugAndPlayDevicesW( NULL, hardware_id, path, INSTALLFLAG_FORCE, &need_reboot ); + ret = UpdateDriverForPlugAndPlayDevicesW( NULL, bus ? bus_hardware_id : hardware_id, path, + INSTALLFLAG_FORCE, &need_reboot ); ok( ret, "failed to install device, error %lu\n", GetLastError() ); ok( !need_reboot, "expected no reboot necessary\n" ); @@ -630,12 +662,22 @@ static BOOL pnp_driver_start(void) void hid_device_stop(void) { - pnp_driver_stop(); + pnp_driver_stop( FALSE ); } BOOL hid_device_start(void) { - return pnp_driver_start(); + return pnp_driver_start( FALSE ); +} + +void bus_device_stop(void) +{ + pnp_driver_stop( TRUE ); +} + +BOOL bus_device_start(void) +{ + return pnp_driver_start( TRUE ); } #define check_hidp_caps( a, b ) check_hidp_caps_( __LINE__, a, b ) @@ -3398,6 +3440,7 @@ BOOL dinput_test_init_( const char *file, int line ) ok( okfile != INVALID_HANDLE_VALUE, "failed to create file, error %lu\n", GetLastError() ); subtest( "driver" ); + subtest( "driver_bus" ); return TRUE; } @@ -3566,10 +3609,39 @@ DWORD WINAPI dinput_test_device_thread( void *stop_event ) return 0; } +static void test_bus_driver(void) +{ + HANDLE control; + + if (!bus_device_start()) goto done; + + control = CreateFileW( L"\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, + NULL, OPEN_EXISTING, 0, NULL ); + ok( control != INVALID_HANDLE_VALUE, "CreateFile failed, error %lu\n", GetLastError() ); + CloseHandle( control ); + + bus_device_stop(); + + control = CreateFileW( L"\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, + NULL, OPEN_EXISTING, 0, NULL ); + ok( control == INVALID_HANDLE_VALUE, "CreateFile succeeded\n" ); + + bus_device_start(); + + control = CreateFileW( L"\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, + NULL, OPEN_EXISTING, 0, NULL ); + ok( control != INVALID_HANDLE_VALUE, "CreateFile failed, error %lu\n", GetLastError() ); + CloseHandle( control ); + +done: + bus_device_stop(); +} + START_TEST( hid ) { if (!dinput_test_init()) return; + test_bus_driver(); test_hidp_kdr(); test_hid_driver( 0, FALSE ); test_hid_driver( 1, FALSE ); -- 2.35.1

2 10

[PATCH 6/6 v2] winealsa: Pass the time relative to the start time to the callback.
by Andrew Eikum March 22, 2022

March 22, 2022

From: Huw Davies <huw(a)codeweavers.com> This is equivalent to commit 01ad503004cf8ea6b0bd8f544ee131fc86abc580 in the coreaudio driver. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winealsa.drv/midi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 3665b557d03..72649eca89c 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -477,7 +477,7 @@ static DWORD midReset(WORD wDevID) MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime - MidiInDev[wDevID].startTime); } in_buffer_unlock(); -- 2.35.1

1 0

[PATCH 5/6 v2] winealsa: Move MIDM_ADDBUFFER to the unixlib.
by Andrew Eikum March 22, 2022

March 22, 2022

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Keep old locking order. dlls/winealsa.drv/alsamidi.c | 35 +++++++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 38 ------------------------------------ 2 files changed, 35 insertions(+), 38 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index a78102745bc..80e677b3064 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -852,6 +852,38 @@ static UINT midi_out_reset(WORD dev_id) return MMSYSERR_NOERROR; } +static UINT midi_in_add_buffer(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) +{ + struct midi_src *src; + MIDIHDR **next; + + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + src = srcs + dev_id; + if (src->state == -1) return MIDIERR_NODEVICE; + + if (!hdr || hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr->dwBufferLength) + return MMSYSERR_INVALPARAM; + if (hdr->dwFlags & MHDR_INQUEUE) return MIDIERR_STILLPLAYING; + if (!(hdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED; + + in_buffer_lock(); + + hdr->dwFlags &= ~WHDR_DONE; + hdr->dwFlags |= MHDR_INQUEUE; + hdr->dwBytesRecorded = 0; + hdr->lpNext = NULL; + + next = &src->lpQueueHdr; + while (*next) next = &(*next)->lpNext; + *next = hdr; + + in_buffer_unlock(); + + return MMSYSERR_NOERROR; +} + static UINT midi_in_prepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) { TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); @@ -963,6 +995,9 @@ NTSTATUS midi_in_message(void *args) /* FIXME: Pretend this is supported */ *params->err = MMSYSERR_NOERROR; break; + case MIDM_ADDBUFFER: + *params->err = midi_in_add_buffer(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; case MIDM_PREPARE: *params->err = midi_in_prepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); break; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 70e6caebfc7..3665b557d03 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -459,42 +459,6 @@ static DWORD midClose(WORD wDevID) return ret; } - -/************************************************************************** - * midAddBuffer [internal] - */ -static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("(%04X, %p, %d);\n", wDevID, lpMidiHdr, dwSize); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - - if (lpMidiHdr == NULL) return MMSYSERR_INVALPARAM; - if (dwSize < offsetof(MIDIHDR,dwOffset)) return MMSYSERR_INVALPARAM; - if (lpMidiHdr->dwBufferLength == 0) return MMSYSERR_INVALPARAM; - if (lpMidiHdr->dwFlags & MHDR_INQUEUE) return MIDIERR_STILLPLAYING; - if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED; - - in_buffer_lock(); - lpMidiHdr->dwFlags &= ~WHDR_DONE; - lpMidiHdr->dwFlags |= MHDR_INQUEUE; - lpMidiHdr->dwBytesRecorded = 0; - lpMidiHdr->lpNext = 0; - if (MidiInDev[wDevID].lpQueueHdr == 0) { - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr; - } else { - LPMIDIHDR ptr; - - for (ptr = MidiInDev[wDevID].lpQueueHdr; ptr->lpNext != 0; - ptr = ptr->lpNext); - ptr->lpNext = lpMidiHdr; - } - in_buffer_unlock(); - - return MMSYSERR_NOERROR; -} - /************************************************************************** * midReset [internal] */ @@ -593,8 +557,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return midClose(wDevID); - case MIDM_ADDBUFFER: - return midAddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MIDM_RESET: return midReset(wDevID); case MIDM_START: -- 2.35.1

1 0

[PATCH 4/6 v2] winealsa: Move the midi in buffer lock to the unixlib.
by Andrew Eikum March 22, 2022

March 22, 2022

From: Huw Davies <huw(a)codeweavers.com> The syscall itself is temporary. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 1 + dlls/winealsa.drv/alsamidi.c | 19 +++++++++++++++++++ dlls/winealsa.drv/midi.c | 31 ++++++++++++++++--------------- dlls/winealsa.drv/unixlib.h | 2 ++ 4 files changed, 38 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index b629cd8317a..eb16203dbf9 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2449,5 +2449,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_in_message, midi_seq_lock, /* temporary */ + midi_in_lock, midi_seq_open, }; diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index f12eefdd1a3..a78102745bc 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -60,6 +60,7 @@ struct midi_dest }; static pthread_mutex_t seq_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t in_buffer_mutex = PTHREAD_MUTEX_INITIALIZER; static unsigned int num_dests, num_srcs; static struct midi_dest dests[MAX_MIDIOUTDRV]; @@ -86,6 +87,24 @@ NTSTATUS midi_seq_lock(void *args) return STATUS_SUCCESS; } +static void in_buffer_lock(void) +{ + pthread_mutex_lock(&in_buffer_mutex); +} + +static void in_buffer_unlock(void) +{ + pthread_mutex_unlock(&in_buffer_mutex); +} + +NTSTATUS midi_in_lock(void *args) +{ + if (args) in_buffer_lock(); + else in_buffer_unlock(); + + return STATUS_SUCCESS; +} + static snd_seq_t *seq_open(int *port_in_ret) { static int midi_warn; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index bd73c1f5db2..70e6caebfc7 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -54,15 +54,6 @@ static int MIDM_NumDevs = 0; static int numStartedMidiIn = 0; -static CRITICAL_SECTION crit_sect; /* protects all MidiIn buffer queues */ -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &crit_sect, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": crit_sect") } -}; -static CRITICAL_SECTION crit_sect = { &critsect_debug, -1, 0, 0, 0, 0 }; - static int end_thread; static HANDLE hThread; @@ -76,6 +67,16 @@ static void seq_unlock(void) ALSA_CALL(midi_seq_lock, (void *)(UINT_PTR)0); } +static void in_buffer_lock(void) +{ + ALSA_CALL(midi_in_lock, (void *)(UINT_PTR)1); +} + +static void in_buffer_unlock(void) +{ + ALSA_CALL(midi_in_lock, (void *)(UINT_PTR)0); +} + static void notify_client(struct notify_context *notify) { TRACE("dev_id = %d msg = %d param1 = %04lX param2 = %04lX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2); @@ -240,7 +241,7 @@ static void handle_midi_event(snd_seq_event_t *ev) LPBYTE ptr = ev->data.ext.ptr; LPMIDIHDR lpMidiHdr; - EnterCriticalSection(&crit_sect); + in_buffer_lock(); while (len) { if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { int copylen = min(len, lpMidiHdr->dwBufferLength - lpMidiHdr->dwBytesRecorded); @@ -262,7 +263,7 @@ static void handle_midi_event(snd_seq_event_t *ev) break; } } - LeaveCriticalSection(&crit_sect); + in_buffer_unlock(); } break; case SND_SEQ_EVENT_SENSING: @@ -475,7 +476,7 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (lpMidiHdr->dwFlags & MHDR_INQUEUE) return MIDIERR_STILLPLAYING; if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED; - EnterCriticalSection(&crit_sect); + in_buffer_lock(); lpMidiHdr->dwFlags &= ~WHDR_DONE; lpMidiHdr->dwFlags |= MHDR_INQUEUE; lpMidiHdr->dwBytesRecorded = 0; @@ -489,7 +490,7 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) ptr = ptr->lpNext); ptr->lpNext = lpMidiHdr; } - LeaveCriticalSection(&crit_sect); + in_buffer_unlock(); return MMSYSERR_NOERROR; } @@ -506,7 +507,7 @@ static DWORD midReset(WORD wDevID) if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - EnterCriticalSection(&crit_sect); + in_buffer_lock(); while (MidiInDev[wDevID].lpQueueHdr) { LPMIDIHDR lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; @@ -514,7 +515,7 @@ static DWORD midReset(WORD wDevID) lpMidiHdr->dwFlags |= MHDR_DONE; MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); } - LeaveCriticalSection(&crit_sect); + in_buffer_unlock(); return MMSYSERR_NOERROR; } diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 7907ad24efa..263e83eda57 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -301,6 +301,7 @@ enum alsa_funcs alsa_midi_in_message, alsa_midi_seq_lock, /* temporary */ + alsa_midi_in_lock, alsa_midi_seq_open, }; @@ -309,6 +310,7 @@ NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_in_lock(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t alsa_handle; -- 2.35.1

1 0