November 2021 - Wine-Devel - list.winehq.org

[PATCH] vbscript: Support VT_BSTR in stack_pop_bool.

by Robert Wilhelm

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51911 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/interp.c | 7 +++++++ dlls/vbscript/tests/lang.vbs | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 48863068013..2d9d1eee741 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -417,6 +417,7 @@ static int stack_pop_bool(exec_ctx_t *ctx, BOOL *b) { variant_val_t val; HRESULT hres; + VARIANT_BOOL vb; hres = stack_pop_val(ctx, &val); if(FAILED(hres)) @@ -437,6 +438,12 @@ static int stack_pop_bool(exec_ctx_t *ctx, BOOL *b) case VT_I4: *b = V_I4(val.v); break; + case VT_BSTR: + hres = VarBoolFromStr(V_BSTR(val.v), ctx->script->lcid, 0, &vb); + if(FAILED(hres)) + return hres; + *b=vb; + break; default: FIXME("unsupported for %s\n", debugstr_variant(val.v)); release_val(&val); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index dc2acbae69c..f147351b1af 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -357,6 +357,22 @@ while empty ok false, "while empty executed" wend +x = 0 +if "0" then + ok false, "if ""0"" executed" +else + x = 1 +end if +Call ok(x = 1, "if ""0"" else not executed") + +x = 0 +if "-1" then + x = 1 +else + ok false, "if ""-1"" else executed" +end if +Call ok(x = 1, "if ""-1"" not executed") + x = 0 WHILE x < 3 : x = x + 1 : Wend Call ok(x = 3, "x not equal to 3") -- 2.31.1

Nov. 2, 2021

Re: [PATCH v2 2/5] jscript: Implement Object.prototype.__proto__ property.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=101181 Your paranoid android. === w8adm (32 bit report) === mshtml: htmldoc.c:3084: Test failed: Incorrect error code: -2146697211 htmldoc.c:3089: Test failed: Page address: L"http://test.winehq.org/tests/winehq_snapshot/" htmldoc.c:5861: Test failed: expected OnChanged_1012 htmldoc.c:5862: Test failed: expected Exec_HTTPEQUIV htmldoc.c:5864: Test failed: expected Exec_SETTITLE htmldoc.c:5905: Test failed: expected FireNavigateComplete2 === w10pro64_ar (64 bit report) === mshtml: htmldoc.c:2541: Test failed: unexpected call UpdateUI htmldoc.c:2853: Test failed: unexpected call Exec_UPDATECOMMANDS htmldoc.c:350: Test failed: expected Exec_SETTITLE htmldoc.c:2859: Test failed: unexpected call Exec_SETTITLE === w7u_adm (32 bit report) === mshtml: script.c:624: Test failed: L"/index.html?es5.js:date_now: unexpected Date.now() result 1635880888082 expected 1635880888144"

Nov. 2, 2021

Re: Re: [PATCH 1/3] dxva2: Add a generic hardware video processor.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=101189 Your paranoid android. === debiant2 (build log) === error: corrupt patch at line 53 Task: Patch failed to apply === debiant2 (build log) === error: corrupt patch at line 53 Task: Patch failed to apply

Nov. 2, 2021

Re: [PATCH 1/3] dxva2: Add a generic hardware video processor.

by Nikolay Sivov

On 11/1/21 2:59 PM, Derek Lesho wrote: > Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> > --- > dlls/dxva2/main.c | 63 ++++++++++++++++++++++++++++------------------- > 1 file changed, 38 insertions(+), 25 deletions(-) > > diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c > index 2fab82ff476..ee11b1d4f84 100644 > --- a/dlls/dxva2/main.c > +++ b/dlls/dxva2/main.c > @@ -377,28 +377,48 @@ static HRESULT WINAPI device_manager_processor_service_RegisterVideoProcessorSof > return E_NOTIMPL; > } > > -static BOOL dxva_is_supported_stream_format(const DXVA2_VideoDesc *video_desc) > +DEFINE_GUID(WINE_DXVA2_VideoProcHardwareDevice, 0x986666c3,0x32ac,0x4788,0xab,0x2a,0xd5,0x74,0x5f,0xf9,0x52,0xd8); > + > I'm not sure we necessarily need something that custom yet. I'm going to testif DXVA2_VideoProcProgressiveDevice has similar properties. It's documented to be available as HW-independent device.

