February 2024 - Wine-commits

Gabriel Ivăncescu : mshtml: Expose the IHTMLEventObj5 props to scripts.
by Alexandre Julliard 05 Feb '24

05 Feb '24

Module: wine Branch: master Commit: 330d8cd99833868291c343fb5c4f252b3295459c URL: https://gitlab.winehq.org/wine/wine/-/commit/330d8cd99833868291c343fb5c4f25… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Feb 5 16:15:23 2024 +0200 mshtml: Expose the IHTMLEventObj5 props to scripts. It's mostly implemented, and issession isn't even exposed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/events.html | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index b86b7513477..1ae3a0de384 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2065,6 +2065,7 @@ static const dispex_static_data_vtbl_t HTMLEventObj_dispex_vtbl = { }; static const tid_t HTMLEventObj_iface_tids[] = { + IHTMLEventObj5_tid, IHTMLEventObj_tid, 0 }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index db37375c089..9609fb5edcb 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -208,6 +208,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLElementCollection) \ XIID(IHTMLEmbedElement) \ XIID(IHTMLEventObj) \ + XIID(IHTMLEventObj5) \ XIID(IHTMLFiltersCollection) \ XIID(IHTMLFormElement) \ XIID(IHTMLFrameBase) \ diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index 6f9b3dacbbc..76473277e3c 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -284,7 +284,12 @@ function test_attach_in_attach() { } function test_event_obj_props(e) { - var i, props; + var i, props = [ + "altKey", "button", "cancelBubble", "clientX", "clientY", "ctrlKey", "data", "fromElement", "keyCode", "offsetX", "offsetY", + "origin", "qualifier", "reason", "returnValue", "screenX", "screenY", "shiftKey", "source", "srcElement", "srcFilter", + "toElement", "type", "url", "x", "y" ]; + for(i = 0; i < props.length; i++) + ok(props[i] in e, props[i] + " not in event obj"); props = [ "imeCompositionChange", "imeNotifyCommand", "imeNotifyData", "imeRequest", "imeRequestData", "issession", "keyboardLayout" ]; for(i = 0; i < props.length; i++)

1 0

Gabriel Ivăncescu : mshtml/tests: Test builtin function default value getter with custom IOleCommandTarget.
by Alexandre Julliard 05 Feb '24

05 Feb '24

