wine-commits April 2023

wine-commits@winehq.org

1 participants
817 discussions

Mohamad Al-Jaf : widl: Add support for WinRT HANDLE parameter type.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: 3b31e75395ec49899102a87b12351632489d03ea URL: https://gitlab.winehq.org/wine/wine/-/commit/3b31e75395ec49899102a87b123516… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Apr 8 21:18:48 2023 -0400 widl: Add support for WinRT HANDLE parameter type. Needed by windows.ui.composition.interop.idl. --- tools/widl/parser.y | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 9b81f9521fa..b802f75874d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2481,8 +2481,12 @@ static void check_field_common(const type_t *container_type, break; } case TGT_POINTER: - type = type_pointer_get_ref_type(type); - more_to_do = TRUE; + if (type_get_type(type_pointer_get_ref_type(type)) != TYPE_VOID || + !type->name || strcmp(type->name, "HANDLE")) + { + type = type_pointer_get_ref_type(type); + more_to_do = TRUE; + } break; case TGT_ARRAY: type = type_array_get_element_type(type);

1 0

Alexandre Julliard : ntdll: Use the correct section start when reading the COR header.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: 738b6c00a99aa90fbb8895a22b889ea3ac04034a URL: https://gitlab.winehq.org/wine/wine/-/commit/738b6c00a99aa90fbb8895a22b889e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 12 14:01:29 2023 +0200 ntdll: Use the correct section start when reading the COR header. --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index f05cd1b4fd9..ce8b3bcba4d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2286,7 +2286,7 @@ static BOOL get_cor_header( HANDLE file, const SECTION_IMAGE_INFORMATION *info, { if (va < sec[i].VirtualAddress) continue; if (sec[i].Misc.VirtualSize && va - sec[i].VirtualAddress >= sec[i].Misc.VirtualSize) continue; - offset.QuadPart = sec->PointerToRawData + va - sec[i].VirtualAddress; + offset.QuadPart = sec[i].PointerToRawData + va - sec[i].VirtualAddress; if (NtReadFile( file, 0, NULL, NULL, &io, cor, sizeof(*cor), &offset, NULL )) return FALSE; return (io.Information == sizeof(*cor)); }

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Support log() intrinsic.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: vkd3d Branch: master Commit: a1bd4e080ef5bd0b1bfb073558fb715e9ad54058 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a1bd4e080ef5bd0b1bfb073558fb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 21 23:15:50 2023 +0100 vkd3d-shader/hlsl: Support log() intrinsic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 20 ++++++++++++++++++++ tests/log.shader_test | 13 +++++++++++++ 2 files changed, 33 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index e487902e..ce20c00e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2843,6 +2843,25 @@ static bool intrinsic_lit(struct hlsl_ctx *ctx, return true; } +static bool intrinsic_log(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_constant *coeff; + struct hlsl_ir_node *log, *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + if (!(log = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_LOG2, arg, loc))) + return false; + + /* ln(2) */ + if (!(coeff = hlsl_new_float_constant(ctx, 0.69314718055f, loc))) + return false; + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, log, &coeff->node, loc); +} + static bool intrinsic_log10(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3330,6 +3349,7 @@ intrinsic_functions[] = {"length", 1, true, intrinsic_length}, {"lerp", 3, true, intrinsic_lerp}, {"lit", 3, true, intrinsic_lit}, + {"log", 1, true, intrinsic_log}, {"log10", 1, true, intrinsic_log10}, {"log2", 1, true, intrinsic_log2}, {"max", 2, true, intrinsic_max}, diff --git a/tests/log.shader_test b/tests/log.shader_test index 0a99904a..b0f405d1 100644 --- a/tests/log.shader_test +++ b/tests/log.shader_test @@ -23,3 +23,16 @@ float4 main() : sv_target uniform 0 float4 10.0 100.0 1.0 0.1 draw quad probe all rgba (1.0, 2.0, 0.0, -1.0) 1 + +[pixel shader] +uniform float4 x; + +float4 main() : sv_target +{ + return log(x); +} + +[test] +uniform 0 float4 3.0 10.0 1.0 0.1 +draw quad +probe all rgba (1.0986123, 2.302585, 0.0, -2.302585) 2

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Support log10() intrinsic.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: vkd3d Branch: master Commit: 210caa931db664e2c9fdcff217581fd4bf421e9c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/210caa931db664e2c9fdcff217581… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 21 23:14:45 2023 +0100 vkd3d-shader/hlsl: Support log10() intrinsic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 20 ++++++++++++++++++++ tests/log.shader_test | 13 +++++++++++++ 2 files changed, 33 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index f2990e6f..e487902e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2843,6 +2843,25 @@ static bool intrinsic_lit(struct hlsl_ctx *ctx, return true; } +static bool intrinsic_log10(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_constant *coeff; + struct hlsl_ir_node *log, *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + if (!(log = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_LOG2, arg, loc))) + return false; + + /* 1 / log2(10) */ + if (!(coeff = hlsl_new_float_constant(ctx, 0.301029996f, loc))) + return false; + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, log, &coeff->node, loc); +} + static bool intrinsic_log2(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3311,6 +3330,7 @@ intrinsic_functions[] = {"length", 1, true, intrinsic_length}, {"lerp", 3, true, intrinsic_lerp}, {"lit", 3, true, intrinsic_lit}, + {"log10", 1, true, intrinsic_log10}, {"log2", 1, true, intrinsic_log2}, {"max", 2, true, intrinsic_max}, {"min", 2, true, intrinsic_min}, diff --git a/tests/log.shader_test b/tests/log.shader_test index 9ba0af76..0a99904a 100644 --- a/tests/log.shader_test +++ b/tests/log.shader_test @@ -10,3 +10,16 @@ float4 main() : sv_target uniform 0 float4 2.0 4.0 5.0 0.4 draw quad probe all rgba (1.0, 2.0, 2.32192802, -1.32192802) 1 + +[pixel shader] +uniform float4 x; + +float4 main() : sv_target +{ + return log10(x); +} + +[test] +uniform 0 float4 10.0 100.0 1.0 0.1 +draw quad +probe all rgba (1.0, 2.0, 0.0, -1.0) 1

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Support log2() intrinsic.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: vkd3d Branch: master Commit: 49b63fbeba6d0665fa8ced7d2e2dd4376c98deb9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/49b63fbeba6d0665fa8ced7d2e2dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 21 23:13:24 2023 +0100 vkd3d-shader/hlsl: Support log2() intrinsic. --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.y | 12 ++++++++++++ tests/log.shader_test | 12 ++++++++++++ 3 files changed, 25 insertions(+) diff --git a/Makefile.am b/Makefile.am index 48991982..a7abd56a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -122,6 +122,7 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/lit.shader_test \ + tests/log.shader_test \ tests/logic-operations.shader_test \ tests/majority-syntax.shader_test \ tests/math.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 3873a939..f2990e6f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2843,6 +2843,17 @@ static bool intrinsic_lit(struct hlsl_ctx *ctx, return true; } +static bool intrinsic_log2(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_LOG2, arg, loc); +} + static bool intrinsic_max(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3300,6 +3311,7 @@ intrinsic_functions[] = {"length", 1, true, intrinsic_length}, {"lerp", 3, true, intrinsic_lerp}, {"lit", 3, true, intrinsic_lit}, + {"log2", 1, true, intrinsic_log2}, {"max", 2, true, intrinsic_max}, {"min", 2, true, intrinsic_min}, {"mul", 2, true, intrinsic_mul}, diff --git a/tests/log.shader_test b/tests/log.shader_test new file mode 100644 index 00000000..9ba0af76 --- /dev/null +++ b/tests/log.shader_test @@ -0,0 +1,12 @@ +[pixel shader] +uniform float4 x; + +float4 main() : sv_target +{ + return log2(x); +} + +[test] +uniform 0 float4 2.0 4.0 5.0 0.4 +draw quad +probe all rgba (1.0, 2.0, 2.32192802, -1.32192802) 1

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Write 'log' instruction for SM1.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: vkd3d Branch: master Commit: c93dac36207263cb8933acc963a129470bffbceb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c93dac36207263cb8933acc963a12… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 6 11:16:00 2023 +0300 vkd3d-shader/hlsl: Write 'log' instruction for SM1. --- libs/vkd3d-shader/hlsl_sm1.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 606ecdd9..be665981 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -723,6 +723,10 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b write_sm1_per_component_unary_op(ctx, buffer, instr, D3DSIO_EXP); break; + case HLSL_OP1_LOG2: + write_sm1_per_component_unary_op(ctx, buffer, instr, D3DSIO_LOG); + break; + case HLSL_OP1_NEG: write_sm1_unary_op(ctx, buffer, D3DSIO_MOV, &instr->reg, &arg1->reg, D3DSPSM_NEG, 0); break;

1 0

Hans Leidekker : ws2_32: Skip non-address records in dns_only_query().
by Alexandre Julliard 12 Apr '23

12 Apr '23

Module: wine Branch: master Commit: f512b3c08ccfc9b9c235964002e644e2cbd657cf URL: https://gitlab.winehq.org/wine/wine/-/commit/f512b3c08ccfc9b9c235964002e644… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 12 15:17:10 2023 +0200 ws2_32: Skip non-address records in dns_only_query(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54819 --- dlls/ws2_32/protocol.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 1f840832c7a..f746257a4fc 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -96,8 +96,8 @@ static int dns_only_query( const char *node, const struct addrinfo *hints, struc } } - for (ptr = rec; ptr; ptr = ptr->pNext) count++; - for (ptr = rec6; ptr; ptr = ptr->pNext) count++; + for (ptr = rec; ptr; ptr = ptr->pNext) { if (ptr->wType == DNS_TYPE_A) count++; }; + for (ptr = rec6; ptr; ptr = ptr->pNext) { if (ptr->wType == DNS_TYPE_AAAA) count++; }; if (!count) { DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); @@ -114,6 +114,7 @@ static int dns_only_query( const char *node, const struct addrinfo *hints, struc for (ptr = rec; ptr; ptr = ptr->pNext) { + if (ptr->wType != DNS_TYPE_A) continue; info->ai_family = AF_INET; info->ai_socktype = hints->ai_socktype; info->ai_protocol = hints->ai_protocol; @@ -128,6 +129,7 @@ static int dns_only_query( const char *node, const struct addrinfo *hints, struc } for (ptr = rec6; ptr; ptr = ptr->pNext) { + if (ptr->wType != DNS_TYPE_AAAA) continue; info->ai_family = AF_INET6; info->ai_socktype = hints->ai_socktype; info->ai_protocol = hints->ai_protocol;

1 0

Gabriel Ivăncescu : mshtml/tests: Add tests for non-stringed url() with non-URL characters in CSS.
by Alexandre Julliard 12 Apr '23

12 Apr '23

Module: wine Branch: master Commit: 5b5dd96fdcc48b4e3b8868244c33a2cac689729d URL: https://gitlab.winehq.org/wine/wine/-/commit/5b5dd96fdcc48b4e3b8868244c33a2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 12 18:34:59 2023 +0300 mshtml/tests: Add tests for non-stringed url() with non-URL characters in CSS. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/style.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 4b72d144354..b0f6da47fea 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -323,6 +323,17 @@ static void test_set_csstext(IHTMLStyle *style) ok(!lstrcmpW(V_BSTR(&v), L"black"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + test_style_set_csstext(style, L"background: url(http://test.winehq.org/i m\ta\\g\\\\e\n((\\(.png);"); + + hres = IHTMLStyle_get_background(style, &str); + ok(hres == S_OK, "get_background failed: %08lx\n", hres); + if(compat_mode < COMPAT_IE9) + todo_wine + ok(wcsstr(str, L"url(http://test.winehq.org/i m\ta\\g\\\\e\n%28%28\\%28.png)") != NULL, "background = %s\n", wine_dbgstr_w(str)); + else + ok(!str, "background = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLCSSStyleDeclaration, (void**)&css_style); ok(hres == S_OK || broken(!is_ie9plus && hres == E_NOINTERFACE), "Could not get IHTMLCSSStyleDeclaration interface: %08lx\n", hres); @@ -2862,6 +2873,42 @@ static void test_body_style(IHTMLStyle *style) SysFreeString(str); } + /* background */ + hres = IHTMLStyle_get_background(style, &sDefault); + ok(hres == S_OK, "get_background failed: %08lx\n", hres); + + str = SysAllocString(L"url(\"http://test.winehq.org/tests/winehq_snapshot/\")"); + hres = IHTMLStyle_put_background(style, str); + ok(hres == S_OK, "put_background failed: %08lx\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_background(style, &str); + ok(hres == S_OK, "get_background failed: %08lx\n", hres); + if(compat_mode < COMPAT_IE9) + todo_wine + ok(wcsstr(str, L"url(http://test.winehq.org/tests/winehq_snapshot/)") != NULL, "background = %s\n", wine_dbgstr_w(str)); + else + ok(wcsstr(str, L"url(\"http://test.winehq.org/tests/winehq_snapshot/\")") != NULL, "background = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = SysAllocString(L"url(http://test.winehq.org/i m\ta\\g\\\\e\n((\\(.png)"); + hres = IHTMLStyle_put_background(style, str); + ok(hres == S_OK, "put_background failed: %08lx\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_background(style, &str); + ok(hres == S_OK, "get_background failed: %08lx\n", hres); + if(compat_mode < COMPAT_IE9) + todo_wine + ok(wcsstr(str, L"url(http://test.winehq.org/i m\ta\\g\\\\e\n%28%28\\%28.png)") != NULL, "background = %s\n", wine_dbgstr_w(str)); + else + ok(wcsstr(str, L"url(\"http://test.winehq.org/tests/winehq_snapshot/\")") != NULL, "background = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hres = IHTMLStyle_put_background(style, sDefault); + ok(hres == S_OK, "put_background failed: %08lx\n", hres); + SysFreeString(sDefault); + /* borderTopWidth */ hres = IHTMLStyle_get_borderTopWidth(style, &vDefault); ok(hres == S_OK, "get_borderTopWidth: %08lx\n", hres);

1 0

Gabriel Ivăncescu : mshtml: Implement ProgressEvent's initProgressEvent method.
by Alexandre Julliard 12 Apr '23

12 Apr '23

Module: wine Branch: master Commit: ebd7f4e7f2e8a6c79c387f1d03d47f2868320d0c URL: https://gitlab.winehq.org/wine/wine/-/commit/ebd7f4e7f2e8a6c79c387f1d03d47f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 12 18:34:59 2023 +0300 mshtml: Implement ProgressEvent's initProgressEvent method. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 28 +++++++++++++++++++++++++--- dlls/mshtml/tests/es5.js | 13 +++++++++++++ dlls/mshtml/tests/xhr.js | 5 +++++ 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index bccdfb81121..d978b626be6 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2583,6 +2583,7 @@ typedef struct { DOMEvent event; IDOMProgressEvent IDOMProgressEvent_iface; nsIDOMProgressEvent *nsevent; + BOOL manual_init; } DOMProgressEvent; static inline DOMProgressEvent *impl_from_IDOMProgressEvent(IDOMProgressEvent *iface) @@ -2670,7 +2671,7 @@ static HRESULT WINAPI DOMProgressEvent_get_total(IDOMProgressEvent *iface, ULONG TRACE("(%p)->(%p)\n", This, p); - if(NS_FAILED(nsIDOMProgressEvent_GetLengthComputable(This->nsevent, &b)) || !b) { + if(!This->manual_init && (NS_FAILED(nsIDOMProgressEvent_GetLengthComputable(This->nsevent, &b)) || !b)) { *p = ~0; return S_OK; } @@ -2683,9 +2684,30 @@ static HRESULT WINAPI DOMProgressEvent_initProgressEvent(IDOMProgressEvent *ifac ULONGLONG loaded, ULONGLONG total) { DOMProgressEvent *This = impl_from_IDOMProgressEvent(iface); - FIXME("(%p)->(%s %x %x %x %s %s)\n", This, debugstr_w(type), can_bubble, cancelable, lengthComputable, + nsAString type_str; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s %x %x %x %s %s)\n", This, debugstr_w(type), can_bubble, cancelable, lengthComputable, wine_dbgstr_longlong(loaded), wine_dbgstr_longlong(total)); - return E_NOTIMPL; + + if(This->event.target) { + TRACE("called on already dispatched event\n"); + return S_OK; + } + + hres = IDOMEvent_initEvent(&This->event.IDOMEvent_iface, type, can_bubble, cancelable); + if(SUCCEEDED(hres)) { + nsAString_InitDepend(&type_str, type); + nsres = nsIDOMProgressEvent_InitProgressEvent(This->nsevent, &type_str, !!can_bubble, !!cancelable, + !!lengthComputable, loaded, total); + nsAString_Finish(&type_str); + if(NS_FAILED(nsres)) + return map_nsresult(nsres); + This->manual_init = TRUE; + } + + return hres; } static const IDOMProgressEventVtbl DOMProgressEventVtbl = { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index e13ad055f4f..b2f63c77c83 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -2095,3 +2095,16 @@ sync_test("matchMedia", function() { mql = window.matchMedia("(max-width: 1000px)"); ok(mql.matches === true, "(max-width: 1000px) does not match"); }); + +sync_test("initProgressEvent", function() { + var e = document.createEvent("ProgressEvent"); + e.initProgressEvent("loadend", false, false, true, 13, 42); + ok(e.lengthComputable === true, "lengthComputable = " + e.lengthComputable); + ok(e.loaded === 13, "loaded = " + e.loaded); + ok(e.total === 42, "total = " + e.total); + + e.initProgressEvent("loadstart", false, false, false, 99, 50); + ok(e.lengthComputable === false, "lengthComputable after re-init = " + e.lengthComputable); + ok(e.loaded === 99, "loaded after re-init = " + e.loaded); + ok(e.total === 50, "total after re-init = " + e.total); +}); diff --git a/dlls/mshtml/tests/xhr.js b/dlls/mshtml/tests/xhr.js index 2deb526cfe1..336f03c1b2f 100644 --- a/dlls/mshtml/tests/xhr.js +++ b/dlls/mshtml/tests/xhr.js @@ -319,6 +319,11 @@ function test_timeout() { ok(e.lengthComputable === false, "lengthComputable = " + e.lengthComputable); ok(e.loaded === 0, "loaded = " + e.loaded); ok(e.total === 18446744073709552000, "total = " + e.total); + + e.initProgressEvent("timeout", false, false, true, 13, 42); + ok(e.lengthComputable === false, "lengthComputable after initProgressEvent = " + e.lengthComputable); + ok(e.loaded === 0, "loaded after initProgressEvent = " + e.loaded); + ok(e.total === 18446744073709552000, "total after initProgressEvent = " + e.total); } next_test(); }

1 0

Gabriel Ivăncescu : mshtml: Get rid of dispatch_nsevent_hook.
by Alexandre Julliard 12 Apr '23

12 Apr '23

Module: wine Branch: master Commit: 14db082f575fd05f474cfe334e7c632b26e5bf98 URL: https://gitlab.winehq.org/wine/wine/-/commit/14db082f575fd05f474cfe334e7c63… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 12 18:34:59 2023 +0300 mshtml: Get rid of dispatch_nsevent_hook. Since wine-gecko now implements synchronous events for image loads in legacy modes, this is no longer needed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlanchor.c | 1 - dlls/mshtml/htmlarea.c | 1 - dlls/mshtml/htmlbody.c | 1 - dlls/mshtml/htmlcomment.c | 1 - dlls/mshtml/htmldoc.c | 4 ---- dlls/mshtml/htmlelem.c | 13 ------------- dlls/mshtml/htmlevent.h | 1 - dlls/mshtml/htmlform.c | 1 - dlls/mshtml/htmlframe.c | 2 -- dlls/mshtml/htmlgeneric.c | 1 - dlls/mshtml/htmlhead.c | 4 ---- dlls/mshtml/htmlimg.c | 43 +----------------------------------------- dlls/mshtml/htmlinput.c | 3 --- dlls/mshtml/htmllink.c | 1 - dlls/mshtml/htmlobject.c | 2 -- dlls/mshtml/htmlscript.c | 1 - dlls/mshtml/htmlselect.c | 2 -- dlls/mshtml/htmlstyleelem.c | 1 - dlls/mshtml/htmltable.c | 3 --- dlls/mshtml/htmltextarea.c | 1 - dlls/mshtml/htmlwindow.c | 1 - dlls/mshtml/mshtml_private.h | 2 -- dlls/mshtml/nsevents.c | 11 +---------- dlls/mshtml/svg.c | 4 ---- dlls/mshtml/tests/events.c | 45 ++++++++++++++++++++++++++++++++++++++++---- 25 files changed, 43 insertions(+), 107 deletions(-)

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
82
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 April 2023