wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Nikolay Sivov : d3d10/effect: Add sin/cos instruction support for expressions.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 30c33c2f982fc8c0ef6d97683c6581ebddd46814 URL: https://gitlab.winehq.org/wine/wine/-/commit/30c33c2f982fc8c0ef6d97683c6581… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 30 17:54:08 2022 +0300 d3d10/effect: Add sin/cos instruction support for expressions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 20 ++++++ dlls/d3d10/tests/effect.c | 157 ++++++++++++++++++++++++---------------------- 2 files changed, 101 insertions(+), 76 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add 'mul' instruction support for expressions.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 8dcadad5c0ec273f9bcc29c6b63f89d32ee44366 URL: https://gitlab.winehq.org/wine/wine/-/commit/8dcadad5c0ec273f9bcc29c6b63f89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 30 17:30:31 2022 +0300 d3d10/effect: Add 'mul' instruction support for expressions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 10 ++++ dlls/d3d10/tests/effect.c | 149 +++++++++++++++++++++++----------------------- 2 files changed, 85 insertions(+), 74 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add 'neg' instruction support for expressions.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: eb3e4b79acb73d9724dc6f978f927c4f9a3c3181 URL: https://gitlab.winehq.org/wine/wine/-/commit/eb3e4b79acb73d9724dc6f978f927c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 30 17:26:34 2022 +0300 d3d10/effect: Add 'neg' instruction support for expressions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 10 ++++++++++ dlls/d3d10/tests/effect.c | 39 ++++++++++++++++++++------------------- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 7afd5da3e4b..a0759514494 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -207,6 +207,15 @@ struct preshader_instr typedef void (*pres_op_func)(float **args, unsigned int n, const struct preshader_instr *instr); +static void pres_neg(float **args, unsigned int n, const struct preshader_instr *instr) +{ + float *retval = args[1]; + unsigned int i; + + for (i = 0; i < instr->comp_count; ++i) + retval[i] = -args[0][i]; +} + static void pres_ftou(float **args, unsigned int n, const struct preshader_instr *instr) { float *retval = args[1]; @@ -255,6 +264,7 @@ struct preshader_op_info static const struct preshader_op_info preshader_ops[] = { + { 0x101, "neg", pres_neg }, { 0x133, "ftou", pres_ftou }, { 0x200, "min", pres_min }, { 0x201, "max", pres_max }, diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 77d0c2e2d60..5d1c2d47699 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -8142,7 +8142,7 @@ technique10 tech { pass p0 { - SetBlendState( NULL, g_var + 0.1f + g_var2, 0 ); + SetBlendState( NULL, -g_var + 0.1f + g_var2, 0 ); } pass p1 { @@ -8164,23 +8164,24 @@ technique10 tech #endif static DWORD fx_test_value_expression[] = { - 0x43425844, 0x20f6c3c9, 0x33c16d9f, 0xa04ed2e5, 0xf3d9ceb1, 0x00000001, 0x00000a01, 0x00000001, - 0x00000024, 0x30315846, 0x000009d5, 0xfeff1001, 0x00000001, 0x00000002, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000001, 0x00000801, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x43425844, 0x88394383, 0x834c826b, 0xb85f55f9, 0xe141c400, 0x00000001, 0x00000a21, 0x00000001, + 0x00000024, 0x30315846, 0x000009f5, 0xfeff1001, 0x00000001, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00000821, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6f6c4724, 0x736c6162, 0x6f6c6600, 0x00347461, 0x0000000d, 0x00000001, 0x00000000, 0x00000010, 0x00000010, - 0x00000010, 0x0000210a, 0x61765f67, 0x5f670072, 0x32726176, 0x63657400, 0x30700068, 0x00016000, - 0x42584400, 0x312ce543, 0xc3ebc897, 0xea47c0a2, 0x8a710323, 0x000001d2, 0x00016000, 0x00000300, + 0x00000010, 0x0000210a, 0x61765f67, 0x5f670072, 0x32726176, 0x63657400, 0x30700068, 0x00018000, + 0x42584400, 0x042b4d43, 0x89240778, 0x7627fdd4, 0xd3b7fecb, 0x0000014d, 0x00018000, 0x00000300, 0x00002c00, 0x0000d400, 0x0000f000, 0x41544300, 0x0000a042, 0x00001c00, 0x00007700, 0x58040000, 0x00000246, 0x00001c00, 0x00010000, 0x00007400, 0x00004400, 0x00000200, 0x00000100, 0x00004c00, 0x00000000, 0x00005c00, 0x01000200, 0x00000100, 0x00006400, 0x00000000, 0x765f6700, 0xab007261, 0x030001ab, 0x04000100, 0x00000100, 0x00000000, 0x765f6700, 0x00327261, 0x030001ab, 0x04000100, 0x00000100, 0x00000000, 0x00787400, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x494c43ab, 0x00001434, 0x00000400, - 0xcccccd00, 0x0000003d, 0x00000000, 0x00000000, 0x4c584600, 0x00006843, 0x00000200, 0x40000400, - 0x00000220, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000200, 0x00000400, 0x00000000, - 0x00000700, 0x00000000, 0x40000400, 0x000002a0, 0x00000000, 0x00000100, 0x00000000, 0x00000000, - 0x00000700, 0x00000000, 0x00000000, 0x00000400, 0x00000000, 0xf0f0f000, 0x0f0f0ff0, 0x00ffff0f, + 0xcccccd00, 0x0000003d, 0x00000000, 0x00000000, 0x4c584600, 0x00008843, 0x00000300, 0x10000400, + 0x00000110, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000700, 0x00000000, 0x40000400, + 0x00000220, 0x00000000, 0x00000700, 0x00000000, 0x00000000, 0x00000200, 0x00000400, 0x00000000, + 0x00000700, 0x00000400, 0x40000400, 0x000002a0, 0x00000000, 0x00000100, 0x00000000, 0x00000000, + 0x00000700, 0x00000400, 0x00000000, 0x00000400, 0x00000000, 0xf0f0f000, 0x0f0f0ff0, 0x00ffff0f, 0x00000100, 0x00000200, 0x00000000, 0x00000100, 0x00000200, 0x00000000, 0x00317000, 0x00000150, 0x43425844, 0xc6a29e4c, 0x6292ed35, 0xd90bb8cb, 0x50dcd25f, 0x00000001, 0x00000150, 0x00000003, 0x0000002c, 0x000000d4, 0x000000e0, 0x42415443, 0x000000a0, 0x0000001c, 0x00000077, 0x46580400, @@ -8235,15 +8236,15 @@ static DWORD fx_test_value_expression[] = 0x00000000, 0x00000200, 0xffffff00, 0x000000ff, 0x00003000, 0x00001400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00003600, 0x00001400, 0x00000000, 0x00001000, 0x00000000, 0x00000000, 0x00000000, 0x00003d00, 0x00000500, 0x00000000, 0x00004200, 0x00000300, 0x00000000, - 0x00000a00, 0x00000000, 0x00000600, 0x00004500, 0x00000b00, 0x00000000, 0x00000100, 0x0001a900, - 0x00000200, 0x00000000, 0x00000100, 0x0001b500, 0x0001c100, 0x00000300, 0x00000000, 0x00000a00, - 0x00000000, 0x00000600, 0x0001c400, 0x00000b00, 0x00000000, 0x00000100, 0x00031800, 0x00000200, - 0x00000000, 0x00000100, 0x00032400, 0x00033000, 0x00000300, 0x00000000, 0x00000a00, 0x00000000, - 0x00000600, 0x00033300, 0x00000b00, 0x00000000, 0x00000100, 0x00056300, 0x00000200, 0x00000000, - 0x00000100, 0x00056f00, 0x00057b00, 0x00000300, 0x00000000, 0x00000a00, 0x00000000, 0x00000600, - 0x00057e00, 0x00000b00, 0x00000000, 0x00000100, 0x0006a600, 0x00000200, 0x00000000, 0x00000100, - 0x0006b200, 0x0006be00, 0x00000300, 0x00000000, 0x00000a00, 0x00000000, 0x00000600, 0x0006c100, - 0x00000b00, 0x00000000, 0x00000100, 0x0007e900, 0x00000200, 0x00000000, 0x00000100, 0x0007f500, + 0x00000a00, 0x00000000, 0x00000600, 0x00004500, 0x00000b00, 0x00000000, 0x00000100, 0x0001c900, + 0x00000200, 0x00000000, 0x00000100, 0x0001d500, 0x0001e100, 0x00000300, 0x00000000, 0x00000a00, + 0x00000000, 0x00000600, 0x0001e400, 0x00000b00, 0x00000000, 0x00000100, 0x00033800, 0x00000200, + 0x00000000, 0x00000100, 0x00034400, 0x00035000, 0x00000300, 0x00000000, 0x00000a00, 0x00000000, + 0x00000600, 0x00035300, 0x00000b00, 0x00000000, 0x00000100, 0x00058300, 0x00000200, 0x00000000, + 0x00000100, 0x00058f00, 0x00059b00, 0x00000300, 0x00000000, 0x00000a00, 0x00000000, 0x00000600, + 0x00059e00, 0x00000b00, 0x00000000, 0x00000100, 0x0006c600, 0x00000200, 0x00000000, 0x00000100, + 0x0006d200, 0x0006de00, 0x00000300, 0x00000000, 0x00000a00, 0x00000000, 0x00000600, 0x0006e100, + 0x00000b00, 0x00000000, 0x00000100, 0x00080900, 0x00000200, 0x00000000, 0x00000100, 0x00081500, 0x00000000, };

