wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Ziqing Hui : include: Remove useless semi-colon in d2d1_3.idl.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 795bc4804b226da34ffd54e1891a99cee62dea90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=795bc4804b226da34ffd54e1… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Apr 26 10:43:53 2022 +0800 include: Remove useless semi-colon in d2d1_3.idl. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_3.idl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index 91835ee1a77..07dc98968f8 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -143,7 +143,7 @@ interface ID2D1InkStyle : ID2D1Resource [in] D2D1_INK_NIB_SHAPE shape ); D2D1_INK_NIB_SHAPE GetNibShape(); -}; +} [ object, @@ -188,7 +188,7 @@ interface ID2D1Ink : ID2D1Resource [in, optional] const D2D1_MATRIX_3X2_F *world_transform, [out] D2D1_RECT_F *bounds ); -}; +} [ object, @@ -203,7 +203,7 @@ interface ID2D1GradientMesh : ID2D1Resource [out] D2D1_GRADIENT_MESH_PATCH *patches, [in] UINT32 patch_count ); -}; +} [ object, @@ -216,7 +216,7 @@ interface ID2D1ImageSource : ID2D1Image HRESULT TryReclaimResources( [out] BOOL *resources_discarded ); -}; +} [ object, @@ -234,7 +234,7 @@ interface ID2D1ImageSourceFromWic : ID2D1ImageSource void GetSource( [out] IWICBitmapSource **source ); -}; +} [ object, @@ -249,7 +249,7 @@ interface ID2D1TransformedImageSource : ID2D1Image void GetProperties( [out] D2D1_TRANSFORMED_IMAGE_SOURCE_PROPERTIES *out ); -}; +} [ object,

1 0

Ziqing Hui : include: Add defines for ID2D1TransformGraph.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 7597fa6ed5a35a282c24851dd507a3e3bb28556b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7597fa6ed5a35a282c24851d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Apr 26 10:40:38 2022 +0800 include: Add defines for ID2D1TransformGraph. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effectauthor.idl | 46 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index 442c0156227..cec7de8c311 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -212,3 +212,49 @@ interface ID2D1ComputeInfo : ID2D1RenderInfo [in] ID2D1ResourceTexture *texture ); } + +[ + object, + uuid(b2efe1e7-729f-4102-949f-505fa21bf666), + local, +] +interface ID2D1TransformNode : IUnknown +{ + UINT32 GetInputCount(); +} + +[ + object, + uuid(13d29038-c3e6-4034-9081-13b53a417992), + local, +] +interface ID2D1TransformGraph : IUnknown +{ + UINT32 GetInputCount(); + HRESULT SetSingleTransformNode( + [in] ID2D1TransformNode *node + ); + HRESULT AddNode( + [in] ID2D1TransformNode *node + ); + HRESULT RemoveNode( + [in] ID2D1TransformNode *node + ); + HRESULT SetOutputNode( + [in] ID2D1TransformNode *node + ); + HRESULT ConnectNode( + [in] ID2D1TransformNode *from_node, + [in] ID2D1TransformNode *to_node, + [in] UINT32 index + ); + HRESULT ConnectToEffectInput( + [in] UINT32 input_index, + [in] ID2D1TransformNode *node, + [in] UINT32 node_index + ); + void Clear(); + HRESULT SetPassthroughGraph( + [in] UINT32 index + ); +}

1 0

Ziqing Hui : include: Add defines for ID2D1ComputeInfo.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 3d891e413057aa2e2657752aa0f13897207a81c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d891e413057aa2e2657752a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Apr 26 10:40:37 2022 +0800 include: Add defines for ID2D1ComputeInfo. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effectauthor.idl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index 1f98999a117..442c0156227 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -192,3 +192,23 @@ interface ID2D1DrawInfo : ID2D1RenderInfo [in, optional] const GUID *shader ); } + +[ + object, + uuid(5598b14b-9fd7-48b7-9bdb-8f0964eb38bc), + local, +] +interface ID2D1ComputeInfo : ID2D1RenderInfo +{ + HRESULT SetComputeShaderconstantBuffer( + [in] const BYTE *buffer, + [in] UINT32 size + ); + HRESULT SetComputeShader( + [in] REFGUID id + ); + HRESULT SetResourceTexture( + [in] UINT32 index, + [in] ID2D1ResourceTexture *texture + ); +}

