wine-commits October 2022

wine-commits@winehq.org

1 participants
537 discussions

Alexandre Julliard : d2d1: Use a gcc pragma instead of a compiler flag for -fexcess-precision.
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: wine Branch: master Commit: efa6b9f647bb397cb7c3677dbd10bd9e1ca45c20 URL: https://gitlab.winehq.org/wine/wine/-/commit/efa6b9f647bb397cb7c3677dbd10bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 09:58:57 2022 +0200 d2d1: Use a gcc pragma instead of a compiler flag for -fexcess-precision. This will be needed to support building multiple architectures from the same tree. --- configure | 71 --------------------------------------------------- configure.ac | 7 ----- dlls/d2d1/Makefile.in | 2 -- dlls/d2d1/geometry.c | 4 +++ 4 files changed, 4 insertions(+), 80 deletions(-) diff --git a/configure b/configure index 2efb2a37011..4adf86ac31d 100755 --- a/configure +++ b/configure @@ -733,7 +733,6 @@ GSM_PE_CFLAGS FAUDIO_PE_LIBS FAUDIO_PE_CFLAGS MINGW_PKG_CONFIG -EXCESS_PRECISION_CFLAGS CROSSDEBUG DELAYLOADFLAG CROSSLDFLAGS @@ -11792,42 +11791,6 @@ fi ;; esac fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -fexcess-precision=standard" >&5 -printf %s "checking whether the cross-compiler supports -fexcess-precision=standard... " >&6; } -if test ${ac_cv_crosscflags__fexcess_precision_standard+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_wine_try_cflags_saved=$CFLAGS -ac_wine_try_cflags_saved_cc=$CC -ac_wine_try_cflags_saved_exeext=$ac_exeext -CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -fexcess-precision=standard" -CC="$CROSSCC" -ac_exeext=".exe" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int __cdecl mainCRTStartup(void) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_crosscflags__fexcess_precision_standard=yes -else $as_nop - ac_cv_crosscflags__fexcess_precision_standard=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -CC=$ac_wine_try_cflags_saved_cc -ac_exeext=$ac_wine_try_cflags_saved_exeext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__fexcess_precision_standard" >&5 -printf "%s\n" "$ac_cv_crosscflags__fexcess_precision_standard" >&6; } -if test "x$ac_cv_crosscflags__fexcess_precision_standard" = xyes -then : - EXCESS_PRECISION_CFLAGS="-fexcess-precision=standard" - -fi - if test "x$enable_werror" = "xyes" then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Werror" >&5 @@ -19021,39 +18984,6 @@ then : EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings" fi - if test -z "$CROSSTARGET" - then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fexcess-precision=standard" >&5 -printf %s "checking whether the compiler supports -fexcess-precision=standard... " >&6; } -if test ${ac_cv_cflags__fexcess_precision_standard+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -fexcess-precision=standard" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_cflags__fexcess_precision_standard=yes -else $as_nop - ac_cv_cflags__fexcess_precision_standard=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fexcess_precision_standard" >&5 -printf "%s\n" "$ac_cv_cflags__fexcess_precision_standard" >&6; } -if test "x$ac_cv_cflags__fexcess_precision_standard" = xyes -then : - EXCESS_PRECISION_CFLAGS="-fexcess-precision=standard" - -fi - fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wpointer-arith" >&5 printf %s "checking whether the compiler supports -Wpointer-arith... " >&6; } if test ${ac_cv_cflags__Wpointer_arith+y} @@ -23343,7 +23273,6 @@ EXTRACROSSCFLAGS = $EXTRACROSSCFLAGS CROSSLDFLAGS = $CROSSLDFLAGS DELAYLOADFLAG = $DELAYLOADFLAG CROSSDEBUG = $CROSSDEBUG -EXCESS_PRECISION_CFLAGS = $EXCESS_PRECISION_CFLAGS MINGW_PKG_CONFIG = $MINGW_PKG_CONFIG FAUDIO_PE_CFLAGS = $FAUDIO_PE_CFLAGS FAUDIO_PE_LIBS = $FAUDIO_PE_LIBS diff --git a/configure.ac b/configure.ac index 41a29cee398..e11f3cfdb63 100644 --- a/configure.ac +++ b/configure.ac @@ -997,8 +997,6 @@ then esac fi - WINE_TRY_CROSSCFLAGS([-fexcess-precision=standard],[AC_SUBST(EXCESS_PRECISION_CFLAGS,"-fexcess-precision=standard")]) - if test "x$enable_werror" = "xyes" then WINE_TRY_CROSSCFLAGS([-Werror]) @@ -1847,11 +1845,6 @@ then WINE_TRY_CFLAGS([-Wvla]) WINE_TRY_CFLAGS([-Wwrite-strings]) - if test -z "$CROSSTARGET" - then - WINE_TRY_CFLAGS([-fexcess-precision=standard],[AC_SUBST(EXCESS_PRECISION_CFLAGS,"-fexcess-precision=standard")]) - fi - dnl Check for noisy string.h WINE_TRY_CFLAGS([-Wpointer-arith], [saved_string_h_CFLAGS=$CFLAGS diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 2bfe57a372d..cd8887064e8 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -21,5 +21,3 @@ C_SRCS = \ wic_render_target.c RC_SRCS = version.rc - -geometry_EXTRADEFS = $(EXCESS_PRECISION_CFLAGS) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 684ac5e240a..d6ee91de005 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if defined(__GNUC__) && !defined(__clang__) +#pragma GCC optimize "O2,no-strict-aliasing,excess-precision=standard" +#endif + #include "d2d1_private.h" #include <float.h>