1 0

Nikolay Sivov : d3d10/effect: Add min/max instructions support for expressions.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 854ecc773cc0273db71a0c90ad74ea635f3eb17e URL: https://gitlab.winehq.org/wine/wine/-/commit/854ecc773cc0273db71a0c90ad74ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 27 20:08:05 2022 +0300 d3d10/effect: Add min/max instructions support for expressions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 23 +++++++- dlls/d3d10/tests/effect.c | 147 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 159 insertions(+), 11 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Remove unused field from property description data.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 9a4f1bb229f6b5204ddc38447ce40810b31153e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a4f1bb229f6b5204ddc38447ce408… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 27 18:24:03 2022 +0300 d3d10/effect: Remove unused field from property description data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 127 ++++++++++++++++++++++++++-------------------------- 1 file changed, 63 insertions(+), 64 deletions(-)

1 0

Gabriel Ivăncescu : include/mshtmhst: Add CGID_ScriptSite and CMDIDs for it.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 4376a8c7096daebd07cd4978dc955d2f14436297 URL: https://gitlab.winehq.org/wine/wine/-/commit/4376a8c7096daebd07cd4978dc955d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 30 18:14:24 2022 +0200 include/mshtmhst: Add CGID_ScriptSite and CMDIDs for it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- include/mshtmhst.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/mshtmhst.idl b/include/mshtmhst.idl index 81b16ed5d62..6cc500ed7a9 100644 --- a/include/mshtmhst.idl +++ b/include/mshtmhst.idl @@ -44,11 +44,25 @@ cpp_quote("#define HTMLDLG_MODAL 0x0020") cpp_quote("#define HTMLDLG_MODELESS 0x0040") cpp_quote("#define HTMLDLG_PRINT_TEMPLATE 0x0080") cpp_quote("#define HTMLDLG_VERIFY 0x0100") +cpp_quote("#define HTMLDLG_ALLOW_UNKNOWN_THREAD 0x0200") cpp_quote("#define PRINT_DONTBOTHERUSER 0x0001") cpp_quote("#define PRINT_WAITFORCOMPLETION 0x0002") +cpp_quote("#define CMDID_SCRIPTSITE_URL 0") +cpp_quote("#define CMDID_SCRIPTSITE_HTMLDLGTRUST 1") +cpp_quote("#define CMDID_SCRIPTSITE_SECSTATE 2") +cpp_quote("#define CMDID_SCRIPTSITE_SID 3") +cpp_quote("#define CMDID_SCRIPTSITE_TRUSTEDDOC 4") +cpp_quote("#define CMDID_SCRIPTSITE_SECURITY_WINDOW 5") +cpp_quote("#define CMDID_SCRIPTSITE_NAMESPACE 6") +cpp_quote("#define CMDID_SCRIPTSITE_IURI 7") +cpp_quote("#define CMDID_HOSTCONTEXT_URL 8") +cpp_quote("#define CMDID_SCRIPTSITE_ALLOWRECOVERY 9") +cpp_quote("#define CMDID_SCRIPTSITE_BASEIURI 10") + cpp_quote("DEFINE_GUID(CGID_MSHTML, 0xde4ba900,0x59ca,0x11cf,0x95,0x92,0x44,0x45,0x53,0x54,0x00,0x00);") +cpp_quote("DEFINE_GUID(CGID_ScriptSite, 0x3050f3f1,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);") cpp_quote("#define CMDSETID_Forms3 CGID_MSHTML") cpp_quote("#if defined(__GNUC__)")

