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

Floris Renaud : joy.cpl: Resize text boxes.
by Alexandre Julliard June 3, 2022

June 3, 2022

Module: wine Branch: master Commit: f3658e05be7bec7ddad78b775d8cd0218848ea4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3658e05be7bec7ddad78b77… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Thu Jun 2 23:34:41 2022 +0200 joy.cpl: Resize text boxes. Some translations need more space. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/joy.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc index c1d8380af37..6c4bb0053ae 100644 --- a/dlls/joy.cpl/joy.rc +++ b/dlls/joy.cpl/joy.rc @@ -40,11 +40,11 @@ FONT 8, "Ms Shell Dlg" PUSHBUTTON "&Reset", IDC_BUTTONRESET, 200, 40, 60, 15 PUSHBUTTON "&Enable", IDC_BUTTONENABLE, 200, 190, 60, 15 PUSHBUTTON "&Override", IDC_BUTTONOVERRIDE, 200, 100, 60, 15 - LTEXT "Connected", IDC_STATIC, 10, 10, 100, 10 + LTEXT "Connected", IDC_STATIC, 10, 10, 180, 10 LISTBOX IDC_JOYSTICKLIST, 10, 20, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY - LTEXT "Connected (xinput device)", IDC_STATIC, 10, 90, 100, 10 + LTEXT "Connected (xinput device)", IDC_STATIC, 10, 90, 180, 10 LISTBOX IDC_XINPUTLIST, 10, 100, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY - LTEXT "Disabled", IDC_STATIC, 10, 180, 100, 10 + LTEXT "Disabled", IDC_STATIC, 10, 180, 180, 10 LISTBOX IDC_DISABLEDLIST, 10, 190, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY LTEXT "After disabling or enabling a device, the connected joysticks won't be updated here until you restart this applet.", IDC_STATIC, 10, 270, 200, 25 }

1 0

Alexandre Julliard : secur32/tests: Update for new WineHQ certificate.
by Alexandre Julliard June 3, 2022

June 3, 2022

Module: wine Branch: master Commit: 02eae36ec861a4133d66035b623dfd81242990c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02eae36ec861a4133d66035b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 21:41:38 2022 +0200 secur32/tests: Update for new WineHQ certificate. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 2bf0336f3f5..314b43a2607 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -575,7 +575,7 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 2, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 3, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); }

1 0

Zebediah Figura : wined3d: Invalidate the depth/stencil view if the depth/stencil state may be written.
by Alexandre Julliard June 3, 2022

June 3, 2022

Module: wine Branch: master Commit: 93d51e64a7a82693993a3b166ee5aa4256bb42d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93d51e64a7a82693993a3b16… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 2 20:23:49 2022 -0500 wined3d: Invalidate the depth/stencil view if the depth/stencil state may be written. This allows menu items to be rendered in Snowrunner. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 228b4901c00..a732182d6c5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -146,9 +146,25 @@ void * CDECL wined3d_depth_stencil_state_get_parent(const struct wined3d_depth_s return state->parent; } +static bool stencil_op_writes_ds(const struct wined3d_stencil_op_desc *desc) +{ + return desc->fail_op != WINED3D_STENCIL_OP_KEEP + || desc->depth_fail_op != WINED3D_STENCIL_OP_KEEP + || desc->pass_op != WINED3D_STENCIL_OP_KEEP; +} + static bool depth_stencil_state_desc_writes_ds(const struct wined3d_depth_stencil_state_desc *desc) { - return desc->depth_write; + if (desc->depth_write) + return true; + + if (desc->stencil && desc->stencil_write_mask) + { + if (stencil_op_writes_ds(&desc->front) || stencil_op_writes_ds(&desc->back)) + return true; + } + + return false; } HRESULT CDECL wined3d_depth_stencil_state_create(struct wined3d_device *device,

1 0

Zebediah Figura : wined3d: Consider the depth write mask in depth_stencil_state_desc_writes_ds() only if depth testing is enabled.
by Alexandre Julliard June 3, 2022

June 3, 2022

Module: wine Branch: master Commit: 25c148956218bf47894b9dbe4acf7778b18d769e URL: https://source.winehq.org/git/wine.git/?a=commit;h=25c148956218bf47894b9dbe… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 2 20:23:50 2022 -0500 wined3d: Consider the depth write mask in depth_stencil_state_desc_writes_ds() only if depth testing is enabled. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a732182d6c5..ee3e083e812 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -155,7 +155,7 @@ static bool stencil_op_writes_ds(const struct wined3d_stencil_op_desc *desc) static bool depth_stencil_state_desc_writes_ds(const struct wined3d_depth_stencil_state_desc *desc) { - if (desc->depth_write) + if (desc->depth && desc->depth_write) return true; if (desc->stencil && desc->stencil_write_mask)

1 0

Ziqing Hui : d2d1/tests: Test unregistering effect which has existing instance.
by Alexandre Julliard June 3, 2022

June 3, 2022

Module: wine Branch: master Commit: 3eaac7211fdf985a9d443fce8555b9bac99a1327 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eaac7211fdf985a9d443fce… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jun 2 18:17:04 2022 +0800 d2d1/tests: Test unregistering effect which has existing instance. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 397e460cbb2..bc662b4f8ae 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10673,10 +10673,15 @@ static void test_effect_register(BOOL d3d11) ok(hr == test->hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, test->hr); if (hr == S_OK) { + effect = NULL; + hr = ID2D1DeviceContext_CreateEffect(device_context, &CLSID_TestEffect, &effect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); todo_wine ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr); + if (effect) + ID2D1Effect_Release(effect); } winetest_pop_context();

