October 2020 - Wine-devel - list.winehq.org

[PATCH v2] mountmgr: Avoid unnecessary permission prompts on macOS 10.15 and newer.
by Brendan Shanks 06 Oct '20

06 Oct '20

On macOS 10.15 and newer, trying to open the device node of a removable drive will trigger an "<app> would like to access files on a removable volume" permission prompt, even if the user doesn't have permissions to access the device node (which is almost always the case). Check the value of access() (recommended by Apple for this purpose) before opening devices. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: Forgot sign-off. dlls/mountmgr.sys/device.c | 7 +++++++ dlls/mountmgr.sys/diskarb.c | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index ccb0685cedd..53ccd3c5fdc 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -26,6 +26,7 @@ #include <stdarg.h> #include <stdio.h> #include <fcntl.h> +#include <unistd.h> #include <sys/time.h> #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> @@ -1026,6 +1027,12 @@ static BOOL get_volume_device_info( struct volume *volume ) if (!unix_device) return FALSE; + if (access( unix_device, R_OK )) + { + WARN("Unable to open %s, not accessible\n", debugstr_a(unix_device)); + return FALSE; + } + if (!(name = wine_get_dos_file_name( unix_device ))) { ERR("Failed to convert %s to NT, err %u\n", debugstr_a(unix_device), GetLastError()); diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 12da89d7688..25e0745372a 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -25,6 +25,7 @@ #include <errno.h> #include <stdarg.h> #include <stdio.h> +#include <unistd.h> #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif @@ -150,7 +151,8 @@ static void appeared_callback( DADiskRef disk, void *context ) else if (guid_ptr) add_volume( device, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr, NULL ); - if ((fd = open( device, O_RDONLY )) >= 0) + if (!access( device, R_OK ) && + (fd = open( device, O_RDONLY )) >= 0) { dk_scsi_identify_t dsi; -- 2.26.2

1 0

[PATCH 4/5] conhost: Use better default values in create_screen_buffer.
by Jacek Caban 06 Oct '20

06 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 21 +++++++++++++++++++++ programs/conhost/conhost.c | 21 ++++++++++++++++----- 2 files changed, 37 insertions(+), 5 deletions(-)

2 1

[PATCH 3/3] dxgi: Support Alt+Enter for d3d12 swapchains.
by Zhiyi Zhang 06 Oct '20