Module: wine Branch: master Commit: 681d34d7844d5839e735016e8c7ddc362a13e3c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/681d34d7844d5839e735016e8c7ddc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Feb 5 16:15:23 2024 +0200 mshtml/tests: Test builtin function default value getter with custom IOleCommandTarget. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/script.c | 146 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 5c969e4a3d9..e6acf5ae5b1 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -147,8 +147,11 @@ DEFINE_EXPECT(external_success); DEFINE_EXPECT(QS_VariantConversion); DEFINE_EXPECT(QS_IActiveScriptSite); DEFINE_EXPECT(QS_GetCaller); +DEFINE_EXPECT(QS_IActiveScriptSite2); +DEFINE_EXPECT(QS_GetCaller2); DEFINE_EXPECT(ChangeType_bstr); DEFINE_EXPECT(ChangeType_dispatch); +DEFINE_EXPECT(cmdtarget_Exec); DEFINE_EXPECT(GetTypeInfo); #define TESTACTIVEX_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80646}" @@ -489,6 +492,8 @@ static IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { static IPropertyNotifySink PropertyNotifySink = { &PropertyNotifySinkVtbl }; +static IOleCommandTarget cmdtarget; + static HRESULT WINAPI VariantChangeType_QueryInterface(IVariantChangeType *iface, REFIID riid, void **ppv) { ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); @@ -595,6 +600,52 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { static IServiceProvider caller_sp = { &ServiceProviderVtbl }; +static HRESULT WINAPI ServiceProvider2_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ServiceProvider2_AddRef(IServiceProvider *iface) +{ + return 2; +} + +static ULONG WINAPI ServiceProvider2_Release(IServiceProvider *iface) +{ + return 1; +} + +static HRESULT WINAPI ServiceProvider2_QueryService(IServiceProvider *iface, REFGUID guidService, + REFIID riid, void **ppv) +{ + if(IsEqualGUID(guidService, &IID_IActiveScriptSite)) { + CHECK_EXPECT(QS_IActiveScriptSite2); + ok(IsEqualGUID(riid, &IID_IOleCommandTarget), "unexpected riid %s\n", wine_dbgstr_guid(riid)); + *ppv = &cmdtarget; + return S_OK; + } + + if(IsEqualGUID(guidService, &SID_GetCaller)) { + CHECK_EXPECT(QS_GetCaller2); + ok(IsEqualGUID(riid, &IID_IServiceProvider), "unexpected riid %s\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return S_OK; + } + + ok(0, "unexpected service %s\n", wine_dbgstr_guid(guidService)); + return E_NOINTERFACE; +} + +static const IServiceProviderVtbl ServiceProvider2Vtbl = { + ServiceProvider2_QueryInterface, + ServiceProvider2_AddRef, + ServiceProvider2_Release, + ServiceProvider2_QueryService +}; + +static IServiceProvider caller_sp2 = { &ServiceProvider2Vtbl }; + static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -1465,6 +1516,88 @@ static IDispatchExVtbl externalDispVtbl = { static IDispatchEx externalDisp = { &externalDispVtbl }; +static HRESULT WINAPI DispatchExStub_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static IDispatchExVtbl DispatchExStubVtbl = { + DispatchExStub_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + DispatchEx_GetDispID, + DispatchEx_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx DispatchExStub = { &DispatchExStubVtbl }; + +static HRESULT WINAPI cmdtarget_QueryInterface(IOleCommandTarget *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IOleCommandTarget)) + *ppv = &cmdtarget; + else { + ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + return S_OK; +} + +static ULONG WINAPI cmdtarget_AddRef(IOleCommandTarget *iface) +{ + return 2; +} + +static ULONG WINAPI cmdtarget_Release(IOleCommandTarget *iface) +{ + return 1; +} + +static HRESULT WINAPI cmdtarget_QueryStatus(IOleCommandTarget *iface, const GUID *pguidCmdGroup, + ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) +{ + ok(0, "unexpected call\n"); + return OLECMDERR_E_UNKNOWNGROUP; +} + +static HRESULT WINAPI cmdtarget_Exec(IOleCommandTarget *iface, const GUID *pguidCmdGroup, + DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + CHECK_EXPECT2(cmdtarget_Exec); + ok(pguidCmdGroup && IsEqualGUID(pguidCmdGroup, &CGID_ScriptSite), "pguidCmdGroup = %s\n", wine_dbgstr_guid(pguidCmdGroup)); + ok(nCmdID == CMDID_SCRIPTSITE_SECURITY_WINDOW, "nCmdID = %lu\n", nCmdID); + ok(!nCmdexecopt, "nCmdexecopt = %lu\n", nCmdexecopt); + ok(!pvaIn, "pvaIn != NULL\n"); + ok(pvaOut != NULL, "pvaOut = NULL\n"); + + /* Looks like native just uses this for some sort of hardcoded security check + * without actually using the IDispatchEx interface or QI? (for ACCESSDENIED) */ + V_VT(pvaOut) = VT_DISPATCH; + V_DISPATCH(pvaOut) = (IDispatch*)&DispatchExStub; + return S_OK; +} + +static const IOleCommandTargetVtbl cmdtarget_vtbl = { + cmdtarget_QueryInterface, + cmdtarget_AddRef, + cmdtarget_Release, + cmdtarget_QueryStatus, + cmdtarget_Exec +}; + +static IOleCommandTarget cmdtarget = { &cmdtarget_vtbl }; + static HRESULT QueryInterface(REFIID,void**); static HRESULT WINAPI DocHostUIHandler_QueryInterface(IDocHostUIHandler2 *iface, REFIID riid, void **ppv) @@ -2740,6 +2873,19 @@ static void test_func(IDispatchEx *obj) todo_wine CHECK_CALLED(QS_IActiveScriptSite); todo_wine CHECK_CALLED(QS_GetCaller); + SET_EXPECT(QS_IActiveScriptSite2); + SET_EXPECT(QS_GetCaller2); + SET_EXPECT(cmdtarget_Exec); + hres = dispex_propget(dispex, DISPID_VALUE, &var, &caller_sp2); + ok(hres == S_OK, "InvokeEx returned: %08lx, expected S_OK\n", hres); + ok(V_VT(&var) == VT_BSTR, "V_VT(var) = %d\n", V_VT(&var)); + ok(!lstrcmpW(V_BSTR(&var), L"\nfunction toString() {\n [native code]\n}\n"), + "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + todo_wine CHECK_CALLED(QS_IActiveScriptSite2); + todo_wine CHECK_CALLED(QS_GetCaller2); + todo_wine CHECK_CALLED(cmdtarget_Exec); + IDispatchEx_Release(dispex); }

1 0

Jacek Caban : include: Add RtlRestoreContext declaration.
by Alexandre Julliard 05 Feb '24

05 Feb '24

