July 2019 - Wine-devel - list.winehq.org

[PATCH] include: Add UI_ANIMATION_KEYFRAME_STORYBOARD_START constant
by Alistair Leslie-Hughes 29 Jul '19

29 Jul '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/uianimation.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/uianimation.idl b/include/uianimation.idl index e8b366e8fb9..631af118990 100644 --- a/include/uianimation.idl +++ b/include/uianimation.idl @@ -30,6 +30,7 @@ interface IUIAnimationTransitionLibrary; typedef DOUBLE UI_ANIMATION_SECONDS; typedef struct { int _; } *UI_ANIMATION_KEYFRAME; +const UI_ANIMATION_KEYFRAME UI_ANIMATION_KEYFRAME_STORYBOARD_START = (UI_ANIMATION_KEYFRAME)(-1); const UI_ANIMATION_SECONDS UI_ANIMATION_SECONDS_EVENTUALLY = -1.0; -- 2.17.1

1 0

[PATCH] include/winuser.h: Add struct tagMENUGETOBJECTINFO.
by Alistair Leslie-Hughes 29 Jul '19

29 Jul '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/winuser.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/winuser.h b/include/winuser.h index 60bc473225b..abb6d5b5e9a 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3425,6 +3425,15 @@ typedef struct tagAUDIODESCRIPTION LCID Locale; } AUDIODESCRIPTION, *LPAUDIODESCRIPTION; +typedef struct tagMENUGETOBJECTINFO +{ + DWORD dwFlags; + UINT uPos; + HMENU hmenu; + void *riid; + void *pvObj; +} MENUGETOBJECTINFO, *PMENUGETOBJECTINFO; + #if defined(_WINGDI_) && !defined(NOGDI) WINUSERAPI LONG WINAPI ChangeDisplaySettingsA(LPDEVMODEA,DWORD); WINUSERAPI LONG WINAPI ChangeDisplaySettingsW(LPDEVMODEW,DWORD); -- 2.17.1

1 0

[PATCH] include/ws2ipdef.h: Add define SS_PORT
by Alistair Leslie-Hughes 29 Jul '19

29 Jul '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/ws2ipdef.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index 52c80c552e1..4cae361e5fe 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -280,6 +280,8 @@ typedef struct WS(in_pktinfo) { #define WS_IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } #endif /* USE_WS_PREFIX */ +#define SS_PORT(ssp) (((PSOCKADDR_IN)(ssp))->sin_port) + #ifdef __cplusplus extern "C" { #endif -- 2.17.1

1 0

[PATCH] include/sal.h: Add mode defines
by Alistair Leslie-Hughes 29 Jul '19