06 Oct '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 51 ++++++++++++++++++++++++++++++++++++++---- dlls/dxgi/tests/dxgi.c | 16 ++++++------- 2 files changed, 54 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index aa889bbe236..e74717056cb 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1919,6 +1919,7 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) close_library(vulkan_module); + wined3d_swapchain_state_unregister(swapchain->state); wined3d_swapchain_state_destroy(swapchain->state); } @@ -2289,18 +2290,37 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenState(IDXGISwapCha BOOL *fullscreen, IDXGIOutput **target) { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain4(iface); + BOOL windowed; + HRESULT hr; TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target); - if (fullscreen) + if (fullscreen || target) { wined3d_mutex_lock(); - *fullscreen = !wined3d_swapchain_state_is_windowed(swapchain->state); + windowed = wined3d_swapchain_state_is_windowed(swapchain->state); wined3d_mutex_unlock(); } - if (target && (*target = swapchain->target)) - IDXGIOutput_AddRef(*target); + if (fullscreen) + *fullscreen = !windowed; + + if (target) + { + if (!windowed) + { + if (!swapchain->target && FAILED(hr = IDXGISwapChain4_GetContainingOutput(iface, + &swapchain->target))) + return hr; + + *target = swapchain->target; + IDXGIOutput_AddRef(*target); + } + else + { + *target = NULL; + } + } return S_OK; } @@ -2936,6 +2956,24 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk return TRUE; } +static void STDMETHODCALLTYPE d3d12_swapchain_windowed_state_changed(void *parent, BOOL windowed) +{ + struct d3d12_swapchain *swapchain = parent; + + TRACE("parent %p, windowed %d.\n", parent, windowed); + + if (windowed && swapchain->target) + { + IDXGIOutput_Release(swapchain->target); + swapchain->target = NULL; + } +} + +static const struct wined3d_swapchain_state_parent_ops d3d12_swapchain_state_parent_ops = +{ + d3d12_swapchain_windowed_state_changed, +}; + static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGIFactory *factory, ID3D12Device *device, ID3D12CommandQueue *queue, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc) @@ -2944,6 +2982,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI struct wined3d_swapchain_desc wined3d_desc; VkWin32SurfaceCreateInfoKHR surface_desc; VkPhysicalDevice vk_physical_device; + struct dxgi_factory *dxgi_factory; VkFenceCreateInfo fence_desc; uint32_t queue_family_index; VkSurfaceKHR vk_surface; @@ -3025,6 +3064,10 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return hr; } + dxgi_factory = unsafe_impl_from_IDXGIFactory((IDXGIFactory *)factory); + wined3d_swapchain_state_register(swapchain->state, dxgi_factory->wined3d, swapchain, + &d3d12_swapchain_state_parent_ops); + if (!fullscreen_desc->Windowed) { hr = wined3d_swapchain_state_set_fullscreen(swapchain->state, &wined3d_desc, NULL); diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 5830426f756..c6ece51f2a8 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2431,7 +2431,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) flush_events(); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); - todo_wine_if(is_d3d12) ok(!fullscreen, "Expect swapchain not full screen.\n"); + ok(!fullscreen, "Expect swapchain not full screen.\n"); /* Move the swapchain output window to the second output */ hr = IDXGIOutput_GetDesc(output2, &output_desc2); @@ -2453,7 +2453,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); hr = IDXGIOutput_GetDesc(output2, &output_desc2); ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); - todo_wine_if(is_d3d12) ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), wine_dbgstr_w(output_desc.DeviceName)); IDXGIOutput_Release(output); @@ -2465,7 +2465,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); hr = IDXGIOutput_GetDesc(output2, &output_desc2); ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); - todo_wine_if(is_d3d12) ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), wine_dbgstr_w(output_desc.DeviceName)); @@ -6148,7 +6148,6 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12) UINT flag; BOOL expect_fullscreen; BOOL broken_d3d10; - BOOL todo_on_d3d12; } tests[] = { @@ -6162,15 +6161,15 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12) * - Posting them hangs the posting thread. Another thread that keeps * sending input is needed to avoid the hang. The hang is not * because of flush_events(). */ - {0, TRUE, FALSE, TRUE}, + {0, TRUE}, {0, FALSE}, {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, - {DXGI_MWA_NO_ALT_ENTER, FALSE, TRUE}, + {DXGI_MWA_NO_ALT_ENTER}, {DXGI_MWA_NO_ALT_ENTER, FALSE}, - {DXGI_MWA_NO_PRINT_SCREEN, TRUE, FALSE, TRUE}, + {DXGI_MWA_NO_PRINT_SCREEN, TRUE}, {DXGI_MWA_NO_PRINT_SCREEN, FALSE}, - {0, TRUE, FALSE, TRUE}, + {0, TRUE}, {0, FALSE} }; @@ -6272,7 +6271,6 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12) output = NULL; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(is_d3d12 && tests[i].todo_on_d3d12) ok(fullscreen == tests[i].expect_fullscreen || broken(tests[i].broken_d3d10 && fullscreen), "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); -- 2.25.1

2 1

[PATCH 2/3] dxgi: Update swapchain containing output after Alt+Enter was used to exit fullscreen.
by Zhiyi Zhang 06 Oct '20

