December 2021 - Wine-Commits

Gabriel Ivăncescu : mshtml: Implement index access for HTMLStyleSheetRulesCollection.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: 12ad9b0caf4f12b6aafca30f920bd7ec43025c80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12ad9b0caf4f12b6aafca30f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 3 15:57:36 2021 +0200 mshtml: Implement index access for HTMLStyleSheetRulesCollection. 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/mshtml/htmlstylesheet.c | 73 ++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/documentmode.js | 2 +- 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index d82a0890319..3d9b7bb8683 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -375,13 +375,84 @@ static const IHTMLStyleSheetRulesCollectionVtbl HTMLStyleSheetRulesCollectionVtb HTMLStyleSheetRulesCollection_item }; +static inline HTMLStyleSheetRulesCollection *HTMLStyleSheetRulesCollection_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLStyleSheetRulesCollection, dispex); +} + +static HRESULT HTMLStyleSheetRulesCollection_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) +{ + HTMLStyleSheetRulesCollection *This = HTMLStyleSheetRulesCollection_from_DispatchEx(dispex); + UINT32 len = 0; + DWORD idx = 0; + WCHAR *ptr; + + for(ptr = name; *ptr && is_digit(*ptr); ptr++) + idx = idx*10 + (*ptr-'0'); + if(*ptr) + return DISP_E_UNKNOWNNAME; + + nsIDOMCSSRuleList_GetLength(This->nslist, &len); + if(idx >= len) + return DISP_E_UNKNOWNNAME; + + *dispid = MSHTML_DISPID_CUSTOM_MIN + idx; + TRACE("ret %x\n", *dispid); + return S_OK; +} + +static HRESULT HTMLStyleSheetRulesCollection_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLStyleSheetRulesCollection *This = HTMLStyleSheetRulesCollection_from_DispatchEx(dispex); + + TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, params, res, ei, caller); + + switch(flags) { + case DISPATCH_PROPERTYGET: { + IHTMLStyleSheetRule *stylesheetrule; + nsIDOMCSSRule *nsstylesheetrule; + nsresult nsres; + HRESULT hres; + + nsres = nsIDOMCSSRuleList_Item(This->nslist, id - MSHTML_DISPID_CUSTOM_MIN, &nsstylesheetrule); + if(NS_FAILED(nsres)) + return DISP_E_MEMBERNOTFOUND; + if(!nsstylesheetrule) { + V_VT(res) = VT_EMPTY; + return S_OK; + } + + hres = create_style_sheet_rule(nsstylesheetrule, dispex_compat_mode(&This->dispex), &stylesheetrule); + nsIDOMCSSRule_Release(nsstylesheetrule); + if(FAILED(hres)) + return hres; + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)stylesheetrule; + break; + } + + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; +} + +static const dispex_static_data_vtbl_t HTMLStyleSheetRulesCollection_dispex_vtbl = { + NULL, + HTMLStyleSheetRulesCollection_get_dispid, + HTMLStyleSheetRulesCollection_invoke +}; static const tid_t HTMLStyleSheetRulesCollection_iface_tids[] = { IHTMLStyleSheetRulesCollection_tid, 0 }; static dispex_static_data_t HTMLStyleSheetRulesCollection_dispex = { L"MSCSSRuleList", - NULL, + &HTMLStyleSheetRulesCollection_dispex_vtbl, DispHTMLStyleSheetRulesCollection_tid, HTMLStyleSheetRulesCollection_iface_tids }; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 256418679bb..6555e8ba489 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -226,7 +226,7 @@ sync_test("builtin_toString", function() { test("sessionStorage", window.sessionStorage, "Storage"); test("style", document.body.style, "MSStyleCSSProperties"); test("styleSheet", sheet, "CSSStyleSheet"); - test("styleSheetRule", sheet.rules.item(0), "CSSStyleRule"); + test("styleSheetRule", sheet.rules[0], "CSSStyleRule"); test("styleSheetRules", sheet.rules, "MSCSSRuleList"); test("styleSheets", document.styleSheets, "StyleSheetList"); test("textNode", document.createTextNode("testNode"), "Text", v < 9 ? "testNode" : null);

1 0

Gabriel Ivăncescu : mshtml: Implement index access for HTMLStyleSheetsCollection.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: d750a6b394a3c849ff9fcfb46e53d6ad82c5e6d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d750a6b394a3c849ff9fcfb4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 3 15:57:35 2021 +0200 mshtml: Implement index access for HTMLStyleSheetsCollection. 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/mshtml/htmlstylesheet.c | 73 +++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/dom.js | 3 ++ 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index c31c7809f63..d82a0890319 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -576,13 +576,84 @@ static const IHTMLStyleSheetsCollectionVtbl HTMLStyleSheetsCollectionVtbl = { HTMLStyleSheetsCollection_item }; +static inline HTMLStyleSheetsCollection *HTMLStyleSheetsCollection_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLStyleSheetsCollection, dispex); +} + +static HRESULT HTMLStyleSheetsCollection_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) +{ + HTMLStyleSheetsCollection *This = HTMLStyleSheetsCollection_from_DispatchEx(dispex); + UINT32 len = 0; + DWORD idx = 0; + WCHAR *ptr; + + for(ptr = name; *ptr && is_digit(*ptr); ptr++) + idx = idx*10 + (*ptr-'0'); + if(*ptr) + return DISP_E_UNKNOWNNAME; + + nsIDOMStyleSheetList_GetLength(This->nslist, &len); + if(idx >= len) + return DISP_E_UNKNOWNNAME; + + *dispid = MSHTML_DISPID_CUSTOM_MIN + idx; + TRACE("ret %x\n", *dispid); + return S_OK; +} + +static HRESULT HTMLStyleSheetsCollection_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLStyleSheetsCollection *This = HTMLStyleSheetsCollection_from_DispatchEx(dispex); + + TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, params, res, ei, caller); + + switch(flags) { + case DISPATCH_PROPERTYGET: { + nsIDOMStyleSheet *nsstylesheet; + IHTMLStyleSheet *stylesheet; + nsresult nsres; + HRESULT hres; + + nsres = nsIDOMStyleSheetList_Item(This->nslist, id - MSHTML_DISPID_CUSTOM_MIN, &nsstylesheet); + if(NS_FAILED(nsres)) + return DISP_E_MEMBERNOTFOUND; + if(!nsstylesheet) { + V_VT(res) = VT_EMPTY; + return S_OK; + } + + hres = create_style_sheet(nsstylesheet, dispex_compat_mode(&This->dispex), &stylesheet); + nsIDOMStyleSheet_Release(nsstylesheet); + if(FAILED(hres)) + return hres; + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)stylesheet; + break; + } + + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; +} + +static const dispex_static_data_vtbl_t HTMLStyleSheetsCollection_dispex_vtbl = { + NULL, + HTMLStyleSheetsCollection_get_dispid, + HTMLStyleSheetsCollection_invoke +}; static const tid_t HTMLStyleSheetsCollection_iface_tids[] = { IHTMLStyleSheetsCollection_tid, 0 }; static dispex_static_data_t HTMLStyleSheetsCollection_dispex = { L"StyleSheetList", - NULL, + &HTMLStyleSheetsCollection_dispex_vtbl, DispHTMLStyleSheetsCollection_tid, HTMLStyleSheetsCollection_iface_tids }; diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index e2be69782fc..ed5f72c4376 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -405,6 +405,9 @@ sync_test("stylesheets", function() { ok(typeof(stylesheet.rules.item(0)) === "object", "typeof(stylesheet.rules.item(0)) = " + typeof(stylesheet.rules.item(0))); + stylesheet = document.styleSheets[0]; + ok(stylesheet.rules.length === 1, "document.styleSheets[0].rules.length = " + stylesheet.rules.length); + try { stylesheet.rules.item(1); ok(false, "expected exception");

1 0

Gabriel Ivăncescu : mshtml: Implement value construction for HTMLOptionElementFactory.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: 14177507170ddec2573948d5406e35f3290c4402 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14177507170ddec2573948d5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 3 15:57:34 2021 +0200 mshtml: Implement value construction for HTMLOptionElementFactory. 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/mshtml/htmlselect.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/dom.c | 22 +++++++++++++++++++++- 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 7869a8e628b..b2c10f725bb 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -590,14 +590,58 @@ static const IHTMLOptionElementFactoryVtbl HTMLOptionElementFactoryVtbl = { HTMLOptionElementFactory_create }; +static inline HTMLOptionElementFactory *HTMLOptionElementFactory_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLOptionElementFactory, dispex); +} + +static HRESULT HTMLOptionElementFactory_value(DispatchEx *dispex, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, + IServiceProvider *caller) +{ + HTMLOptionElementFactory *This = HTMLOptionElementFactory_from_DispatchEx(dispex); + unsigned int i, argc = params->cArgs - params->cNamedArgs; + IHTMLOptionElement *opt; + VARIANT empty, *arg[4]; + HRESULT hres; + + if(flags != DISPATCH_CONSTRUCT) { + FIXME("flags %x not supported\n", flags); + return E_NOTIMPL; + } + + V_VT(res) = VT_NULL; + V_VT(&empty) = VT_EMPTY; + + for(i = 0; i < ARRAY_SIZE(arg); i++) + arg[i] = argc > i ? &params->rgvarg[params->cArgs - 1 - i] : ∅ + + hres = IHTMLOptionElementFactory_create(&This->IHTMLOptionElementFactory_iface, + *arg[0], *arg[1], *arg[2], *arg[3], &opt); + if(FAILED(hres)) + return hres; + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)opt; + + return S_OK; +} + static const tid_t HTMLOptionElementFactory_iface_tids[] = { IHTMLOptionElementFactory_tid, 0 }; +static const dispex_static_data_vtbl_t HTMLOptionElementFactory_dispex_vtbl = { + HTMLOptionElementFactory_value, + NULL, + NULL, + NULL +}; + static dispex_static_data_t HTMLOptionElementFactory_dispex = { L"Function", - NULL, + &HTMLOptionElementFactory_dispex_vtbl, IHTMLOptionElementFactory_tid, HTMLOptionElementFactory_iface_tids, HTMLElement_init_dispex_info diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ea5b2108100..0c065a2da7e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2190,10 +2190,12 @@ static void _set_object_name(unsigned line, IHTMLElement *elem, const WCHAR *nam static IHTMLOptionElement *_create_option_elem(unsigned line, IHTMLDocument2 *doc, const WCHAR *txt, const WCHAR *val) { + VARIANT text, value, empty, option_var, args[2]; + DISPPARAMS dp = { args, NULL, 2, 0 }; IHTMLOptionElementFactory *factory; IHTMLOptionElement *option; IHTMLWindow2 *window; - VARIANT text, value, empty; + IDispatch *disp; HRESULT hres; hres = IHTMLDocument2_get_parentWindow(doc, &window); @@ -2211,6 +2213,24 @@ static IHTMLOptionElement *_create_option_elem(unsigned line, IHTMLDocument2 *do V_BSTR(&value) = SysAllocString(val); V_VT(&empty) = VT_EMPTY; + hres = IHTMLOptionElementFactory_QueryInterface(factory, &IID_IDispatch, (void**)&disp); + ok_(__FILE__,line)(hres == S_OK, "Could not get IDispatch: %08x\n", hres); + + args[1] = text; + args[0] = value; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_CONSTRUCT, &dp, &option_var, NULL, NULL); + IDispatch_Release(disp); + ok_(__FILE__,line)(hres == S_OK, "Invoke(DISPID_VALUE) returned: %08x\n", hres); + ok_(__FILE__,line)(V_VT(&option_var) == VT_DISPATCH, "VT(option_var) = %d\n", V_VT(&option_var)); + hres = IDispatch_QueryInterface(V_DISPATCH(&option_var), &IID_IHTMLOptionElement, (void**)&option); + ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLOptionElement: %08x\n", hres); + VariantClear(&option_var); + + _test_option_text(line, option, txt); + _test_option_value(line, option, val); + _test_option_selected(line, option, VARIANT_FALSE); + IHTMLOptionElement_Release(option); + hres = IHTMLOptionElementFactory_create(factory, text, value, empty, empty, &option); ok_(__FILE__,line) (hres == S_OK, "create failed: %08x\n", hres);

1 0

Jacek Caban : win32u: Use NtUserSelectPalette instead of GDISelectPalette.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: f359c7f60c08751a11c5d8dd4396881edbb793d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f359c7f60c08751a11c5d8dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 3 12:56:43 2021 +0100 win32u: Use NtUserSelectPalette instead of GDISelectPalette. 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/gdi32/dc.c | 3 +-- dlls/win32u/dc.c | 4 ++-- dlls/win32u/gdiobj.c | 2 +- dlls/win32u/ntgdi_private.h | 1 - dlls/win32u/palette.c | 8 +++++--- dlls/win32u/win32u.spec | 3 +-- dlls/win32u/win32u_private.h | 4 +--- dlls/win32u/wrappers.c | 10 +++++----- 8 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 705593ac6f7..ea8047a4285 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2097,8 +2097,7 @@ static UINT WINAPI realize_palette( HDC hdc ) /* Pointers to USER implementation of SelectPalette/RealizePalette */ /* they will be patched by USER on startup */ -extern HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg ); -HPALETTE (WINAPI *pfnSelectPalette)( HDC hdc, HPALETTE hpal, WORD bkgnd ) = GDISelectPalette; +HPALETTE (WINAPI *pfnSelectPalette)( HDC hdc, HPALETTE hpal, WORD bkgnd ) = NtUserSelectPalette; UINT (WINAPI *pfnRealizePalette)( HDC hdc ) = realize_palette; /*********************************************************************** diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 1456eb1b887..3aae73779e9 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -481,7 +481,7 @@ static BOOL reset_dc_state( HDC hdc ) NtGdiSelectFont( hdc, get_stock_object( SYSTEM_FONT )); NtGdiSelectPen( hdc, get_stock_object( BLACK_PEN )); NtGdiSetVirtualResolution( hdc, 0, 0, 0, 0 ); - GDISelectPalette( hdc, get_stock_object( DEFAULT_PALETTE ), FALSE ); + NtUserSelectPalette( hdc, get_stock_object( DEFAULT_PALETTE ), FALSE ); NtGdiSetBoundsRect( hdc, NULL, DCB_DISABLE ); NtGdiAbortPath( hdc ); @@ -689,7 +689,7 @@ BOOL WINAPI NtGdiRestoreDC( HDC hdc, INT level ) NtGdiSelectPen( hdc, dcs->hPen ); set_bk_color( dc, dcs->attr->background_color); set_text_color( dc, dcs->attr->text_color); - GDISelectPalette( hdc, dcs->hPalette, FALSE ); + NtUserSelectPalette( hdc, dcs->hPalette, FALSE ); dc->saved_dc = dcs->saved_dc; dcs->saved_dc = 0; diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 3dc87509313..796ae460a17 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1183,12 +1183,12 @@ static struct unix_funcs unix_funcs = NtUserIsClipboardFormatAvailable, NtUserMapVirtualKeyEx, NtUserScrollDC, + NtUserSelectPalette, NtUserShowCursor, NtUserToUnicodeEx, NtUserUnregisterHotKey, NtUserVkKeyScanEx, - GDISelectPalette, GetDCHook, MirrorRgn, SetDCHook, diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index 0244882ce3e..534687cb60b 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -399,7 +399,6 @@ extern BOOL PATH_RestorePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; extern POINT *GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut ) DECLSPEC_HIDDEN; /* palette.c */ -extern HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg) DECLSPEC_HIDDEN; extern HPALETTE PALETTE_Init(void) DECLSPEC_HIDDEN; extern UINT get_palette_entries( HPALETTE hpalette, UINT start, UINT count, PALETTEENTRY *entries ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/palette.c b/dlls/win32u/palette.c index b59a196caff..3aeda89851f 100644 --- a/dlls/win32u/palette.c +++ b/dlls/win32u/palette.c @@ -513,15 +513,17 @@ static BOOL PALETTE_DeleteObject( HGDIOBJ handle ) /*********************************************************************** - * GDISelectPalette (Not a Windows API) + * NtUserSelectPalette (win32u.@) */ -HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg) +HPALETTE WINAPI NtUserSelectPalette( HDC hdc, HPALETTE hpal, WORD bkg ) { HPALETTE ret = 0; DC *dc; TRACE("%p %p\n", hdc, hpal ); + /* FIXME: move primary palette handling from user32 */ + if (get_gdi_object_type(hpal) != NTGDI_OBJ_PAL) { WARN("invalid selected palette %p\n",hpal); @@ -531,7 +533,7 @@ HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg) { ret = dc->hPalette; dc->hPalette = hpal; - if (!wBkg) hPrimaryPalette = hpal; + if (!bkg) hPrimaryPalette = hpal; release_dc_ptr( dc ); } return ret; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 8d1a1bbb234..786d2c47b28 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1157,7 +1157,7 @@ @ stub NtUserSBGetParms @ stdcall NtUserScrollDC(long long long ptr ptr long ptr) @ stub NtUserScrollWindowEx -@ stub NtUserSelectPalette +@ stdcall NtUserSelectPalette(long long long) @ stub NtUserSendEventMessage @ stub NtUserSendInput @ stub NtUserSendInteractiveControlHapticsReport @@ -1324,7 +1324,6 @@ @ stdcall GetDCHook(long ptr) @ stdcall SetDCHook(long ptr long) @ stdcall SetHookFlags(long long) -@ stdcall GDISelectPalette(long long long) @ cdecl __wine_make_gdi_object_system(long long) @ cdecl __wine_set_visible_region(long long ptr ptr ptr) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index d6454b7ad47..648d8cc003a 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -215,6 +215,7 @@ struct unix_funcs UINT (WINAPI *pNtUserMapVirtualKeyEx)( UINT code, UINT type, HKL layout ); BOOL (WINAPI *pNtUserScrollDC)( HDC hdc, INT dx, INT dy, const RECT *scroll, const RECT *clip, HRGN ret_update_rgn, RECT *update_rect ); + HPALETTE (WINAPI *pNtUserSelectPalette)( HDC hdc, HPALETTE hpal, WORD bkg ); INT (WINAPI *pNtUserShowCursor)( BOOL show ); INT (WINAPI *pNtUserToUnicodeEx)( UINT virt, UINT scan, const BYTE *state, WCHAR *str, int size, UINT flags, HKL layout ); @@ -222,7 +223,6 @@ struct unix_funcs WORD (WINAPI *pNtUserVkKeyScanEx)( WCHAR chr, HKL layout ); /* Wine-specific functions */ - HPALETTE (WINAPI *pGDISelectPalette)( HDC hdc, HPALETTE hpal, WORD bkg ); DWORD_PTR (WINAPI *pGetDCHook)( HDC hdc, DCHOOKPROC *proc ); BOOL (WINAPI *pMirrorRgn)( HWND hwnd, HRGN hrgn ); BOOL (WINAPI *pSetDCHook)( HDC hdc, DCHOOKPROC proc, DWORD_PTR data ); @@ -241,8 +241,6 @@ struct unix_funcs struct window_surface *surface ); }; -HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg ); - extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern void wrappers_init( unixlib_handle_t handle ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 1ea45e42c21..5eefd48a635 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -681,6 +681,11 @@ BOOL WINAPI NtUserScrollDC( HDC hdc, INT dx, INT dy, const RECT *scroll, const R return unix_funcs->pNtUserScrollDC( hdc, dx, dy, scroll, clip, ret_update_rgn, update_rect ); } +HPALETTE WINAPI NtUserSelectPalette( HDC hdc, HPALETTE hpal, WORD bkg ) +{ + return unix_funcs->pNtUserSelectPalette( hdc, hpal, bkg ); +} + INT WINAPI NtUserShowCursor( BOOL show ) { return unix_funcs->pNtUserShowCursor( show ); @@ -702,11 +707,6 @@ WORD WINAPI NtUserVkKeyScanEx( WCHAR chr, HKL layout ) return unix_funcs->pNtUserVkKeyScanEx( chr, layout ); } -HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD bkg ) -{ - return unix_funcs->pGDISelectPalette( hdc, hpal, bkg ); -} - DWORD_PTR WINAPI GetDCHook( HDC hdc, DCHOOKPROC *proc ) { return unix_funcs->pGetDCHook( hdc, proc );

1 0

Rémi Bernon : dinput: Set internal params lpvTypeSpecificParams in Initialize.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: 812a9751678bebc7acc538f956cfd89f63209fe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=812a9751678bebc7acc538f9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 3 14:08:47 2021 +0100 dinput: Set internal params lpvTypeSpecificParams in Initialize. And lpEnvelope in SetParameters. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 37 +++++++++++++++++++++---------------- dlls/dinput8/tests/hid.c | 1 - 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index a5deedb6ffb..86bb31737ab 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2136,6 +2136,7 @@ static HRESULT WINAPI hid_joystick_effect_Initialize( IDirectInputEffect *iface, status = HidP_InitializeReportForID( HidP_Output, joystick->pid_set_periodic.id, joystick->preparsed, impl->type_specific_buf, report_len ); if (status != HIDP_STATUS_SUCCESS) return DIERR_DEVICENOTREG; + impl->params.lpvTypeSpecificParams = &impl->periodic; break; case PID_USAGE_ET_SPRING: case PID_USAGE_ET_DAMPER: @@ -2144,16 +2145,19 @@ static HRESULT WINAPI hid_joystick_effect_Initialize( IDirectInputEffect *iface, status = HidP_InitializeReportForID( HidP_Output, joystick->pid_set_condition.id, joystick->preparsed, impl->type_specific_buf, report_len ); if (status != HIDP_STATUS_SUCCESS) return DIERR_DEVICENOTREG; + impl->params.lpvTypeSpecificParams = &impl->condition; break; case PID_USAGE_ET_CONSTANT_FORCE: status = HidP_InitializeReportForID( HidP_Output, joystick->pid_set_constant_force.id, joystick->preparsed, impl->type_specific_buf, report_len ); if (status != HIDP_STATUS_SUCCESS) return DIERR_DEVICENOTREG; + impl->params.lpvTypeSpecificParams = &impl->constant_force; break; case PID_USAGE_ET_RAMP: status = HidP_InitializeReportForID( HidP_Output, joystick->pid_set_ramp_force.id, joystick->preparsed, impl->type_specific_buf, report_len ); if (status != HIDP_STATUS_SUCCESS) return DIERR_DEVICENOTREG; + impl->params.lpvTypeSpecificParams = &impl->ramp_force; break; case PID_USAGE_ET_CUSTOM_FORCE_DATA: FIXME( "effect type %#x not implemented!\n", type ); @@ -2417,7 +2421,7 @@ static HRESULT WINAPI hid_joystick_effect_GetParameters( IDirectInputEffect *ifa case PID_USAGE_ET_SAWTOOTH_DOWN: if (!params->lpvTypeSpecificParams) return E_POINTER; if (params->cbTypeSpecificParams != sizeof(DIPERIODIC)) return DIERR_INVALIDPARAM; - memcpy( params->lpvTypeSpecificParams, &impl->periodic, sizeof(DIPERIODIC) ); + memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, sizeof(DIPERIODIC) ); break; case PID_USAGE_ET_SPRING: case PID_USAGE_ET_DAMPER: @@ -2427,17 +2431,17 @@ static HRESULT WINAPI hid_joystick_effect_GetParameters( IDirectInputEffect *ifa capacity = params->cbTypeSpecificParams; params->cbTypeSpecificParams = count; if (capacity < count) return DIERR_MOREDATA; - memcpy( params->lpvTypeSpecificParams, impl->condition, params->cbTypeSpecificParams ); + memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, params->cbTypeSpecificParams ); break; case PID_USAGE_ET_CONSTANT_FORCE: if (!params->lpvTypeSpecificParams) return E_POINTER; if (params->cbTypeSpecificParams != sizeof(DICONSTANTFORCE)) return DIERR_INVALIDPARAM; - memcpy( params->lpvTypeSpecificParams, &impl->constant_force, sizeof(DICONSTANTFORCE) ); + memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, sizeof(DICONSTANTFORCE) ); break; case PID_USAGE_ET_RAMP: if (!params->lpvTypeSpecificParams) return E_POINTER; if (params->cbTypeSpecificParams != sizeof(DIRAMPFORCE)) return DIERR_INVALIDPARAM; - memcpy( params->lpvTypeSpecificParams, &impl->ramp_force, sizeof(DIRAMPFORCE) ); + memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, sizeof(DIRAMPFORCE) ); break; case PID_USAGE_ET_CUSTOM_FORCE_DATA: FIXME( "DIEP_TYPESPECIFICPARAMS not implemented!\n" ); @@ -2449,7 +2453,8 @@ static HRESULT WINAPI hid_joystick_effect_GetParameters( IDirectInputEffect *ifa { if (!params->lpEnvelope) return E_POINTER; if (params->lpEnvelope->dwSize != sizeof(DIENVELOPE)) return DIERR_INVALIDPARAM; - memcpy( params->lpEnvelope, &impl->envelope, sizeof(DIENVELOPE) ); + if (!impl->params.lpEnvelope) params->lpEnvelope = NULL; + else memcpy( params->lpEnvelope, impl->params.lpEnvelope, sizeof(DIENVELOPE) ); } if (flags & DIEP_DURATION) params->dwDuration = impl->params.dwDuration; @@ -2559,9 +2564,9 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa case PID_USAGE_ET_SAWTOOTH_DOWN: if (!params->lpvTypeSpecificParams) return E_POINTER; if (params->cbTypeSpecificParams != sizeof(DIPERIODIC)) return DIERR_INVALIDPARAM; - if (memcmp( &impl->periodic, params->lpvTypeSpecificParams, sizeof(DIPERIODIC) )) + if (memcmp( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, sizeof(DIPERIODIC) )) impl->modified |= DIEP_TYPESPECIFICPARAMS; - memcpy( &impl->periodic, params->lpvTypeSpecificParams, sizeof(DIPERIODIC) ); + memcpy( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, sizeof(DIPERIODIC) ); impl->params.cbTypeSpecificParams = sizeof(DIPERIODIC); break; case PID_USAGE_ET_SPRING: @@ -2574,26 +2579,26 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa if (params->cbTypeSpecificParams != count * sizeof(DICONDITION) && params->cbTypeSpecificParams != sizeof(DICONDITION)) return DIERR_INVALIDPARAM; - if (memcmp( impl->condition, params->lpvTypeSpecificParams, params->cbTypeSpecificParams )) + if (memcmp( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, params->cbTypeSpecificParams )) impl->modified |= DIEP_TYPESPECIFICPARAMS; - memcpy( impl->condition, params->lpvTypeSpecificParams, params->cbTypeSpecificParams ); + memcpy( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, params->cbTypeSpecificParams ); impl->params.cbTypeSpecificParams = params->cbTypeSpecificParams; } break; case PID_USAGE_ET_CONSTANT_FORCE: if (!params->lpvTypeSpecificParams) return E_POINTER; if (params->cbTypeSpecificParams != sizeof(DICONSTANTFORCE)) return DIERR_INVALIDPARAM; - if (memcmp( &impl->constant_force, params->lpvTypeSpecificParams, sizeof(DICONSTANTFORCE) )) + if (memcmp( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, sizeof(DICONSTANTFORCE) )) impl->modified |= DIEP_TYPESPECIFICPARAMS; - memcpy( &impl->constant_force, params->lpvTypeSpecificParams, sizeof(DICONSTANTFORCE) ); + memcpy( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, sizeof(DICONSTANTFORCE) ); impl->params.cbTypeSpecificParams = sizeof(DICONSTANTFORCE); break; case PID_USAGE_ET_RAMP: if (!params->lpvTypeSpecificParams) return E_POINTER; if (params->cbTypeSpecificParams != sizeof(DIRAMPFORCE)) return DIERR_INVALIDPARAM; - if (memcmp( &impl->ramp_force, params->lpvTypeSpecificParams, sizeof(DIRAMPFORCE) )) + if (memcmp( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, sizeof(DIRAMPFORCE) )) impl->modified |= DIEP_TYPESPECIFICPARAMS; - memcpy( &impl->ramp_force, params->lpvTypeSpecificParams, sizeof(DIRAMPFORCE) ); + memcpy( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, sizeof(DIRAMPFORCE) ); impl->params.cbTypeSpecificParams = sizeof(DIRAMPFORCE); break; case PID_USAGE_ET_CUSTOM_FORCE_DATA: @@ -2605,9 +2610,10 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa if ((flags & DIEP_ENVELOPE) && params->lpEnvelope) { if (params->lpEnvelope->dwSize != sizeof(DIENVELOPE)) return DIERR_INVALIDPARAM; - if (memcmp( &impl->envelope, params->lpEnvelope, sizeof(DIENVELOPE) )) + impl->params.lpEnvelope = &impl->envelope; + if (memcmp( impl->params.lpEnvelope, params->lpEnvelope, sizeof(DIENVELOPE) )) impl->modified |= DIEP_ENVELOPE; - memcpy( &impl->envelope, params->lpEnvelope, sizeof(DIENVELOPE) ); + memcpy( impl->params.lpEnvelope, params->lpEnvelope, sizeof(DIENVELOPE) ); } if (flags & DIEP_DURATION) @@ -3119,7 +3125,6 @@ static HRESULT hid_joystick_create_effect( IDirectInputDevice8W *iface, IDirectI impl->envelope.dwSize = sizeof(DIENVELOPE); impl->params.dwSize = sizeof(DIEFFECT); - impl->params.lpEnvelope = &impl->envelope; impl->params.rgdwAxes = impl->axes; impl->params.rglDirection = impl->directions; impl->params.dwTriggerButton = -1; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 0a58f215ea9..2411053390f 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -5980,7 +5980,6 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO check_member( desc, expect_desc_init, "%u", rgdwAxes[0] ); check_member( desc, expect_desc_init, "%u", rgdwAxes[1] ); check_member( desc, expect_desc_init, "%p", rglDirection ); - todo_wine check_member( desc, expect_desc_init, "%p", lpEnvelope ); todo_wine check_member( desc, expect_desc_init, "%u", cbTypeSpecificParams );

1 0

Ivo Ivanov : dinput: Fix incorrect use of constant_force instead of ramp_force.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: 10d0fbec4b4068f1a5f70e7da2e3f4902abdf934 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10d0fbec4b4068f1a5f70e7d… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Dec 3 14:08:46 2021 +0100 dinput: Fix incorrect use of constant_force instead of ramp_force. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 976961c3a9f..a5deedb6ffb 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2437,7 +2437,7 @@ static HRESULT WINAPI hid_joystick_effect_GetParameters( IDirectInputEffect *ifa case PID_USAGE_ET_RAMP: if (!params->lpvTypeSpecificParams) return E_POINTER; if (params->cbTypeSpecificParams != sizeof(DIRAMPFORCE)) return DIERR_INVALIDPARAM; - memcpy( params->lpvTypeSpecificParams, &impl->constant_force, sizeof(DIRAMPFORCE) ); + memcpy( params->lpvTypeSpecificParams, &impl->ramp_force, sizeof(DIRAMPFORCE) ); break; case PID_USAGE_ET_CUSTOM_FORCE_DATA: FIXME( "DIEP_TYPESPECIFICPARAMS not implemented!\n" ); @@ -2591,9 +2591,9 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa case PID_USAGE_ET_RAMP: if (!params->lpvTypeSpecificParams) return E_POINTER; if (params->cbTypeSpecificParams != sizeof(DIRAMPFORCE)) return DIERR_INVALIDPARAM; - if (memcmp( &impl->constant_force, params->lpvTypeSpecificParams, sizeof(DIRAMPFORCE) )) + if (memcmp( &impl->ramp_force, params->lpvTypeSpecificParams, sizeof(DIRAMPFORCE) )) impl->modified |= DIEP_TYPESPECIFICPARAMS; - memcpy( &impl->constant_force, params->lpvTypeSpecificParams, sizeof(DIRAMPFORCE) ); + memcpy( &impl->ramp_force, params->lpvTypeSpecificParams, sizeof(DIRAMPFORCE) ); impl->params.cbTypeSpecificParams = sizeof(DIRAMPFORCE); break; case PID_USAGE_ET_CUSTOM_FORCE_DATA:

1 0

Jacek Caban : win32u: Move NtUserShowCursor implementation from user32.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: c87925bae30c698ab36999afe04179343db42f6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c87925bae30c698ab36999af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 3 12:55:30 2021 +0100 win32u: Move NtUserShowCursor 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/cursoricon.c | 27 ------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/Makefile.in | 1 + dlls/win32u/cursoricon.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/driver.c | 6 +++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 5 ++++ 9 files changed, 79 insertions(+), 29 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index b02ee6d8723..eb033e72005 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1933,33 +1933,6 @@ HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cu return hOldCursor; } -/*********************************************************************** - * ShowCursor (USER32.@) - */ -INT WINAPI DECLSPEC_HOTPATCH ShowCursor( BOOL bShow ) -{ - HCURSOR cursor; - int increment = bShow ? 1 : -1; - int count; - - SERVER_START_REQ( set_cursor ) - { - req->flags = SET_CURSOR_COUNT; - req->show_count = increment; - wine_server_call( req ); - cursor = wine_server_ptr_handle( reply->prev_handle ); - count = reply->prev_count + increment; - } - SERVER_END_REQ; - - TRACE("%d, count=%d\n", bShow, count ); - - if (bShow && !count) USER_Driver->pSetCursor( cursor ); - else if (!bShow && count == -1) USER_Driver->pSetCursor( 0 ); - - return count; -} - /*********************************************************************** * GetCursor (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 9955add4252..a89bcdc8c56 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -736,7 +736,7 @@ @ stdcall SetWindowsHookExW(long long long long) @ stdcall SetWindowsHookW(long ptr) @ stdcall ShowCaret(long) -@ stdcall ShowCursor(long) +@ stdcall -import ShowCursor(long) NtUserShowCursor @ stdcall ShowOwnedPopups(long long) @ stdcall ShowScrollBar(long long long) @ stub ShowStartGlass diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index 184271174f2..41c252be59c 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -13,6 +13,7 @@ C_SRCS = \ brush.c \ clipboard.c \ clipping.c \ + cursoricon.c \ dc.c \ dib.c \ dibdrv/bitblt.c \ diff --git a/dlls/win32u/cursoricon.c b/dlls/win32u/cursoricon.c new file mode 100644 index 00000000000..8d297e838c9 --- /dev/null +++ b/dlls/win32u/cursoricon.c @@ -0,0 +1,63 @@ +/* + * Cursor and icon support + * + * Copyright 1995 Alexandre Julliard + * Copyright 1996 Martin Von Loewis + * Copyright 1997 Alex Korobka + * Copyright 1998 Turchanov Sergey + * Copyright 2007 Henri Verbeet + * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2016 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include "win32u_private.h" +#include "wine/server.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cursor); + + +/*********************************************************************** + * NtUserShowCursor (win32u.@) + */ +INT WINAPI NtUserShowCursor( BOOL show ) +{ + HCURSOR cursor; + int increment = show ? 1 : -1; + int count; + + SERVER_START_REQ( set_cursor ) + { + req->flags = SET_CURSOR_COUNT; + req->show_count = increment; + wine_server_call( req ); + cursor = wine_server_ptr_handle( reply->prev_handle ); + count = reply->prev_count + increment; + } + SERVER_END_REQ; + + TRACE("%d, count=%d\n", show, count ); + + if (show && !count) user_driver->pSetCursor( cursor ); + else if (!show && count == -1) user_driver->pSetCursor( 0 ); + + return count; +} diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 5d43daf2355..adffdaca8d2 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1032,6 +1032,11 @@ static BOOL CDECL loaderdrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDE return load_driver()->pEnumDisplaySettingsEx( name, num, mode, flags ); } +static void CDECL loaderdrv_SetCursor( HCURSOR cursor ) +{ + load_driver()->pSetCursor( cursor ); +} + static void CDECL loaderdrv_UpdateClipboard(void) { load_driver()->pUpdateClipboard(); @@ -1055,6 +1060,7 @@ static const struct user_driver_funcs lazy_load_driver = .pChangeDisplaySettingsEx = loaderdrv_ChangeDisplaySettingsEx, .pEnumDisplaySettingsEx = loaderdrv_EnumDisplaySettingsEx, .pUpdateDisplayDevices = loaderdrv_UpdateDisplayDevices, + .pSetCursor = loaderdrv_SetCursor, .pUpdateClipboard = loaderdrv_UpdateClipboard, .pScrollDC = nulldrv_ScrollDC, }; diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index e0a036f4d0d..e68c9126cd6 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1182,6 +1182,7 @@ static struct unix_funcs unix_funcs = NtUserIsClipboardFormatAvailable, NtUserMapVirtualKeyEx, NtUserScrollDC, + NtUserShowCursor, NtUserToUnicodeEx, NtUserUnregisterHotKey, NtUserVkKeyScanEx, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 82c232617fb..95bddc09e5a 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1258,7 +1258,7 @@ @ stub NtUserSetWindowsHookAW @ stub NtUserSetWindowsHookEx @ stub NtUserShowCaret -@ stub NtUserShowCursor +@ stdcall NtUserShowCursor(long) @ stub NtUserShowScrollBar @ stub NtUserShowSystemCursor @ stub NtUserShowWindow diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index d301d8b6b8b..c8b5e0f4246 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -214,6 +214,7 @@ struct unix_funcs UINT (WINAPI *pNtUserMapVirtualKeyEx)( UINT code, UINT type, HKL layout ); BOOL (WINAPI *pNtUserScrollDC)( HDC hdc, INT dx, INT dy, const RECT *scroll, const RECT *clip, HRGN ret_update_rgn, RECT *update_rect ); + INT (WINAPI *pNtUserShowCursor)( BOOL show ); INT (WINAPI *pNtUserToUnicodeEx)( UINT virt, UINT scan, const BYTE *state, WCHAR *str, int size, UINT flags, HKL layout ); BOOL (WINAPI *pNtUserUnregisterHotKey)( HWND hwnd, INT id ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 4b9a291bf6b..a9a72eaa903 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -676,6 +676,11 @@ BOOL WINAPI NtUserScrollDC( HDC hdc, INT dx, INT dy, const RECT *scroll, const R return unix_funcs->pNtUserScrollDC( hdc, dx, dy, scroll, clip, ret_update_rgn, update_rect ); } +INT WINAPI NtUserShowCursor( BOOL show ) +{ + return unix_funcs->pNtUserShowCursor( show ); +} + INT WINAPI NtUserToUnicodeEx( UINT virt, UINT scan, const BYTE *state, WCHAR *str, int size, UINT flags, HKL layout ) {

1 0

Jacek Caban : win32u: Move NtUserGetCursor implementation from user32.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: a25148ae46b15b3644b57828739e230b08f920e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a25148ae46b15b3644b57828… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 3 12:55:44 2021 +0100 win32u: Move NtUserGetCursor 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/cursoricon.c | 19 +------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/cursoricon.c | 18 ++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 5 +++++ include/ntuser.h | 1 + 8 files changed, 29 insertions(+), 20 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index eb033e72005..ba5c5d8904c 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1873,7 +1873,7 @@ BOOL WINAPI DestroyIcon( HICON hIcon ) { BOOL shared = (obj->rsrc != NULL); release_user_handle_ptr( obj ); - ret = (GetCursor() != hIcon); + ret = (NtUserGetCursor() != hIcon); if (!shared) free_icon_handle( hIcon ); } return ret; @@ -1933,23 +1933,6 @@ HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cu return hOldCursor; } -/*********************************************************************** - * GetCursor (USER32.@) - */ -HCURSOR WINAPI GetCursor(void) -{ - HCURSOR ret; - - SERVER_START_REQ( set_cursor ) - { - req->flags = 0; - wine_server_call( req ); - ret = wine_server_ptr_handle( reply->prev_handle ); - } - SERVER_END_REQ; - return ret; -} - /*********************************************************************** * ClipCursor (USER32.@) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index a89bcdc8c56..8b8dcb611f9 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -282,7 +282,7 @@ @ stdcall GetClipboardViewer() NtUserGetClipboardViewer @ stdcall GetComboBoxInfo(long ptr) @ stdcall GetCurrentInputMessageSource(ptr) -@ stdcall GetCursor() +@ stdcall GetCursor() NtUserGetCursor @ stdcall GetCursorFrameInfo(long long long ptr ptr) @ stdcall GetCursorInfo(ptr) @ stdcall GetCursorPos(ptr) diff --git a/dlls/win32u/cursoricon.c b/dlls/win32u/cursoricon.c index 8d297e838c9..ad7e51b507e 100644 --- a/dlls/win32u/cursoricon.c +++ b/dlls/win32u/cursoricon.c @@ -61,3 +61,21 @@ INT WINAPI NtUserShowCursor( BOOL show ) return count; } + + +/*********************************************************************** + * NtUserGetCursor (win32u.@) + */ +HCURSOR WINAPI NtUserGetCursor(void) +{ + HCURSOR ret; + + SERVER_START_REQ( set_cursor ) + { + req->flags = 0; + wine_server_call( req ); + ret = wine_server_ptr_handle( reply->prev_handle ); + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index e07fdcc6953..c8f08e3c2a6 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -111,6 +111,7 @@ static void * const syscalls[] = NtUserGetClipboardOwner, NtUserGetClipboardSequenceNumber, NtUserGetClipboardViewer, + NtUserGetCursor, NtUserGetKeyState, NtUserGetKeyboardLayout, NtUserGetKeyboardState, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 95bddc09e5a..7d3421efbcc 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -912,7 +912,7 @@ @ stub NtUserGetControlColor @ stub NtUserGetCurrentDpiInfoForWindow @ stub NtUserGetCurrentInputMessageSource -@ stub NtUserGetCursor +@ stdcall -syscall NtUserGetCursor() @ stub NtUserGetCursorFrameInfo @ stub NtUserGetCursorInfo @ stub NtUserGetDC diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 2ffe10b733c..7a148935444 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -98,6 +98,7 @@ SYSCALL_ENTRY( NtUserGetClipboardOwner ) \ SYSCALL_ENTRY( NtUserGetClipboardSequenceNumber ) \ SYSCALL_ENTRY( NtUserGetClipboardViewer ) \ + SYSCALL_ENTRY( NtUserGetCursor ) \ SYSCALL_ENTRY( NtUserGetKeyState ) \ SYSCALL_ENTRY( NtUserGetKeyboardLayout ) \ SYSCALL_ENTRY( NtUserGetKeyboardState ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index da94ea02dc0..eea3879b9b5 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -234,6 +234,11 @@ NTSTATUS WINAPI wow64_NtUserRemoveClipboardFormatListener( UINT *args ) return NtUserRemoveClipboardFormatListener( hwnd ); } +NTSTATUS WINAPI wow64_NtUserGetCursor( UINT *args ) +{ + return HandleToUlong( NtUserGetCursor() ); +} + NTSTATUS WINAPI wow64_NtUserAttachThreadInput( UINT *args ) { DWORD from = get_ulong( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index ec0ccc0c2c5..e962c5b3fa2 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -98,6 +98,7 @@ INT WINAPI NtUserGetClipboardFormatName( UINT format, WCHAR *buffer, INT max HWND WINAPI NtUserGetClipboardOwner(void); DWORD WINAPI NtUserGetClipboardSequenceNumber(void); HWND WINAPI NtUserGetClipboardViewer(void); +HCURSOR WINAPI NtUserGetCursor(void); LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path_info, UINT32 *num_mode_info ); INT WINAPI NtUserGetKeyNameText( LONG lparam, WCHAR *buffer, INT size );

1 0

Jacek Caban : win32u: Use NtUserCallOneParam instead of GDIRealizePalette.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: 41eac6e25c767e3dba979ad15748b61b7dada17d URL: https://source.winehq.org/git/wine.git/?a=commit;h=41eac6e25c767e3dba979ad1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 3 12:56:30 2021 +0100 win32u: Use NtUserCallOneParam instead of GDIRealizePalette. 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/gdi32/dc.c | 10 +++++++--- dlls/win32u/gdiobj.c | 2 +- dlls/win32u/ntgdi_private.h | 1 + dlls/win32u/palette.c | 7 ++++--- dlls/win32u/sysparams.c | 18 ++++++++++++++++++ dlls/win32u/win32u.spec | 3 +-- dlls/win32u/win32u_private.h | 3 +-- dlls/win32u/wrappers.c | 10 +++++----- include/ntuser.h | 8 ++++++++ 9 files changed, 46 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 1511c565194..705593ac6f7 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -22,7 +22,7 @@ */ #include "gdi_private.h" -#include "winternl.h" +#include "ntuser.h" #include "ddrawgdi.h" #include "winnls.h" @@ -2090,12 +2090,16 @@ BOOL WINAPI ScaleWindowExtEx( HDC hdc, INT x_num, INT x_denom, return NtGdiScaleWindowExtEx( hdc, x_num, x_denom, y_num, y_denom, size ); } +static UINT WINAPI realize_palette( HDC hdc ) +{ + return NtUserCallOneParam( HandleToUlong(hdc), NtUserRealizePalette ); +} + /* Pointers to USER implementation of SelectPalette/RealizePalette */ /* they will be patched by USER on startup */ extern HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg ); -extern UINT WINAPI GDIRealizePalette( HDC hdc ); HPALETTE (WINAPI *pfnSelectPalette)( HDC hdc, HPALETTE hpal, WORD bkgnd ) = GDISelectPalette; -UINT (WINAPI *pfnRealizePalette)( HDC hdc ) = GDIRealizePalette; +UINT (WINAPI *pfnRealizePalette)( HDC hdc ) = realize_palette; /*********************************************************************** * SelectPalette (GDI32.@) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index e68c9126cd6..3dc87509313 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1168,6 +1168,7 @@ static struct unix_funcs unix_funcs = NtGdiUpdateColors, NtGdiWidenPath, NtUserActivateKeyboardLayout, + NtUserCallOneParam, NtUserCallTwoParam, NtUserChangeDisplaySettings, NtUserCountClipboardFormats, @@ -1187,7 +1188,6 @@ static struct unix_funcs unix_funcs = NtUserUnregisterHotKey, NtUserVkKeyScanEx, - GDIRealizePalette, GDISelectPalette, GetDCHook, MirrorRgn, diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index 8aaf8ba231d..0244882ce3e 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -403,6 +403,7 @@ extern HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg) DECL extern HPALETTE PALETTE_Init(void) DECLSPEC_HIDDEN; extern UINT get_palette_entries( HPALETTE hpalette, UINT start, UINT count, PALETTEENTRY *entries ) DECLSPEC_HIDDEN; +extern UINT realize_palette( HDC hdc ) DECLSPEC_HIDDEN; /* pen.c */ extern HPEN create_pen( INT style, INT width, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/palette.c b/dlls/win32u/palette.c index 8e9e51295bb..b59a196caff 100644 --- a/dlls/win32u/palette.c +++ b/dlls/win32u/palette.c @@ -539,16 +539,17 @@ HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg) /*********************************************************************** - * GDIRealizePalette (Not a Windows API) + * realize_palette */ -UINT WINAPI GDIRealizePalette( HDC hdc ) +UINT realize_palette( HDC hdc ) { UINT realized = 0; DC* dc = get_dc_ptr( hdc ); + TRACE( "%p\n", hdc ); if (!dc) return 0; - TRACE("%p...\n", hdc ); + /* FIXME: move primary palette handling from user32 */ if( dc->hPalette == get_stock_object( DEFAULT_PALETTE )) { diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index e0de4edc6e5..095a6cfe680 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1657,6 +1657,24 @@ void sysparams_init(void) } } +/*********************************************************************** + * NtUserCallOneParam (win32u.@) + */ +ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) +{ + switch(code) + { + case NtUserRealizePalette: + return realize_palette( UlongToHandle(arg) ); + default: + FIXME( "invalid code %u\n", code ); + return 0; + } +} + +/*********************************************************************** + * NtUserCallTwoParam (win32u.@) + */ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ) { switch(code) diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 8499d52e32c..8d1a1bbb234 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -779,7 +779,7 @@ @ stub NtUserCallMsgFilter @ stub NtUserCallNextHookEx @ stub NtUserCallNoParam -@ stub NtUserCallOneParam +@ stdcall NtUserCallOneParam(long long) @ stdcall NtUserCallTwoParam(long long long) @ stub NtUserCanBrokerForceForeground @ stub NtUserChangeClipboardChain @@ -1325,7 +1325,6 @@ @ stdcall SetDCHook(long ptr long) @ stdcall SetHookFlags(long long) @ stdcall GDISelectPalette(long long long) -@ stdcall GDIRealizePalette(long) @ cdecl __wine_make_gdi_object_system(long long) @ cdecl __wine_set_visible_region(long long ptr ptr ptr) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 7fbc92cde7b..d6454b7ad47 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -195,6 +195,7 @@ struct unix_funcs BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); HKL (WINAPI *pNtUserActivateKeyboardLayout)( HKL layout, UINT flags ); + ULONG_PTR (WINAPI *pNtUserCallOneParam)( ULONG_PTR arg, ULONG code ); ULONG_PTR (WINAPI *pNtUserCallTwoParam)( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ); LONG (WINAPI *pNtUserChangeDisplaySettings)( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ); @@ -221,7 +222,6 @@ struct unix_funcs WORD (WINAPI *pNtUserVkKeyScanEx)( WCHAR chr, HKL layout ); /* Wine-specific functions */ - UINT (WINAPI *pGDIRealizePalette)( HDC hdc ); HPALETTE (WINAPI *pGDISelectPalette)( HDC hdc, HPALETTE hpal, WORD bkg ); DWORD_PTR (WINAPI *pGetDCHook)( HDC hdc, DCHOOKPROC *proc ); BOOL (WINAPI *pMirrorRgn)( HWND hwnd, HRGN hrgn ); @@ -241,7 +241,6 @@ struct unix_funcs struct window_surface *surface ); }; -UINT WINAPI GDIRealizePalette( HDC hdc ); HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg ); extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index a9a72eaa903..1ea45e42c21 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -601,6 +601,11 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ) return unix_funcs->pNtUserActivateKeyboardLayout( layout, flags ); } +ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) +{ + return unix_funcs->pNtUserCallOneParam( arg, code ); +} + ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ) { return unix_funcs->pNtUserCallTwoParam( arg1, arg2, code ); @@ -697,11 +702,6 @@ WORD WINAPI NtUserVkKeyScanEx( WCHAR chr, HKL layout ) return unix_funcs->pNtUserVkKeyScanEx( chr, layout ); } -UINT WINAPI GDIRealizePalette( HDC hdc ) -{ - return unix_funcs->pGDIRealizePalette( hdc ); -} - HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD bkg ) { return unix_funcs->pGDISelectPalette( hdc, hpal, bkg ); diff --git a/include/ntuser.h b/include/ntuser.h index 3904daf5a82..3edfeab188e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -39,6 +39,12 @@ struct enum_display_monitor_params LPARAM lparam; }; +/* NtUserCallOneParam codes, not compatible with Windows */ +enum +{ + NtUserRealizePalette, +}; + /* NtUserCallTwoParam codes, not compatible with Windows */ enum { @@ -78,6 +84,7 @@ C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ); BOOL WINAPI NtUserAddClipboardFormatListener( HWND hwnd ); BOOL WINAPI NtUserAttachThreadInput( DWORD from, DWORD to, BOOL attach ); +ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ); ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ); LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ); @@ -128,6 +135,7 @@ BOOL WINAPI NtUserRemoveClipboardFormatListener( HWND hwnd ); HANDLE WINAPI NtUserRemoveProp( HWND hwnd, const WCHAR *str ); BOOL WINAPI NtUserScrollDC( HDC hdc, INT dx, INT dy, const RECT *scroll, const RECT *clip, HRGN ret_update_rgn, RECT *update_rect ); +HPALETTE WINAPI NtUserSelectPalette( HDC hdc, HPALETTE palette, WORD force_background ); BOOL WINAPI NtUserSetKeyboardState( BYTE *state ); BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle ); BOOL WINAPI NtUserSetProp( HWND hwnd, const WCHAR *str, HANDLE handle );

1 0

Alexandre Julliard : kernel32/tests: Use the correct scanf format for a handle.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: 3c715f14c729116992619f13ea241ad6b973b20c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c715f14c729116992619f13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 16:27:18 2021 +0100 kernel32/tests: Use the correct scanf format for a handle. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52155 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 1ed4ecec7e6..93eeca16c75 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -4206,9 +4206,9 @@ START_TEST(pipe) { if (!strcmp(argv[2], "writepipe")) { - UINT_PTR handle; - sscanf(argv[3], "%lx", &handle); - child_process_write_pipe((HANDLE)handle); + ULONG handle; + sscanf(argv[3], "%x", &handle); + child_process_write_pipe(ULongToHandle(handle)); return; } if (!strcmp(argv[2], "checkpid"))

1 0