29 Jul '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/sal.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/sal.h b/include/sal.h index 35f64934f69..823361af17e 100644 --- a/include/sal.h +++ b/include/sal.h @@ -22,25 +22,34 @@ #define _Always_(exp) +#define _At_ #define _At_buffer_(a, b, c, d) #define _Check_return_ #define _Check_return_opt_ +#define _COM_Outptr_ +#define _COM_Outptr_result_maybenull_ + #define _Deref_out_ #define _Deref_out_z_ #define _Deref_out_opt_ #define _Deref_out_opt_z_ +#define _Deref_post_maybenull_ #define _Deref_post_opt_cap_(count) #define _Deref_post_opt_valid_ #define _Deref_post_opt_z_cap_(count) #define _Deref_post_valid_ #define _Deref_post_z_ +#define _Deref_pre_maybenull_ +#define _Deref_pre_z_ #define _Deref_prepost_opt_z_ #define _Deref_ret_z_ #define _Field_range_(min, max) +#define __in +#define __in_opt #define _In_ #define _In_bytecount_(count) #define _In_bytecount_c_(count) @@ -66,6 +75,7 @@ #define _In_reads_(count) #define _In_reads_bytes_(count) #define _In_reads_bytes_opt_(count) +#define _In_reads_opt_(count) #define _In_reads_opt_z_(count) #define _In_reads_or_z_(count) #define _In_reads_or_z_opt_(count) @@ -76,6 +86,7 @@ #define _In_z_count_(count) #define _In_z_count_c_(count) +#define __inout #define _Inout_ #define _Inout_bytecap_x_(count) #define _Inout_cap_(count) @@ -85,6 +96,7 @@ #define _Inout_opt_z_bytecap_(count) #define _Inout_updates_(count) #define _Inout_updates_bytes_(count) +#define _Inout_updates_bytes_all_opt_(count) #define _Inout_updates_opt_(count) #define _Inout_updates_z_(count) #define _Inout_updates_opt_z_(count) @@ -95,7 +107,10 @@ #define _Null_terminated_ +#define __out +#define __out_opt #define _Out_ +#define _Outptr_ #define _Out_bytecap_(count) #define _Out_bytecap_c_(count) #define _Out_bytecap_x_(count) @@ -129,6 +144,7 @@ #define _Out_opt_z_cap_post_count_(count1, count2) #define _Out_ptrdiff_cap_(count) #define _Out_writes_(count) +#define _Out_writes_all_(count) #define _Out_writes_bytes_(count) #define _Out_writes_bytes_all_(count) #define _Out_writes_bytes_all_opt_(count) @@ -150,10 +166,12 @@ #define _Out_z_cap_x_(count) #define _Out_z_cap_post_count_(count1, count2) +#define _Outptr_opt_ #define _Outptr_result_buffer_(count) #define _Outptr_result_buffer_maybenull_(count) #define _Outptr_result_maybenull_ #define _Outptr_result_maybenull_z_ +#define _Outptr_result_nullonfailure_ #define _Outptr_result_z_ #define _Param_(p) @@ -164,15 +182,20 @@ #define _Post_invalid_ #define _Post_maybez_ #define _Post_ptr_invalid_ +#define _Post_readable_byte_size_(count) #define _Post_readable_size_(count) +#define _Post_same_lock_(exp, exp1) #define _Post_satisfies_(exp) #define _Post_writable_byte_size_(count) +#define _Post_writable_size_(count) #define _Post_z_ #define _Pre_cap_for_(count) #define _Pre_maybenull_ #define _Pre_notnull_ +#define _Pre_null_ #define _Pre_opt_z_ +#define _Pre_valid_ #define _Pre_writable_size_(count) #define _Pre_z_ #define _Prepost_z_ @@ -180,6 +203,10 @@ #define _Printf_format_string_ #define _Printf_format_string_params_(count) +#define _Reserved_ + +#define _Result_nullonfailure_ + #define _Ret_maybenull_ #define _Ret_maybenull_z_ #define _Ret_notnull_ @@ -187,9 +214,12 @@ #define _Ret_opt_bytecap_(count) #define _Ret_opt_bytecap_x_(count) #define _Ret_opt_z_cap_(count) +#define _Ret_range_(exp,exp2) #define _Ret_writes_bytes_maybenull_(count) #define _Ret_z_ +#define _Return_type_success_(count) + #define _Scanf_format_string_ #define _Scanf_format_string_params_(count) #define _Scanf_s_format_string_ -- 2.17.1

1 0

[PATCH] include: Add filter.idl
by Alistair Leslie-Hughes 29 Jul '19

