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

Zebediah Figura : user32: Perform HID ioctls on the right file handle.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: 2ae59899bf905dc1d6e12bb6114a5c3ac12cbb69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ae59899bf905dc1d6e12bb6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 2 23:22:13 2022 -0500 user32: Perform HID ioctls on the right file handle. This fixes a regression from 8962ec5a83286488da6f839ceba3c39ad1cf00b3. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 90ca074f2a4..4dc240b58b3 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -153,7 +153,7 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, switch (type) { case RIM_TYPEHID: - status = NtDeviceIoControlFile( device->file, NULL, NULL, NULL, &io, + status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &hid_info, sizeof(hid_info) ); if (status) @@ -172,7 +172,7 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, goto fail; } - status = NtDeviceIoControlFile( device->file, NULL, NULL, NULL, &io, + status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, preparsed, hid_info.DescriptorSize ); if (status)

1 0

Ziqing Hui : d2d1/tests: Test custom effect properties.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: 5cb2c805b19d9a4285adc7086798da708f54c617 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cb2c805b19d9a4285adc708… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jun 2 18:17:03 2022 +0800 d2d1/tests: Test custom effect properties. 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 | 251 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 251 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5cb2c805b19d9a4285ad…

1 0

Ziqing Hui : d2d1/tests: Test unregistering effect which has existing instance.
by Alexandre Julliard 03 Jun '22

03 Jun '22

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

Gabriel Ivăncescu : jscript: Don't allow starting script using state from uninitialized.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: 079b14b2e97234526c5f1a51d590c0c2d0db0ec7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=079b14b2e97234526c5f1a51… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 2 20:00:43 2022 +0300 jscript: Don't allow starting script using state from uninitialized. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.c | 2 +- dlls/jscript/tests/jscript.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 8cf141d3990..d6028e69888 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -824,7 +824,7 @@ static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE s switch(ss) { case SCRIPTSTATE_STARTED: case SCRIPTSTATE_CONNECTED: /* FIXME */ - if(This->ctx->state == SCRIPTSTATE_CLOSED) + if(This->ctx->state == SCRIPTSTATE_UNINITIALIZED || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; exec_queued_code(This); diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 8c985e5c6a5..872354161fc 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -863,6 +863,12 @@ static void test_jscript_uninitializing(void) hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08lx\n", hres); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_STARTED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_STARTED) returned: %08lx\n", hres); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_CONNECTED) returned: %08lx\n", hres); + SET_EXPECT(GetLCID); SET_EXPECT(OnStateChange_INITIALIZED); hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite);

1 0

