March 2022 - Wine-Commits - list.winehq.org

Giovanni Mascellani : tests: Mark NaN conversion as todo on NVIDIA.
by Alexandre Julliard March 17, 2022

March 17, 2022

Module: vkd3d Branch: master Commit: 90827313f5a84987d26f88691b4f3a1f8ca2d552 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=90827313f5a84987d26f886… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Mar 17 14:35:51 2022 +0100 tests: Mark NaN conversion as todo on NVIDIA. D3D mandates that NaN becomes zero when converted to unsigned[1], while it doesn't look like that SPIR-V's OpConvertFToU has a similar provision[2]. In practice, this seems to work on AMD and fails on NVIDIA, where 0x80000000 is produced instead. [1] https://microsoft.github.io/DirectX-Specs/d3d/archive/D3D11_3_FunctionalSpe… [2] https://www.khronos.org/registry/SPIR-V/specs/unified1/SPIRV.html#Conversion Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index d17a1c32..bfdc256d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9939,6 +9939,7 @@ static void test_shader_instructions(void) bool is_float64; bool is_todo; bool skip_on_warp; + bool todo_on_nvidia; } uint_tests[] = { @@ -10187,8 +10188,8 @@ static void test_shader_instructions(void) {&ps_dge, {.d = {{1.5, 1.0}}}, {{0xffffffff}}, true}, {&ps_dlt, {.d = {{0.0, 1.0}}}, {{0xffffffff}}, true}, {&ps_dlt, {.d = {{1.0, 1.0}}}, {{0x00000000}}, true}, - {&ps_dtou, {.d = {{ -NAN}}}, {{ 0, 0 }}, true}, - {&ps_dtou, {.d = {{ NAN}}}, {{ 0, 0 }}, true}, + {&ps_dtou, {.d = {{ -NAN}}}, {{ 0, 0 }}, true, false, false, true}, + {&ps_dtou, {.d = {{ NAN}}}, {{ 0, 0 }}, true, false, false, true}, {&ps_dtou, {.d = {{-INFINITY}}}, {{ 0, ~0u}}, true}, {&ps_dtou, {.d = {{ INFINITY}}}, {{~0u, 0 }}, true}, {&ps_dtou, {.d = {{ -1.0}}}, {{ 0, 1 }}, true}, @@ -10605,6 +10606,7 @@ static void test_shader_instructions(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + todo_if(uint_tests[i].todo_on_nvidia && is_nvidia_device(context.device)) check_sub_resource_uvec4(context.render_target, 0, queue, command_list, &uint_tests[i].output.u); reset_command_list(command_list, context.allocator);

1 0

Jinoh Kang : comctl32: Pre-multiply static control bitmap image by alpha for GdiAlphaBlend.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: 62df608d3ed84aac7ce517fd07ea13e48b49b08c URL: https://source.winehq.org/git/wine.git/?a=commit;h=62df608d3ed84aac7ce517fd… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Mar 15 03:35:12 2022 +0900 comctl32: Pre-multiply static control bitmap image by alpha for GdiAlphaBlend. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/static.c | 11 +++++++++++ dlls/comctl32/tests/static.c | 2 -- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 7a3ac958111..9b20e6a8b66 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -203,6 +203,17 @@ static HBITMAP create_alpha_bitmap( HBITMAP hbitmap ) DeleteObject( alpha ); alpha = 0; } + else + { + /* pre-multiply by alpha */ + for (i = 0, ptr = bits; i < bm.bmWidth * bm.bmHeight; i++, ptr += 4) + { + unsigned int alpha = ptr[3]; + ptr[0] = (ptr[0] * alpha + 127) / 255; + ptr[1] = (ptr[1] * alpha + 127) / 255; + ptr[2] = (ptr[2] * alpha + 127) / 255; + } + } } DeleteDC( hdc ); diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index b8f43142d6b..7b6ac679c92 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -165,7 +165,6 @@ static void test_image(HBITMAP image, BOOL is_dib, BOOL is_premult, BOOL is_alph ok(bm.bmBits != NULL, "bmBits is NULL\n"); memcpy(bits, bm.bmBits, 4); if (is_premult) - todo_wine ok(bits[0] == 0x05 && bits[1] == 0x09 && bits[2] == 0x0e && bits[3] == 0x44, "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); else if (is_alpha) @@ -195,7 +194,6 @@ static void test_image(HBITMAP image, BOOL is_dib, BOOL is_premult, BOOL is_alph DeleteDC(hdc); if (is_premult) - todo_wine ok(bits[0] == 0x05 && bits[1] == 0x09 && bits[2] == 0x0e && bits[3] == 0x44, "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); else if (is_alpha)