29 Jul '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/filter.idl | 101 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 include/filter.idl diff --git a/include/Makefile.in b/include/Makefile.in index 69135879a9f..7c841bc299a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -268,6 +268,7 @@ SOURCES = \ fci.h \ fdi.h \ fileapi.h \ + filter.idl \ fltdefs.h \ fontsub.h \ fusion.idl \ diff --git a/include/filter.idl b/include/filter.idl new file mode 100644 index 00000000000..f176ac3be5e --- /dev/null +++ b/include/filter.idl @@ -0,0 +1,101 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * 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 + */ + +import "unknwn.idl"; +import "objidl.idl"; +import "propidl.idl"; + +typedef struct tagFULLPROPSPEC +{ + GUID guidPropSet; + PROPSPEC psProperty; +} FULLPROPSPEC; + +[ + object, + uuid(89bcb740-6119-101a-bcb7-00dd010655af), + pointer_default(unique) +] + +interface IFilter : IUnknown +{ + typedef enum tagIFILTER_INIT + { + IFILTER_INIT_CANON_PARAGRAPHS = 1, + IFILTER_INIT_HARD_LINE_BREAKS = 2, + IFILTER_INIT_CANON_HYPHENS = 4, + IFILTER_INIT_CANON_SPACES = 8, + IFILTER_INIT_APPLY_INDEX_ATTRIBUTES = 16, + IFILTER_INIT_APPLY_OTHER_ATTRIBUTES = 32, + IFILTER_INIT_INDEXING_ONLY = 64, + IFILTER_INIT_SEARCH_LINKS = 128, + IFILTER_INIT_APPLY_CRAWL_ATTRIBUTES = 256, + IFILTER_INIT_FILTER_OWNED_VALUE_OK = 512, + IFILTER_INIT_FILTER_AGGRESSIVE_BREAK = 1024, + IFILTER_INIT_DISABLE_EMBEDDED = 2048, + IFILTER_INIT_EMIT_FORMATTING = 4096 + } IFILTER_INIT; + + typedef enum tagIFILTER_FLAGS + { + IFILTER_FLAGS_OLE_PROPERTIES = 1 + } IFILTER_FLAGS; + + typedef enum tagCHUNKSTATE + { + CHUNK_TEXT = 0x1, + CHUNK_VALUE = 0x2, + CHUNK_FILTER_OWNED_VALUE = 0x4 + } CHUNKSTATE; + + typedef enum tagCHUNK_BREAKTYPE + { + CHUNK_NO_BREAK = 0, + CHUNK_EOW = 1, + CHUNK_EOS = 2, + CHUNK_EOP = 3, + CHUNK_EOC = 4 + } CHUNK_BREAKTYPE; + + typedef struct tagFILTERREGION + { + ULONG idChunk; + ULONG cwcStart; + ULONG cwcExtent; + } FILTERREGION; + + typedef struct tagSTAT_CHUNK + { + ULONG idChunk; + CHUNK_BREAKTYPE breakType; + CHUNKSTATE flags; + LCID locale; + FULLPROPSPEC attribute; + ULONG idChunkSource; + ULONG cwcStartSource; + ULONG cwcLenSource; + } STAT_CHUNK; + + SCODE Init([in] ULONG flags, [in] ULONG cnt, [in, size_is(cnt), unique] FULLPROPSPEC const *attributes, [out] ULONG *out_flags); + SCODE GetChunk([out] STAT_CHUNK *stat); + SCODE GetText([in, out] ULONG *cnt, [out, size_is(*cnt)] WCHAR *buffer); + SCODE GetValue([out] PROPVARIANT **value); + + [local] + SCODE BindRegion([in] FILTERREGION pos, [in] REFIID riid, [out] void **unk); +} -- 2.17.1

1 0

RFC: VK_EXTERNAL_MEMORY_WIN32 extension patch
by Derek Lesho 29 Jul '19

29 Jul '19

Hello, before I break this patch up and submit a patchset, I'd like to inquire about a few things in this patch I have made. The biggest question I have is how we want to process allocate_info without modifying what is passed in. In order to copy the whole pNext chain or the unknown bits, we'd need a way to get the struct length given the sType. To do this we'd have to generate something in make_vulkan, but I'm not sure of the specifics (mostly where the helper would go). Alternatively, we could try restoring the chain after it is finished, however this may not be thread safe, if the struct is being read in another thread. Additionally, I'd like to know how to better organize the functions for creating/operating on gpu-resource objects. Right now they're in ntdll's misc.c, so that I can use some ntdll internal functions, but maybe we should have a separate file for this. If any of you want to play around with this patch, Joshua Ashton (d9vk creator) made a few patches on DXVK that implement D3D shared resources using this extension and files, and modified a D3D example to use shared resources, which is what I've been using to test my implementation: https://github.com/Joshua-Ashton/dxvk/tree/dxvk-shared-resources D3D11 binary attached (Joshua didn't send me source) Note: Make sure to reset to HEAD~1 then build, as I think the latest commit is broken. Also, replace VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_(+KMT_)BIT with VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_(+KMT_)BIT. Also, this branch only compiles with MSVC. Alternatively, I'll attach the binaries to this email. Note 2: Make sure to use native d3dcompiler_47 Shared-Resources.tar.xz <https://drive.google.com/file/d/112N8xhnUJ0FyBDodgbP42fD31-VLq5ka/view?usp=…>

3 4

[PATCH v2] d3dcompiler: Parse type name strings.
by Zebediah Figura 29 Jul '19