Nov. 2, 2021

Re: [PATCH] configure.ac: allow expressing dwarf version in CFLAGS and CROSSCFLAGS

by Jacek Caban

On 11/2/21 9:45 AM, Eric Pouech wrote: > usage: > configure CFLAGS="-gdwarf-4 -O2" > will enable dwarf4 compilation for ELF parts > (and CROSSCFLAGS="-gdwarf-4 -O2" for PE parts) > > evolution from current behavior: > - when CFLAGS contains "-gdwarf-X", -gdwarf-X option is not tested with > WINE_TRY_CFLAGS (the option remains anyway in CFLAGS -so WINE_TRY is > useless- and is not copied in EXTRACFLAGS) (ditto for CROSSCFLAGS) > - using CROSSCFLAGS=-gdwarf is no longer converted to Wine's default > format, but is kepts as is, hence will boil down to compiler's > preferred dwarf version > - CROSSDEBUG=split used to pick up compiler's default format > (while CROSSDEBUG=split-dwarf picked up wine's default format). > They both now pick up the format derived from or specified in > CROSSCLAGS (if any) > > what remains undone (and could be improved): > - no test that the final configuration is suitable for Wine (ie > if WINE_TRY_CFLAGS fails on -gdwarf-2, compilation is done with > compilers's default format => dwarf5 on Linux) > > Changes from previous version: > - fixed handling of "-g -gcodeview" in CROSSCFLAGS > - fixed CROSSDEBUG=split* (mixup between split-dwarf and dwarf-split) > > open question: > - I kept the original behavior, when providing as configure args (and > not providing CROSSCFLAGS in configure args): > CROSSDEBUG=pdb > to add -gcodeview to EXTRACROSSCFLAGS > It could be simplified with no longer supporting CROSSDEBUG from > command line, but: > + set CROSSDEBUG=pdb in configure when -gcodeview > option is present is CROSSCFLAGS > + set CROSSDEBUG=split in configure when -gsplit-dwarf > option is present is CROSSCFLAGS > > Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> > > --- > configure.ac | 40 ++++++++++++++++++++++++---------------- > 1 file changed, 24 insertions(+), 16 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 7c1e446814b..99347813a13 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1008,21 +1008,24 @@ then > > dnl Determine debug info format > AC_SUBST(CROSSDEBUG) > - if test -z "$CROSSDEBUG" > + ac_debug_format_seen= > + for ac_flag in $CROSSCFLAGS; do > + case $ac_flag in > + -gdwarf*) ac_debug_format_seen=yes ;; > + -g) ac_debug_format_seen=${ac_debug_format_seen:-default} ;; > + -gcodeview) ac_debug_format_seen=yes ;; > + esac > + done > + if test "x$ac_debug_format_seen" = "xdefault" -a "x$CROSSDEBUG" = "xpdb" > then > - for ac_flag in $CROSSCFLAGS; do > - case $ac_flag in > - -gdwarf*) CROSSDEBUG=dwarf ;; > - -gcodeview) CROSSDEBUG=pdb ;; > - -g) CROSSDEBUG=${CROSSDEBUG:-dwarf} ;; > - esac > - done > + WINE_TRY_CROSSCFLAGS([-gcodeview]) > + ac_debug_format_seen=yes > + fi > + if test "x$ac_debug_format_seen" = "xdefault" > + then > + WINE_TRY_CROSSCFLAGS([-gdwarf-2]) > + WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) > fi > - case $CROSSDEBUG in > - *dwarf) WINE_TRY_CROSSCFLAGS([-gdwarf-2]) > - WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) ;; > - pdb) WINE_TRY_CROSSCFLAGS([-gcodeview]) ;; > - esac > This version does not set CROSSDEBUG when -gcodeview is present in CROSSCFLAGS (while CROSSDEBUG needs to be set for makedep). What do you think about simplified (barely tested) version of the patch that I attached? Thanks, Jacek

Nov. 2, 2021

[PATCH 3/3] dxva2: Limit allowed number of substreams in CreateVideoProcessor().

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/main.c | 6 ++++++ dlls/dxva2/tests/dxva2.c | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 81c32692f7f..46f5a7af485 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -496,6 +496,12 @@ static HRESULT WINAPI device_manager_processor_service_CreateVideoProcessor(IDir /* FIXME: validate render target format */ + if (max_substreams >= 16) + { + WARN("Invalid substreams count %u.\n", max_substreams); + return E_INVALIDARG; + } + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 75c23dfdcda..e3307032ad4 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -470,9 +470,7 @@ static void test_video_processor(void) /* Number of substreams does not include reference stream. */ hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &DXVA2_VideoProcSoftwareDevice, &video_desc, D3DFMT_A8R8G8B8, 16, &processor); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) IDirectXVideoProcessor_Release(processor); hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &DXVA2_VideoProcSoftwareDevice, &video_desc, D3DFMT_A8R8G8B8, 15, &processor); -- 2.33.0