Module: wine Branch: master Commit: 3c19b29ce60821f379b7b8cbdc0c8cc65a50ae24 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c19b29ce60821f379b7b8cbdc0c8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 5 14:20:22 2024 +0100 include: Add RtlRestoreContext declaration. --- include/winnt.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnt.h b/include/winnt.h index e1de2f29ecd..8c91ebc79b5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2060,6 +2060,7 @@ typedef void (CALLBACK *PTERMINATION_HANDLER)(BOOLEAN,DWORD64); #endif /* __aarch64__ */ NTSYSAPI void NTAPI RtlRaiseException(struct _EXCEPTION_RECORD*); +NTSYSAPI void CDECL RtlRestoreContext(CONTEXT*,struct _EXCEPTION_RECORD*); NTSYSAPI void NTAPI RtlUnwind(void*,void*,struct _EXCEPTION_RECORD*,void*); #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__)

1 0

Esme Povirk : gdiplus: Fix some degenerate cases combining infinite regions.
by Alexandre Julliard 05 Feb '24

05 Feb '24

Module: wine Branch: master Commit: 13b2755d4d4f93f76d7e4f113affba260c857d54 URL: https://gitlab.winehq.org/wine/wine/-/commit/13b2755d4d4f93f76d7e4f113affba… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Feb 5 20:41:23 2024 +0000 gdiplus: Fix some degenerate cases combining infinite regions. --- dlls/gdiplus/region.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 058f659561b..9617f492a51 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -1108,7 +1108,10 @@ static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *grap case CombineModeXor: case CombineModeExclude: left = CreateRectRgn(-(1 << 22), -(1 << 22), 1 << 22, 1 << 22); break; - case CombineModeUnion: case CombineModeComplement: + case CombineModeComplement: + *hrgn = CreateRectRgn(0, 0, 0, 0); + return *hrgn ? Ok : OutOfMemory; + case CombineModeUnion: *hrgn = NULL; return Ok; } @@ -1133,7 +1136,11 @@ static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *grap case CombineModeXor: case CombineModeComplement: right = CreateRectRgn(-(1 << 22), -(1 << 22), 1 << 22, 1 << 22); break; - case CombineModeUnion: case CombineModeExclude: + case CombineModeExclude: + DeleteObject(left); + *hrgn = CreateRectRgn(0, 0, 0, 0); + return *hrgn ? Ok : OutOfMemory; + case CombineModeUnion: DeleteObject(left); *hrgn = NULL; return Ok;

1 0

Esme Povirk : gdiplus/tests: Thoroughly test region combines.
by Alexandre Julliard 05 Feb '24

05 Feb '24