29 Jul '19

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/reflection.c | 15 +++++++++++++++ dlls/d3dcompiler_43/tests/reflection.c | 12 +++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index e492011c55f..b163fca9e73 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -51,6 +51,7 @@ struct d3dcompiler_shader_reflection_type D3D11_SHADER_TYPE_DESC desc; struct d3dcompiler_shader_reflection_type_member *members; + char *name; }; struct d3dcompiler_shader_reflection_type_member @@ -222,6 +223,7 @@ static void d3dcompiler_shader_reflection_type_destroy(struct wine_rb_entry *ent HeapFree(GetProcessHeap(), 0, t->members); } + heap_free(t->name); HeapFree(GetProcessHeap(), 0, t); } @@ -1244,6 +1246,19 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type } } + if ((type->reflection->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK) >= 0x500) + { + read_dword(&ptr, &offset); + if (!copy_name(data + offset, &type->name)) + { + ERR("Failed to copy name.\n"); + heap_free(members); + return E_OUTOFMEMORY; + } + desc->Name = type->name; + TRACE("Type name: %s.\n", debugstr_a(type->name)); + } + type->members = members; return S_OK; diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 2c1c9028bbb..1b9d2d418d9 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1207,11 +1207,11 @@ static const struct { static const D3D11_SHADER_TYPE_DESC test_reflection_constant_buffer_type_result[] = { - {D3D11_SVC_INTERFACE_POINTER, D3D11_SVT_INTERFACE_POINTER, 1, 4, 0, 1, 0}, - {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 1, 0}, - {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 2, 1, 0}, - {D3D_SVC_SCALAR, D3D_SVT_INT, 1, 1, 0, 1, 0}, - {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 2, 0, 1, 0}, + {D3D11_SVC_INTERFACE_POINTER, D3D11_SVT_INTERFACE_POINTER, 1, 4, 0, 1, 0, "iTest"}, + {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 1, 0, "float"}, + {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 2, 1, 0, "float"}, + {D3D_SVC_SCALAR, D3D_SVT_INT, 1, 1, 0, 1, 0, "int"}, + {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 2, 0, 1, 0, "s"}, }; static void test_reflection_constant_buffer(void) @@ -1459,6 +1459,8 @@ static void test_reflection_constant_buffer(void) i, tdesc.Elements, ptdesc->Elements); ok(tdesc.Offset == ptdesc->Offset, "GetDesc(%u) Offset failed, got %u, expected %u\n", i, tdesc.Offset, ptdesc->Offset); + ok(!strcmp(tdesc.Name, ptdesc->Name), "GetDesc(%u) Name failed, got %s, expected %s\n", + i, tdesc.Name, ptdesc->Name); } /* types */ -- 2.20.1

2 1

[PATCH] wined3d: Inhibit the screensaver while a full-screen application has focus.
by Zebediah Figura 29 Jul '19

29 Jul '19

This matches Windows behaviour at least as of Windows 7. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Windows does not seem to do it using SystemParametersInfo(), nor using SetThreadExecutionState(). I suspect it is instead using the Power*Request() APIs, but as far as I'm aware implementing those would require getting at an external library such as X11 or dbus from ntdll (or kernel32), which is not permitted. dlls/wined3d/device.c | 2 ++ dlls/wined3d/swapchain.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a4c26cf3976..d37a2169707 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1033,6 +1033,7 @@ HRESULT CDECL wined3d_device_acquire_focus_window(struct wined3d_device *device, InterlockedExchangePointer((void **)&device->focus_window, window); SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, FALSE, NULL, 0); return WINED3D_OK; } @@ -1043,6 +1044,7 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device) if (device->focus_window) wined3d_unregister_window(device->focus_window); InterlockedExchangePointer((void **)&device->focus_window, NULL); + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, TRUE, NULL, 0); } static void device_init_swapchain_state(struct wined3d_device *device, struct wined3d_swapchain *swapchain) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8603c8de7a0..7e35a2f349e 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1198,6 +1198,8 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa ShowWindow(swapchain->device_window, SW_MINIMIZE); } + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, !activate, NULL, 0); + if (!focus_messages) device->filter_messages = filter_messages; } -- 2.20.1

2 2

[PATCH v2] wined3d: Inhibit the screensaver while a full-screen application has focus.
by Zebediah Figura 29 Jul '19

29 Jul '19