Nov. 2, 2021

[PATCH 2/3] dxva2: Add GetVideoProcessorCaps() for software device.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/main.c | 21 +++++++++++++++++-- dlls/dxva2/tests/dxva2.c | 45 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 60 insertions(+), 6 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 2fab82ff476..81c32692f7f 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -204,9 +204,26 @@ static HRESULT WINAPI video_processor_GetCreationParameters(IDirectXVideoProcess static HRESULT WINAPI video_processor_GetVideoProcessorCaps(IDirectXVideoProcessor *iface, DXVA2_VideoProcessorCaps *caps) { - FIXME("%p, %p.\n", iface, caps); + struct video_processor *processor = impl_from_IDirectXVideoProcessor(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, caps); + + if (IsEqualGUID(&processor->device, &DXVA2_VideoProcSoftwareDevice)) + { + memset(caps, 0, sizeof(*caps)); + caps->DeviceCaps = DXVA2_VPDev_SoftwareDevice; + caps->InputPool = D3DPOOL_SYSTEMMEM; + caps->VideoProcessorOperations = DXVA2_VideoProcess_PlanarAlpha | DXVA2_VideoProcess_YUV2RGB | + DXVA2_VideoProcess_StretchX | DXVA2_VideoProcess_StretchY | DXVA2_VideoProcess_SubRects | + DXVA2_VideoProcess_SubStreams | DXVA2_VideoProcess_SubStreamsExtended | DXVA2_VideoProcess_YUV2RGBExtended; + } + else + { + FIXME("Unsupported device %s.\n", debugstr_guid(&processor->device)); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI video_processor_GetProcAmpRange(IDirectXVideoProcessor *iface, UINT cap, DXVA2_ValueRange *range) diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index ab0a2769bd2..75c23dfdcda 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -420,17 +420,18 @@ done: static void test_video_processor(void) { IDirectXVideoProcessorService *service, *service2; - IDirect3DDevice9 *device; + IDirectXVideoProcessor *processor, *processor2; IDirect3DDeviceManager9 *manager; + DXVA2_VideoProcessorCaps caps; + DXVA2_VideoDesc video_desc; + IDirect3DDevice9 *device; HANDLE handle, handle1; + D3DFORMAT format; IDirect3D9 *d3d; HWND window; UINT token; HRESULT hr; - IDirectXVideoProcessor *processor, *processor2; - DXVA2_VideoDesc video_desc; GUID guid; - D3DFORMAT format; window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); @@ -466,10 +467,46 @@ static void test_video_processor(void) video_desc.SampleHeight = 64; video_desc.Format = D3DFMT_A8R8G8B8; + /* Number of substreams does not include reference stream. */ + hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &DXVA2_VideoProcSoftwareDevice, &video_desc, + D3DFMT_A8R8G8B8, 16, &processor); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) IDirectXVideoProcessor_Release(processor); + + hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &DXVA2_VideoProcSoftwareDevice, &video_desc, + D3DFMT_A8R8G8B8, 15, &processor); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IDirectXVideoProcessor_Release(processor); + + hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &DXVA2_VideoProcSoftwareDevice, &video_desc, + D3DFMT_A8R8G8B8, 0, &processor); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IDirectXVideoProcessor_Release(processor); + hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &DXVA2_VideoProcSoftwareDevice, &video_desc, D3DFMT_A8R8G8B8, 1, &processor); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IDirectXVideoProcessor_GetVideoProcessorCaps(processor, &caps); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(caps.DeviceCaps == DXVA2_VPDev_SoftwareDevice, "Unexpected device type %#x.\n", caps.DeviceCaps); + ok(caps.InputPool == D3DPOOL_SYSTEMMEM, "Unexpected input pool %#x.\n", caps.InputPool); + ok(!caps.NumForwardRefSamples, "Unexpected sample count.\n"); + ok(!caps.NumBackwardRefSamples, "Unexpected sample count.\n"); + ok(!caps.Reserved, "Unexpected field.\n"); + ok(caps.DeinterlaceTechnology == DXVA2_DeinterlaceTech_Unknown, "Unexpected deinterlace technology %#x.\n", + caps.DeinterlaceTechnology); + ok(!caps.ProcAmpControlCaps, "Unexpected proc amp mask %#x.\n", caps.ProcAmpControlCaps); + ok(caps.VideoProcessorOperations == (DXVA2_VideoProcess_PlanarAlpha | DXVA2_VideoProcess_YUV2RGB | + DXVA2_VideoProcess_StretchX | DXVA2_VideoProcess_StretchY | DXVA2_VideoProcess_SubRects | + DXVA2_VideoProcess_SubStreams | DXVA2_VideoProcess_SubStreamsExtended | DXVA2_VideoProcess_YUV2RGBExtended), + "Unexpected processor operations %#x.\n", caps.VideoProcessorOperations); + ok(caps.NoiseFilterTechnology == DXVA2_NoiseFilterTech_Unsupported, "Unexpected noise filter technology %#x.\n", + caps.NoiseFilterTechnology); + ok(caps.DetailFilterTechnology == DXVA2_DetailFilterTech_Unsupported, "Unexpected detail filter technology %#x.\n", + caps.DetailFilterTechnology); + hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &DXVA2_VideoProcSoftwareDevice, &video_desc, D3DFMT_A8R8G8B8, 1, &processor2); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -- 2.33.0