06 Oct '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 21 ++++++++++++++++++++- dlls/dxgi/tests/dxgi.c | 4 ++-- dlls/wined3d/swapchain.c | 4 ++++ dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_main.c | 6 +++++- dlls/wined3d/wined3d_private.h | 3 +++ include/wine/wined3d.h | 8 +++++++- 7 files changed, 42 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 9d6ec0246ce..aa889bbe236 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -807,6 +807,24 @@ static const struct wined3d_parent_ops d3d11_swapchain_wined3d_parent_ops = d3d11_swapchain_wined3d_object_released, }; +static void STDMETHODCALLTYPE d3d11_swapchain_windowed_state_changed(void *parent, BOOL windowed) +{ + struct d3d11_swapchain *swapchain = parent; + + TRACE("parent %p, windowed %d.\n", parent, windowed); + + if (windowed && swapchain->target) + { + IDXGIOutput_Release(swapchain->target); + swapchain->target = NULL; + } +} + +static const struct wined3d_swapchain_state_parent_ops d3d11_swapchain_state_parent_ops = +{ + d3d11_swapchain_windowed_state_changed, +}; + HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, struct wined3d_swapchain_desc *desc) { @@ -855,7 +873,8 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi swapchain->state = wined3d_swapchain_get_state(swapchain->wined3d_swapchain); wined3d = wined3d_device_get_wined3d(device->wined3d_device); - wined3d_swapchain_state_register(swapchain->state, wined3d); + wined3d_swapchain_state_register(swapchain->state, wined3d, swapchain, + &d3d11_swapchain_state_parent_ops); swapchain->target = NULL; if (fullscreen) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f747e236f31..5830426f756 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2453,7 +2453,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); hr = IDXGIOutput_GetDesc(output2, &output_desc2); ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); - todo_wine ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + todo_wine_if(is_d3d12) ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), wine_dbgstr_w(output_desc.DeviceName)); IDXGIOutput_Release(output); @@ -2465,7 +2465,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); hr = IDXGIOutput_GetDesc(output2, &output_desc2); ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); - todo_wine ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + todo_wine_if(is_d3d12) ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), wine_dbgstr_w(output_desc.DeviceName)); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2cf36d189cb..a36946cc620 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2171,6 +2171,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st { struct wined3d_display_mode actual_mode; struct wined3d_output_desc output_desc; + BOOL windowed = state->desc.windowed; HRESULT hr; TRACE("state %p, swapchain_desc %p, mode %p.\n", state, swapchain_desc, mode); @@ -2259,6 +2260,9 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st state->desc.output = swapchain_desc->output; state->desc.windowed = swapchain_desc->windowed; + if (state->parent_ops && windowed != state->desc.windowed) + state->parent_ops->windowed_state_changed(state->parent, state->desc.windowed); + return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 816108e8b3b..4c42b0854e1 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -292,7 +292,7 @@ @ cdecl wined3d_swapchain_state_create(ptr ptr ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) @ cdecl wined3d_swapchain_state_is_windowed(ptr) -@ cdecl wined3d_swapchain_state_register(ptr ptr) +@ cdecl wined3d_swapchain_state_register(ptr ptr ptr ptr) @ cdecl wined3d_swapchain_state_resize_target(ptr ptr) @ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr) @ cdecl wined3d_swapchain_state_unregister(ptr) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index bb3ad7ffa51..09d741ac87f 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -775,7 +775,8 @@ static struct wined3d_window_hook *wined3d_find_hook(DWORD thread_id) } void CDECL wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, - struct wined3d *wined3d) + struct wined3d *wined3d, void *parent, + const struct wined3d_swapchain_state_parent_ops *parent_ops) { struct wined3d_registered_swapchain_state *state_entry; struct wined3d_window_hook *hook; @@ -789,6 +790,9 @@ void CDECL wined3d_swapchain_state_register(struct wined3d_swapchain_state *stat return; } + state->parent = parent; + state->parent_ops = parent_ops; + state_entry = &swapchain_state_table.states[swapchain_state_table.state_count++]; state_entry->state = state; state_entry->wined3d = wined3d; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7c88e04f5e7..0d14f1e2860 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5062,6 +5062,9 @@ struct wined3d_swapchain_state LONG style; LONG exstyle; HWND device_window; + + void *parent; + const struct wined3d_swapchain_state_parent_ops *parent_ops; }; void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_state *state, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3f2361e55a5..9d2d37c4856 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2208,6 +2208,11 @@ struct wined3d_parent_ops void (__stdcall *wined3d_object_destroyed)(void *parent); }; +struct wined3d_swapchain_state_parent_ops +{ + void (__stdcall *windowed_state_changed)(void *parent, BOOL windowed); +}; + struct wined3d; struct wined3d_adapter; struct wined3d_blend_state; @@ -2807,7 +2812,8 @@ HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_de void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); BOOL __cdecl wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_state *state); void __cdecl wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, - struct wined3d *wined3d); + struct wined3d *wined3d, void *context, + const struct wined3d_swapchain_state_parent_ops *parent_ops); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, -- 2.25.1

2 1

[PATCH] mmdevapi: Implement ActivateAudioInterfaceAsync
by Andrew Eikum 06 Oct '20

