December 2021 - Wine-commits

Jacek Caban : win32u: Use NtUserSelectPalette instead of GDISelectPalette.
by Alexandre Julliard 03 Dec '21

03 Dec '21

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

Gabriel Ivăncescu : mshtml: Implement value construction for HTMLOptionElementFactory.
by Alexandre Julliard 03 Dec '21

03 Dec '21

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

Gabriel Ivăncescu : mshtml: Implement index access for HTMLStyleSheetsCollection.
by Alexandre Julliard 03 Dec '21

03 Dec '21

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 index access for HTMLStyleSheetRulesCollection.
by Alexandre Julliard 03 Dec '21

03 Dec '21

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

Ivo Ivanov : dinput: Fix incorrect use of constant_force instead of ramp_force.
by Alexandre Julliard 03 Dec '21

03 Dec '21

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

Rémi Bernon : dinput: Set internal params lpvTypeSpecificParams in Initialize.
by Alexandre Julliard 03 Dec '21

03 Dec '21

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: Check cbTypeSpecificParams before lpvTypeSpecificParams.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: 5ce61fc04f2c274e3cccf12cccfe0757c9927383 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ce61fc04f2c274e3cccf12c… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Dec 3 14:08:48 2021 +0100 dinput: Check cbTypeSpecificParams before lpvTypeSpecificParams. And return DIERR_MOREDATA the provided buffer is too short. Fixes the WheelCheck application not showing type specific params for Constant and Periodic effects. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 86bb31737ab..56ef9ef6ce2 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2419,28 +2419,34 @@ static HRESULT WINAPI hid_joystick_effect_GetParameters( IDirectInputEffect *ifa case PID_USAGE_ET_TRIANGLE: case PID_USAGE_ET_SAWTOOTH_UP: case PID_USAGE_ET_SAWTOOTH_DOWN: + capacity = params->cbTypeSpecificParams; + params->cbTypeSpecificParams = sizeof(DIPERIODIC); + if (capacity < sizeof(DIPERIODIC)) return DIERR_MOREDATA; if (!params->lpvTypeSpecificParams) return E_POINTER; - if (params->cbTypeSpecificParams != sizeof(DIPERIODIC)) return DIERR_INVALIDPARAM; memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, sizeof(DIPERIODIC) ); break; case PID_USAGE_ET_SPRING: case PID_USAGE_ET_DAMPER: case PID_USAGE_ET_INERTIA: case PID_USAGE_ET_FRICTION: - count = impl->params.cbTypeSpecificParams; capacity = params->cbTypeSpecificParams; - params->cbTypeSpecificParams = count; - if (capacity < count) return DIERR_MOREDATA; + params->cbTypeSpecificParams = impl->params.cbTypeSpecificParams; + if (capacity < impl->params.cbTypeSpecificParams) return DIERR_MOREDATA; + if (!params->lpvTypeSpecificParams) return E_POINTER; memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, params->cbTypeSpecificParams ); break; case PID_USAGE_ET_CONSTANT_FORCE: + capacity = params->cbTypeSpecificParams; + params->cbTypeSpecificParams = sizeof(DICONSTANTFORCE); + if (capacity < sizeof(DICONSTANTFORCE)) return DIERR_MOREDATA; if (!params->lpvTypeSpecificParams) return E_POINTER; - if (params->cbTypeSpecificParams != sizeof(DICONSTANTFORCE)) return DIERR_INVALIDPARAM; memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, sizeof(DICONSTANTFORCE) ); break; case PID_USAGE_ET_RAMP: + capacity = params->cbTypeSpecificParams; + params->cbTypeSpecificParams = sizeof(DIRAMPFORCE); + if (capacity < sizeof(DIRAMPFORCE)) return DIERR_MOREDATA; if (!params->lpvTypeSpecificParams) return E_POINTER; - if (params->cbTypeSpecificParams != sizeof(DIRAMPFORCE)) return DIERR_INVALIDPARAM; memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, sizeof(DIRAMPFORCE) ); break; case PID_USAGE_ET_CUSTOM_FORCE_DATA:

1 0