1 0

Jinoh Kang : user32: Fix rounding in premultiplied alpha conversion for cursors and icons.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: c4773e1823d4ed48e2f3918bf6a8753fcb2f645f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4773e1823d4ed48e2f3918b… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Mar 15 03:14:17 2022 +0900 user32: Fix rounding in premultiplied alpha conversion for cursors and icons. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index cab9fbde32e..abf3a5dac53 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -775,9 +775,9 @@ static HBITMAP create_alpha_bitmap( HBITMAP color, const BITMAPINFO *src_info, c for (i = 0, ptr = bits; i < bm.bmWidth * bm.bmHeight; i++, ptr += 4) { unsigned int alpha = ptr[3]; - ptr[0] = ptr[0] * alpha / 255; - ptr[1] = ptr[1] * alpha / 255; - ptr[2] = ptr[2] * alpha / 255; + ptr[0] = (ptr[0] * alpha + 127) / 255; + ptr[1] = (ptr[1] * alpha + 127) / 255; + ptr[2] = (ptr[2] * alpha + 127) / 255; } done:

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.208.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: 0a4af87e7f411925d76659e81d65147be76c17af URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a4af87e7f411925d76659e8… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Mar 15 20:11:41 2022 +0100 winevulkan: Update to VK spec version 1.3.208. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 1 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 10 +++++++++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 8838200403e..2a3129bacfe 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.3.207" +VK_XML_VERSION = "1.3.208" WINE_VK_VERSION = (1, 3) # Filenames to create. diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 719113d7e81..cb6a214b9f2 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -9820,6 +9820,7 @@ static const char * const vk_instance_extensions[] = "VK_KHR_external_semaphore_capabilities", "VK_KHR_get_physical_device_properties2", "VK_KHR_get_surface_capabilities2", + "VK_KHR_portability_enumeration", "VK_KHR_surface", "VK_KHR_win32_surface", }; diff --git a/dlls/winevulkan/winevulkan.json b/dlls/winevulkan/winevulkan.json index f40c777e55d..5a4a1747626 100644 --- a/dlls/winevulkan/winevulkan.json +++ b/dlls/winevulkan/winevulkan.json @@ -2,6 +2,6 @@ "file_format_version": "1.0.0", "ICD": { "library_path": ".\\winevulkan.dll", - "api_version": "1.3.207" + "api_version": "1.3.208" } } diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 60f434426ed..675f6cf12a5 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -483,6 +483,8 @@ #define VK_EXT_IMAGE_VIEW_MIN_LOD_EXTENSION_NAME "VK_EXT_image_view_min_lod" #define VK_EXT_MULTI_DRAW_SPEC_VERSION 1 #define VK_EXT_MULTI_DRAW_EXTENSION_NAME "VK_EXT_multi_draw" +#define VK_KHR_PORTABILITY_ENUMERATION_SPEC_VERSION 1 +#define VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME "VK_KHR_portability_enumeration" #define VK_EXT_LOAD_STORE_OP_NONE_SPEC_VERSION 1 #define VK_EXT_LOAD_STORE_OP_NONE_EXTENSION_NAME "VK_EXT_load_store_op_none" #define VK_EXT_BORDER_COLOR_SWIZZLE_SPEC_VERSION 1 @@ -519,7 +521,7 @@ #define VK_API_VERSION_1_1 VK_MAKE_API_VERSION(0, 1, 1, 0) #define VK_API_VERSION_1_2 VK_MAKE_API_VERSION(0, 1, 2, 0) #define VK_API_VERSION_1_3 VK_MAKE_API_VERSION(0, 1, 3, 0) -#define VK_HEADER_VERSION 207 +#define VK_HEADER_VERSION 208 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 3, VK_HEADER_VERSION) #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; #define VK_USE_64_BIT_PTR_DEFINES 0 @@ -2371,6 +2373,12 @@ typedef enum VkIndirectStateFlagBitsNV VK_INDIRECT_STATE_FLAG_BITS_NV_MAX_ENUM = 0x7fffffff, } VkIndirectStateFlagBitsNV; +typedef enum VkInstanceCreateFlagBits +{ + VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR = 0x00000001, + VK_INSTANCE_CREATE_FLAG_BITS_MAX_ENUM = 0x7fffffff, +} VkInstanceCreateFlagBits; + typedef enum VkInternalAllocationType { VK_INTERNAL_ALLOCATION_TYPE_EXECUTABLE = 0,

1 0

Bernhard Kölbl : windows.media.speech: Implement Completed event.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: c0910657669b47de4de9de375b547f208a0612de URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0910657669b47de4de9de37… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Mar 16 17:31:04 2022 +0100 windows.media.speech: Implement Completed event. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/recognizer.c | 14 ++++-- dlls/windows.media.speech/tests/speech.c | 85 ++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index 7f4c7429929..da219d6bd0a 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -34,6 +34,7 @@ struct session ISpeechContinuousRecognitionSession ISpeechContinuousRecognitionSession_iface; LONG ref; + struct list completed_handlers; struct list result_handlers; }; @@ -83,6 +84,7 @@ static ULONG WINAPI session_Release( ISpeechContinuousRecognitionSession *iface if (!ref) { + typed_event_handlers_clear(&impl->completed_handlers); typed_event_handlers_clear(&impl->result_handlers); free(impl); } @@ -162,14 +164,17 @@ static HRESULT WINAPI session_add_Completed( ISpeechContinuousRecognitionSession ITypedEventHandler_SpeechContinuousRecognitionSession_SpeechContinuousRecognitionCompletedEventArgs *handler, EventRegistrationToken *token ) { - FIXME("iface %p, handler %p, token %p stub!\n", iface, handler, token); - return E_NOTIMPL; + struct session *impl = impl_from_ISpeechContinuousRecognitionSession(iface); + TRACE("iface %p, handler %p, token %p.\n", iface, handler, token); + if (!handler) return E_INVALIDARG; + return typed_event_handlers_append(&impl->completed_handlers, (ITypedEventHandler_IInspectable_IInspectable *)handler, token); } static HRESULT WINAPI session_remove_Completed( ISpeechContinuousRecognitionSession *iface, EventRegistrationToken token ) { - FIXME("iface %p, token.value %#I64x stub!\n", iface, token.value); - return E_NOTIMPL; + struct session *impl = impl_from_ISpeechContinuousRecognitionSession(iface); + TRACE("iface %p, token.value %#I64x.\n", iface, token.value); + return typed_event_handlers_remove(&impl->completed_handlers, &token); } static HRESULT WINAPI session_add_ResultGenerated( ISpeechContinuousRecognitionSession *iface, @@ -645,6 +650,7 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface session->ISpeechContinuousRecognitionSession_iface.lpVtbl = &session_vtbl; session->ref = 1; + list_init(&session->completed_handlers); list_init(&session->result_handlers); impl->ISpeechRecognizer_iface.lpVtbl = &speech_recognizer_vtbl; diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 80e5d9af634..fc0a8d762c1 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -46,6 +46,12 @@ #define impl_from_IHandler_RecognitionResult impl_from_ITypedEventHandler_SpeechContinuousRecognitionSession_SpeechContinuousRecognitionResultGeneratedEventArgs #define IHandler_RecognitionResult_iface ITypedEventHandler_SpeechContinuousRecognitionSession_SpeechContinuousRecognitionResultGeneratedEventArgs_iface +#define IHandler_RecognitionCompleted ITypedEventHandler_SpeechContinuousRecognitionSession_SpeechContinuousRecognitionCompletedEventArgs +#define IHandler_RecognitionCompletedVtbl ITypedEventHandler_SpeechContinuousRecognitionSession_SpeechContinuousRecognitionCompletedEventArgsVtbl +#define IID_IHandler_RecognitionCompleted IID_ITypedEventHandler_SpeechContinuousRecognitionSession_SpeechContinuousRecognitionCompletedEventArgs +#define impl_from_IHandler_RecognitionCompleted impl_from_ITypedEventHandler_SpeechContinuousRecognitionSession_SpeechContinuousRecognitionCompletedEventArgs +#define IHandler_RecognitionCompleted_iface ITypedEventHandler_SpeechContinuousRecognitionSession_SpeechContinuousRecognitionCompletedEventArgs_iface + HRESULT WINAPI (*pDllGetActivationFactory)(HSTRING, IActivationFactory **); static BOOL is_win10_1507 = FALSE; @@ -86,6 +92,72 @@ static const char *debugstr_hstring(HSTRING hstr) return wine_dbgstr_wn(str, len); } +struct completed_event_handler +{ + IHandler_RecognitionCompleted IHandler_RecognitionCompleted_iface; + LONG ref; +}; + +static inline struct completed_event_handler *impl_from_IHandler_RecognitionCompleted( IHandler_RecognitionCompleted *iface ) +{ + return CONTAINING_RECORD(iface, struct completed_event_handler, IHandler_RecognitionCompleted_iface); +} + +HRESULT WINAPI completed_event_handler_QueryInterface( IHandler_RecognitionCompleted *iface, REFIID iid, void **out ) +{ + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IHandler_RecognitionCompleted)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + trace("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +ULONG WINAPI completed_event_handler_AddRef( IHandler_RecognitionCompleted *iface ) +{ + struct completed_event_handler *impl = impl_from_IHandler_RecognitionCompleted(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + return ref; +} + +ULONG WINAPI completed_event_handler_Release( IHandler_RecognitionCompleted *iface ) +{ + struct completed_event_handler *impl = impl_from_IHandler_RecognitionCompleted(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + return ref; +} + +HRESULT WINAPI completed_event_handler_Invoke( IHandler_RecognitionCompleted *iface, + ISpeechContinuousRecognitionSession *sender, + ISpeechContinuousRecognitionCompletedEventArgs *args ) +{ + trace("iface %p, sender %p, args %p.\n", iface, sender, args); + return S_OK; +} + +static const struct IHandler_RecognitionCompletedVtbl completed_event_handler_vtbl = +{ + /* IUnknown methods */ + completed_event_handler_QueryInterface, + completed_event_handler_AddRef, + completed_event_handler_Release, + /* ITypedEventHandler<SpeechContinuousRecognitionSession*, SpeechContinuousRecognitionCompletedEventArgs* > methods */ + completed_event_handler_Invoke +}; + +static HRESULT WINAPI completed_event_handler_create_static( struct completed_event_handler *impl ) +{ + impl->IHandler_RecognitionCompleted_iface.lpVtbl = &completed_event_handler_vtbl; + impl->ref = 1; + + return S_OK; +} + struct recognition_result_handler { IHandler_RecognitionResult IHandler_RecognitionResult_iface; @@ -651,6 +723,7 @@ static void test_SpeechRecognizer(void) IInspectable *inspectable = NULL; IClosable *closable = NULL; ILanguage *language = NULL; + struct completed_event_handler completed_handler; struct recognition_result_handler result_handler; EventRegistrationToken token = { .value = 0 }; HSTRING hstr, hstr_lang; @@ -728,6 +801,18 @@ static void test_SpeechRecognizer(void) check_refcount(session, 2); check_refcount(inspectable, 3); + hr = ISpeechContinuousRecognitionSession_add_Completed(session, NULL, &token); + ok(hr == E_INVALIDARG, "ISpeechContinuousRecognitionSession_add_ResultGenerated failed, hr %#lx.\n", hr); + + token.value = 0xdeadbeef; + completed_event_handler_create_static(&completed_handler); + hr = ISpeechContinuousRecognitionSession_add_Completed(session, &completed_handler.IHandler_RecognitionCompleted_iface, &token); + ok(hr == S_OK, "ISpeechContinuousRecognitionSession_add_ResultGenerated failed, hr %#lx.\n", hr); + ok(token.value != 0xdeadbeef, "Got unexpexted token: %#I64x.\n", token.value); + + hr = ISpeechContinuousRecognitionSession_remove_Completed(session, token); + ok(hr == S_OK, "ISpeechContinuousRecognitionSession_remove_ResultGenerated failed, hr %#lx.\n", hr); + hr = ISpeechContinuousRecognitionSession_add_ResultGenerated(session, NULL, &token); ok(hr == E_INVALIDARG, "ISpeechContinuousRecognitionSession_add_ResultGenerated failed, hr %#lx.\n", hr);

1 0

Daniel Lehman : kernel32/tests: Add test for FileTimeToSystemTime.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: a4a7ab8e3b5e88125cfb859d5cb7e81422de38c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4a7ab8e3b5e88125cfb859d… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Mar 15 10:12:01 2022 -0700 kernel32/tests: Add test for FileTimeToSystemTime. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/time.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index b1e14b1b8c4..fdef78a4466 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -395,6 +395,16 @@ static void test_FileTimeToSystemTime(void) "Got Year %4d Month %2d Day %2d Hour %2d Min %2d Sec %2d mSec %3d\n", st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds); + + ft.dwHighDateTime = -1; + ft.dwLowDateTime = -1; + SetLastError(0xdeadbeef); + ret = FileTimeToSystemTime(&ft, &st); + todo_wine { + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + } } static void test_FileTimeToLocalFileTime(void)