1 0

Louis Lenders : wbemprox: Add HypervisorPresent property to win32_ComputerSystem.
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: wine Branch: master Commit: 40b262799dce47b4c03156b030de99008e06509a URL: https://gitlab.winehq.org/wine/wine/-/commit/40b262799dce47b4c03156b030de99… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Oct 14 10:59:46 2022 +0200 wbemprox: Add HypervisorPresent property to win32_ComputerSystem. Native Access 2 queries for this property --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 820fb61930f..b8f7d0b8dca 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -100,6 +100,7 @@ static const struct column col_compsys[] = { L"Description", CIM_STRING }, { L"Domain", CIM_STRING }, { L"DomainRole", CIM_UINT16 }, + { L"HypervisorPresent", CIM_BOOLEAN }, { L"Manufacturer", CIM_STRING }, { L"Model", CIM_STRING }, { L"Name", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -541,6 +542,7 @@ struct record_computersystem const WCHAR *description; const WCHAR *domain; UINT16 domainrole; + int hypervisorpresent; const WCHAR *manufacturer; const WCHAR *model; const WCHAR *name; @@ -1669,6 +1671,7 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co rec->description = L"AT/AT COMPATIBLE"; rec->domain = L"WORKGROUP"; rec->domainrole = 0; /* standalone workstation */ + rec->hypervisorpresent = 0; rec->manufacturer = get_compsysproduct_vendor( buf, len ); rec->model = get_compsysproduct_name( buf, len ); rec->name = get_computername(); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 6c66fd93d95..12bc42d249c 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -751,6 +751,17 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) trace( "numlogicalprocessors %ld\n", V_I4( &value ) ); } + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( obj, L"HypervisorPresent", 0, &value, &type, NULL ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* win7 testbot */, "got %#lx\n", hr ); + if (hr == S_OK) + { + ok( V_VT( &value ) == VT_BOOL, "unexpected variant type %#x\n", V_VT( &value ) ); + ok( type == CIM_BOOLEAN, "unexpected type %#lx\n", type ); + trace( "HypervisorPresent %d\n", V_BOOL( &value ) ); + } + check_property( obj, L"NumberOfProcessors", VT_I4, CIM_UINT32 ); check_property( obj, L"SystemType", VT_BSTR, CIM_STRING );

1 0

Alex Henrie : include: Add LV_COLUMN[AW].
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: wine Branch: master Commit: 8aef70a997943fe4cc5b93e648903e656a350afa URL: https://gitlab.winehq.org/wine/wine/-/commit/8aef70a997943fe4cc5b93e648903e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Oct 12 21:12:22 2022 -0600 include: Add LV_COLUMN[AW]. Needed to compile Tera Term. --- include/commctrl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 725ef64764f..22750a5b9c4 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3605,6 +3605,8 @@ typedef struct tagLVCOLUMNW #define LVCOLUMN_V1_SIZE WINELIB_NAME_AW(LVCOLUMN_V1_SIZE) #define LV_COLUMN LVCOLUMN +#define LV_COLUMNA LVCOLUMNA +#define LV_COLUMNW LVCOLUMNW typedef struct tagNMLISTVIEW