1 0

Ziqing Hui : include: Add defines for ID2D1DrawInfo.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 04de217c266e667a60276aa6eb054db90bc87fc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04de217c266e667a60276aa6… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Apr 26 10:40:36 2022 +0800 include: Add defines for ID2D1DrawInfo. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effectauthor.idl | 93 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index 91c8fc20141..1f98999a117 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -40,12 +40,73 @@ typedef enum D2D1_CHANNEL_DEPTH D2D1_CHANNEL_DEPTH_FORCE_DWORD = 0xffffffff } D2D1_CHANNEL_DEPTH; +typedef enum D2D1_PIXEL_OPTIONS +{ + D2D1_PIXEL_OPTIONS_NONE = 0x0, + D2D1_PIXEL_OPTIONS_TRIVIAL_SAMPLING = 0x1, + D2D1_PIXEL_OPTIONS_FORCE_DWORD = 0xffffffff +} D2D1_PIXEL_OPTIONS; + +typedef enum D2D1_VERTEX_OPTIONS +{ + D2D1_VERTEX_OPTIONS_NONE = 0x0, + D2D1_VERTEX_OPTIONS_DO_NOT_CLEAR = 0x1, + D2D1_VERTEX_OPTIONS_USE_DEPTH_BUFFER = 0x2, + D2D1_VERTEX_OPTIONS_ASSUME_NO_OVERLAP = 0x4, + D2D1_VERTEX_OPTIONS_FORCE_DWORD = 0xffffffff +} D2D1_VERTEX_OPTIONS; + +typedef enum D2D1_BLEND_OPERATION +{ + D2D1_BLEND_OPERATION_ADD = 0x1, + D2D1_BLEND_OPERATION_SUBTRACT = 0x2, + D2D1_BLEND_OPERATION_REV_SUBTRACT = 0x3, + D2D1_BLEND_OPERATION_MIN = 0x4, + D2D1_BLEND_OPERATION_MAX = 0x5, + D2D1_BLEND_OPERATION_FORCE_DWORD = 0xffffffff +} D2D1_BLEND_OPERATION; + +typedef enum D2D1_BLEND +{ + D2D1_BLEND_ZERO = 1, + D2D1_BLEND_ONE = 2, + D2D1_BLEND_SRC_COLOR = 3, + D2D1_BLEND_INV_SRC_COLOR = 4, + D2D1_BLEND_SRC_ALPHA = 5, + D2D1_BLEND_INV_SRC_ALPHA = 6, + D2D1_BLEND_DEST_ALPHA = 7, + D2D1_BLEND_INV_DEST_ALPHA = 8, + D2D1_BLEND_DEST_COLOR = 9, + D2D1_BLEND_INV_DEST_COLOR = 10, + D2D1_BLEND_SRC_ALPHA_SAT = 11, + D2D1_BLEND_BLEND_FACTOR = 14, + D2D1_BLEND_INV_BLEND_FACTOR = 15, + D2D1_BLEND_FORCE_DWORD = 0xffffffff +} D2D1_BLEND; + typedef struct D2D1_INPUT_DESCRIPTION { D2D1_FILTER filter; UINT32 levelOfDetailCount; } D2D1_INPUT_DESCRIPTION; +typedef struct D2D1_VERTEX_RANGE +{ + UINT32 startVertex; + UINT32 vertexCount; +} D2D1_VERTEX_RANGE; + +typedef struct D2D1_BLEND_DESCRIPTION +{ + D2D1_BLEND sourceBlend; + D2D1_BLEND destinationBlend; + D2D1_BLEND_OPERATION blendOperation; + D2D1_BLEND sourceBlendAlpha; + D2D1_BLEND destinationBlendAlpha; + D2D1_BLEND_OPERATION blendOperationAlpha; + float blendFactor[4]; +} D2D1_BLEND_DESCRIPTION; + [ object, uuid(9b8b1336-00a5-4668-92b7-ced5d8bf9b7b), @@ -99,3 +160,35 @@ interface ID2D1RenderInfo : IUnknown [in] UINT32 count ); } + +[ + object, + uuid(693ce632-7f2f-45de-93fe-18d88b37aa21), + local, +] +interface ID2D1DrawInfo : ID2D1RenderInfo +{ + HRESULT SetPixelShaderConstantBuffer( + [in] const BYTE *buffer, + [in] UINT32 size + ); + HRESULT SetResourceTexture( + [in] UINT32 index, + [in] ID2D1ResourceTexture *texture + ); + HRESULT SetVertexShaderConstantBuffer( + [in] const BYTE *buffer, + [in] UINT32 size + ); + HRESULT SetPixelShader( + [in] REFGUID id, + [in] D2D1_PIXEL_OPTIONS options + ); + HRESULT SetVertexProcessing( + [in, optional] ID2D1VertexBuffer *buffer, + [in] D2D1_VERTEX_OPTIONS options, + [in, optional] const D2D1_BLEND_DESCRIPTION *description, + [in, optional] const D2D1_VERTEX_RANGE *range, + [in, optional] const GUID *shader + ); +}