Module: wine Branch: master Commit: 23f98e9663a1737c94f6bd6c7612baa8b4a47bc5 URL: https://gitlab.winehq.org/wine/wine/-/commit/23f98e9663a1737c94f6bd6c7612ba… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Feb 5 20:24:09 2024 +0000 gdiplus/tests: Thoroughly test region combines. --- dlls/gdiplus/tests/region.c | 199 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 7920afd8ef4..1bcef8a35dd 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -2333,6 +2333,204 @@ static void test_GdipCreateRegionRgnData(void) ReleaseDC(0, hdc); } +static void test_incombinedregion(void) +{ + struct testrgn + { + const char* desc; + BOOL origin_in_region; + GpRegion *region; + }; + + struct testrgn test_regions[] = { + { "infinite region", TRUE }, + { "infinite region inverted", FALSE }, + { "empty region", FALSE }, + { "empty region inverted", TRUE }, + { "inside rectangle", TRUE }, + { "inside rectangle inverted", FALSE }, + { "outside rectangle", FALSE }, + { "outside rectangle inverted", TRUE }, + { "inside path", TRUE }, + { "inside path inverted", FALSE }, + { "outside path but in bounding rect", FALSE }, + { "outside path but in bounding rect inverted", TRUE }, + { "outside path", FALSE }, + { "outside path inverted", TRUE }, + }; + + GpStatus stat; + GpRectF rect; + const GpPointF inside_path_points[] = { { -1, -2 }, { 2, 1 }, { -1, 1 } }; + const GpPointF outside_path_bounding_points[] = { { -2, -1 }, { 1, 2 }, { -2, 2 } }; + const GpPointF outside_path_points[] = { { 5, 5 }, { 5, 10 }, { 10, 10 } }; + GpPath *path; + int i, j; + BOOL in_region; + + /* Prepare test regions: */ + + /* infinite */ + stat = GdipCreateRegion(&test_regions[0].region); + expect(Ok, stat); + + /* empty */ + stat = GdipCreateRegion(&test_regions[2].region); + expect(Ok, stat); + stat = GdipSetEmpty(test_regions[2].region); + expect(Ok, stat); + + /* inside rectangle */ + rect.X = -5; + rect.Y = -2; + rect.Width = 10; + rect.Height = 4; + stat = GdipCreateRegionRect(&rect, &test_regions[4].region); + expect(Ok, stat); + + /* outside rectangle */ + rect.X = -10; + rect.Y = -10; + rect.Width = 7; + rect.Height = 7; + stat = GdipCreateRegionRect(&rect, &test_regions[6].region); + expect(Ok, stat); + + /* inside path */ + stat = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, stat); + stat = GdipAddPathPolygon(path, inside_path_points, ARRAY_SIZE(inside_path_points)); + expect(Ok, stat); + stat = GdipCreateRegion(&test_regions[8].region); + expect(Ok, stat); + stat = GdipCombineRegionPath(test_regions[8].region, path, CombineModeReplace); + expect(Ok, stat); + stat = GdipDeletePath(path); + expect(Ok, stat); + + /* outside path but in bounding rect */ + stat = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, stat); + stat = GdipAddPathPolygon(path, outside_path_bounding_points, ARRAY_SIZE(outside_path_bounding_points)); + expect(Ok, stat); + stat = GdipCreateRegion(&test_regions[10].region); + expect(Ok, stat); + stat = GdipCombineRegionPath(test_regions[10].region, path, CombineModeReplace); + expect(Ok, stat); + stat = GdipDeletePath(path); + expect(Ok, stat); + + /* outside path */ + stat = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, stat); + stat = GdipAddPathPolygon(path, outside_path_points, ARRAY_SIZE(outside_path_points)); + expect(Ok, stat); + stat = GdipCreateRegion(&test_regions[12].region); + expect(Ok, stat); + stat = GdipCombineRegionPath(test_regions[12].region, path, CombineModeReplace); + expect(Ok, stat); + stat = GdipDeletePath(path); + expect(Ok, stat); + + for (i = 1; i < ARRAY_SIZE(test_regions); i += 2) + { + winetest_push_context("%s", test_regions[i].desc); + stat = GdipCreateRegion(&test_regions[i].region); + expect(Ok, stat); + stat = GdipCombineRegionRegion(test_regions[i].region, test_regions[i-1].region, CombineModeExclude); + expect(Ok, stat); + winetest_pop_context(); + } + + /* Check regions individually */ + for (i = 0; i < ARRAY_SIZE(test_regions); i++) + { + winetest_push_context("%s", test_regions[i].desc); + stat = GdipIsVisibleRegionPoint(test_regions[i].region, 0, 0, NULL, &in_region); + expect(Ok, stat); + expect(test_regions[i].origin_in_region, in_region); + winetest_pop_context(); + } + + /* Check combined regions */ + for (i = 0; i < ARRAY_SIZE(test_regions); i++) + { + for (j = 0; j < ARRAY_SIZE(test_regions); j++) + { + GpRegion *region; + BOOL expected_result; + + winetest_push_context("%s + %s", test_regions[i].desc, test_regions[j].desc); + + stat = GdipCreateRegion(&region); + expect(Ok, stat); + + /* CombineModeIntersect */ + stat = GdipCombineRegionRegion(region, test_regions[i].region, CombineModeReplace); + expect(Ok, stat); + stat = GdipCombineRegionRegion(region, test_regions[j].region, CombineModeIntersect); + expect(Ok, stat); + + expected_result = test_regions[i].origin_in_region & test_regions[j].origin_in_region; + stat = GdipIsVisibleRegionPoint(region, 0, 0, NULL, &in_region); + expect(Ok, stat); + ok(expected_result == in_region, "CombineModeIntersect: expected %i, got %i\n", expected_result, in_region); + + /* CombineModeUnion */ + stat = GdipCombineRegionRegion(region, test_regions[i].region, CombineModeReplace); + expect(Ok, stat); + stat = GdipCombineRegionRegion(region, test_regions[j].region, CombineModeUnion); + expect(Ok, stat); + + expected_result = test_regions[i].origin_in_region | test_regions[j].origin_in_region; + stat = GdipIsVisibleRegionPoint(region, 0, 0, NULL, &in_region); + expect(Ok, stat); + ok(expected_result == in_region, "CombineModeUnion: expected %i, got %i\n", expected_result, in_region); + + /* CombineModeXor */ + stat = GdipCombineRegionRegion(region, test_regions[i].region, CombineModeReplace); + expect(Ok, stat); + stat = GdipCombineRegionRegion(region, test_regions[j].region, CombineModeXor); + expect(Ok, stat); + + expected_result = test_regions[i].origin_in_region ^ test_regions[j].origin_in_region; + stat = GdipIsVisibleRegionPoint(region, 0, 0, NULL, &in_region); + expect(Ok, stat); + ok(expected_result == in_region, "CombineModeXor: expected %i, got %i\n", expected_result, in_region); + + /* CombineModeExclude */ + stat = GdipCombineRegionRegion(region, test_regions[i].region, CombineModeReplace); + expect(Ok, stat); + stat = GdipCombineRegionRegion(region, test_regions[j].region, CombineModeExclude); + expect(Ok, stat); + + expected_result = test_regions[i].origin_in_region & !test_regions[j].origin_in_region; + stat = GdipIsVisibleRegionPoint(region, 0, 0, NULL, &in_region); + expect(Ok, stat); + ok(expected_result == in_region, "CombineModeExclude: expected %i, got %i\n", expected_result, in_region); + + /* CombineModeComplement */ + stat = GdipCombineRegionRegion(region, test_regions[i].region, CombineModeReplace); + expect(Ok, stat); + stat = GdipCombineRegionRegion(region, test_regions[j].region, CombineModeComplement); + expect(Ok, stat); + + expected_result = (!test_regions[i].origin_in_region) & test_regions[j].origin_in_region; + stat = GdipIsVisibleRegionPoint(region, 0, 0, NULL, &in_region); + expect(Ok, stat); + ok(expected_result == in_region, "CombineModeComplement: expected %i, got %i\n", expected_result, in_region); + + winetest_pop_context(); + } + } + + for (i = 0; i < ARRAY_SIZE(test_regions); i++) + { + stat = GdipDeleteRegion(test_regions[i].region); + expect(Ok, stat); + } +} + START_TEST(region) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2367,6 +2565,7 @@ START_TEST(region) test_isvisiblerect(); test_excludeinfinite(); test_GdipCreateRegionRgnData(); + test_incombinedregion(); GdiplusShutdown(gdiplusToken); }