This matches Windows behaviour at least as of Windows 7. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Windows does not seem to do it using SystemParametersInfo(), nor using SetThreadExecutionState(). I suspect it is instead using the Power*Request() APIs, but as far as I'm aware implementing those would require getting at an external library such as X11 or dbus from ntdll (or kernel32), which is not permitted. dlls/wined3d/device.c | 6 ++++++ dlls/wined3d/swapchain.c | 2 ++ dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a4c26cf3976..ab4a6ce9400 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1023,6 +1023,8 @@ void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *devic HRESULT CDECL wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window) { + UINT screensaver_active; + TRACE("device %p, window %p.\n", device, window); if (!wined3d_register_window(NULL, window, device, 0)) @@ -1033,6 +1035,9 @@ HRESULT CDECL wined3d_device_acquire_focus_window(struct wined3d_device *device, InterlockedExchangePointer((void **)&device->focus_window, window); SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + SystemParametersInfoW(SPI_GETSCREENSAVEACTIVE, 0, &screensaver_active, 0); + device->restore_screensaver = !!screensaver_active; + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, FALSE, NULL, 0); return WINED3D_OK; } @@ -1043,6 +1048,7 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device) if (device->focus_window) wined3d_unregister_window(device->focus_window); InterlockedExchangePointer((void **)&device->focus_window, NULL); + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, device->restore_screensaver, NULL, 0); } static void device_init_swapchain_state(struct wined3d_device *device, struct wined3d_swapchain *swapchain) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8603c8de7a0..6534fe28cb0 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1148,6 +1148,8 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa if (!focus_messages) device->filter_messages = 1; + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, !activate && device->restore_screensaver, NULL, 0); + if (activate) { if (!(device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b959a280608..56c7e0004d4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3171,7 +3171,8 @@ struct wined3d_device BYTE inScene : 1; /* A flag to check for proper BeginScene / EndScene call pairs */ BYTE softwareVertexProcessing : 1; /* process vertex shaders using software or hardware */ BYTE filter_messages : 1; - BYTE padding : 3; + BYTE restore_screensaver : 1; + BYTE padding : 2; unsigned char surface_alignment; /* Line Alignment of surfaces */ -- 2.20.1

1 0

[PATCH v9 7/8] winex11.drv: Implement native mouse-button raw-input using RawButton*.
by Derek Lesho 29 Jul '19