1 0

Ziqing Hui : include: Add defines for ID2D1RenderInfo.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 3b64dfd8e6fc38d5aebf1face8cf7cd923cf6864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b64dfd8e6fc38d5aebf1fac… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Apr 26 10:40:35 2022 +0800 include: Add defines for ID2D1RenderInfo. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effectauthor.idl | 51 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index 9d64690b453..91c8fc20141 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -18,6 +18,34 @@ import "d2d1_1.idl"; +typedef enum D2D1_FILTER +{ + D2D1_FILTER_MIN_MAG_MIP_POINT = 0x00, + D2D1_FILTER_MIN_MAG_POINT_MIP_LINEAR = 0x01, + D2D1_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x04, + D2D1_FILTER_MIN_POINT_MAG_MIP_LINEAR = 0x05, + D2D1_FILTER_MIN_LINEAR_MAG_MIP_POINT = 0x10, + D2D1_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x11, + D2D1_FILTER_MIN_MAG_LINEAR_MIP_POINT = 0x14, + D2D1_FILTER_MIN_MAG_MIP_LINEAR = 0x15, + D2D1_FILTER_ANISOTROPIC = 0x55, + D2D1_FILTER_FORCE_DWORD = 0xffffffff +} D2D1_FILTER; + +typedef enum D2D1_CHANNEL_DEPTH +{ + D2D1_CHANNEL_DEPTH_DEFAULT = 0x0, + D2D1_CHANNEL_DEPTH_1 = 0x1, + D2D1_CHANNEL_DEPTH_4 = 0x4, + D2D1_CHANNEL_DEPTH_FORCE_DWORD = 0xffffffff +} D2D1_CHANNEL_DEPTH; + +typedef struct D2D1_INPUT_DESCRIPTION +{ + D2D1_FILTER filter; + UINT32 levelOfDetailCount; +} D2D1_INPUT_DESCRIPTION; + [ object, uuid(9b8b1336-00a5-4668-92b7-ced5d8bf9b7b), @@ -48,3 +76,26 @@ interface ID2D1ResourceTexture : IUnknown [in] UINT32 data_size ); } + +[ + object, + uuid(519ae1bd-d19a-420d-b849-364f594776b7), + local, +] +interface ID2D1RenderInfo : IUnknown +{ + HRESULT SetInputDescription( + [in] UINT32 index, + [in] D2D1_INPUT_DESCRIPTION description + ); + HRESULT SetOutputBuffer( + [in] D2D1_BUFFER_PRECISION precision, + [in] D2D1_CHANNEL_DEPTH depth + ); + void SetCached( + [in] BOOL is_cached + ); + void SetInstructionCountHint( + [in] UINT32 count + ); +}