1 0

Jacek Caban : winemac: Use unixlib interface for query_drag_drop.
by Alexandre Julliard June 3, 2022

June 3, 2022

Module: wine Branch: master Commit: 3aa1a86b3ffa99d4b81f4276325a89b0cc9e019e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aa1a86b3ffa99d4b81f4276… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 1 01:21:53 2022 +0200 winemac: Use unixlib interface for query_drag_drop. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/dllmain.c | 1 + dlls/winemac.drv/dragdrop.c | 32 ++++++++++++-------------------- dlls/winemac.drv/event.c | 42 +++++++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/unixlib.h | 13 ++++++++++++- 5 files changed, 67 insertions(+), 23 deletions(-) diff --git a/dlls/winemac.drv/dllmain.c b/dlls/winemac.drv/dllmain.c index 493062521ad..69bc02e46c2 100644 --- a/dlls/winemac.drv/dllmain.c +++ b/dlls/winemac.drv/dllmain.c @@ -29,6 +29,7 @@ HMODULE macdrv_module = 0; typedef NTSTATUS (WINAPI *kernel_callback)(void *params, ULONG size); static const kernel_callback kernel_callbacks[] = { + macdrv_dnd_query_drop, macdrv_dnd_query_exited, macdrv_ime_query_char_rect, macdrv_ime_set_text, diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index 19a5c4794b5..a57caab423b 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -427,40 +427,32 @@ static IDropTarget* get_droptarget_pointer(HWND hwnd) /************************************************************************** - * query_drag_drop + * macdrv_dnd_query_drop */ -BOOL query_drag_drop(macdrv_query* query) +NTSTATUS WINAPI macdrv_dnd_query_drop(void *arg, ULONG size) { + struct dnd_query_drop_params *params = arg; + IDropTarget *droptarget; BOOL ret = FALSE; - HWND hwnd = macdrv_get_window_hwnd(query->window); - struct macdrv_win_data *data = get_win_data(hwnd); POINT pt; - IDropTarget *droptarget; - - TRACE("win %p/%p x,y %d,%d op 0x%08x pasteboard %p\n", hwnd, query->window, - query->drag_drop.x, query->drag_drop.y, query->drag_drop.op, query->drag_drop.pasteboard); - if (!data) - { - WARN("no win_data for win %p/%p\n", hwnd, query->window); - return FALSE; - } + TRACE("win %p x,y %d,%d effect %x pasteboard %s\n", params->hwnd, params->x, params->y, + params->effect, wine_dbgstr_longlong(params->handle)); - pt.x = query->drag_drop.x + data->whole_rect.left; - pt.y = query->drag_drop.y + data->whole_rect.top; - release_win_data(data); + pt.x = params->x; + pt.y = params->y; droptarget = get_droptarget_pointer(last_droptarget_hwnd); if (droptarget) { HRESULT hr; POINTL pointl; - DWORD effect = drag_operations_to_dropeffects(query->drag_drop.op); + DWORD effect = params->effect; if (!active_data_object) { WARN("shouldn't happen: no active IDataObject\n"); - active_data_object = create_data_object_for_pasteboard(query->drag_drop.pasteboard); + active_data_object = create_data_object_for_pasteboard((void *)(UINT_PTR)params->handle); } pointl.x = pt.x; @@ -484,12 +476,12 @@ BOOL query_drag_drop(macdrv_query* query) } else { - hwnd = WindowFromPoint(pt); + HWND hwnd = WindowFromPoint(pt); while (hwnd && !(GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_ACCEPTFILES)) hwnd = GetParent(hwnd); if (hwnd) { - HDROP hdrop = macdrv_get_pasteboard_data(query->drag_drop.pasteboard, CF_HDROP); + HDROP hdrop = macdrv_get_pasteboard_data((void *)(UINT_PTR)params->handle, CF_HDROP); DROPFILES *dropfiles = GlobalLock(hdrop); if (dropfiles) { diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index aed8f94076a..8432218d8d1 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -23,7 +23,7 @@ #include "config.h" #include "macdrv.h" -#include "winuser.h" +#include "oleidl.h" WINE_DEFAULT_DEBUG_CHANNEL(event); WINE_DECLARE_DEBUG_CHANNEL(imm); @@ -179,6 +179,46 @@ static void macdrv_sent_text_input(const macdrv_event *event) } +/************************************************************************** + * drag_operations_to_dropeffects + */ +static DWORD drag_operations_to_dropeffects(uint32_t ops) +{ + DWORD effects = 0; + if (ops & (DRAG_OP_COPY | DRAG_OP_GENERIC)) + effects |= DROPEFFECT_COPY; + if (ops & DRAG_OP_MOVE) + effects |= DROPEFFECT_MOVE; + if (ops & (DRAG_OP_LINK | DRAG_OP_GENERIC)) + effects |= DROPEFFECT_LINK; + return effects; +} + + +/************************************************************************** + * query_drag_drop + */ +static BOOL query_drag_drop(macdrv_query *query) +{ + HWND hwnd = macdrv_get_window_hwnd(query->window); + struct macdrv_win_data *data = get_win_data(hwnd); + struct dnd_query_drop_params params; + + if (!data) + { + WARN("no win_data for win %p/%p\n", hwnd, query->window); + return FALSE; + } + + params.hwnd = hwnd; + params.effect = drag_operations_to_dropeffects(query->drag_drop.op); + params.x = query->drag_drop.x + data->whole_rect.left; + params.y = query->drag_drop.y + data->whole_rect.top; + params.handle = (UINT_PTR)query->drag_drop.pasteboard; + release_win_data(data); + return macdrv_client_func(client_func_dnd_query_drop, &params, sizeof(params)); +} + /************************************************************************** * query_drag_exited */ diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 401ebab3bcc..a0ae0225423 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -260,7 +260,6 @@ extern BOOL macdrv_pasteboard_has_format(CFTypeRef pasteboard, UINT desired_form extern UINT* macdrv_get_pasteboard_formats(CFTypeRef pasteboard, UINT* num_formats) DECLSPEC_HIDDEN; extern BOOL query_drag_operation(macdrv_query* query) DECLSPEC_HIDDEN; -extern BOOL query_drag_drop(macdrv_query* query) DECLSPEC_HIDDEN; extern struct opengl_funcs *macdrv_wine_get_wgl_driver(UINT version) DECLSPEC_HIDDEN; extern const struct vulkan_funcs *macdrv_wine_get_vulkan_driver(UINT version) DECLSPEC_HIDDEN; @@ -296,6 +295,7 @@ extern NTSTATUS macdrv_notify_icon(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS macdrv_client_func(enum macdrv_client_funcs func, const void *params, ULONG size) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI macdrv_dnd_query_drop(void *arg, ULONG size) DECLSPEC_HIDDEN; extern NTSTATUS WINAPI macdrv_dnd_query_exited(void *arg, ULONG size) DECLSPEC_HIDDEN; /* user helpers */ diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index 067f46c8f5d..a858b29baaa 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -67,12 +67,23 @@ struct notify_icon_params /* driver client callbacks exposed with KernelCallbackTable interface */ enum macdrv_client_funcs { - client_func_dnd_query_exited = NtUserDriverCallbackFirst, + client_func_dnd_query_drop = NtUserDriverCallbackFirst, + client_func_dnd_query_exited, client_func_ime_query_char_rect, client_func_ime_set_text, client_func_last }; +/* macdrv_dnd_query_drop params */ +struct dnd_query_drop_params +{ + HWND hwnd; + UINT32 effect; + INT32 x; + INT32 y; + UINT64 handle; +}; + /* macdrv_dnd_query_exited params */ struct dnd_query_exited_params {

1 0

Jacek Caban : winemac: Use unixlib interface for macdrv_app_icon.
by Alexandre Julliard June 3, 2022

June 3, 2022

Module: wine Branch: master Commit: dd818662b24777f1da1411da0dc476d350659746 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd818662b24777f1da1411da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 00:04:57 2022 +0200 winemac: Use unixlib interface for macdrv_app_icon. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/dllmain.c | 168 ++++++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/image.c | 178 +++++++-------------------------------------- dlls/winemac.drv/unixlib.h | 25 ++++++- 3 files changed, 219 insertions(+), 152 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dd818662b24777f1da14…

1 0

Jacek Caban : winemac: Don't use sprintfW in copy_system_cursor_name.
by Alexandre Julliard June 3, 2022

June 3, 2022

Module: wine Branch: master Commit: 22342300d915cd3516307f13d2207e77025f1cbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=22342300d915cd3516307f13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 00:25:09 2022 +0200 winemac: Don't use sprintfW in copy_system_cursor_name. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/mouse.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 00ec9a36c38..18a98296a76 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -166,7 +166,6 @@ static void send_mouse_input(HWND hwnd, macdrv_window cocoa_window, UINT flags, */ CFStringRef copy_system_cursor_name(ICONINFOEXW *info) { - static const WCHAR idW[] = {'%','h','u',0}; const struct system_cursors *cursors; unsigned int i; CFStringRef cursor_name = NULL; @@ -184,7 +183,12 @@ CFStringRef copy_system_cursor_name(ICONINFOEXW *info) p = name + strlenW(name); *p++ = ','; if (info->szResName[0]) strcpyW(p, info->szResName); - else sprintfW(p, idW, info->wResID); + else + { + char buf[16]; + sprintf(buf, "%hu", info->wResID); + asciiz_to_unicode(p, buf); + } /* @@ Wine registry key: HKCU\Software\Wine\Mac Driver\Cursors */ if (!(key = open_hkcu_key("Software\\Wine\\Mac Driver\\Cursors")))

1 0

Jacek Caban : winemac: Use unixlib interface for query_drag_operation.
by Alexandre Julliard June 3, 2022

June 3, 2022

Module: wine Branch: master Commit: 4938929ccf16be6564f65c37711fc5dea93f9c23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4938929ccf16be6564f65c37… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 1 02:41:22 2022 +0200 winemac: Use unixlib interface for query_drag_operation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/dllmain.c | 1 + dlls/winemac.drv/dragdrop.c | 72 +++++++++------------------------------------ dlls/winemac.drv/event.c | 47 +++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 3 +- dlls/winemac.drv/unixlib.h | 13 +++++++- 5 files changed, 75 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4938929ccf16be6564f6…

1 0

Jacek Caban : winemac: Use unixlib interface for dragdrop.c calls.
by Alexandre Julliard June 3, 2022

June 3, 2022

Module: wine Branch: master Commit: a21983f1340258f9338de56cd2f15ea7fb31bdfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a21983f1340258f9338de56c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 1 19:30:04 2022 +0200 winemac: Use unixlib interface for dragdrop.c calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 61 ++++++++++++++++++++++++++++-------------- dlls/winemac.drv/dragdrop.c | 34 ++++++++++++----------- dlls/winemac.drv/macdrv.h | 6 +++-- dlls/winemac.drv/macdrv_main.c | 4 +++ dlls/winemac.drv/unixlib.h | 18 +++++++++++++ 5 files changed, 86 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a21983f1340258f9338d…

1 0