1 0

Gabriel Ivăncescu : mshtml/tests: Expect UpdateUI, Exec_UPDATECOMMANDS and Exec_SETTITLE in edit mode.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: a431aa42b040d9433130533dff68f0058b243135 URL: https://gitlab.winehq.org/wine/wine/-/commit/a431aa42b040d9433130533dff68f0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 30 18:14:24 2022 +0200 mshtml/tests: Expect UpdateUI, Exec_UPDATECOMMANDS and Exec_SETTITLE in edit mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53530 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/htmldoc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 5b45ccb0c75..e4780e9c379 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6018,10 +6018,12 @@ static void test_download(DWORD flags) SET_EXPECT(CountEntries); SET_EXPECT(Exec_HTTPEQUIV_DONE); } - if(nav_url || support_wbapp) { + if(nav_url || support_wbapp || editmode) { SET_EXPECT(UpdateUI); SET_EXPECT(Exec_UPDATECOMMANDS); SET_EXPECT(Exec_SETTITLE); + } + if(nav_url || support_wbapp) { if(flags & DWL_EXPECT_HISTUPDATE) SET_EXPECT(Exec_Explorer_38); SET_EXPECT(UpdateBackForwardState); @@ -6126,10 +6128,12 @@ static void test_download(DWORD flags) CHECK_CALLED(Exec_HTTPEQUIV_DONE); } SET_CALLED(SetStatusText); - if(nav_url || support_wbapp) { /* avoiding race, FIXME: find better way */ + if(nav_url || support_wbapp || editmode) { /* avoiding race, FIXME: find better way */ CLEAR_CALLED(UpdateUI); CLEAR_CALLED(Exec_UPDATECOMMANDS); CLEAR_CALLED(Exec_SETTITLE); + } + if(nav_url || support_wbapp) { if(flags & DWL_EXPECT_HISTUPDATE) { if(flags & DWL_FROM_HISTORY) CHECK_CALLED_BROKEN(Exec_Explorer_38); /* Some old IEs don't call it. */