1 0

Ziqing Hui : include: Add defines for ID2D1ResourceTexture.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: ef16100946e9870bfc8333195735e4ff49c13a94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef16100946e9870bfc833319… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Apr 26 10:40:34 2022 +0800 include: Add defines for ID2D1ResourceTexture. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effectauthor.idl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index 8b7a024c025..9d64690b453 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -31,3 +31,20 @@ interface ID2D1VertexBuffer : IUnknown ); HRESULT Unmap(); } + +[ + object, + uuid(688d15c3-02b0-438d-b13a-d1b44c32c39a), + local, +] +interface ID2D1ResourceTexture : IUnknown +{ + HRESULT Update( + [in] const UINT32 *min_extents, + [in] const UINT32 *max_extents, + [in] const UINT32 *strides, + [in] UINT32 dimensions, + [in] const BYTE *data, + [in] UINT32 data_size + ); +}

1 0

Ziqing Hui : include: Add defines for ID2D1VertexBuffer.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 2629c606bf8e464eb580153ce666069f9a570a7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2629c606bf8e464eb580153c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Apr 26 10:40:33 2022 +0800 include: Add defines for ID2D1VertexBuffer. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/effect.c | 1 + include/Makefile.in | 1 + include/d2d1effectauthor.idl | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 601932b005b..350ac3c7bbf 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -17,6 +17,7 @@ */ #include "d2d1_private.h" +#include "d2d1effectauthor.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/include/Makefile.in b/include/Makefile.in index 31dc14a39d1..571f91d6ced 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -104,6 +104,7 @@ SOURCES = \ d2d1_1.idl \ d2d1_2.idl \ d2d1_3.idl \ + d2d1effectauthor.idl \ d2d1effects.idl \ d2d1effects_1.idl \ d2d1effects_2.idl \ diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl new file mode 100644 index 00000000000..8b7a024c025 --- /dev/null +++ b/include/d2d1effectauthor.idl @@ -0,0 +1,33 @@ +/* + * Copyright 2022 Ziqing Hui 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 + */ + + import "d2d1_1.idl"; + +[ + object, + uuid(9b8b1336-00a5-4668-92b7-ced5d8bf9b7b), + local, +] +interface ID2D1VertexBuffer : IUnknown +{ + HRESULT Map( + [out] BYTE **data, + [in] UINT32 size + ); + HRESULT Unmap(); +}

1 0

Jan Sikorski : msvcrt: Faster memcmp().
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: d5a0334b1399fb983aa1e65edf75c97c5fadaaa2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5a0334b1399fb983aa1e65e… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Apr 19 15:53:46 2022 +0200 msvcrt: Faster memcmp(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 3b352ac0bf2..181a161481c 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2675,21 +2675,64 @@ int CDECL I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I10_OUTPU } #undef I10_OUTPUT_MAX_PREC -/********************************************************************* - * memcmp (MSVCRT.@) - */ -int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) +static inline int memcmp_bytes(const void *ptr1, const void *ptr2, size_t n) { const unsigned char *p1, *p2; for (p1 = ptr1, p2 = ptr2; n; n--, p1++, p2++) { - if (*p1 < *p2) return -1; - if (*p1 > *p2) return 1; + if (*p1 != *p2) + return *p1 > *p2 ? 1 : -1; } return 0; } +static inline int memcmp_blocks(const void *ptr1, const void *ptr2, size_t size) +{ + typedef uint64_t DECLSPEC_ALIGN(1) unaligned_ui64; + + const uint64_t *p1 = ptr1; + const unaligned_ui64 *p2 = ptr2; + size_t remainder = size & (sizeof(uint64_t) - 1); + size_t block_count = size / sizeof(uint64_t); + + while (block_count) + { + if (*p1 != *p2) + return memcmp_bytes(p1, p2, sizeof(uint64_t)); + + p1++; + p2++; + block_count--; + } + + return memcmp_bytes(p1, p2, remainder); +} + +/********************************************************************* + * memcmp (MSVCRT.@) + */ +int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) +{ + const unsigned char *p1 = ptr1, *p2 = ptr2; + size_t align; + int result; + + if (n < sizeof(uint64_t)) + return memcmp_bytes(p1, p2, n); + + align = -(size_t)p1 & (sizeof(uint64_t) - 1); + + if ((result = memcmp_bytes(p1, p2, align))) + return result; + + p1 += align; + p2 += align; + n -= align; + + return memcmp_blocks(p1, p2, n); +} + #if defined(__i386__) || defined(__x86_64__) #ifdef __i386__