1 0

Jacek Caban : win32u: Move KillSystemTimer implementation from user32.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: a23ad9819a9e5dd7ebd7f83fdc77b2964131f985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a23ad9819a9e5dd7ebd7f83f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 16 15:36:42 2022 +0100 win32u: Move KillSystemTimer implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 12 +----------- dlls/win32u/message.c | 16 ++++++++++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 2 ++ include/ntuser.h | 1 + 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 7fe9df68508..365f703c56e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4422,17 +4422,7 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) */ BOOL WINAPI KillSystemTimer( HWND hwnd, UINT_PTR id ) { - BOOL ret; - - SERVER_START_REQ( kill_win_timer ) - { - req->win = wine_server_user_handle( hwnd ); - req->msg = WM_SYSTIMER; - req->id = id; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + return NtUserCallHwndParam( hwnd, id, NtUserKillSystemTimer ); } diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index d70984dbe2b..d00178e6aa4 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -210,6 +210,22 @@ BOOL WINAPI NtUserKillTimer( HWND hwnd, UINT_PTR id ) return ret; } +/* see KillSystemTimer */ +BOOL kill_system_timer( HWND hwnd, UINT_PTR id ) +{ + BOOL ret; + + SERVER_START_REQ( kill_win_timer ) + { + req->win = wine_server_user_handle( hwnd ); + req->msg = WM_SYSTIMER; + req->id = id; + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + return ret; +} + /* see SendMessageW */ LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index c943089c462..0c4e3b82f0f 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -313,6 +313,7 @@ extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECL extern BOOL set_foreground_window( HWND hwnd, BOOL mouse ) DECLSPEC_HIDDEN; /* message.c */ +extern BOOL kill_system_timer( HWND hwnd, UINT_PTR id ) DECLSPEC_HIDDEN; extern LRESULT post_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 2700df862ca..079b4b0695f 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -3332,6 +3332,8 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return get_window_word( hwnd, param ); case NtUserIsChild: return is_child( hwnd, UlongToHandle(param) ); + case NtUserKillSystemTimer: + return kill_system_timer( hwnd, param ); case NtUserMonitorFromWindow: return HandleToUlong( monitor_from_window( hwnd, param, NtUserMonitorFromWindow )); case NtUserSetCaptureWindow: diff --git a/include/ntuser.h b/include/ntuser.h index 3352a63e1ea..5e79083aa01 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -178,6 +178,7 @@ enum NtUserGetWindowThread, NtUserGetWindowWord, NtUserIsChild, + NtUserKillSystemTimer, NtUserMonitorFromWindow, NtUserSetCaptureWindow, NtUserSetForegroundWindow,

1 0

Jacek Caban : win32u: Move NtUserSetSystemTimer implementation from user32.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: ce9a782a4f4c4db38badb40751c91302ab747858 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9a782a4f4c4db38badb407… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 16 15:36:18 2022 +0100 win32u: Move NtUserSetSystemTimer implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/caret.c | 4 ++-- dlls/user32/input.c | 3 ++- dlls/user32/listbox.c | 2 +- dlls/user32/message.c | 33 --------------------------------- dlls/user32/scroll.c | 16 ++++++++-------- dlls/user32/user32.spec | 2 +- dlls/user32/user_private.h | 4 ---- dlls/user32/winproc.c | 2 +- dlls/win32u/message.c | 32 ++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 3 +++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 ++++++++++ include/ntuser.h | 1 + 15 files changed, 64 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ce9a782a4f4c4db38bad…

1 0

Jacek Caban : win32u: Move NtUsetSetWindowLong implementation from user32.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: 1b847dff822bb3f43d3a82b1c08e97192372c431 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b847dff822bb3f43d3a82b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 16 15:35:25 2022 +0100 win32u: Move NtUsetSetWindowLong implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 7 +- dlls/user32/message.c | 2 - dlls/user32/user32.spec | 2 +- dlls/user32/win.c | 307 +---------------------------------------- dlls/user32/win.h | 1 - dlls/win32u/class.c | 11 ++ dlls/win32u/gdiobj.c | 3 + dlls/win32u/message.c | 2 + dlls/win32u/ntuser_private.h | 1 + dlls/win32u/win32u.spec | 6 +- dlls/win32u/win32u_private.h | 5 + dlls/win32u/window.c | 317 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 18 +++ include/ntuser.h | 3 + 14 files changed, 369 insertions(+), 316 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b847dff822bb3f43d3a…

1 0

Jacek Caban : win32u: Move set_window_style implementation from user32.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: 895ef97bc0c662c6a006b7a7285ba3a191dec796 URL: https://source.winehq.org/git/wine.git/?a=commit;h=895ef97bc0c662c6a006b7a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 16 15:34:55 2022 +0100 win32u: Move set_window_style implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 3 --- dlls/user32/win.c | 49 +++--------------------------------- dlls/win32u/driver.c | 1 + dlls/win32u/message.c | 3 +++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 7 files changed, 69 insertions(+), 48 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 27a83dc662b..5867b6b4009 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1866,9 +1866,6 @@ LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar return ShowWindow( hwnd, wparam ); case WM_WINE_SETWINDOWLONG: return WIN_SetWindowLong( hwnd, (short)LOWORD(wparam), HIWORD(wparam), lparam, TRUE ); - case WM_WINE_SETSTYLE: - if (is_desktop_window( hwnd )) return 0; - return WIN_SetStyle(hwnd, wparam, lparam); default: { MSG m; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index ca4697713d6..bb6df478b1b 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -668,51 +668,10 @@ static HWND WIN_SetOwner( HWND hwnd, HWND owner ) */ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) { - BOOL ok, made_visible = FALSE; - STYLESTRUCT style; - WND *win = WIN_GetPtr( hwnd ); - - if (!win || win == WND_DESKTOP) return 0; - if (win == WND_OTHER_PROCESS) - { - if (IsWindow(hwnd)) - return SendMessageW(hwnd, WM_WINE_SETSTYLE, set_bits, clear_bits); - return 0; - } - style.styleOld = win->dwStyle; - style.styleNew = (win->dwStyle | set_bits) & ~clear_bits; - if (style.styleNew == style.styleOld) - { - WIN_ReleasePtr( win ); - return style.styleNew; - } - SERVER_START_REQ( set_window_info ) - { - req->handle = wine_server_user_handle( hwnd ); - req->flags = SET_WIN_STYLE; - req->style = style.styleNew; - req->extra_offset = -1; - if ((ok = !wine_server_call( req ))) - { - style.styleOld = reply->old_style; - win->dwStyle = style.styleNew; - } - } - SERVER_END_REQ; - - if (ok && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) - { - made_visible = (style.styleNew & WS_VISIBLE) != 0; - invalidate_dce( win, NULL ); - } - WIN_ReleasePtr( win ); - - if (!ok) return 0; - - USER_Driver->pSetWindowStyle( hwnd, GWL_STYLE, &style ); - if (made_visible) update_window_state( hwnd ); - - return style.styleOld; + /* FIXME: Use SetWindowLong or move callers to win32u instead. + * We use STYLESTRUCT to pass params, but meaning of its field does not match our usage. */ + STYLESTRUCT style = { .styleNew = set_bits, .styleOld = clear_bits }; + return NtUserCallHwndParam( hwnd, (UINT_PTR)&style, NtUserSetWindowStyle ); } diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 56fce1c6496..afe44e1c4a3 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1196,6 +1196,7 @@ static const struct user_driver_funcs lazy_load_driver = .pSetLayeredWindowAttributes = loaderdrv_SetLayeredWindowAttributes, .pSetParent = nulldrv_SetParent, .pSetWindowRgn = loaderdrv_SetWindowRgn, + .pSetWindowStyle = nulldrv_SetWindowStyle, .pMsgWaitForMultipleObjectsEx = nulldrv_MsgWaitForMultipleObjectsEx, .pReleaseDC = nulldrv_ReleaseDC, .pScrollDC = nulldrv_ScrollDC, diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 5582f627166..1f0d6e6c297 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -47,6 +47,9 @@ LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar case WM_WINE_SETPARENT: if (is_desktop_window( hwnd )) return 0; return HandleToUlong( NtUserSetParent( hwnd, UlongToHandle(wparam) )); + case WM_WINE_SETSTYLE: + if (is_desktop_window( hwnd )) return 0; + return set_window_style( hwnd, wparam, lparam ); case WM_WINE_SETACTIVEWINDOW: if (!wparam && NtUserGetForegroundWindow() == hwnd) return 0; return (LRESULT)NtUserSetActiveWindow( (HWND)wparam ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index ac40daa5d35..67df4490bf3 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -361,6 +361,7 @@ extern int map_window_points( HWND hwnd_from, HWND hwnd_to, POINT *points, UINT UINT dpi ) DECLSPEC_HIDDEN; extern void map_window_region( HWND from, HWND to, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL set_window_pos( WINDOWPOS *winpos, int parent_x, int parent_y ) DECLSPEC_HIDDEN; +extern ULONG set_window_style( HWND hwnd, ULONG set_bits, ULONG clear_bits ) DECLSPEC_HIDDEN; extern void update_window_state( HWND hwnd ) DECLSPEC_HIDDEN; /* to release pointers retrieved by win_get_ptr */ diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index c3da53d08e4..01b1f15d158 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1050,6 +1050,60 @@ static WORD get_window_word( HWND hwnd, INT offset ) return get_window_long_size( hwnd, offset, sizeof(WORD), TRUE ); } +/*********************************************************************** + * set_window_style + * + * Change the style of a window. + */ +ULONG set_window_style( HWND hwnd, ULONG set_bits, ULONG clear_bits ) +{ + BOOL ok, made_visible = FALSE; + STYLESTRUCT style; + WND *win = get_win_ptr( hwnd ); + + if (!win || win == WND_DESKTOP) return 0; + if (win == WND_OTHER_PROCESS) + { + if (is_window(hwnd)) + return send_message( hwnd, WM_WINE_SETSTYLE, set_bits, clear_bits ); + return 0; + } + style.styleOld = win->dwStyle; + style.styleNew = (win->dwStyle | set_bits) & ~clear_bits; + if (style.styleNew == style.styleOld) + { + release_win_ptr( win ); + return style.styleNew; + } + SERVER_START_REQ( set_window_info ) + { + req->handle = wine_server_user_handle( hwnd ); + req->flags = SET_WIN_STYLE; + req->style = style.styleNew; + req->extra_offset = -1; + if ((ok = !wine_server_call( req ))) + { + style.styleOld = reply->old_style; + win->dwStyle = style.styleNew; + } + } + SERVER_END_REQ; + + if (ok && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) + { + made_visible = (style.styleNew & WS_VISIBLE) != 0; + invalidate_dce( win, NULL ); + } + release_win_ptr( win ); + + if (!ok) return 0; + + user_driver->pSetWindowStyle( hwnd, GWL_STYLE, &style ); + if (made_visible) update_window_state( hwnd ); + + return style.styleOld; +} + /*********************************************************************** * NtUserGetProp (win32u.@) * @@ -2954,6 +3008,11 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) /* temporary exports */ case NtUserIsWindowDrawable: return is_window_drawable( hwnd, param ); + case NtUserSetWindowStyle: + { + STYLESTRUCT *style = (void *)param; + return set_window_style( hwnd, style->styleNew, style->styleOld ); + } default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index f68f5481f90..96f61d2a07a 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -183,6 +183,7 @@ enum NtUserSetForegroundWindow, /* temporary exports */ NtUserIsWindowDrawable, + NtUserSetWindowStyle, }; /* NtUserMessageCall codes */

1 0