29 Jul '19

Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> --- dlls/winex11.drv/mouse.c | 97 +++++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/x11drv.h | 1 + 2 files changed, 93 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 7423f946b9..9259907eb5 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -257,6 +257,7 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator thread_data->x_rel_valuator.number = -1; thread_data->y_rel_valuator.number = -1; + thread_data->wheel_valuator.number = -1; for (i = 0; i < n_valuators; i++) { @@ -274,6 +275,10 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator { valuator_data = &thread_data->y_rel_valuator; } + else if (class->number == 3) /* scroll wheel */ + { + valuator_data = &thread_data->wheel_valuator; + } if (valuator_data) { valuator_data->number = class->number; @@ -285,6 +290,21 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator #endif +/*********************************************************************** + * inform_wineserver + */ +static void inform_wineserver(void) +{ + static int once = 0; + if (!once) + { + RAWINPUT raw_input; + raw_input.header.dwType = RIM_ENABLE_NATIVE_MOUSE; + __wine_send_raw_input(&raw_input); + once = 1; + } +} + /*********************************************************************** * X11DRV_XInput2_Enable */ @@ -318,6 +338,8 @@ void X11DRV_XInput2_Enable(void) mask.deviceid = XIAllMasterDevices; memset( mask_bits, 0, sizeof(mask_bits) ); XISetMask( mask_bits, XI_RawMotion ); + XISetMask( mask_bits, XI_RawButtonPress ); + XISetMask( mask_bits, XI_RawButtonRelease ); pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); @@ -326,6 +348,8 @@ void X11DRV_XInput2_Enable(void) pXIFreeDeviceInfo( pointer_info ); data->xi2_state = xi_enabled; + + inform_wineserver(); #endif } @@ -350,6 +374,7 @@ void X11DRV_XInput2_Disable(void) pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); data->x_rel_valuator.number = -1; data->y_rel_valuator.number = -1; + data->wheel_valuator.number = -1; #endif } @@ -1713,16 +1738,17 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) INPUT input; RAWINPUT raw_input; int i; - double dx = 0, dy = 0, raw_dx = 0, raw_dy = 0, val, raw_val; + double dx = 0, dy = 0, raw_dx = 0, raw_dy = 0, dwheel = 0, val, raw_val; struct x11drv_thread_data *thread_data = x11drv_thread_data(); - struct x11drv_valuator_data *x_rel, *y_rel; + struct x11drv_valuator_data *x_rel, *y_rel, *wheel; - if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0) return FALSE; + if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0 || thread_data->wheel_valuator.number < 0) return FALSE; if (!event->valuators.mask_len) return FALSE; if (thread_data->xi2_state < xi_enabled) return FALSE; x_rel = &thread_data->x_rel_valuator; y_rel = &thread_data->y_rel_valuator; + wheel = &thread_data->wheel_valuator; input.type = INPUT_MOUSE; input.u.mi.mouseData = 0; @@ -1741,7 +1767,7 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) virtual_rect = get_virtual_screen_rect(); - for (i = 0; i <= max ( x_rel->number, y_rel->number ); i++) + for (i = 0; i <= max( wheel->number, max( x_rel->number, y_rel->number ) ); i++) { if (!XIMaskIsSet( event->valuators.mask, i )) continue; val = *values++; @@ -1764,6 +1790,8 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) raw_input.data.mouse.lLastY = raw_dy = raw_val; } + if (i == wheel->number) + dwheel = raw_val; } if (broken_rawevents && is_old_motion_event( xev->serial )) @@ -1778,12 +1806,66 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) __wine_send_input( 0, &input ); } - TRACE("raw event %f,%f\n", raw_dx, raw_dy); + if (dwheel) + { + raw_input.data.mouse.u.usButtonFlags = RI_MOUSE_WHEEL; + raw_input.data.mouse.u.usButtonData = dwheel; + } + + TRACE("raw event %f,%f + %f\n", raw_dx, raw_dy, dwheel); __wine_send_raw_input( &raw_input ); return TRUE; } +/*********************************************************************** + * X11DRV_RawButton + */ +static BOOL X11DRV_RawButton( XGenericEventCookie *xev ) +{ + RAWINPUT ri; + + static const unsigned short raw_button_press_flags[] = { + 0, /* 0 = unused */ + RI_MOUSE_LEFT_BUTTON_DOWN, /* 1 */ + RI_MOUSE_MIDDLE_BUTTON_DOWN, /* 2 */ + RI_MOUSE_RIGHT_BUTTON_DOWN, /* 3 */ + 0, /* 4 = unknown */ + 0, /* 5 = unknown */ + 0, /* 6 = unknown */ + 0, /* 7 = unknown */ + RI_MOUSE_BUTTON_4_DOWN, /* 8 */ + RI_MOUSE_BUTTON_5_DOWN /* 9 */ + }; + + static const unsigned short raw_button_release_flags[] = { + 0, /* 0 = unused */ + RI_MOUSE_LEFT_BUTTON_UP, /* 1 */ + RI_MOUSE_MIDDLE_BUTTON_UP, /* 2 */ + RI_MOUSE_RIGHT_BUTTON_UP, /* 3 */ + 0, /* 4 = unknown */ + 0, /* 5 = unknown */ + 0, /* 6 = unknown */ + 0, /* 7 = unknown */ + RI_MOUSE_BUTTON_4_UP, /* 8 */ + RI_MOUSE_BUTTON_5_UP /* 9 */ + }; + + int detail = ((XIRawEvent*)xev->data)->detail; + if (detail > 9) return TRUE; + + ri.header.dwType = RIM_TYPEMOUSE; + ri.data.mouse.u.usButtonFlags = xev->evtype == XI_RawButtonPress ? raw_button_press_flags[detail] : raw_button_release_flags[detail] ; + ri.data.mouse.u.usButtonData = 0; + ri.data.mouse.lLastX = 0; + ri.data.mouse.lLastY = 0; + ri.data.mouse.ulExtraInformation = 0; + + __wine_send_raw_input( &ri ); + + return TRUE; +} + #endif /* HAVE_X11_EXTENSIONS_XINPUT2_H */ @@ -1845,6 +1927,11 @@ BOOL X11DRV_GenericEvent( HWND hwnd, XEvent *xev ) case XI_RawMotion: ret = X11DRV_RawMotion( event ); break; + case XI_RawButtonPress: + /* fall through */ + case XI_RawButtonRelease: + ret = X11DRV_RawButton( event ); + break; default: TRACE( "Unhandled event %#x\n", event->evtype ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a6d64f4383..8af2ebfcef 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -340,6 +340,7 @@ struct x11drv_thread_data enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled, xi_extra } xi2_state; /* XInput2 state */ struct x11drv_valuator_data x_rel_valuator; struct x11drv_valuator_data y_rel_valuator; + struct x11drv_valuator_data wheel_valuator; }; extern struct x11drv_thread_data *x11drv_init_thread_data(void) DECLSPEC_HIDDEN; -- 2.22.0

2 2