1 0

Rémi Bernon : server: Create message queue and thread input in get_key_state.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 68b6e876f03acf5c7933d9b7a2d502fb68e1e680 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68b6e876f03acf5c7933d9b7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 1 23:41:31 2021 +0200 server: Create message queue and thread input in get_key_state. This removes the fallback to desktop async keystate and uses instead the keystate synchronization logic in all cases. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27238 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31899 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35907 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45385 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 50 +++++++++++++++++++++++------------------------ server/queue.c | 18 +++-------------- 2 files changed, 28 insertions(+), 40 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 4ab8c9b5f63..8b84a39d009 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3961,8 +3961,8 @@ struct get_key_state_thread_params int index; }; -#define check_get_keyboard_state(i, j, c, x, todo_x) check_get_keyboard_state_(i, j, c, x, todo_x, __LINE__) -static void check_get_keyboard_state_(int i, int j, int c, int x, int todo_x, int line) +#define check_get_keyboard_state(i, j, c, x) check_get_keyboard_state_(i, j, c, x, __LINE__) +static void check_get_keyboard_state_(int i, int j, int c, int x, int line) { unsigned char keystate[256]; BOOL ret; @@ -3970,24 +3970,24 @@ static void check_get_keyboard_state_(int i, int j, int c, int x, int todo_x, in memset(keystate, 0, sizeof(keystate)); ret = GetKeyboardState(keystate); ok_(__FILE__, line)(ret, "GetKeyboardState failed, %lu\n", GetLastError()); - todo_wine_if(todo_x) ok_(__FILE__, line)(!(keystate['X'] & 0x80) == !x, "%d:%d: expected that X keystate is %s\n", i, j, x ? "set" : "unset"); + ok_(__FILE__, line)(!(keystate['X'] & 0x80) == !x, "%d:%d: expected that X keystate is %s\n", i, j, x ? "set" : "unset"); ok_(__FILE__, line)(!(keystate['C'] & 0x80) == !c, "%d:%d: expected that C keystate is %s\n", i, j, c ? "set" : "unset"); /* calling it twice shouldn't change */ memset(keystate, 0, sizeof(keystate)); ret = GetKeyboardState(keystate); ok_(__FILE__, line)(ret, "GetKeyboardState failed, %lu\n", GetLastError()); - todo_wine_if(todo_x) ok_(__FILE__, line)(!(keystate['X'] & 0x80) == !x, "%d:%d: expected that X keystate is %s\n", i, j, x ? "set" : "unset"); + ok_(__FILE__, line)(!(keystate['X'] & 0x80) == !x, "%d:%d: expected that X keystate is %s\n", i, j, x ? "set" : "unset"); ok_(__FILE__, line)(!(keystate['C'] & 0x80) == !c, "%d:%d: expected that C keystate is %s\n", i, j, c ? "set" : "unset"); } -#define check_get_key_state(i, j, c, x, todo_x) check_get_key_state_(i, j, c, x, todo_x, __LINE__) -static void check_get_key_state_(int i, int j, int c, int x, int todo_x, int line) +#define check_get_key_state(i, j, c, x) check_get_key_state_(i, j, c, x, __LINE__) +static void check_get_key_state_(int i, int j, int c, int x, int line) { SHORT state; state = GetKeyState('X'); - todo_wine_if(todo_x) ok_(__FILE__, line)(!(state & 0x8000) == !x, "%d:%d: expected that X highest bit is %s, got %#x\n", i, j, x ? "set" : "unset", state); + ok_(__FILE__, line)(!(state & 0x8000) == !x, "%d:%d: expected that X highest bit is %s, got %#x\n", i, j, x ? "set" : "unset", state); ok_(__FILE__, line)(!(state & 0x007e), "%d:%d: expected that X undefined bits are unset, got %#x\n", i, j, state); state = GetKeyState('C'); @@ -4041,18 +4041,18 @@ static DWORD WINAPI get_key_state_thread(void *arg) if (test->set_keyboard_state) expect_c = TRUE; else expect_c = FALSE; - check_get_keyboard_state(i, j, expect_c, FALSE, /* todo */ !has_queue); - check_get_key_state(i, j, expect_c, expect_x, /* todo */ !has_queue && j == 0); - check_get_keyboard_state(i, j, expect_c, expect_x, /* todo */ !has_queue && j == 0); + check_get_keyboard_state(i, j, expect_c, FALSE); + check_get_key_state(i, j, expect_c, expect_x); + check_get_keyboard_state(i, j, expect_c, expect_x); /* key released */ ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %lu\n", i, result); - check_get_keyboard_state(i, j, expect_c, expect_x, /* todo */ !has_queue && j > 0); - check_get_key_state(i, j, expect_c, FALSE, /* todo */ FALSE); - check_get_keyboard_state(i, j, expect_c, FALSE, /* todo */ FALSE); + check_get_keyboard_state(i, j, expect_c, expect_x); + check_get_key_state(i, j, expect_c, FALSE); + check_get_keyboard_state(i, j, expect_c, FALSE); } return 0; @@ -4120,18 +4120,18 @@ static void test_GetKeyState(void) } else expect_c = FALSE; - check_get_keyboard_state(i, j, expect_c, FALSE, /* todo */ FALSE); - check_get_key_state(i, j, expect_c, FALSE, /* todo */ FALSE); - check_get_keyboard_state(i, j, expect_c, FALSE, /* todo */ FALSE); + check_get_keyboard_state(i, j, expect_c, FALSE); + check_get_key_state(i, j, expect_c, FALSE); + check_get_keyboard_state(i, j, expect_c, FALSE); if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); if (test->peek_message_main) expect_x = TRUE; else expect_x = FALSE; - check_get_keyboard_state(i, j, expect_c, expect_x, /* todo */ FALSE); - check_get_key_state(i, j, expect_c, expect_x, /* todo */ FALSE); - check_get_keyboard_state(i, j, expect_c, expect_x, /* todo */ FALSE); + check_get_keyboard_state(i, j, expect_c, expect_x); + check_get_key_state(i, j, expect_c, expect_x); + check_get_keyboard_state(i, j, expect_c, expect_x); ReleaseSemaphore(params.semaphores[1], 1, NULL); @@ -4147,15 +4147,15 @@ static void test_GetKeyState(void) SetKeyboardState(keystate); } - check_get_keyboard_state(i, j, FALSE, expect_x, /* todo */ FALSE); - check_get_key_state(i, j, FALSE, expect_x, /* todo */ FALSE); - check_get_keyboard_state(i, j, FALSE, expect_x, /* todo */ FALSE); + check_get_keyboard_state(i, j, FALSE, expect_x); + check_get_key_state(i, j, FALSE, expect_x); + check_get_keyboard_state(i, j, FALSE, expect_x); if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - check_get_keyboard_state(i, j, FALSE, FALSE, /* todo */ FALSE); - check_get_key_state(i, j, FALSE, FALSE, /* todo */ FALSE); - check_get_keyboard_state(i, j, FALSE, FALSE, /* todo */ FALSE); + check_get_keyboard_state(i, j, FALSE, FALSE); + check_get_key_state(i, j, FALSE, FALSE); + check_get_keyboard_state(i, j, FALSE, FALSE); ReleaseSemaphore(params.semaphores[1], 1, NULL); } diff --git a/server/queue.c b/server/queue.c index 9e0b9836965..d79add56fba 100644 --- a/server/queue.c +++ b/server/queue.c @@ -3098,25 +3098,13 @@ DECL_HANDLER(get_key_state) set_reply_data( desktop->keystate, size ); release_object( desktop ); } - else if (!current->queue) - { - unsigned char *keystate; - /* fallback to desktop keystate */ - if (!(desktop = get_thread_desktop( current, 0 ))) return; - if (req->key >= 0) reply->state = desktop->keystate[req->key & 0xff] & ~0x40; - if ((keystate = set_reply_data_size( size ))) - { - unsigned int i; - for (i = 0; i < size; i++) keystate[i] = desktop->keystate[i] & ~0x40; - } - release_object( desktop ); - } else { - unsigned char *keystate = current->queue->input->keystate; + struct msg_queue *queue = get_current_queue(); + unsigned char *keystate = queue->input->keystate; if (req->key >= 0) { - if (current->queue) sync_input_keystate( current->queue->input ); + sync_input_keystate( queue->input ); reply->state = keystate[req->key & 0xff]; } set_reply_data( keystate, size );