Gabriel Ivăncescu : jscript: Setup builtin function when the dispid is retrieved.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: c8d7d504eb2c4fe063e3750091051f2b902fd946 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8d7d504eb2c4fe063e37500… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 2 20:00:44 2022 +0300 jscript: Setup builtin function when the dispid is retrieved. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 67 ++++++++++++++++--------------------------------- dlls/jscript/function.c | 3 +++ 2 files changed, 25 insertions(+), 45 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 468a0ddf557..df829b76c4d 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -242,6 +242,7 @@ static HRESULT find_prop_name(jsdisp_t *This, unsigned hash, const WCHAR *name, const builtin_prop_t *builtin; unsigned bucket, pos, prev = ~0; dispex_prop_t *prop; + HRESULT hres; bucket = get_props_idx(This, hash); pos = This->props[bucket].bucket_head; @@ -264,9 +265,24 @@ static HRESULT find_prop_name(jsdisp_t *This, unsigned hash, const WCHAR *name, builtin = find_builtin_prop(This, name); if(builtin) { unsigned flags = builtin->flags; - if(flags & PROPF_METHOD) - flags |= PROPF_WRITABLE | PROPF_CONFIGURABLE; - else if(builtin->setter) + if(flags & PROPF_METHOD) { + jsdisp_t *obj; + + hres = create_builtin_function(This->ctx, builtin->invoke, builtin->name, NULL, flags, NULL, &obj); + if(FAILED(hres)) + return hres; + + prop = alloc_prop(This, name, PROP_JSVAL, (flags & PROPF_ALL) | PROPF_WRITABLE | PROPF_CONFIGURABLE); + if(!prop) { + jsdisp_release(obj); + return E_OUTOFMEMORY; + } + + prop->type = PROP_JSVAL; + prop->u.val = jsval_obj(obj); + *ret = prop; + return S_OK; + }else if(builtin->setter) flags |= PROPF_WRITABLE; flags &= PROPF_ENUMERABLE | PROPF_WRITABLE | PROPF_CONFIGURABLE; prop = alloc_prop(This, name, PROP_BUILTIN, flags); @@ -431,23 +447,7 @@ static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) switch(prop->type) { case PROP_BUILTIN: - if(prop->u.p->getter) { - hres = prop->u.p->getter(This->ctx, This, r); - }else { - jsdisp_t *obj; - - assert(prop->u.p->invoke != NULL); - hres = create_builtin_function(This->ctx, prop->u.p->invoke, prop->u.p->name, NULL, - prop->u.p->flags, NULL, &obj); - if(FAILED(hres)) - break; - - prop->type = PROP_JSVAL; - prop->u.val = jsval_obj(obj); - - jsdisp_addref(obj); - *r = jsval_obj(obj); - } + hres = prop->u.p->getter(This->ctx, This, r); break; case PROP_JSVAL: hres = jsval_copy(prop->u.val, r); @@ -497,12 +497,6 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) switch(prop->type) { case PROP_BUILTIN: - if(prop->u.p->invoke) { - prop->type = PROP_JSVAL; - prop->flags = PROPF_CONFIGURABLE | PROPF_WRITABLE; - prop->u.val = jsval_undefined(); - break; - } if(!prop->u.p->setter) { TRACE("getter with no setter\n"); return S_OK; @@ -557,25 +551,8 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t HRESULT hres; switch(prop->type) { - case PROP_BUILTIN: { - jsval_t vthis; - - if(!prop->u.p->invoke) - return JS_E_FUNCTION_EXPECTED; - - if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) { - WARN("%s is not a constructor\n", debugstr_w(prop->name)); - return E_INVALIDARG; - } - - if(This->builtin_info->class != JSCLASS_FUNCTION && prop->u.p->invoke != JSGlobal_eval) - flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; - if(jsthis) - vthis = jsval_disp(jsthis); - else - vthis = jsval_obj(This); - return prop->u.p->invoke(This->ctx, vthis, flags, argc, argv, r); - } + case PROP_BUILTIN: + return JS_E_FUNCTION_EXPECTED; case PROP_PROTREF: return invoke_prop_func(This->prototype, jsthis ? jsthis : (IDispatch *)&This->IDispatchEx_iface, This->prototype->props+prop->u.ref, flags, argc, argv, r, caller); diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 638d176cf2c..18465e53a86 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -664,6 +664,9 @@ HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, NativeFunction *function; HRESULT hres; + if(!ctx->function_constr) + return E_UNEXPECTED; + hres = create_function(ctx, builtin_info, &NativeFunctionVtbl, sizeof(NativeFunction), flags, FALSE, NULL, (void**)&function); if(FAILED(hres)) return hres;

1 0

Jacek Caban : winemac: Rename MOUSE_MOVE_RELATIVE to avoid collision with wincontypes.h.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: 4998bbacef89875db65b80d96e1bd43c3033c2c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4998bbacef89875db65b80d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 02:00:15 2022 +0200 winemac: Rename MOUSE_MOVE_RELATIVE to avoid collision with wincontypes.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/cocoa_app.m | 4 ++-- dlls/winemac.drv/cocoa_event.m | 6 +++--- dlls/winemac.drv/event.c | 6 +++--- dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/mouse.c | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index b5a3059382e..b13bc678c6d 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1188,7 +1188,7 @@ static NSString* WineLocalizedString(unsigned int stringID) [eventQueuesLock lock]; for (queue in eventQueues) { - [queue discardEventsMatchingMask:event_mask_for_type(MOUSE_MOVED) | + [queue discardEventsMatchingMask:event_mask_for_type(MOUSE_MOVED_RELATIVE) | event_mask_for_type(MOUSE_MOVED_ABSOLUTE) forWindow:nil]; [queue resetMouseEventPositions:pos]; @@ -1444,7 +1444,7 @@ static NSString* WineLocalizedString(unsigned int stringID) mouseMoveDeltaX += [anEvent deltaX]; mouseMoveDeltaY += [anEvent deltaY]; - event = macdrv_create_event(MOUSE_MOVED, targetWindow); + event = macdrv_create_event(MOUSE_MOVED_RELATIVE, targetWindow); event->mouse_moved.x = mouseMoveDeltaX * scale; event->mouse_moved.y = mouseMoveDeltaY * scale; diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 868ce5a7813..24f69b17a0a 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -204,17 +204,17 @@ static const OSType WineHotKeySignature = 'Wine'; }]; [events removeObjectsAtIndexes:indexes]; - if ((event->event->type == MOUSE_MOVED || + if ((event->event->type == MOUSE_MOVED_RELATIVE || event->event->type == MOUSE_MOVED_ABSOLUTE) && event->event->deliver == INT_MAX && (lastEvent = [events lastObject]) && - (lastEvent->event->type == MOUSE_MOVED || + (lastEvent->event->type == MOUSE_MOVED_RELATIVE || lastEvent->event->type == MOUSE_MOVED_ABSOLUTE) && lastEvent->event->deliver == INT_MAX && lastEvent->event->window == event->event->window && lastEvent->event->mouse_moved.drag == event->event->mouse_moved.drag) { - if (event->event->type == MOUSE_MOVED) + if (event->event->type == MOUSE_MOVED_RELATIVE) { lastEvent->event->mouse_moved.x += event->event->mouse_moved.x; lastEvent->event->mouse_moved.y += event->event->mouse_moved.y; diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 361709010c9..aed8f94076a 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -44,7 +44,7 @@ static const char *dbgstr_event(int type) "KEYBOARD_CHANGED", "LOST_PASTEBOARD_OWNERSHIP", "MOUSE_BUTTON", - "MOUSE_MOVED", + "MOUSE_MOVED_RELATIVE", "MOUSE_MOVED_ABSOLUTE", "MOUSE_SCROLL", "QUERY_EVENT", @@ -100,7 +100,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) if (mask & QS_MOUSEMOVE) { - event_mask |= event_mask_for_type(MOUSE_MOVED); + event_mask |= event_mask_for_type(MOUSE_MOVED_RELATIVE); event_mask |= event_mask_for_type(MOUSE_MOVED_ABSOLUTE); } @@ -325,7 +325,7 @@ void macdrv_handle_event(const macdrv_event *event) case MOUSE_BUTTON: macdrv_mouse_button(hwnd, event); break; - case MOUSE_MOVED: + case MOUSE_MOVED_RELATIVE: case MOUSE_MOVED_ABSOLUTE: macdrv_mouse_moved(hwnd, event); break; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 94f9fbcfa17..27b130ca32e 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -328,7 +328,7 @@ enum { KEYBOARD_CHANGED, LOST_PASTEBOARD_OWNERSHIP, MOUSE_BUTTON, - MOUSE_MOVED, + MOUSE_MOVED_RELATIVE, MOUSE_MOVED_ABSOLUTE, MOUSE_SCROLL, QUERY_EVENT, diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 078b674d7c0..00ec9a36c38 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -892,14 +892,14 @@ void macdrv_mouse_button(HWND hwnd, const macdrv_event *event) /*********************************************************************** * macdrv_mouse_moved * - * Handler for MOUSE_MOVED and MOUSE_MOVED_ABSOLUTE events. + * Handler for MOUSE_MOVED_RELATIVE and MOUSE_MOVED_ABSOLUTE events. */ void macdrv_mouse_moved(HWND hwnd, const macdrv_event *event) { UINT flags = MOUSEEVENTF_MOVE; TRACE("win %p/%p %s (%d,%d) drag %d time %lu (%lu ticks ago)\n", hwnd, event->window, - (event->type == MOUSE_MOVED) ? "relative" : "absolute", + (event->type == MOUSE_MOVED_RELATIVE) ? "relative" : "absolute", event->mouse_moved.x, event->mouse_moved.y, event->mouse_moved.drag, event->mouse_moved.time_ms, (NtGetTickCount() - event->mouse_moved.time_ms));

1 0

Jacek Caban : winemac: Use unixlib interface for query_drag_drop.
by Alexandre Julliard 03 Jun '22

03 Jun '22

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 query_drag_operation.
by Alexandre Julliard 03 Jun '22

03 Jun '22

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 03 Jun '22

03 Jun '22

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

Jacek Caban : winemac: Use unixlib interface for macdrv_dnd_get_data.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: 80e24bcc01c0863049ca3380356c9b53e4a86eb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80e24bcc01c0863049ca3380… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 1 20:28:56 2022 +0200 winemac: Use unixlib interface for macdrv_dnd_get_data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 29 ++++++++++++++--------------- dlls/winemac.drv/dragdrop.c | 24 ++++++++++++++++++++++-- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_main.c | 1 + dlls/winemac.drv/unixlib.h | 10 ++++++++++ 5 files changed, 48 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index f46bb389cc9..8a795e61724 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1128,24 +1128,26 @@ static CFDataRef export_unicodetext_to_utf16(void *data, size_t size) /************************************************************************** - * macdrv_get_pasteboard_data + * macdrv_dnd_get_data */ -HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_format) +NTSTATUS macdrv_dnd_get_data(void *arg) { + struct dnd_get_data_params *params = arg; + CFTypeRef pasteboard = pasteboard_from_handle(params->handle); CFArrayRef types; CFIndex count; CFIndex i; CFStringRef type, best_type; WINE_CLIPFORMAT* best_format = NULL; - HANDLE data = NULL; + NTSTATUS status = STATUS_SUCCESS; - TRACE("pasteboard %p, desired_format %s\n", pasteboard, debugstr_format(desired_format)); + TRACE("pasteboard %p, desired_format %s\n", pasteboard, debugstr_format(params->format)); types = macdrv_copy_pasteboard_types(pasteboard); if (!types) { WARN("Failed to copy pasteboard types\n"); - return NULL; + return STATUS_NO_MEMORY; } count = CFArrayGetCount(types); @@ -1161,7 +1163,7 @@ HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_format) { TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); - if (format->format_id == desired_format) + if (format->format_id == params->format) { /* The best format is the matching one which is not synthesized. Failing that, the best format is the first matching synthesized format. */ @@ -1183,15 +1185,12 @@ HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_format) if (pasteboard_data) { size_t size; - void *import = best_format->import_func(pasteboard_data, &size), *ptr; + void *import = best_format->import_func(pasteboard_data, &size); if (import) { - data = GlobalAlloc(GMEM_FIXED, size); - if (data && (ptr = GlobalLock(data))) - { - memcpy(ptr, import, size); - GlobalUnlock(data); - } + if (size > params->size) status = STATUS_BUFFER_OVERFLOW; + else memcpy(params->data, import, size); + params->size = size; free(import); } CFRelease(pasteboard_data); @@ -1199,8 +1198,8 @@ HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_format) } CFRelease(types); - TRACE(" -> %p\n", data); - return data; + TRACE(" -> %#x\n", status); + return status; } diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index 962a9d8c24b..aec8b1f4790 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -24,6 +24,8 @@ #define NONAMELESSUNION +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "macdrv.h" #define COBJMACROS @@ -92,6 +94,24 @@ static inline DragDropDataObject *impl_from_IDataObject(IDataObject *iface) } +static HANDLE get_pasteboard_data(UINT64 pasteboard, UINT desired_format) +{ + struct dnd_get_data_params params = { .handle = pasteboard, .format = desired_format, .size = 2048 }; + HANDLE handle; + NTSTATUS status; + + for (;;) + { + if (!(handle = GlobalAlloc(GMEM_FIXED, params.size))) return 0; + params.data = GlobalLock(handle); + status = MACDRV_CALL(dnd_get_data, &params); + GlobalUnlock(handle); + if (!status) return GlobalReAlloc(handle, params.size, 0); + GlobalFree(handle); + if (status != STATUS_BUFFER_OVERFLOW) return 0; + } +} + static HRESULT WINAPI dddo_QueryInterface(IDataObject* iface, REFIID riid, LPVOID *ppvObj) { DragDropDataObject *This = impl_from_IDataObject(iface); @@ -148,7 +168,7 @@ static HRESULT WINAPI dddo_GetData(IDataObject* iface, FORMATETC* formatEtc, STG if (SUCCEEDED(hr)) { medium->tymed = TYMED_HGLOBAL; - medium->u.hGlobal = macdrv_get_pasteboard_data((void *)(UINT_PTR)This->pasteboard, formatEtc->cfFormat); + medium->u.hGlobal = get_pasteboard_data(This->pasteboard, formatEtc->cfFormat); medium->pUnkForRelease = NULL; hr = medium->u.hGlobal ? S_OK : E_OUTOFMEMORY; } @@ -454,7 +474,7 @@ NTSTATUS WINAPI macdrv_dnd_query_drop(void *arg, ULONG size) hwnd = GetParent(hwnd); if (hwnd) { - HDROP hdrop = macdrv_get_pasteboard_data((void *)(UINT_PTR)params->handle, CF_HDROP); + HDROP hdrop = get_pasteboard_data(params->handle, CF_HDROP); DROPFILES *dropfiles = GlobalLock(hdrop); if (dropfiles) { diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 4c1a21a3fe8..a841465486e 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -255,7 +255,6 @@ extern void macdrv_displays_changed(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_UpdateClipboard(void) DECLSPEC_HIDDEN; extern BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) DECLSPEC_HIDDEN; extern void macdrv_lost_pasteboard_ownership(HWND hwnd) DECLSPEC_HIDDEN; -extern HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_format) 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; @@ -285,6 +284,7 @@ extern NTSTATUS WINAPI macdrv_ime_query_char_rect(void *params, ULONG size) DECL /* unixlib interface */ +extern NTSTATUS macdrv_dnd_get_data(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS macdrv_dnd_get_formats(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS macdrv_dnd_have_format(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS macdrv_dnd_release(void *arg) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index a0b29604e62..61195d408c8 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -630,6 +630,7 @@ static NTSTATUS macdrv_ime_using_input_method(void *arg) const unixlib_entry_t __wine_unix_call_funcs[] = { + macdrv_dnd_get_data, macdrv_dnd_get_formats, macdrv_dnd_have_format, macdrv_dnd_release, diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index b29bf99e7f4..0bfc61321d0 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -21,6 +21,7 @@ enum macdrv_funcs { + unix_dnd_get_data, unix_dnd_get_formats, unix_dnd_have_format, unix_dnd_release, @@ -37,6 +38,15 @@ enum macdrv_funcs extern NTSTATUS unix_call(enum macdrv_funcs code, void *params) DECLSPEC_HIDDEN; #define MACDRV_CALL(func, params) unix_call( unix_ ## func, params ) +/* macdrv_dnd_get_data params */ +struct dnd_get_data_params +{ + UINT64 handle; + UINT format; + size_t size; + void *data; +}; + /* macdrv_dnd_get_formats params */ struct dnd_get_formats_params {

1 0