1 0

Rémi Bernon : win32u: Asynchronously send the WM_DISPLAYCHANGE to the desktop window.
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: wine Branch: master Commit: 4e8844529c5ea361ad6a0b5ac19d28cb88670456 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e8844529c5ea361ad6a0b5ac19d28… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 13 21:17:54 2022 +0200 win32u: Asynchronously send the WM_DISPLAYCHANGE to the desktop window. --- dlls/win32u/message.c | 2 +- dlls/win32u/sysparams.c | 4 ++-- dlls/win32u/win32u_private.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 51967d2598a..caffd837c8b 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -3047,7 +3047,7 @@ LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) } /* see SendNotifyMessageW */ -static BOOL send_notify_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) +BOOL send_notify_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) { struct send_message_info info; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 1c81dda9dd3..6b5a6f65aef 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2487,8 +2487,8 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod user_driver->pGetCurrentDisplaySettings( adapter->dev.device_name, &current_mode ); adapter_release( adapter ); - send_message( NtUserGetDesktopWindow(), WM_DISPLAYCHANGE, current_mode.dmBitsPerPel, - MAKELPARAM( current_mode.dmPelsWidth, current_mode.dmPelsHeight ) ); + send_notify_message( NtUserGetDesktopWindow(), WM_DISPLAYCHANGE, current_mode.dmBitsPerPel, + MAKELPARAM( current_mode.dmPelsWidth, current_mode.dmPelsHeight ), FALSE ); send_message_timeout( HWND_BROADCAST, WM_DISPLAYCHANGE, current_mode.dmBitsPerPel, MAKELPARAM( current_mode.dmPelsWidth, current_mode.dmPelsHeight ), SMTO_ABORTIFHUNG, 2000, FALSE ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 298cafcf7bf..4be068b968d 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -308,6 +308,7 @@ extern LRESULT send_internal_message_timeout( DWORD dest_pid, DWORD dest_tid, UI LPARAM lparam, UINT flags, UINT timeout, PDWORD_PTR res_ptr ) DECLSPEC_HIDDEN; extern LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; +extern BOOL send_notify_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) DECLSPEC_HIDDEN; extern LRESULT send_message_timeout( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, UINT flags, UINT timeout, BOOL ansi );

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: wine Branch: master Commit: a93edc8e6ef6754c05819dde96182f73110ed4bd URL: https://gitlab.winehq.org/wine/wine/-/commit/a93edc8e6ef6754c05819dde96182f… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Oct 13 08:42:22 2022 +0300 po: Update Finnish translation. --- po/fi.po | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/po/fi.po b/po/fi.po index 6018f61084b..8386a598fa0 100644 --- a/po/fi.po +++ b/po/fi.po @@ -15043,10 +15043,8 @@ msgid "&Replace...\tCtrl+H" msgstr "&Korvaa...\tCtrl+H" #: programs/notepad/notepad.rc:59 -#, fuzzy -#| msgid "&New...\tCtrl+N" msgid "&Go To...\tCtrl+G" -msgstr "&Uusi...\tCtrl+N" +msgstr "&Siirry...\tCtrl+G" #: programs/notepad/notepad.rc:63 programs/oleview/oleview.rc:68 #: programs/oleview/oleview.rc:90 programs/winefile/winefile.rc:67 @@ -15089,17 +15087,15 @@ msgstr "Y&lä:" #: programs/notepad/notepad.rc:132 msgid "Go To Line" -msgstr "" +msgstr "Siirry riville" #: programs/notepad/notepad.rc:134 -#, fuzzy -#| msgid "CRL Number" msgid "&Line Number:" -msgstr "Sulkulistan numero" +msgstr "&Rivinumero:" #: programs/notepad/notepad.rc:137 msgid "Go To" -msgstr "" +msgstr "Siirry" #: programs/notepad/notepad.rc:145 msgid "Encoding:" @@ -15165,7 +15161,7 @@ msgstr "Z" #: programs/notepad/notepad.rc:162 msgctxt "accelerator GoTo" msgid "G" -msgstr "" +msgstr "G" #: programs/notepad/notepad.rc:74 msgid "Page &p" @@ -15242,7 +15238,7 @@ msgstr "" #: programs/notepad/notepad.rc:90 msgid "Ln %ld, Col %ld" -msgstr "" +msgstr "Rivi %ld, sarake %ld" #: programs/oleview/oleview.rc:32 msgid "&Bind to file..."

1 0

Gabriel Ivăncescu : mshtml: Don't create dynamic prop before checking if elem prop even exists.
by Alexandre Julliard 13 Oct '22

13 Oct '22

Module: wine Branch: master Commit: fded20df6c7422e85dbcd5a20475fd0c5d38d3c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/fded20df6c7422e85dbcd5a20475fd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 13 20:24:39 2022 +0300 mshtml: Don't create dynamic prop before checking if elem prop even exists. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 11 +++++---- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 49 +++++++++++++++++++++++++++++++++++++-- 3 files changed, 54 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5805138f4b2..2a99316d129 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4981,7 +4981,7 @@ static HRESULT WINAPI DocDispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, HTMLDocument *This = impl_from_IDispatchEx(iface); HRESULT hres; - hres = IDispatchEx_GetDispID(This->dispex, bstrName, grfdex, pid); + hres = IDispatchEx_GetDispID(This->dispex, bstrName, grfdex & ~fdexNameEnsure, pid); if(hres != DISP_E_UNKNOWNNAME) return hres; @@ -4990,6 +4990,9 @@ static HRESULT WINAPI DocDispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, if(SUCCEEDED(hres)) hres = dispid_from_elem_name(This->doc_node, bstrName, pid); } + + if(hres == DISP_E_UNKNOWNNAME && (grfdex & fdexNameEnsure)) + hres = IDispatchEx_GetDispID(This->dispex, bstrName, grfdex, pid); return hres; } @@ -5899,10 +5902,8 @@ static HRESULT HTMLDocumentNode_invoke(DispatchEx *dispex, DISPID id, LCID lcid, unsigned i; HRESULT hres; - if(flags != DISPATCH_PROPERTYGET && flags != (DISPATCH_METHOD|DISPATCH_PROPERTYGET)) { - FIXME("unsupported flags %x\n", flags); - return E_NOTIMPL; - } + if(flags != DISPATCH_PROPERTYGET && flags != (DISPATCH_METHOD|DISPATCH_PROPERTYGET)) + return MSHTML_E_INVALID_PROPERTY; i = id - MSHTML_DISPID_CUSTOM_MIN; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4ce90d3f17e..7ac4cea2e2b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -72,6 +72,7 @@ #define NSAPI WINAPI +#define MSHTML_E_INVALID_PROPERTY 0x800a01b6 #define MSHTML_E_INVALID_ACTION 0x800a01bd #define MSHTML_E_NODOC 0x800a025c diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index fa264526302..a9ff38d5781 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -669,13 +669,13 @@ sync_test("for..in", function() { sync_test("elem_by_id", function() { document.body.innerHTML = '<form id="testid" name="testname"></form>'; - var found, i; + var v = document.documentMode, found, i; var id_elem = document.getElementById("testid"); ok(id_elem.tagName === "FORM", "id_elem.tagName = " + id_elem.tagName); var name_elem = document.getElementById("testname"); - if(document.documentMode < 8) + if(v < 8) ok(id_elem === name_elem, "id_elem != id_elem"); else ok(name_elem === null, "name_elem != null"); @@ -705,6 +705,51 @@ sync_test("elem_by_id", function() { } ok(found, "testname was not enumerated in document"); + try { + document.testname(); + ok(false, "document.testname() did not throw exception"); + }catch(e) { + ok(e.number === 0xa01b6 - 0x80000000, "document.testname() threw = " + e.number); + } + + try { + document.testname = "foo"; + ok(v >= 9, "Setting document.testname did not throw exception"); + + id_elem = document.testid; + ok(id_elem.tagName === "FORM", "document.testid after set = " + id_elem); + name_elem = document.testname; + ok(name_elem === "foo", "document.testname after set = " + name_elem); + }catch(e) { + todo_wine_if(v >= 9). + ok(v < 9 && e.number === 0xa01b6 - 0x80000000, "Setting document.testname threw = " + e.number); + } + + try { + document.testid = "bar"; + ok(v >= 9, "Setting document.testid did not throw exception"); + + id_elem = document.testid; + ok(id_elem === "bar", "document.testid after both set = " + id_elem); + name_elem = document.testname; + ok(name_elem === "foo", "document.testname after both set = " + name_elem); + + found = false, name_elem = false; + for(id_elem in document) { + if(id_elem === "testid") + found = true; + if(id_elem === "testname") + name_elem = true; + } + ok(found, "testid was not enumerated in document after both set"); + ok(name_elem, "testname was not enumerated in document after both set"); + delete document.testid; + delete document.testname; + }catch(e) { + todo_wine_if(v >= 9). + ok(v < 9 && e.number === 0xa01b6 - 0x80000000, "Setting document.testid threw = " + e.number); + } + // these tags expose name as props, and id only if they have a name var tags = [ "embed", "form", "iframe", "img" ]; for(i in tags) {

1 0

Gabriel Ivăncescu : mshtml: Allow accessing some document elements as props via id.
by Alexandre Julliard 13 Oct '22

13 Oct '22

Module: wine Branch: master Commit: d5c764e8c73615cc4cad90fcbe3f14c8dfec2397 URL: https://gitlab.winehq.org/wine/wine/-/commit/d5c764e8c73615cc4cad90fcbe3f14… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 13 20:24:39 2022 +0300 mshtml: Allow accessing some document elements as props via id. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 58 +++++++++++++++++++++++++++++---------- dlls/mshtml/tests/documentmode.js | 3 -- 2 files changed, 43 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index aa71e53d144..5805138f4b2 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4846,6 +4846,41 @@ static HRESULT has_elem_name(nsIDOMHTMLDocument *nsdoc, const WCHAR *name) return S_OK; } +static HRESULT get_elem_by_name_or_id(nsIDOMHTMLDocument *nsdoc, const WCHAR *name, nsIDOMElement **ret) +{ + static const WCHAR fmt[] = L":-moz-any(embed,form,iframe,img):-moz-any([name=\"%s\"],[id=\"%s\"][name])," + L":-moz-any(applet,object):-moz-any([name=\"%s\"],[id=\"%s\"])"; + WCHAR buf[384], *selector = buf; + nsAString selector_str; + nsIDOMElement *nselem; + nsresult nsres; + size_t len; + + len = wcslen(name) * 4 + ARRAY_SIZE(fmt) - 8 /* %s */; + if(len > ARRAY_SIZE(buf) && !(selector = heap_alloc(len * sizeof(WCHAR)))) + return E_OUTOFMEMORY; + swprintf(selector, len, fmt, name, name, name, name); + + nsAString_InitDepend(&selector_str, selector); + nsres = nsIDOMHTMLDocument_QuerySelector(nsdoc, &selector_str, &nselem); + nsAString_Finish(&selector_str); + if(selector != buf) + heap_free(selector); + if(NS_FAILED(nsres)) + return map_nsresult(nsres); + + if(ret) { + *ret = nselem; + return S_OK; + } + + if(nselem) { + nsIDOMElement_Release(nselem); + return S_OK; + } + return DISP_E_UNKNOWNNAME; +} + static HRESULT dispid_from_elem_name(HTMLDocumentNode *This, const WCHAR *name, DISPID *dispid) { unsigned i; @@ -4951,7 +4986,7 @@ static HRESULT WINAPI DocDispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, return hres; if(This->doc_node->nsdoc) { - hres = has_elem_name(This->doc_node->nsdoc, bstrName); + hres = get_elem_by_name_or_id(This->doc_node->nsdoc, bstrName, NULL); if(SUCCEEDED(hres)) hres = dispid_from_elem_name(This->doc_node, bstrName, pid); } @@ -5859,12 +5894,9 @@ static HRESULT HTMLDocumentNode_invoke(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { HTMLDocumentNode *This = impl_from_DispatchEx(dispex); - nsIDOMNodeList *node_list; - nsAString name_str; - nsIDOMNode *nsnode; + nsIDOMElement *nselem; HTMLDOMNode *node; unsigned i; - nsresult nsres; HRESULT hres; if(flags != DISPATCH_PROPERTYGET && flags != (DISPATCH_METHOD|DISPATCH_PROPERTYGET)) { @@ -5877,18 +5909,14 @@ static HRESULT HTMLDocumentNode_invoke(DispatchEx *dispex, DISPID id, LCID lcid, if(!This->nsdoc || i >= This->elem_vars_cnt) return DISP_E_MEMBERNOTFOUND; - nsAString_InitDepend(&name_str, This->elem_vars[i]); - nsres = nsIDOMHTMLDocument_GetElementsByName(This->nsdoc, &name_str, &node_list); - nsAString_Finish(&name_str); - if(NS_FAILED(nsres)) - return E_FAIL; - - nsres = nsIDOMNodeList_Item(node_list, 0, &nsnode); - nsIDOMNodeList_Release(node_list); - if(NS_FAILED(nsres) || !nsnode) + hres = get_elem_by_name_or_id(This->nsdoc, This->elem_vars[i], &nselem); + if(FAILED(hres)) + return hres; + if(!nselem) return DISP_E_MEMBERNOTFOUND; - hres = get_node(nsnode, TRUE, &node); + hres = get_node((nsIDOMNode*)nselem, TRUE, &node); + nsIDOMElement_Release(nselem); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 5aa9759fe81..fa264526302 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -711,7 +711,6 @@ sync_test("elem_by_id", function() { var tag = tags[i]; document.body.innerHTML = '<' + tag + ' id="testid" name="testname"></' + tag + '><' + tag + ' id="foobar"></' + tag + '>'; ok("testname" in document, tag + " did not expose testname"); - todo_wine. ok("testid" in document, tag + " did not expose testid"); ok(!("foobar" in document), tag + " exposed foobar"); } @@ -722,9 +721,7 @@ sync_test("elem_by_id", function() { var tag = tags[i]; document.body.innerHTML = '<' + tag + ' id="testid" name="testname"></' + tag + '><' + tag + ' id="foobar"></' + tag + '>'; ok("testname" in document, tag + " did not expose testname"); - todo_wine. ok("testid" in document, tag + " did not expose testid"); - todo_wine. ok("foobar" in document, tag + " did not expose foobar"); }

1 0

Gabriel Ivăncescu : mshtml: Expose props via element name only for specific element types.
by Alexandre Julliard 13 Oct '22

13 Oct '22

Module: wine Branch: master Commit: 3216c04d71ed8118f8acb3e52861ba60ca032d8e URL: https://gitlab.winehq.org/wine/wine/-/commit/3216c04d71ed8118f8acb3e52861ba… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 13 20:24:39 2022 +0300 mshtml: Expose props via element name only for specific element types. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 31 +++++++++++++++++++------------ dlls/mshtml/tests/documentmode.js | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index d86ed07e033..aa71e53d144 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4820,23 +4820,30 @@ static inline HTMLDocument *impl_from_IDispatchEx(IDispatchEx *iface) static HRESULT has_elem_name(nsIDOMHTMLDocument *nsdoc, const WCHAR *name) { - nsIDOMNodeList *node_list; - nsAString name_str; + static const WCHAR fmt[] = L":-moz-any(applet,embed,form,iframe,img,object)[name=\"%s\"]"; + WCHAR buf[128], *selector = buf; + nsAString selector_str; + nsIDOMElement *nselem; nsresult nsres; - UINT32 len; + size_t len; - nsAString_InitDepend(&name_str, name); - nsres = nsIDOMHTMLDocument_GetElementsByName(nsdoc, &name_str, &node_list); - nsAString_Finish(&name_str); - if(NS_FAILED(nsres)) - return map_nsresult(nsres); + len = wcslen(name) + ARRAY_SIZE(fmt) - 2 /* %s */; + if(len > ARRAY_SIZE(buf) && !(selector = heap_alloc(len * sizeof(WCHAR)))) + return E_OUTOFMEMORY; + swprintf(selector, len, fmt, name); - nsres = nsIDOMNodeList_GetLength(node_list, &len); - nsIDOMNodeList_Release(node_list); + nsAString_InitDepend(&selector_str, selector); + nsres = nsIDOMHTMLDocument_QuerySelector(nsdoc, &selector_str, &nselem); + nsAString_Finish(&selector_str); + if(selector != buf) + heap_free(selector); if(NS_FAILED(nsres)) return map_nsresult(nsres); - return len ? S_OK : DISP_E_UNKNOWNNAME; + if(!nselem) + return DISP_E_UNKNOWNNAME; + nsIDOMElement_Release(nselem); + return S_OK; } static HRESULT dispid_from_elem_name(HTMLDocumentNode *This, const WCHAR *name, DISPID *dispid) @@ -5918,7 +5925,7 @@ static HRESULT HTMLDocumentNode_next_dispid(DispatchEx *dispex, DISPID id, DISPI } /* Populate possibly missing DISPIDs */ - nsAString_InitDepend(&nsstr, L"[name]"); + nsAString_InitDepend(&nsstr, L":-moz-any(applet,embed,form,iframe,img,object)[name]"); nsres = nsIDOMHTMLDocument_QuerySelectorAll(This->nsdoc, &nsstr, &node_list); nsAString_Finish(&nsstr); if(NS_FAILED(nsres)) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index ad258b3df2e..5aa9759fe81 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -669,7 +669,7 @@ sync_test("for..in", function() { sync_test("elem_by_id", function() { document.body.innerHTML = '<form id="testid" name="testname"></form>'; - var found; + var found, i; var id_elem = document.getElementById("testid"); ok(id_elem.tagName === "FORM", "id_elem.tagName = " + id_elem.tagName); @@ -704,6 +704,39 @@ sync_test("elem_by_id", function() { found = true; } ok(found, "testname was not enumerated in document"); + + // these tags expose name as props, and id only if they have a name + var tags = [ "embed", "form", "iframe", "img" ]; + for(i in tags) { + var tag = tags[i]; + document.body.innerHTML = '<' + tag + ' id="testid" name="testname"></' + tag + '><' + tag + ' id="foobar"></' + tag + '>'; + ok("testname" in document, tag + " did not expose testname"); + todo_wine. + ok("testid" in document, tag + " did not expose testid"); + ok(!("foobar" in document), tag + " exposed foobar"); + } + + // these tags always expose their id as well as name (we don't test applet because it makes Windows pop up a dialog box) + tags = [ "object" ]; + for(i in tags) { + var tag = tags[i]; + document.body.innerHTML = '<' + tag + ' id="testid" name="testname"></' + tag + '><' + tag + ' id="foobar"></' + tag + '>'; + ok("testname" in document, tag + " did not expose testname"); + todo_wine. + ok("testid" in document, tag + " did not expose testid"); + todo_wine. + ok("foobar" in document, tag + " did not expose foobar"); + } + + // all other tags don't expose props for either id or name, test a few of them here + tags = [ "a", "b", "body", "center", "div", "frame", "h2", "head", "html", "input", "meta", "p", "span", "style", "table", "winetest" ]; + for(i in tags) { + var tag = tags[i]; + document.body.innerHTML = '<' + tag + ' id="testid" name="testname"></' + tag + '><' + tag + ' id="foobar"></' + tag + '>'; + ok(!("testname" in document), tag + " exposed testname"); + ok(!("testid" in document), tag + " exposed testid"); + ok(!("foobar" in document), tag + " exposed foobar"); + } }); sync_test("doc_mode", function() {

1 0

Rémi Bernon : winegstreamer: Register WMV decoder MFT / DMO stub.
by Alexandre Julliard 13 Oct '22

13 Oct '22

Module: wine Branch: master Commit: baf7c13b9c704f1e4be1fac4935e1c906a53edd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/baf7c13b9c704f1e4be1fac4935e1c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 30 10:25:24 2022 +0200 winegstreamer: Register WMV decoder MFT / DMO stub. --- MAINTAINERS | 1 + dlls/mf/tests/transform.c | 3 + dlls/winegstreamer/Makefile.in | 3 +- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/main.c | 34 ++ dlls/winegstreamer/mfplat.c | 38 ++ dlls/winegstreamer/winegstreamer_classes.idl | 6 + dlls/winegstreamer/wmv_decoder.c | 608 +++++++++++++++++++++++++++ 8 files changed, 693 insertions(+), 1 deletion(-)

1 0

Rémi Bernon : winegstreamer: Register AAC decoder MFT stub.
by Alexandre Julliard 13 Oct '22

13 Oct '22

Module: wine Branch: master Commit: 2a57854c6a32dee57904b87c73982d12daca656d URL: https://gitlab.winehq.org/wine/wine/-/commit/2a57854c6a32dee57904b87c73982d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 12 09:52:53 2022 +0200 winegstreamer: Register AAC decoder MFT stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 --- MAINTAINERS | 1 + dlls/mf/tests/transform.c | 9 + dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/aac_decoder.c | 276 +++++++++++++++++++++++++++ dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/mfplat.c | 24 +++ dlls/winegstreamer/winegstreamer_classes.idl | 6 + 7 files changed, 318 insertions(+)

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2022