Rémi Bernon : dinput: Factor all type specific parameter handling together.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: d0fc7c96f34247c5ac301d152e675168e963a419 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0fc7c96f34247c5ac301d15… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 3 14:08:49 2021 +0100 dinput: Factor all type specific parameter handling together. The internal params cbTypeSpecificParams is assigned in SetParameters after validation, and contains the expected buffer size. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 92 ++++++++++++---------------------------------- dlls/dinput8/tests/hid.c | 23 +++++++++++- 2 files changed, 46 insertions(+), 69 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 56ef9ef6ce2..682af063ff1 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2412,46 +2412,14 @@ static HRESULT WINAPI hid_joystick_effect_GetParameters( IDirectInputEffect *ifa if (flags & DIEP_TYPESPECIFICPARAMS) { - switch (impl->type) + capacity = params->cbTypeSpecificParams; + params->cbTypeSpecificParams = impl->params.cbTypeSpecificParams; + if (capacity < impl->params.cbTypeSpecificParams) return DIERR_MOREDATA; + if (impl->params.lpvTypeSpecificParams) { - case PID_USAGE_ET_SQUARE: - case PID_USAGE_ET_SINE: - case PID_USAGE_ET_TRIANGLE: - case PID_USAGE_ET_SAWTOOTH_UP: - case PID_USAGE_ET_SAWTOOTH_DOWN: - capacity = params->cbTypeSpecificParams; - params->cbTypeSpecificParams = sizeof(DIPERIODIC); - if (capacity < sizeof(DIPERIODIC)) return DIERR_MOREDATA; - if (!params->lpvTypeSpecificParams) return E_POINTER; - memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, sizeof(DIPERIODIC) ); - break; - case PID_USAGE_ET_SPRING: - case PID_USAGE_ET_DAMPER: - case PID_USAGE_ET_INERTIA: - case PID_USAGE_ET_FRICTION: - capacity = params->cbTypeSpecificParams; - params->cbTypeSpecificParams = impl->params.cbTypeSpecificParams; - if (capacity < impl->params.cbTypeSpecificParams) return DIERR_MOREDATA; if (!params->lpvTypeSpecificParams) return E_POINTER; - memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, params->cbTypeSpecificParams ); - break; - case PID_USAGE_ET_CONSTANT_FORCE: - capacity = params->cbTypeSpecificParams; - params->cbTypeSpecificParams = sizeof(DICONSTANTFORCE); - if (capacity < sizeof(DICONSTANTFORCE)) return DIERR_MOREDATA; - if (!params->lpvTypeSpecificParams) return E_POINTER; - memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, sizeof(DICONSTANTFORCE) ); - break; - case PID_USAGE_ET_RAMP: - capacity = params->cbTypeSpecificParams; - params->cbTypeSpecificParams = sizeof(DIRAMPFORCE); - if (capacity < sizeof(DIRAMPFORCE)) return DIERR_MOREDATA; - if (!params->lpvTypeSpecificParams) return E_POINTER; - memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, sizeof(DIRAMPFORCE) ); - break; - case PID_USAGE_ET_CUSTOM_FORCE_DATA: - FIXME( "DIEP_TYPESPECIFICPARAMS not implemented!\n" ); - return DIERR_UNSUPPORTED; + memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, + impl->params.cbTypeSpecificParams ); } } @@ -2561,6 +2529,7 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa if (flags & DIEP_TYPESPECIFICPARAMS) { + if (!params->lpvTypeSpecificParams) return E_POINTER; switch (impl->type) { case PID_USAGE_ET_SQUARE: @@ -2568,49 +2537,36 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa case PID_USAGE_ET_TRIANGLE: case PID_USAGE_ET_SAWTOOTH_UP: case PID_USAGE_ET_SAWTOOTH_DOWN: - if (!params->lpvTypeSpecificParams) return E_POINTER; - if (params->cbTypeSpecificParams != sizeof(DIPERIODIC)) return DIERR_INVALIDPARAM; - if (memcmp( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, sizeof(DIPERIODIC) )) - impl->modified |= DIEP_TYPESPECIFICPARAMS; - memcpy( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, sizeof(DIPERIODIC) ); - impl->params.cbTypeSpecificParams = sizeof(DIPERIODIC); + if (params->cbTypeSpecificParams != sizeof(DIPERIODIC)) + return DIERR_INVALIDPARAM; break; case PID_USAGE_ET_SPRING: case PID_USAGE_ET_DAMPER: case PID_USAGE_ET_INERTIA: case PID_USAGE_ET_FRICTION: - if ((count = impl->params.cAxes)) - { - if (!params->lpvTypeSpecificParams) return E_POINTER; - if (params->cbTypeSpecificParams != count * sizeof(DICONDITION) && - params->cbTypeSpecificParams != sizeof(DICONDITION)) - return DIERR_INVALIDPARAM; - if (memcmp( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, params->cbTypeSpecificParams )) - impl->modified |= DIEP_TYPESPECIFICPARAMS; - memcpy( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, params->cbTypeSpecificParams ); - impl->params.cbTypeSpecificParams = params->cbTypeSpecificParams; - } + if (params->cbTypeSpecificParams != sizeof(DICONDITION) && impl->params.cAxes && + params->cbTypeSpecificParams != impl->params.cAxes * sizeof(DICONDITION)) + return DIERR_INVALIDPARAM; break; case PID_USAGE_ET_CONSTANT_FORCE: - if (!params->lpvTypeSpecificParams) return E_POINTER; - if (params->cbTypeSpecificParams != sizeof(DICONSTANTFORCE)) return DIERR_INVALIDPARAM; - if (memcmp( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, sizeof(DICONSTANTFORCE) )) - impl->modified |= DIEP_TYPESPECIFICPARAMS; - memcpy( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, sizeof(DICONSTANTFORCE) ); - impl->params.cbTypeSpecificParams = sizeof(DICONSTANTFORCE); + if (params->cbTypeSpecificParams != sizeof(DICONSTANTFORCE)) + return DIERR_INVALIDPARAM; break; case PID_USAGE_ET_RAMP: - if (!params->lpvTypeSpecificParams) return E_POINTER; - if (params->cbTypeSpecificParams != sizeof(DIRAMPFORCE)) return DIERR_INVALIDPARAM; - if (memcmp( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, sizeof(DIRAMPFORCE) )) - impl->modified |= DIEP_TYPESPECIFICPARAMS; - memcpy( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, sizeof(DIRAMPFORCE) ); - impl->params.cbTypeSpecificParams = sizeof(DIRAMPFORCE); + if (params->cbTypeSpecificParams != sizeof(DIRAMPFORCE)) + return DIERR_INVALIDPARAM; break; case PID_USAGE_ET_CUSTOM_FORCE_DATA: - FIXME( "DIEP_TYPESPECIFICPARAMS not implemented!\n" ); + FIXME( "custom force data not implemented!\n" ); return DIERR_UNSUPPORTED; } + + if (memcmp( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, + params->cbTypeSpecificParams )) + impl->modified |= DIEP_TYPESPECIFICPARAMS; + memcpy( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, + params->cbTypeSpecificParams ); + impl->params.cbTypeSpecificParams = params->cbTypeSpecificParams; } if ((flags & DIEP_ENVELOPE) && params->lpEnvelope) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 2411053390f..7759a8d05f1 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -5981,7 +5981,6 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO check_member( desc, expect_desc_init, "%u", rgdwAxes[1] ); check_member( desc, expect_desc_init, "%p", rglDirection ); check_member( desc, expect_desc_init, "%p", lpEnvelope ); - todo_wine check_member( desc, expect_desc_init, "%u", cbTypeSpecificParams ); if (version >= 0x700) check_member( desc, expect_desc_init, "%u", dwStartDelay ); else ok( desc.dwStartDelay == 0xcdcdcdcd, "got dwStartDelay %#x\n", desc.dwStartDelay ); @@ -6900,6 +6899,28 @@ static void test_condition_effect( IDirectInputDevice8W *device, HANDLE file, DW ref = IDirectInputEffect_Release( effect ); ok( ref == 0, "Release returned %d\n", ref ); set_hid_expect( file, NULL, 0 ); + + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Spring, NULL, &effect, NULL ); + ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); + desc = expect_desc; + desc.cAxes = 0; + desc.cbTypeSpecificParams = 1 * sizeof(DICONDITION); + desc.lpvTypeSpecificParams = (void *)&expect_condition[0]; + hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_TYPESPECIFICPARAMS | DIEP_NODOWNLOAD ); + ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#x\n", hr ); + desc.cbTypeSpecificParams = 0 * sizeof(DICONDITION); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_TYPESPECIFICPARAMS ); + ok( hr == DIERR_MOREDATA, "SetParameters returned %#x\n", hr ); + ok( desc.cbTypeSpecificParams == 1 * sizeof(DICONDITION), "got %u\n", desc.cbTypeSpecificParams ); + desc.cbTypeSpecificParams = 0 * sizeof(DICONDITION); + hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_TYPESPECIFICPARAMS | DIEP_NODOWNLOAD ); + ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#x\n", hr ); + desc.cbTypeSpecificParams = 0 * sizeof(DICONDITION); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_TYPESPECIFICPARAMS ); + ok( hr == DI_OK, "SetParameters returned %#x\n", hr ); + ok( desc.cbTypeSpecificParams == 0 * sizeof(DICONDITION), "got %u\n", desc.cbTypeSpecificParams ); + ref = IDirectInputEffect_Release( effect ); + ok( ref == 0, "Release returned %d\n", ref ); } static void test_force_feedback_joystick( DWORD version )