1 0

Gabriel Ivăncescu : mshtml/tests: Allow BINDINFO_OPTIONS_ENABLE_UTF8 in bind options.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 823a4414f2c3b5a5a2f18e9196fbc9d99cdebb2f URL: https://gitlab.winehq.org/wine/wine/-/commit/823a4414f2c3b5a5a2f18e9196fbc9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 30 18:14:24 2022 +0200 mshtml/tests: Allow BINDINFO_OPTIONS_ENABLE_UTF8 in bind options. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52910 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/htmldoc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index bbfac5aa8fa..5b45ccb0c75 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -808,8 +808,8 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, if(is_mhtml) ok(!bindinfo.dwOptions, "bindinfo.dwOptions=%lx\n", bindinfo.dwOptions); else - ok(bindinfo.dwOptions == 0x80000 || bindinfo.dwOptions == 0x4080000, /* win2k3 */ - "bindinfo.dwOptions=%lx\n", bindinfo.dwOptions); + ok(bindinfo.dwOptions == 0x80000 || bindinfo.dwOptions == 0x4080000 /* win2k3 */ || + bindinfo.dwOptions == 0x20000, "bindinfo.dwOptions=%lx\n", bindinfo.dwOptions); ok(bindinfo.dwOptionsFlags == 0, "bindinfo.dwOptionsFlags=%ld\n", bindinfo.dwOptionsFlags); /* TODO: test dwCodePage */ /* TODO: test securityAttributes */ @@ -1691,8 +1691,8 @@ static HRESULT WINAPI Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMon ok(bindinfo.dwBindVerb == 0, "bindinfo.dwBindVerb=%ld\n", bindinfo.dwBindVerb); ok(bindinfo.szCustomVerb == 0, "bindinfo.szCustomVerb=%p\n", bindinfo.szCustomVerb); ok(bindinfo.cbstgmedData == 0, "bindinfo.cbstgmedData=%ld\n", bindinfo.cbstgmedData); - ok(bindinfo.dwOptions == 0x80000 || bindinfo.dwOptions == 0x4080000, - "bindinfo.dwOptions=%lx\n", bindinfo.dwOptions); + ok(bindinfo.dwOptions == 0x80000 || bindinfo.dwOptions == 0x4080000 || + bindinfo.dwOptions == 0x20000, "bindinfo.dwOptions=%lx\n", bindinfo.dwOptions); ok(bindinfo.dwOptionsFlags == 0, "bindinfo.dwOptionsFlags=%ld\n", bindinfo.dwOptionsFlags); /* TODO: test dwCodePage */ /* TODO: test securityAttributes */