Nov. 2, 2021

[PATCH 1/3] evr/mixer: Fix number of substreams in CreateVideoProcessor().

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 30b4ed31b3f..3a2b6830782 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -35,7 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(evr); -#define MAX_MIXER_INPUT_STREAMS 16 +#define MAX_MIXER_INPUT_SUBSTREAMS (15) +#define MAX_MIXER_INPUT_STREAMS (MAX_MIXER_INPUT_SUBSTREAMS + 1) struct input_stream { @@ -932,7 +933,7 @@ static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, D rt_format = subtype.Data1; if (SUCCEEDED(hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &mixer->output.rt_formats[i].device, - &video_desc, rt_format, MAX_MIXER_INPUT_STREAMS, &mixer->processor))) + &video_desc, rt_format, MAX_MIXER_INPUT_SUBSTREAMS, &mixer->processor))) { if (mixer->output.media_type) IMFMediaType_Release(mixer->output.media_type); -- 2.33.0

Nov. 2, 2021

[PATCH v2 5/5] mshtml: Populate the element props properly.

by Gabriel Ivăncescu

For IE modes 8 and above, IHTMLElement::setAttribute uses the underlying nsIDOMElement::SetAttribute, which does nothing since we're already enumerating the ns attributes, and we're supposed to create the DISPIDs for them. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 5 ++++- dlls/mshtml/tests/documentmode.js | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 503a287..6624264 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6480,7 +6480,10 @@ static HRESULT HTMLElement_populate_props(DispatchEx *dispex) } else V_BSTR(&value) = NULL; - IHTMLElement_setAttribute(&This->IHTMLElement_iface, name, value, 0); + hres = IDispatchEx_GetDispID(&dispex->IDispatchEx_iface, name, fdexNameEnsure | fdexNameCaseInsensitive, &id); + if(SUCCEEDED(hres)) + set_elem_attr_value_by_dispid(This, id, &value); + SysFreeString(name); VariantClear(&value); } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 69f4796..d7c1350 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -518,9 +518,7 @@ sync_test("createElement_inline_attr", function() { for(var i = 0; i < tags.length; i++) { e = document.createElement("<" + tags[i] + " test='a\"' abcd=\""b"\">"); ok(e.tagName === tags[i].toUpperCase(), "<" + tags[i] + " test=\"a\" abcd=\"b\">.tagName returned " + e.tagName); - todo_wine_if(v == 8). ok(e.test === "a\"", "<" + tags[i] + " test='a\"' abcd=\""b"\">.test returned " + e.test); - todo_wine_if(v == 8). ok(e.abcd === "\"b\"", "<" + tags[i] + " test='a\"' abcd=\""b"\">.abcd returned " + e.abcd); } }else { -- 2.31.1

Nov. 2, 2021

[PATCH v2 4/5] mshtml: Implement inline attributes parsing for createElement.

by Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 98 ++++++++++++++++++++++++++++++- dlls/mshtml/tests/documentmode.js | 63 ++++++++++++++++++++ 2 files changed, 160 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index de69e2f..503a287 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -355,6 +355,98 @@ static inline HTMLElement *impl_from_IHTMLElement(IHTMLElement *iface) return CONTAINING_RECORD(iface, HTMLElement, IHTMLElement_iface); } +static HRESULT create_nselem_parse(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMElement **ret) +{ + WCHAR *p = wcschr(tag + 1, '>'); + nsIDOMHTMLCollection *nscol; + UINT32 i, name_len, length; + nsIDOMHTMLElement *nshtml; + HRESULT hres = E_FAIL; + nsresult nsres; + nsAString str; + + if(!p || p[1] || wcschr(tag + 1, '<')) + return E_FAIL; + if(!doc->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + /* Ignore the > or /> end token */ + length = p - tag - (p[-1] == '/'); + + /* Get the tag name using HTML whitespace rules */ + name_len = length - 1; + for(i = 1; i < length; i++) { + if((tag[i] >= 0x09 && tag[i] <= 0x0d) || tag[i] == ' ') { + name_len = i - 1; + break; + } + } + if(!name_len) + return E_FAIL; + + /* Create a temporary html element and parse it there */ + nsAString_InitDepend(&str, L"HTML"); + nsres = nsIDOMHTMLDocument_CreateElement(doc->nsdoc, &str, (nsIDOMElement**)&nshtml); + nsAString_Finish(&str); + if(NS_FAILED(nsres)) + return map_nsresult(nsres); + + if(name_len == 4 && !wcsnicmp(tag + 1, L"HTML", 4)) { + FIXME("Returning <html> element with no attributes\n"); + *ret = (nsIDOMElement*)nshtml; + return S_OK; + } + + nsAString_InitDepend(&str, tag); + nsres = nsIDOMHTMLElement_SetInnerHTML(nshtml, &str); + nsAString_Finish(&str); + if(NS_FAILED(nsres)) { + hres = map_nsresult(nsres); + goto fail; + } + + /* Get the element and remove it from the temporary */ + if(!(p = heap_alloc((name_len + 1) * sizeof(WCHAR)))) + hres = E_OUTOFMEMORY; + else { + memcpy(p, tag + 1, name_len * sizeof(WCHAR)); + p[name_len] = '\0'; + nsAString_InitDepend(&str, p); + nsres = nsIDOMHTMLElement_GetElementsByTagName(nshtml, &str, &nscol); + nsAString_Finish(&str); + heap_free(p); + if(NS_FAILED(nsres)) + goto fail; + + length = 0; + nsres = nsIDOMHTMLCollection_GetLength(nscol, &length); + if(NS_SUCCEEDED(nsres) && length == 1) { + nsIDOMNode *nsnode, *nsparent, *tmp; + + nsIDOMHTMLCollection_Item(nscol, 0, &nsnode); + nsres = nsIDOMNode_GetParentNode(nsnode, &nsparent); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIDOMNode_RemoveChild(nsparent, nsnode, &tmp); + nsIDOMNode_Release(nsparent); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIDOMNode_QueryInterface(tmp, &IID_nsIDOMElement, (void**)ret); + nsIDOMNode_Release(tmp); + if(NS_SUCCEEDED(nsres)) + hres = S_OK; + } + } + nsIDOMNode_Release(nsnode); + } + nsIDOMHTMLCollection_Release(nscol); + } + +fail: + nsIDOMHTMLElement_Release(nshtml); + return hres; +} + HRESULT create_nselem(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMElement **ret) { nsAString tag_str; @@ -385,7 +477,11 @@ HRESULT create_element(HTMLDocumentNode *doc, const WCHAR *tag, HTMLElement **re if(!doc->nsdoc) doc = doc->node.doc; - hres = create_nselem(doc, tag, &nselem); + /* IE8 and below allow creating elements with attributes, such as <div class="a"> */ + if(tag[0] == '<' && dispex_compat_mode(&doc->node.event_target.dispex) <= COMPAT_MODE_IE8) + hres = create_nselem_parse(doc, tag, &nselem); + else + hres = create_nselem(doc, tag, &nselem); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 02a5f5f..69f4796 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -488,6 +488,69 @@ sync_test("style_props", function() { } }); +sync_test("createElement_inline_attr", function() { + var v = document.documentMode, e, s; + + if(v < 9) { + s = document.createElement("<div>").tagName; + ok(s === "DIV", "<div>.tagName returned " + s); + s = document.createElement("<div >").tagName; + ok(s === "DIV", "<div >.tagName returned " + s); + s = document.createElement("<div/>").tagName; + ok(s === "DIV", "<div/>.tagName returned " + s); + e = 0; + try { + document.createElement("<div"); + }catch(ex) { + e = ex.number; + } + ok(e === 0x4005 - 0x80000000, "<div e = " + e); + e = 0; + try { + document.createElement("<div test=1"); + }catch(ex) { + e = ex.number; + } + ok(e === 0x4005 - 0x80000000, "<div test=1 e = " + e); + + var tags = [ "div", "head", "body", "title" ]; + + for(var i = 0; i < tags.length; i++) { + e = document.createElement("<" + tags[i] + " test='a\"' abcd=\""b"\">"); + ok(e.tagName === tags[i].toUpperCase(), "<" + tags[i] + " test=\"a\" abcd=\"b\">.tagName returned " + e.tagName); + todo_wine_if(v == 8). + ok(e.test === "a\"", "<" + tags[i] + " test='a\"' abcd=\""b"\">.test returned " + e.test); + todo_wine_if(v == 8). + ok(e.abcd === "\"b\"", "<" + tags[i] + " test='a\"' abcd=\""b"\">.abcd returned " + e.abcd); + } + }else { + s = ""; + e = 0; + try { + document.createElement("<div>"); + }catch(ex) { + s = ex.toString(); + e = ex.number; + } + todo_wine. + ok(e === undefined, "<div> e = " + e); + todo_wine. + ok(s === "InvalidCharacterError", "<div> s = " + s); + s = ""; + e = 0; + try { + document.createElement("<div test=\"a\">"); + }catch(ex) { + s = ex.toString(); + e = ex.number; + } + todo_wine. + ok(e === undefined, "<div test=\"a\"> e = " + e); + todo_wine. + ok(s === "InvalidCharacterError", "<div test=\"a\"> s = " + s); + } +}); + sync_test("JS objs", function() { var g = window; -- 2.31.1

Nov. 2, 2021