1 0

Georg Lehmann : winevulkan: Fix concurrent modification in struct decoupling.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: 2b6c2358988080867d832b4d4b3013e4a03addd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b6c2358988080867d832b4d… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Thu Dec 2 23:04:35 2021 +0100 winevulkan: Fix concurrent modification in struct decoupling. This fixes the huge diffs generated by trivial winevulkan updates. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 3 +- include/wine/vulkan.h | 6220 +++++++++++++++++++++---------------------- 2 files changed, 3112 insertions(+), 3111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2b6c2358988080867d83…

1 0

Zebediah Figura : configure: Try to detect MinGW libpng using pkg-config if --with-system-dllpath is specified.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: aafddb16c3406ba22d7c0c898f36cfc7eacd45a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aafddb16c3406ba22d7c0c89… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 2 19:22:07 2021 -0600 configure: Try to detect MinGW libpng using pkg-config if --with-system-dllpath is specified. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 9 +++++ 2 files changed, 119 insertions(+) diff --git a/configure b/configure index 5948756e7ae..ffde96cb40e 100755 --- a/configure +++ b/configure @@ -12794,6 +12794,116 @@ CPPFLAGS=$ac_save_CPPFLAGS as_fn_append wine_notices "|libmpg123 ${notice_platform}MinGW development files not found (or too old); using bundled version." fi + if ${PNG_PE_CFLAGS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + PNG_PE_CFLAGS=`$MINGW_PKG_CONFIG --cflags libpng 2>/dev/null` +fi +fi +if ${PNG_PE_LIBS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + PNG_PE_LIBS=`$MINGW_PKG_CONFIG --libs libpng 2>/dev/null` +fi +fi + +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $PNG_PE_CFLAGS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW png.h" >&5 +printf %s "checking for MinGW png.h... " >&6; } +if test ${ac_cv_mingw_header_png_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <png.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_png_h=yes +else $as_nop + ac_cv_mingw_header_png_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_png_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_png_h" >&6; } +if test "x$ac_cv_mingw_header_png_h" = xyes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for png_create_read_struct in MinGW -lpng" >&5 +printf %s "checking for png_create_read_struct in MinGW -lpng... " >&6; } +if test ${ac_cv_mingw_lib_png+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-lpng $PNG_PE_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char png_create_read_struct (); +int +main (void) +{ +return png_create_read_struct (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_png=yes +else $as_nop + ac_cv_mingw_lib_png=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_png" >&5 +printf "%s\n" "$ac_cv_mingw_lib_png" >&6; } +if test "x$ac_cv_mingw_lib_png" = xyes +then : + : +else $as_nop + PNG_PE_CFLAGS=""; PNG_PE_LIBS="" +fi +else $as_nop + PNG_PE_CFLAGS=""; PNG_PE_LIBS="" +fi +CPPFLAGS=$ac_save_CPPFLAGS + + if test "x$PNG_PE_LIBS" = "x" + then + as_fn_append wine_notices "|libpng ${notice_platform}MinGW development files not found; using bundled version." + fi + if ${ZLIB_PE_CFLAGS:+false} : then : if test ${MINGW_PKG_CONFIG+y} diff --git a/configure.ac b/configure.ac index 2fe4b186fd6..d6c57bd41ad 100644 --- a/configure.ac +++ b/configure.ac @@ -1073,6 +1073,15 @@ then WINE_NOTICE([libmpg123 ${notice_platform}MinGW development files not found (or too old); using bundled version.]) fi + WINE_MINGW_PACKAGE_FLAGS(PNG,[libpng],, + [WINE_CHECK_MINGW_HEADER(png.h, + [WINE_CHECK_MINGW_LIB(png,png_create_read_struct,[:],[PNG_PE_CFLAGS=""; PNG_PE_LIBS=""],[$PNG_PE_LIBS])], + [PNG_PE_CFLAGS=""; PNG_PE_LIBS=""])]) + if test "x$PNG_PE_LIBS" = "x" + then + WINE_NOTICE([libpng ${notice_platform}MinGW development files not found; using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],

1 0