1 0

Rémi Bernon : dinput/tests: Use a polled HID touchscreen device.
by Alexandre Julliard 05 Feb '24

05 Feb '24

Module: wine Branch: master Commit: e3c61ba74c6e55dce3ea6eaecbb79562edc2569e URL: https://gitlab.winehq.org/wine/wine/-/commit/e3c61ba74c6e55dce3ea6eaecbb795… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 2 08:55:44 2024 +0100 dinput/tests: Use a polled HID touchscreen device. Looks like touches are automatically released if the device doesn't send updates regularly. --- dlls/dinput/tests/device8.c | 115 ++++++++++++++++++++++++++++++++------------ 1 file changed, 85 insertions(+), 30 deletions(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index aa37679b0a7..e5ae8fcb13b 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1765,16 +1765,15 @@ done: } static UINT pointer_enter_count; -static UINT pointer_down_count; static UINT pointer_up_count; -static UINT pointer_leave_count; +static HANDLE touchdown_event, touchleave_event; static LRESULT CALLBACK touch_screen_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { if (msg == WM_POINTERENTER) pointer_enter_count++; - if (msg == WM_POINTERDOWN) pointer_down_count++; + if (msg == WM_POINTERDOWN) ReleaseSemaphore( touchdown_event, 1, NULL ); if (msg == WM_POINTERUP) pointer_up_count++; - if (msg == WM_POINTERLEAVE) pointer_leave_count++; + if (msg == WM_POINTERLEAVE) ReleaseSemaphore( touchleave_event, 1, NULL ); return DefWindowProcA( hwnd, msg, wparam, lparam ); } @@ -1916,6 +1915,11 @@ static void test_hid_touch_screen(void) HWND hwnd; BOOL ret; + touchdown_event = CreateSemaphoreW( NULL, 0, LONG_MAX, NULL ); + ok( !!touchdown_event, "CreateSemaphoreW failed, error %lu\n", GetLastError() ); + touchleave_event = CreateSemaphoreW( NULL, 0, LONG_MAX, NULL ); + ok( !!touchleave_event, "CreateSemaphoreW failed, error %lu\n", GetLastError() ); + desc.report_descriptor_len = sizeof(report_desc); memcpy( desc.report_descriptor_buf, report_desc, sizeof(report_desc) ); desc.expect_size = sizeof(expect_max_count); @@ -1962,65 +1966,113 @@ static void test_hid_touch_screen(void) SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)touch_screen_wndproc ); - pointer_enter_count = pointer_down_count = pointer_up_count = pointer_leave_count = 0; + /* a single touch is automatically released if we don't send continuous updates */ + + pointer_enter_count = pointer_up_count = 0; bus_send_hid_input( file, &desc, &touch_single, sizeof(touch_single) ); res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); todo_wine ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); - msg_wait_for_events( 0, NULL, 5 ); /* process pending messages */ + + res = msg_wait_for_events( 1, &touchdown_event, 10 ); + todo_wine + ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); + res = msg_wait_for_events( 1, &touchleave_event, 100 ); + todo_wine + ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); todo_wine ok( pointer_enter_count == 1, "got pointer_enter_count %u\n", pointer_enter_count ); todo_wine - ok( pointer_down_count == 1, "got pointer_down_count %u\n", pointer_down_count ); + ok( pointer_up_count == 1, "got pointer_up_count %u\n", pointer_up_count ); + + + DestroyWindow( hwnd ); + + CloseHandle( file ); + hid_device_stop( &desc, 1 ); + + + /* create a polled device instead so updates are sent continuously */ + + desc.is_polled = TRUE; + desc.input_size = sizeof(touch_release); + memcpy( desc.input, &touch_release, sizeof(touch_release) ); + fill_context( desc.context, ARRAY_SIZE(desc.context) ); + + if (!hid_device_start( &desc, 1 )) goto done; + + swprintf( device_path, MAX_PATH, L"\\\\?\\hid#vid_%04x&pid_%04x", desc.attributes.VendorID, + desc.attributes.ProductID ); + ret = find_hid_device_path( device_path ); + ok( ret, "Failed to find HID device matching %s\n", debugstr_w( device_path ) ); + + file = CreateFileW( L"\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, + NULL, OPEN_EXISTING, 0, NULL ); + ok( file != INVALID_HANDLE_VALUE, "CreateFile failed, error %lu\n", GetLastError() ); + + hwnd = create_foreground_window( TRUE ); + SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)touch_screen_wndproc ); + + + /* now the touch is continuously updated */ + + pointer_enter_count = pointer_up_count = 0; + bus_send_hid_input( file, &desc, &touch_single, sizeof(touch_single) ); + + res = msg_wait_for_events( 1, &touchdown_event, 1000 ); + todo_wine + ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); + res = msg_wait_for_events( 1, &touchleave_event, 10 ); + ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx\n", res ); + todo_wine + ok( pointer_enter_count == 1, "got pointer_enter_count %u\n", pointer_enter_count ); ok( pointer_up_count == 0, "got pointer_up_count %u\n", pointer_up_count ); - ok( pointer_leave_count == 0, "got pointer_leave_count %u\n", pointer_leave_count ); - pointer_enter_count = pointer_down_count = pointer_up_count = pointer_leave_count = 0; + pointer_enter_count = pointer_up_count = 0; bus_send_hid_input( file, &desc, &touch_release, sizeof(touch_release) ); - res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); + res = msg_wait_for_events( 1, &touchleave_event, 1000 ); todo_wine - ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); - msg_wait_for_events( 0, NULL, 5 ); /* process pending messages */ + ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); + res = msg_wait_for_events( 1, &touchdown_event, 10 ); + ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx\n", res ); ok( pointer_enter_count == 0, "got pointer_enter_count %u\n", pointer_enter_count ); - ok( pointer_down_count == 0, "got pointer_down_count %u\n", pointer_down_count ); todo_wine ok( pointer_up_count == 1, "got pointer_up_count %u\n", pointer_up_count ); - todo_wine - ok( pointer_leave_count == 1, "got pointer_leave_count %u\n", pointer_leave_count ); - - pointer_enter_count = pointer_down_count = pointer_up_count = pointer_leave_count = 0; + pointer_enter_count = pointer_up_count = 0; bus_send_hid_input( file, &desc, &touch_multiple, sizeof(touch_multiple) ); - res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); + res = msg_wait_for_events( 1, &touchdown_event, 1000 ); todo_wine - ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); - msg_wait_for_events( 0, NULL, 5 ); /* process pending messages */ + ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); + res = msg_wait_for_events( 1, &touchdown_event, 1000 ); todo_wine - ok( pointer_enter_count == 2, "got pointer_enter_count %u\n", pointer_enter_count ); + ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); + res = msg_wait_for_events( 1, &touchleave_event, 10 ); + ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx\n", res ); todo_wine - ok( pointer_down_count == 2, "got pointer_down_count %u\n", pointer_down_count ); + ok( pointer_enter_count == 2, "got pointer_enter_count %u\n", pointer_enter_count ); ok( pointer_up_count == 0, "got pointer_up_count %u\n", pointer_up_count ); - ok( pointer_leave_count == 0, "got pointer_leave_count %u\n", pointer_leave_count ); - pointer_enter_count = pointer_down_count = pointer_up_count = pointer_leave_count = 0; + pointer_enter_count = pointer_up_count = 0; bus_send_hid_input( file, &desc, &touch_release, sizeof(touch_release) ); - res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); + res = msg_wait_for_events( 1, &touchleave_event, 1000 ); todo_wine - ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); - msg_wait_for_events( 0, NULL, 5 ); /* process pending messages */ + ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); + res = msg_wait_for_events( 1, &touchleave_event, 1000 ); + todo_wine + ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); + res = msg_wait_for_events( 1, &touchdown_event, 10 ); + ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx\n", res ); ok( pointer_enter_count == 0, "got pointer_enter_count %u\n", pointer_enter_count ); - ok( pointer_down_count == 0, "got pointer_down_count %u\n", pointer_down_count ); todo_wine ok( pointer_up_count == 2, "got pointer_up_count %u\n", pointer_up_count ); - todo_wine - ok( pointer_leave_count == 2, "got pointer_leave_count %u\n", pointer_leave_count ); DestroyWindow( hwnd ); @@ -2029,6 +2081,9 @@ static void test_hid_touch_screen(void) done: hid_device_stop( &desc, 1 ); + + CloseHandle( touchdown_event ); + CloseHandle( touchleave_event ); } static void test_dik_codes( IDirectInputDevice8W *device, HANDLE event, HWND hwnd, DWORD version )