06 Oct '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/mmdevapi/main.c | 165 +++++++++++++++++++++++++++ dlls/mmdevapi/mmdevapi.spec | 2 + dlls/mmdevapi/tests/mmdevenum.c | 190 ++++++++++++++++++++++++++++++++ include/mmdeviceapi.idl | 36 ++++++ 4 files changed, 393 insertions(+) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 7680b451381..8e9127a7507 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -319,3 +319,168 @@ HRESULT WINAPI DllUnregisterServer(void) { return __wine_unregister_resources( instance ); } + +struct activate_async_op { + IActivateAudioInterfaceAsyncOperation IActivateAudioInterfaceAsyncOperation_iface; + LONG ref; + + IActivateAudioInterfaceCompletionHandler *callback; + HRESULT result_hr; + IUnknown *result_iface; +}; + +static struct activate_async_op *impl_from_IActivateAudioInterfaceAsyncOperation(IActivateAudioInterfaceAsyncOperation *iface) +{ + return CONTAINING_RECORD(iface, struct activate_async_op, IActivateAudioInterfaceAsyncOperation_iface); +} + +static HRESULT WINAPI activate_async_op_QueryInterface(IActivateAudioInterfaceAsyncOperation *iface, + REFIID riid, void **ppv) +{ + struct activate_async_op *This = impl_from_IActivateAudioInterfaceAsyncOperation(iface); + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IActivateAudioInterfaceAsyncOperation)) { + *ppv = &This->IActivateAudioInterfaceAsyncOperation_iface; + } else { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI activate_async_op_AddRef(IActivateAudioInterfaceAsyncOperation *iface) +{ + struct activate_async_op *This = impl_from_IActivateAudioInterfaceAsyncOperation(iface); + LONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) refcount now %i\n", This, ref); + return ref; +} + +static ULONG WINAPI activate_async_op_Release(IActivateAudioInterfaceAsyncOperation *iface) +{ + struct activate_async_op *This = impl_from_IActivateAudioInterfaceAsyncOperation(iface); + LONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) refcount now %i\n", This, ref); + if (!ref) { + if(This->result_iface) + IUnknown_Release(This->result_iface); + IActivateAudioInterfaceCompletionHandler_Release(This->callback); + HeapFree(GetProcessHeap(), 0, This); + } + return ref; +} + +static HRESULT WINAPI activate_async_op_GetActivateResult(IActivateAudioInterfaceAsyncOperation *iface, + HRESULT *result_hr, IUnknown **result_iface) +{ + struct activate_async_op *This = impl_from_IActivateAudioInterfaceAsyncOperation(iface); + + TRACE("(%p)->(%p, %p)\n", This, result_hr, result_iface); + + *result_hr = This->result_hr; + + if(This->result_hr == S_OK){ + *result_iface = This->result_iface; + IUnknown_AddRef(*result_iface); + } + + return S_OK; +} + +static IActivateAudioInterfaceAsyncOperationVtbl IActivateAudioInterfaceAsyncOperation_vtbl = { + activate_async_op_QueryInterface, + activate_async_op_AddRef, + activate_async_op_Release, + activate_async_op_GetActivateResult, +}; + +static DWORD WINAPI activate_async_threadproc(void *user) +{ + struct activate_async_op *op = user; + + IActivateAudioInterfaceCompletionHandler_ActivateCompleted(op->callback, &op->IActivateAudioInterfaceAsyncOperation_iface); + + IActivateAudioInterfaceAsyncOperation_Release(&op->IActivateAudioInterfaceAsyncOperation_iface); + + return 0; +} + +static HRESULT get_mmdevice_by_activatepath(const WCHAR *path, IMMDevice **mmdev) +{ + IMMDeviceEnumerator *devenum; + HRESULT hr; + + static const WCHAR DEVINTERFACE_AUDIO_RENDER_WSTR[] = L"{E6327CAD-DCEC-4949-AE8A-991E976A79D2}"; + static const WCHAR DEVINTERFACE_AUDIO_CAPTURE_WSTR[] = L"{2EEF81BE-33FA-4800-9670-1CD474972C3F}"; + + hr = MMDevEnum_Create(&IID_IMMDeviceEnumerator, (void**)&devenum); + if (FAILED(hr)) { + WARN("Failed to create MMDeviceEnumerator: %08x\n", hr); + return hr; + } + + if (!lstrcmpiW(path, DEVINTERFACE_AUDIO_RENDER_WSTR)){ + hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, eRender, eMultimedia, mmdev); + } else if (!lstrcmpiW(path, DEVINTERFACE_AUDIO_CAPTURE_WSTR)){ + hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, eCapture, eMultimedia, mmdev); + } else { + FIXME("How to map path to device id? %s\n", debugstr_w(path)); + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + + if (FAILED(hr)) { + WARN("Failed to get requested device (%s): %08x\n", debugstr_w(path), hr); + *mmdev = NULL; + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + + IMMDeviceEnumerator_Release(devenum); + + return hr; +} + +/*********************************************************************** + * ActivateAudioInterfaceAsync (MMDEVAPI.17) + */ +HRESULT WINAPI ActivateAudioInterfaceAsync(const WCHAR *path, REFIID riid, + PROPVARIANT *params, IActivateAudioInterfaceCompletionHandler *done_handler, + IActivateAudioInterfaceAsyncOperation **op_out) +{ + struct activate_async_op *op; + HANDLE ht; + IMMDevice *mmdev; + + TRACE("(%s, %s, %p, %p, %p)\n", debugstr_w(path), debugstr_guid(riid), + params, done_handler, op_out); + + op = HeapAlloc(GetProcessHeap(), 0, sizeof(*op)); + if (!op) + return E_OUTOFMEMORY; + + op->ref = 2; /* returned ref and threadproc ref */ + op->IActivateAudioInterfaceAsyncOperation_iface.lpVtbl = &IActivateAudioInterfaceAsyncOperation_vtbl; + op->callback = done_handler; + IActivateAudioInterfaceCompletionHandler_AddRef(done_handler); + + op->result_hr = get_mmdevice_by_activatepath(path, &mmdev); + if (SUCCEEDED(op->result_hr)) { + op->result_hr = IMMDevice_Activate(mmdev, riid, CLSCTX_INPROC_SERVER, params, (void**)&op->result_iface); + IMMDevice_Release(mmdev); + }else + op->result_iface = NULL; + + ht = CreateThread(NULL, 0, &activate_async_threadproc, op, 0, NULL); + CloseHandle(ht); + + *op_out = &op->IActivateAudioInterfaceAsyncOperation_iface; + + return S_OK; +} diff --git a/dlls/mmdevapi/mmdevapi.spec b/dlls/mmdevapi/mmdevapi.spec index 88aaf7c30c9..90ecaf569bc 100644 --- a/dlls/mmdevapi/mmdevapi.spec +++ b/dlls/mmdevapi/mmdevapi.spec @@ -12,6 +12,8 @@ 13 stub @ 14 stub @ 15 stub @ +16 stub @ +17 stdcall ActivateAudioInterfaceAsync( wstr ptr ptr ptr ptr ) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject( ptr ptr ptr ) diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 4f8c848380d..11df1f0229b 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -31,6 +31,9 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +static UINT g_num_mmdevs; +static WCHAR g_device_path[MAX_PATH]; + /* Some of the QueryInterface tests are really just to check if I got the IIDs right :) */ /* IMMDeviceCollection appears to have no QueryInterface method and instead forwards to mme */ @@ -85,6 +88,8 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) ok(hr == E_INVALIDARG, "Asking for too high device returned 0x%08x\n", hr); ok(dev == NULL, "Returned non-null device\n"); + g_num_mmdevs = numdev; + if (numdev) { hr = IMMDeviceCollection_Item(col, 0, NULL); @@ -101,6 +106,7 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) { IMMDevice *dev2; + lstrcpyW(g_device_path, id); temp[sizeof(temp)-1] = 0; WideCharToMultiByte(CP_ACP, 0, id, -1, temp, sizeof(temp)-1, NULL, NULL); trace("Device found: %s\n", temp); @@ -119,6 +125,188 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) IMMDeviceCollection_Release(col); } +static struct { + LONG ref; + HANDLE evt; + CRITICAL_SECTION lock; + IActivateAudioInterfaceAsyncOperation *op; + DWORD main_tid; + char msg_pfx[128]; + IUnknown *result_iface; + HRESULT result_hr; +} async_activate_test; + +static HRESULT WINAPI async_activate_QueryInterface( + IActivateAudioInterfaceCompletionHandler *iface, + REFIID riid, + void **ppvObject) +{ + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IAgileObject) || + IsEqualIID(riid, &IID_IActivateAudioInterfaceCompletionHandler)){ + *ppvObject = iface; + IUnknown_AddRef((IUnknown*)*ppvObject); + return S_OK; + } + + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI async_activate_AddRef( + IActivateAudioInterfaceCompletionHandler *iface) +{ + return InterlockedIncrement(&async_activate_test.ref); +} + +static ULONG WINAPI async_activate_Release( + IActivateAudioInterfaceCompletionHandler *iface) +{ + ULONG ref = InterlockedDecrement(&async_activate_test.ref); + if(ref == 1) + SetEvent(async_activate_test.evt); + return ref; +} + +static HRESULT WINAPI async_activate_ActivateCompleted( + IActivateAudioInterfaceCompletionHandler *iface, + IActivateAudioInterfaceAsyncOperation *op) +{ + HRESULT hr; + + EnterCriticalSection(&async_activate_test.lock); + ok(op == async_activate_test.op, + "%s: Got different completion operation\n", + async_activate_test.msg_pfx); + LeaveCriticalSection(&async_activate_test.lock); + + ok(GetCurrentThreadId() != async_activate_test.main_tid, + "%s: Expected callback on worker thread\n", + async_activate_test.msg_pfx); + + hr = IActivateAudioInterfaceAsyncOperation_GetActivateResult(op, + &async_activate_test.result_hr, &async_activate_test.result_iface); + ok(hr == S_OK, + "%s: GetActivateResult failed: %08x\n", + async_activate_test.msg_pfx, hr); + + return S_OK; +} + +static IActivateAudioInterfaceCompletionHandlerVtbl async_activate_vtbl = { + async_activate_QueryInterface, + async_activate_AddRef, + async_activate_Release, + async_activate_ActivateCompleted, +}; + +static IActivateAudioInterfaceCompletionHandler async_activate_done = { + &async_activate_vtbl +}; + +static void test_ActivateAudioInterfaceAsync(void) +{ + HRESULT (* WINAPI pActivateAudioInterfaceAsync)(const WCHAR *path, + REFIID riid, PROPVARIANT *params, + IActivateAudioInterfaceCompletionHandler *done_handler, + IActivateAudioInterfaceAsyncOperation **op); + HANDLE h_mmdev; + HRESULT hr; + LPOLESTR path; + DWORD dr; + IAudioClient3 *ac3; + + h_mmdev = LoadLibraryA("mmdevapi.dll"); + + /* some applications look this up by ordinal */ + pActivateAudioInterfaceAsync = (void*)GetProcAddress(h_mmdev, (char *)17); + ok(pActivateAudioInterfaceAsync != NULL, "mmdevapi.ActivateAudioInterfaceAsync missing!\n"); + + async_activate_test.ref = 1; + async_activate_test.evt = CreateEventW(NULL, FALSE, FALSE, NULL); + InitializeCriticalSection(&async_activate_test.lock); + async_activate_test.op = NULL; + async_activate_test.main_tid = GetCurrentThreadId(); + async_activate_test.result_iface = NULL; + async_activate_test.result_hr = 0; + + + /* try invalid device path */ + strcpy(async_activate_test.msg_pfx, "invalid_path"); + + EnterCriticalSection(&async_activate_test.lock); + hr = pActivateAudioInterfaceAsync(L"winetest_bogus", &IID_IAudioClient3, NULL, &async_activate_done, &async_activate_test.op); + ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); + LeaveCriticalSection(&async_activate_test.lock); + + IActivateAudioInterfaceAsyncOperation_Release(async_activate_test.op); + + dr = WaitForSingleObject(async_activate_test.evt, 1000); /* wait for all refs other than our own to be released */ + ok(dr == WAIT_OBJECT_0, "Timed out waiting for async activate to complete\n"); + ok(async_activate_test.ref == 1, "ActivateAudioInterfaceAsync leaked a handler ref: %u\n", async_activate_test.ref); + ok(async_activate_test.result_hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "mmdevice activation gave wrong result: %08x\n", async_activate_test.result_hr); + ok(async_activate_test.result_iface == NULL, "Got non-NULL iface pointer: %p\n", async_activate_test.result_iface); + + + /* device id from IMMDevice does not work */ + if(g_num_mmdevs > 0){ + strcpy(async_activate_test.msg_pfx, "mmdevice_id"); + + EnterCriticalSection(&async_activate_test.lock); + hr = pActivateAudioInterfaceAsync(g_device_path, &IID_IAudioClient3, NULL, &async_activate_done, &async_activate_test.op); + ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); + LeaveCriticalSection(&async_activate_test.lock); + + IActivateAudioInterfaceAsyncOperation_Release(async_activate_test.op); + + dr = WaitForSingleObject(async_activate_test.evt, 1000); + ok(dr == WAIT_OBJECT_0, "Timed out waiting for async activate to complete\n"); + ok(async_activate_test.ref == 1, "ActivateAudioInterfaceAsync leaked a handler ref: %u\n", async_activate_test.ref); + ok(async_activate_test.result_hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "mmdevice activation gave wrong result: %08x\n", async_activate_test.result_hr); + ok(async_activate_test.result_iface == NULL, "Got non-NULL iface pointer: %p\n", async_activate_test.result_iface); + } + + + /* try DEVINTERFACE_AUDIO_RENDER */ + strcpy(async_activate_test.msg_pfx, "audio_render"); + StringFromIID(&DEVINTERFACE_AUDIO_RENDER, &path); + + EnterCriticalSection(&async_activate_test.lock); + hr = pActivateAudioInterfaceAsync(path, &IID_IAudioClient3, NULL, &async_activate_done, &async_activate_test.op); + ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); + LeaveCriticalSection(&async_activate_test.lock); + + IActivateAudioInterfaceAsyncOperation_Release(async_activate_test.op); + + dr = WaitForSingleObject(async_activate_test.evt, 1000); + ok(dr == WAIT_OBJECT_0, "Timed out waiting for async activate to complete\n"); + ok(async_activate_test.ref == 1, "ActivateAudioInterfaceAsync leaked a handler ref\n"); + ok(async_activate_test.result_hr == S_OK || + (g_num_mmdevs == 0 && async_activate_test.result_hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) || /* no devices */ + broken(async_activate_test.result_hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)), /* win8 doesn't support DEVINTERFACE_AUDIO_RENDER */ + "mmdevice activation gave wrong result: %08x\n", async_activate_test.result_hr); + + if(async_activate_test.result_hr == S_OK){ + ok(async_activate_test.result_iface != NULL, "Got NULL iface pointer on success?\n"); + + /* returned iface should be the IID we requested */ + hr = IUnknown_QueryInterface(async_activate_test.result_iface, &IID_IAudioClient3, (void**)&ac3); + ok(hr == S_OK, "Failed to query IAudioClient3: %08x\n", hr); + ok(async_activate_test.result_iface == (IUnknown*)ac3, + "Activated interface other than IAudioClient3!\n"); + IAudioClient3_Release(ac3); + + IUnknown_Release(async_activate_test.result_iface); + } + + CoTaskMemFree(path); + + CloseHandle(async_activate_test.evt); + DeleteCriticalSection(&async_activate_test.lock); +} + static HRESULT WINAPI notif_QueryInterface(IMMNotificationClient *iface, const GUID *riid, void **obj) { @@ -285,4 +473,6 @@ START_TEST(mmdevenum) ok(hr == E_NOTFOUND, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); IMMDeviceEnumerator_Release(mme); + + test_ActivateAudioInterfaceAsync(); } diff --git a/include/mmdeviceapi.idl b/include/mmdeviceapi.idl index d1fb6ae74ff..1c2bb18c33c 100644 --- a/include/mmdeviceapi.idl +++ b/include/mmdeviceapi.idl @@ -26,6 +26,8 @@ cpp_quote("#ifndef E_UNSUPPORTED_TYPE") cpp_quote("#define E_UNSUPPORTED_TYPE HRESULT_FROM_WIN32(ERROR_UNSUPPORTED_TYPE)") cpp_quote("#endif") +cpp_quote("DEFINE_GUID(DEVINTERFACE_AUDIO_RENDER, 0xe6327cad,0xdcec,0x4949,0xae,0x8a,0x99,0x1e,0x97,0x6a,0x79,0xd2);") +cpp_quote("DEFINE_GUID(DEVINTERFACE_AUDIO_CAPTURE, 0x2eef81be,0x33fa,0x4800,0x96,0x70,0x1c,0xd4,0x74,0x97,0x2c,0x3f);") cpp_quote("#define DEVICE_STATE_ACTIVE 0x1") cpp_quote("#define DEVICE_STATE_DISABLED 0x2") @@ -237,6 +239,40 @@ typedef struct _AudioExtensionParams IMMDevice *pPnpDevnode; } AudioExtensionParams; +[ + object, + local, + uuid(72a22d78-cde4-431d-b8cc-843a71199b6d), + nonextensible, + pointer_default(unique) +] +interface IActivateAudioInterfaceAsyncOperation : IUnknown +{ + HRESULT GetActivateResult( + [out] HRESULT *result, + [out] IUnknown **iface + ); +} + +[ + object, + local, + uuid(41d949ab-9862-444a-80f6-c261334da5eb), + nonextensible, + pointer_default(unique) +] +interface IActivateAudioInterfaceCompletionHandler : IUnknown +{ + HRESULT ActivateCompleted( + [in] IActivateAudioInterfaceAsyncOperation *op + ); +} + +cpp_quote("HRESULT WINAPI ActivateAudioInterfaceAsync(") +cpp_quote(" const WCHAR *path, REFIID riid, PROPVARIANT *params,") +cpp_quote(" IActivateAudioInterfaceCompletionHandler *done_handler,") +cpp_quote(" IActivateAudioInterfaceAsyncOperation **op);") + [ uuid(2fdaafa3-7523-4f66-9957-9d5e7fe698f6), version(1.0) -- 2.28.0

2 1

[PATCH v3 1/5] ntdll: Introduce RtlProcessFlsData() and use it for FLS data destruction.
by Paul Gofman 06 Oct '20

06 Oct '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernelbase/thread.c | 2 +- dlls/ntdll/loader.c | 3 ++- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 10 ++++++++++ include/winternl.h | 1 + 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 0bfef62a7da..f2b746856e1 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1022,7 +1022,7 @@ void WINAPI DECLSPEC_HOTPATCH DeleteFiber( LPVOID fiber_ptr ) RtlExitUserThread( 1 ); } RtlFreeUserStack( fiber->stack_allocation ); - HeapFree( GetProcessHeap(), 0, fiber->fls_slots ); + RtlProcessFlsData( fiber->fls_slots, 3 ); HeapFree( GetProcessHeap(), 0, fiber ); } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 20bc3f977d1..cd27ce5658b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3255,7 +3255,8 @@ void WINAPI LdrShutdownThread(void) for (i = 0; i < tls_module_count; i++) RtlFreeHeap( GetProcessHeap(), 0, pointers[i] ); RtlFreeHeap( GetProcessHeap(), 0, pointers ); } - RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->FlsSlots ); + RtlProcessFlsData( NtCurrentTeb()->FlsSlots, 3 ); + NtCurrentTeb()->FlsSlots = NULL; RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->TlsExpansionSlots ); NtCurrentTeb()->TlsExpansionSlots = NULL; RtlReleasePebLock(); diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ce9f6281d5d..6f44f499825 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -874,6 +874,7 @@ @ stdcall RtlPopFrame(ptr) @ stdcall RtlPrefixString(ptr ptr long) @ stdcall RtlPrefixUnicodeString(ptr ptr long) +@ stdcall RtlProcessFlsData(ptr long) @ stub RtlPropertySetNameToGuid @ stub RtlProtectHeap @ stdcall RtlPushFrame(ptr) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 716ef3b61d0..57292043582 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -343,3 +343,13 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsGetValue( ULONG index, void **data ) return STATUS_SUCCESS; } + + +/*********************************************************************** + * RtlProcessFlsData (NTDLL.@) + */ +void WINAPI DECLSPEC_HOTPATCH RtlProcessFlsData( void *teb_fls_data, ULONG flags ) +{ + if (flags & 2) + RtlFreeHeap( GetProcessHeap(), 0, teb_fls_data ); +} diff --git a/include/winternl.h b/include/winternl.h index 82328167c9e..75324635ed7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3480,6 +3480,7 @@ NTSYSAPI NTSTATUS WINAPI RtlPinAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM); NTSYSAPI void WINAPI RtlPopFrame(TEB_ACTIVE_FRAME*); NTSYSAPI BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); +NTSYSAPI void WINAPI RtlProcessFlsData(void*,ULONG); NTSYSAPI void WINAPI RtlPushFrame(TEB_ACTIVE_FRAME*); NTSYSAPI NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings(DWORD,HANDLE,const WCHAR*,const WCHAR*,WCHAR*,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI RtlQueryAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM,ULONG*,ULONG*,WCHAR*,ULONG*); -- 2.26.2

2 9

[PATCH] mountmgr: Avoid unnecessary permission prompts on macOS 10.15 and newer.
by Brendan Shanks 06 Oct '20

06 Oct '20

On macOS 10.15 and newer, trying to open the device node of a removable drive will trigger an "<app> would like to access files on a removable volume" permission prompt, even if the user doesn't have permissions to access the device node (which is almost always the case). Check the value of access() (recommended by Apple for this purpose) before opening devices. --- dlls/mountmgr.sys/device.c | 7 +++++++ dlls/mountmgr.sys/diskarb.c | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index ccb0685cedd..53ccd3c5fdc 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -26,6 +26,7 @@ #include <stdarg.h> #include <stdio.h> #include <fcntl.h> +#include <unistd.h> #include <sys/time.h> #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> @@ -1026,6 +1027,12 @@ static BOOL get_volume_device_info( struct volume *volume ) if (!unix_device) return FALSE; + if (access( unix_device, R_OK )) + { + WARN("Unable to open %s, not accessible\n", debugstr_a(unix_device)); + return FALSE; + } + if (!(name = wine_get_dos_file_name( unix_device ))) { ERR("Failed to convert %s to NT, err %u\n", debugstr_a(unix_device), GetLastError()); diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 12da89d7688..25e0745372a 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -25,6 +25,7 @@ #include <errno.h> #include <stdarg.h> #include <stdio.h> +#include <unistd.h> #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif @@ -150,7 +151,8 @@ static void appeared_callback( DADiskRef disk, void *context ) else if (guid_ptr) add_volume( device, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr, NULL ); - if ((fd = open( device, O_RDONLY )) >= 0) + if (!access( device, R_OK ) && + (fd = open( device, O_RDONLY )) >= 0) { dk_scsi_identify_t dsi; -- 2.26.2

1 0

[RFC PATCH] PE conversion for dinput.dll and dinput8.dll
by Rémi Bernon 06 Oct '20

06 Oct '20

Hi! It seems like converting things to PE is all the rage these days, so I thought I could give it a try too. I don't know any application or games that requires dinput or dinput8 to be PE dlls, but I guess it wouldn't hurt any either. I did a PE + unix lib split, but apparently there were some plans to re-implement it over HID, so I'm just sending this as RFC, to see if there's any interest in it, or if the HID path is preferred. IMHO the HID path is much more work, so clearly not something achievable short term, and will possibly cause some feature regression. For instance the macos forcefeedback seems pretty straightforward to map to dinput and would be a shame to port over HID. Also HID is complicated add will add a lot of intermediate layers. The it can always be done in parallel or in addition to this split. I tried to make sure the unit tests as well as joy.cpl reported identical results, with an X-Box and a DualShock 4 gamepads, but I don't have any more specific joysticks to test with. For macos I just made sure that it builds, hopefully every single commit although I only checked the whole series. The series is quite long so I'm just attaching it as a single file that git am can split. Cheers, -- Rémi Bernon <rbernon(a)codeweavers.com>

1 0

[PATCH 5/5] kernel32/tests: Improve current console test mode.
by Jacek Caban 06 Oct '20

06 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-)

1 0

[PATCH 3/5] kernel32/tests: Move pseudo console tests before FreeConsole.
by Jacek Caban 06 Oct '20

06 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0