1 0

Gabriel Ivăncescu : mshtml: Don't lock document mode when querying IEventTarget.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 8cb7dc2e40bc3aa2b2f8e73d3b298e7cc3f87228 URL: https://gitlab.winehq.org/wine/wine/-/commit/8cb7dc2e40bc3aa2b2f8e73d3b298e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 30 18:14:24 2022 +0200 mshtml: Don't lock document mode when querying IEventTarget. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/oleobj.c | 2 +- dlls/mshtml/tests/dom.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index e6f5239538c..d1853435606 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -3380,7 +3380,7 @@ static HRESULT WINAPI HTMLDocumentObj_QueryInterface(IUnknown *iface, REFIID rii }else if(IsEqualGUID(&IID_IEventTarget, riid)) { /* IEventTarget is conditionally exposed. This breaks COM rules when it changes its compat mode, but it is how native works (see tests). */ - if(!This->doc_node || dispex_compat_mode(&This->doc_node->node.event_target.dispex) < COMPAT_MODE_IE9) { + if(!This->doc_node || This->doc_node->document_mode < COMPAT_MODE_IE9) { *ppv = NULL; return E_NOINTERFACE; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4e6ad469b28..6a960bfa21f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -11731,6 +11731,56 @@ static void test_quirks_mode(void) "</html>", test_document_mode); } +static void test_document_mode_lock(void) +{ + IEventTarget *event_target; + IPersistStreamInit *init; + IHTMLDocument2 *doc; + IStream *stream; + HRESULT hres; + HGLOBAL mem; + SIZE_T len; + MSG msg; + + notif_doc = doc = create_document(); + if(!doc) + return; + doc_complete = FALSE; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IEventTarget, (void**)&event_target); + ok(hres == E_NOINTERFACE, "QueryInterface(IID_IEventTarget) returned %08lx.\n", hres); + ok(event_target == NULL, "event_target != NULL\n"); + + len = strlen(doc_blank_ie9); + mem = GlobalAlloc(0, len); + memcpy(mem, doc_blank_ie9, len); + hres = CreateStreamOnHGlobal(mem, TRUE, &stream); + ok(hres == S_OK, "Failed to create stream: %08lx.\n", hres); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + ok(hres == S_OK, "QueryInterface(IID_IPersistStreamInit) failed: %08lx.\n", hres); + + IPersistStreamInit_Load(init, stream); + IPersistStreamInit_Release(init); + IStream_Release(stream); + + set_client_site(doc, TRUE); + do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink); + + while(!doc_complete && GetMessageW(&msg, NULL, 0, 0)) { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IEventTarget, (void**)&event_target); + ok(hres == S_OK, "QueryInterface(IID_IEventTarget) returned %08lx.\n", hres); + ok(event_target != NULL, "event_target == NULL\n"); + IEventTarget_Release(event_target); + + set_client_site(doc, FALSE); + IHTMLDocument2_Release(doc); +} + static void test_custom_user_agent(IHTMLDocument2 *doc) { static const WCHAR ua[] = L"1234567890xxxABC"; @@ -11830,6 +11880,7 @@ START_TEST(dom) run_domtest(doctype_str, test_doctype); test_quirks_mode(); + test_document_mode_lock(); /* Run this last since it messes with the process-wide user agent */ if (winetest_interactive || ! is_ie_hardened()) {

1 0

Gabriel Ivăncescu : jscript: Pass correct 'this' to host objects in ES5 mode.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 2e4721ac8f2d81bd84b013ad6cc3bf32b72b64cf URL: https://gitlab.winehq.org/wine/wine/-/commit/2e4721ac8f2d81bd84b013ad6cc3bf… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 30 18:14:24 2022 +0200 jscript: Pass correct 'this' to host objects in ES5 mode. For some reason, only pure js objects are passed in mshtml's jscript engine. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 11 ++--- dlls/mshtml/tests/es5.js | 14 +++++++ dlls/mshtml/tests/script.c | 102 ++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 119 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 4e872c93717..1a7a75875df 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2212,14 +2212,11 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, jsval_t vthis, WORD if(jsdisp) jsdisp_release(jsdisp); - if(is_undefined(vthis)) - jsthis = NULL; - else if(is_object_instance(vthis)) + if(is_object_instance(vthis) && (ctx->version < SCRIPTLANGUAGEVERSION_ES5 || + ((jsdisp = to_jsdisp(get_object(vthis))) && is_class(jsdisp, JSCLASS_OBJECT)))) jsthis = get_object(vthis); - else { - FIXME("Unimplemented 'this' passed to host object: %s\n", debugstr_jsval(vthis)); - return E_NOTIMPL; - } + else + jsthis = NULL; flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(r && argc && flags == DISPATCH_METHOD) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 93ede87eeb0..e13ad055f4f 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1668,6 +1668,20 @@ sync_test("builtin_context", function() { ok(obj.valueOf() === 42, "obj = " + obj); }); +sync_test("host this", function() { + var tests = [ undefined, null, external.nullDisp, function() {}, [0], "foobar", true, 42, new Number(42), external.testHostContext(true), window, document ]; + var i, obj = Object.create(Function.prototype); + + // only pure js objects are passed as 'this' (regardless of prototype) + [137].forEach(external.testHostContext(true), obj); + Function.prototype.apply.call(external.testHostContext(true), obj, [137, 0, {}]); + + for(i = 0; i < tests.length; i++) { + [137].forEach(external.testHostContext(false), tests[i]); + Function.prototype.apply.call(external.testHostContext(false), tests[i], [137, 0, {}]); + } +}); + sync_test("head_setter", function() { document.head = ""; ok(typeof(document.head) === "object", "typeof(document.head) = " + typeof(document.head)); diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index b27b68b5bd1..8d9ff3cd3f7 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -158,7 +158,8 @@ DEFINE_EXPECT(GetTypeInfo); #define DISPID_EXTERNAL_IS_ENGLISH 0x300009 #define DISPID_EXTERNAL_LIST_SEP 0x30000A #define DISPID_EXTERNAL_TEST_VARS 0x30000B -#define DISPID_EXTERNAL_GETMIMETYPE 0x30000C +#define DISPID_EXTERNAL_TESTHOSTCTX 0x30000C +#define DISPID_EXTERNAL_GETMIMETYPE 0x30000D static const GUID CLSID_TestScript = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x07,0x46}}; @@ -745,6 +746,87 @@ static IDispatchExVtbl scriptDispVtbl = { static IDispatchEx scriptDisp = { &scriptDispVtbl }; +static HRESULT WINAPI testHostContextDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + ok(id == DISPID_VALUE, "id = %ld\n", id); + ok(wFlags == (DISPATCH_PROPERTYGET | DISPATCH_METHOD), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->cArgs == 4, "pdp->cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "pdp->cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_THIS, "pdp->rgdispidNamedArgs[0] = %ld\n", pdp->rgdispidNamedArgs[0]); + ok(V_VT(&pdp->rgvarg[0]) == VT_DISPATCH, "V_VT(rgvarg[0]) = %d\n", V_VT(&pdp->rgvarg[0])); + ok(V_DISPATCH(&pdp->rgvarg[0]) != NULL, "V_DISPATCH(rgvarg[0]) = NULL\n"); + ok(V_VT(&pdp->rgvarg[1]) == VT_DISPATCH, "V_VT(rgvarg[1]) = %d\n", V_VT(&pdp->rgvarg[1])); + ok(V_DISPATCH(&pdp->rgvarg[1]) != NULL, "V_DISPATCH(rgvarg[1]) = NULL\n"); + ok(V_VT(&pdp->rgvarg[2]) == VT_I4, "V_VT(rgvarg[2]) = %d\n", V_VT(&pdp->rgvarg[2])); + ok(V_I4(&pdp->rgvarg[2]) == 0, "V_I4(rgvarg[2]) = %ld\n", V_I4(&pdp->rgvarg[2])); + ok(V_VT(&pdp->rgvarg[3]) == VT_I4, "V_VT(rgvarg[3]) = %d\n", V_VT(&pdp->rgvarg[3])); + ok(V_I4(&pdp->rgvarg[3]) == 137, "V_I4(rgvarg[3]) = %ld\n", V_I4(&pdp->rgvarg[3])); + V_VT(pvarRes) = VT_EMPTY; + return S_OK; +} + +static IDispatchExVtbl testHostContextDispVtbl = { + DispatchEx_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + DispatchEx_GetDispID, + testHostContextDisp_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx testHostContextDisp = { &testHostContextDispVtbl }; + +static HRESULT WINAPI testHostContextDisp_no_this_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + ok(id == DISPID_VALUE, "id = %ld\n", id); + ok(wFlags == (DISPATCH_PROPERTYGET | DISPATCH_METHOD), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->cArgs == 3, "pdp->cArgs = %d\n", pdp->cArgs); + ok(V_VT(&pdp->rgvarg[0]) == VT_DISPATCH, "V_VT(rgvarg[1]) = %d\n", V_VT(&pdp->rgvarg[1])); + ok(V_DISPATCH(&pdp->rgvarg[0]) != NULL, "V_DISPATCH(rgvarg[1]) = NULL\n"); + ok(V_VT(&pdp->rgvarg[1]) == VT_I4, "V_VT(rgvarg[2]) = %d\n", V_VT(&pdp->rgvarg[2])); + ok(V_I4(&pdp->rgvarg[1]) == 0, "V_I4(rgvarg[2]) = %ld\n", V_I4(&pdp->rgvarg[2])); + ok(V_VT(&pdp->rgvarg[2]) == VT_I4, "V_VT(rgvarg[3]) = %d\n", V_VT(&pdp->rgvarg[3])); + ok(V_I4(&pdp->rgvarg[2]) == 137, "V_I4(rgvarg[3]) = %ld\n", V_I4(&pdp->rgvarg[3])); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + ok(pspCaller != NULL, "pspCaller == NULL\n"); + V_VT(pvarRes) = VT_EMPTY; + return S_OK; +} + +static IDispatchExVtbl testHostContextDisp_no_this_vtbl = { + DispatchEx_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + DispatchEx_GetDispID, + testHostContextDisp_no_this_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx testHostContextDisp_no_this = { &testHostContextDisp_no_this_vtbl }; + static HRESULT WINAPI externalDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { if(!lstrcmpW(bstrName, L"ok")) { @@ -795,6 +877,10 @@ static HRESULT WINAPI externalDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, *pid = DISPID_EXTERNAL_TEST_VARS; return S_OK; } + if(!lstrcmpW(bstrName, L"testHostContext")) { + *pid = DISPID_EXTERNAL_TESTHOSTCTX; + return S_OK; + } if(!lstrcmpW(bstrName, L"getExpectedMimeType")) { *pid = DISPID_EXTERNAL_GETMIMETYPE; return S_OK; @@ -1032,6 +1118,20 @@ static HRESULT WINAPI externalDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID test_script_vars(pdp->cArgs, pdp->rgvarg); return S_OK; + case DISPID_EXTERNAL_TESTHOSTCTX: + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(V_VT(pdp->rgvarg) == VT_BOOL, "V_VT(rgvarg) = %d\n", V_VT(pdp->rgvarg)); + V_VT(pvarRes) = VT_DISPATCH; + V_DISPATCH(pvarRes) = (IDispatch*)(V_BOOL(pdp->rgvarg) ? &testHostContextDisp : &testHostContextDisp_no_this); + return S_OK; + case DISPID_EXTERNAL_GETMIMETYPE: ok(pdp != NULL, "pdp == NULL\n"); ok(pdp->rgvarg != NULL, "rgvarg == NULL\n");

1 0

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 November 2022