1 0

Rémi Bernon : dinput/tests: Test rawinput with the virtual HID touchscreen.
by Alexandre Julliard 05 Feb '24

05 Feb '24

Module: wine Branch: master Commit: 303717f45fddfc21d54f52e85cb4d381c3552a53 URL: https://gitlab.winehq.org/wine/wine/-/commit/303717f45fddfc21d54f52e85cb4d3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 28 09:34:36 2024 +0100 dinput/tests: Test rawinput with the virtual HID touchscreen. --- dlls/dinput/tests/device8.c | 75 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index e5ae8fcb13b..fa5b800b74f 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1909,7 +1909,11 @@ static void test_hid_touch_screen(void) .todo = TRUE, }; + RAWINPUTDEVICE rawdevice = {.usUsagePage = HID_USAGE_PAGE_DIGITIZER, .usUsage = HID_USAGE_DIGITIZER_TOUCH_SCREEN}; + UINT rawbuffer_count, rawbuffer_size; WCHAR device_path[MAX_PATH]; + char rawbuffer[1024]; + RAWINPUT *rawinput; HANDLE file; DWORD res; HWND hwnd; @@ -1987,6 +1991,77 @@ static void test_hid_touch_screen(void) ok( pointer_up_count == 1, "got pointer_up_count %u\n", pointer_up_count ); + /* test that we receive HID rawinput type with the touchscreen */ + + rawdevice.dwFlags = RIDEV_INPUTSINK; + rawdevice.hwndTarget = hwnd; + ret = RegisterRawInputDevices( &rawdevice, 1, sizeof(RAWINPUTDEVICE) ); + ok( ret, "RegisterRawInputDevices failed, error %lu\n", GetLastError() ); + + bus_send_hid_input( file, &desc, &touch_multiple, sizeof(touch_multiple) ); + bus_wait_hid_input( file, &desc, 5000 ); + bus_send_hid_input( file, &desc, &touch_release, sizeof(touch_release) ); + bus_wait_hid_input( file, &desc, 5000 ); + + res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); + todo_wine + ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); + + memset( rawbuffer, 0, sizeof(rawbuffer) ); + rawinput = (RAWINPUT *)rawbuffer; + rawbuffer_size = sizeof(rawbuffer); + rawbuffer_count = GetRawInputBuffer( rawinput, &rawbuffer_size, sizeof(RAWINPUTHEADER) ); + ok( rawbuffer_count == 2, "got rawbuffer_count %u\n", rawbuffer_count ); + ok( rawbuffer_size == sizeof(rawbuffer), "got rawbuffer_size %u\n", rawbuffer_size ); + + rawinput = (RAWINPUT *)rawbuffer; + ok( rawinput->header.dwType == RIM_TYPEHID, "got dwType %lu\n", rawinput->header.dwType ); + ok( rawinput->header.dwSize == offsetof(RAWINPUT, data.hid.bRawData[desc.caps.InputReportByteLength * rawinput->data.hid.dwCount]), + "got header.dwSize %lu\n", rawinput->header.dwSize ); + ok( rawinput->header.hDevice != 0, "got hDevice %p\n", rawinput->header.hDevice ); + ok( rawinput->header.wParam == 0, "got wParam %#Ix\n", rawinput->header.wParam ); + ok( rawinput->data.hid.dwSizeHid == desc.caps.InputReportByteLength, "got dwSizeHid %lu\n", rawinput->data.hid.dwSizeHid ); + ok( rawinput->data.hid.dwCount == 1, "got dwCount %lu\n", rawinput->data.hid.dwCount ); + ok( !memcmp( rawinput->data.hid.bRawData, touch_multiple.report_buf, desc.caps.InputReportByteLength ), + "got unexpected report data\n" ); + + rawdevice.dwFlags = RIDEV_REMOVE; + rawdevice.hwndTarget = 0; + ret = RegisterRawInputDevices( &rawdevice, 1, sizeof(RAWINPUTDEVICE) ); + ok( ret, "RegisterRawInputDevices failed, error %lu\n", GetLastError() ); + + + /* test that we don't receive mouse rawinput type with the touchscreen */ + + memset( rawbuffer, 0, sizeof(rawbuffer) ); + rawdevice.usUsagePage = HID_USAGE_PAGE_GENERIC; + rawdevice.usUsage = HID_USAGE_GENERIC_MOUSE; + rawdevice.dwFlags = RIDEV_INPUTSINK; + rawdevice.hwndTarget = hwnd; + ret = RegisterRawInputDevices( &rawdevice, 1, sizeof(RAWINPUTDEVICE) ); + ok( ret, "RegisterRawInputDevices failed, error %lu\n", GetLastError() ); + + bus_send_hid_input( file, &desc, &touch_multiple, sizeof(touch_multiple) ); + res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); + todo_wine + ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); + bus_send_hid_input( file, &desc, &touch_release, sizeof(touch_release) ); + res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); + todo_wine + ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); + + rawinput = (RAWINPUT *)rawbuffer; + rawbuffer_size = sizeof(rawbuffer); + rawbuffer_count = GetRawInputBuffer( rawinput, &rawbuffer_size, sizeof(RAWINPUTHEADER) ); + ok( rawbuffer_count == 0, "got rawbuffer_count %u\n", rawbuffer_count ); + ok( rawbuffer_size == 0, "got rawbuffer_size %u\n", rawbuffer_size ); + + rawdevice.dwFlags = RIDEV_REMOVE; + rawdevice.hwndTarget = 0; + ret = RegisterRawInputDevices( &rawdevice, 1, sizeof(RAWINPUTDEVICE) ); + ok( ret, "RegisterRawInputDevices failed, error %lu\n", GetLastError() ); + + DestroyWindow( hwnd ); CloseHandle( file );