1 0

Rémi Bernon : server: Lock thread input keystate whenever it is modified.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: f076e5f85490a44fd34057df9af1c3ae3e7d5d3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f076e5f85490a44fd34057df… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 1 23:30:46 2021 +0200 server: Lock thread input keystate whenever it is modified. And synchronize it with desktop async keystate, on GetKeyState calls, if it is not locked yet. Based on a patch from Sebastian Lackner <sebastian(a)fds-team.de>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27238 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31899 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35907 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45385 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 6 +++--- server/queue.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 38a2e4eea84..4ab8c9b5f63 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -4042,15 +4042,15 @@ static DWORD WINAPI get_key_state_thread(void *arg) else expect_c = FALSE; check_get_keyboard_state(i, j, expect_c, FALSE, /* todo */ !has_queue); - check_get_key_state(i, j, expect_c, expect_x, /* todo */ has_queue || j == 0); - check_get_keyboard_state(i, j, expect_c, expect_x, /* todo */ has_queue || j == 0); + check_get_key_state(i, j, expect_c, expect_x, /* todo */ !has_queue && j == 0); + check_get_keyboard_state(i, j, expect_c, expect_x, /* todo */ !has_queue && j == 0); /* key released */ ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %lu\n", i, result); - check_get_keyboard_state(i, j, expect_c, expect_x, /* todo */ has_queue || j > 0); + check_get_keyboard_state(i, j, expect_c, expect_x, /* todo */ !has_queue && j > 0); check_get_key_state(i, j, expect_c, FALSE, /* todo */ FALSE); check_get_keyboard_state(i, j, expect_c, FALSE, /* todo */ FALSE); } diff --git a/server/queue.c b/server/queue.c index 561fa825ee7..9e0b9836965 100644 --- a/server/queue.c +++ b/server/queue.c @@ -112,6 +112,8 @@ struct thread_input int cursor_count; /* cursor show count */ struct list msg_list; /* list of hardware messages */ unsigned char keystate[256]; /* state of each key */ + unsigned char desktop_keystate[256]; /* desktop keystate when keystate was synced */ + int keystate_lock; /* keystate is locked */ }; struct msg_queue @@ -138,6 +140,7 @@ struct msg_queue struct thread_input *input; /* thread input descriptor */ struct hook_table *hooks; /* hook table */ timeout_t last_get_msg; /* time of last get message call */ + int keystate_lock; /* owns an input keystate lock */ }; struct hotkey @@ -263,12 +266,14 @@ static struct thread_input *create_thread_input( struct thread *thread ) list_init( &input->msg_list ); set_caret_window( input, 0 ); memset( input->keystate, 0, sizeof(input->keystate) ); + input->keystate_lock = 0; if (!(input->desktop = get_thread_desktop( thread, 0 /* FIXME: access rights */ ))) { release_object( input ); return NULL; } + memcpy( input->desktop_keystate, input->desktop->keystate, sizeof(input->desktop_keystate) ); } return input; } @@ -303,6 +308,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ queue->input = (struct thread_input *)grab_object( input ); queue->hooks = NULL; queue->last_get_msg = current_time; + queue->keystate_lock = 0; list_init( &queue->send_result ); list_init( &queue->callback_result ); list_init( &queue->pending_timers ); @@ -324,6 +330,31 @@ void free_msg_queue( struct thread *thread ) thread->queue = NULL; } +/* synchronize thread input keystate with the desktop */ +static void sync_input_keystate( struct thread_input *input ) +{ + int i; + if (!input->desktop || input->keystate_lock) return; + for (i = 0; i < sizeof(input->keystate); ++i) + { + if (input->desktop_keystate[i] == input->desktop->keystate[i]) continue; + input->keystate[i] = input->desktop_keystate[i] = input->desktop->keystate[i]; + } +} + +/* locks thread input keystate to prevent synchronization */ +static void lock_input_keystate( struct thread_input *input ) +{ + input->keystate_lock++; +} + +/* unlock the thread input keystate and synchronize it again */ +static void unlock_input_keystate( struct thread_input *input ) +{ + input->keystate_lock--; + if (!input->keystate_lock) sync_input_keystate( input ); +} + /* change the thread input data of a given thread */ static int assign_thread_input( struct thread *thread, struct thread_input *new_input ) { @@ -337,9 +368,11 @@ static int assign_thread_input( struct thread *thread, struct thread_input *new_ if (queue->input) { queue->input->cursor_count -= queue->cursor_count; + if (queue->keystate_lock) unlock_input_keystate( queue->input ); release_object( queue->input ); } queue->input = (struct thread_input *)grab_object( new_input ); + if (queue->keystate_lock) lock_input_keystate( queue->input ); new_input->cursor_count += queue->cursor_count; return 1; } @@ -476,6 +509,11 @@ static inline int is_signaled( struct msg_queue *queue ) /* set some queue bits */ static inline void set_queue_bits( struct msg_queue *queue, unsigned int bits ) { + if (bits & (QS_KEY | QS_MOUSEBUTTON)) + { + if (!queue->keystate_lock) lock_input_keystate( queue->input ); + queue->keystate_lock = 1; + } queue->wake_bits |= bits; queue->changed_bits |= bits; if (is_signaled( queue )) wake_up( &queue->obj, 0 ); @@ -486,6 +524,11 @@ static inline void clear_queue_bits( struct msg_queue *queue, unsigned int bits { queue->wake_bits &= ~bits; queue->changed_bits &= ~bits; + if (!(queue->wake_bits & (QS_KEY | QS_MOUSEBUTTON))) + { + if (queue->keystate_lock) unlock_input_keystate( queue->input ); + queue->keystate_lock = 0; + } } /* check whether msg is a keyboard message */ @@ -1030,6 +1073,7 @@ static void msg_queue_destroy( struct object *obj ) } if (queue->timeout) remove_timeout_user( queue->timeout ); queue->input->cursor_count -= queue->cursor_count; + if (queue->keystate_lock) unlock_input_keystate( queue->input ); release_object( queue->input ); if (queue->hooks) release_object( queue->hooks ); if (queue->fd) release_object( queue->fd ); @@ -3070,7 +3114,11 @@ DECL_HANDLER(get_key_state) else { unsigned char *keystate = current->queue->input->keystate; - if (req->key >= 0) reply->state = keystate[req->key & 0xff]; + if (req->key >= 0) + { + if (current->queue) sync_input_keystate( current->queue->input ); + reply->state = keystate[req->key & 0xff]; + } set_reply_data( keystate, size ); } } @@ -3084,6 +3132,7 @@ DECL_HANDLER(set_key_state) data_size_t size = min( 256, get_req_data_size() ); memcpy( queue->input->keystate, get_req_data(), size ); + memcpy( queue->input->desktop_keystate, queue->input->desktop->keystate, 256 ); if (req->async && (desktop = get_thread_desktop( current, 0 ))) { memcpy( desktop->keystate, get_req_data(), size );

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2022