1 0

Zebediah Figura : wined3d: Move state objects from state.c to device.c.
by Alexandre Julliard 05 Feb '24

05 Feb '24

Module: wine Branch: master Commit: 7181ef4052c99a8ce294dbbedfb34c3daff6f102 URL: https://gitlab.winehq.org/wine/wine/-/commit/7181ef4052c99a8ce294dbbedfb34c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 28 14:01:10 2023 -0500 wined3d: Move state objects from state.c to device.c. The entire rest of state.c is concerned with the GL fixed-function pipeline. device.c seems the most fitting place for these, since they're associated with the device and stored in the device. device.c is also one of the few files that contains client-side code, which these functions are. --- dlls/wined3d/device.c | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 226 ------------------------------------------------- 2 files changed, 228 insertions(+), 226 deletions(-)

1 0

Zebediah Figura : wined3d: Rename state.c to ffp_gl.c.
by Alexandre Julliard 05 Feb '24

05 Feb '24

Module: wine Branch: master Commit: 4a30ab299ae60f891ef7498245a97c4099dd337d URL: https://gitlab.winehq.org/wine/wine/-/commit/4a30ab299ae60f891ef7498245a97c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 28 14:05:25 2023 -0500 wined3d: Rename state.c to ffp_gl.c. Better reflect its contents. There is still a small amount of code in this file not directly related to the FFP: - compile_state_table(), which should eventually go away; - states like state_so() and indexbuffer(), which should eventually be moved to context_gl.c with the rest of the resource loading/binding code. --- dlls/wined3d/Makefile.in | 2 +- dlls/wined3d/{state.c => ffp_gl.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 35de4aec8da..9223ecd77c9 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -15,6 +15,7 @@ SOURCES = \ cs.c \ device.c \ directx.c \ + ffp_gl.c \ gl_compat.c \ glsl_shader.c \ nvidia_texture_shader.c \ @@ -26,7 +27,6 @@ SOURCES = \ shader_sm1.c \ shader_sm4.c \ shader_spirv.c \ - state.c \ stateblock.c \ surface.c \ swapchain.c \ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/ffp_gl.c similarity index 99% rename from dlls/wined3d/state.c rename to dlls/wined3d/ffp_gl.c index 4183de6e638..de350241b05 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/ffp_gl.c @@ -1,5 +1,5 @@ /* - * Direct3D state management + * GL fixed-function pipeline * * Copyright 2002 Lionel Ulmer * Copyright 2002-2005 Jason Edmeades

1 0

Zebediah Figura : wined3d: Move sampler_texdim() and texture_activate_dimensions() to ffp_gl.c.
by Alexandre Julliard 05 Feb '24

05 Feb '24

Module: wine Branch: master Commit: 0b4ad32c164e6474c689094d8f98825aee225b30 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b4ad32c164e6474c689094d8f9882… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 27 16:34:35 2023 -0500 wined3d: Move sampler_texdim() and texture_activate_dimensions() to ffp_gl.c. --- dlls/wined3d/ffp_gl.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/utils.c | 112 ------------------------------------------------ 2 files changed, 115 insertions(+), 112 deletions(-)

1 0