April 2021 - Wine-commits - list.winehq.org

Zebediah Figura : xactengine: Explicitly convert notification type constants.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 4ca4a6d8d744959f33563db986eae7dbf6a6eb5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ca4a6d8d744959f33563db9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 22 10:30:50 2021 -0500 xactengine: Explicitly convert notification type constants. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 68 ++++++++++++++++++++++++++++++------------- 1 file changed, 47 insertions(+), 21 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index d7ee07490de..8a3642b89b2 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -843,12 +843,7 @@ static void FACTCALL fact_notification_cb(const FACTNotification *notification) return; } - if (notification->type == XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED) - { - FIXME("Callback XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED\n"); - } - else - FIXME("Unsupported callback type %d\n", notification->type); + FIXME("Unsupported callback type %d\n", notification->type); } static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, @@ -1125,6 +1120,38 @@ enum { NOTIFY_waveIndex = 0x20 }; +/* these constants don't have the same values across xactengine versions */ +static uint8_t fact_notification_type_from_xact(XACTNOTIFICATIONTYPE type) +{ + /* we can't use a switch statement, because the constants are static const + * variables, and some compilers can't deal with that */ +#define X(a) if (type == XACTNOTIFICATIONTYPE_##a) return FACTNOTIFICATIONTYPE_##a + X(CUEPREPARED); + X(CUEPLAY); + X(CUESTOP); + X(CUEDESTROYED); + X(MARKER); + X(SOUNDBANKDESTROYED); + X(WAVEBANKDESTROYED); + X(LOCALVARIABLECHANGED); + X(GLOBALVARIABLECHANGED); + X(GUICONNECTED); + X(GUIDISCONNECTED); + X(WAVEPLAY); + X(WAVESTOP); + X(WAVEBANKPREPARED); + X(WAVEBANKSTREAMING_INVALIDCONTENT); +#if XACT3_VER >= 0x0205 + X(WAVEPREPARED); + X(WAVELOOPED); + X(WAVEDESTROYED); +#endif +#undef X + + FIXME("unknown type %#x\n", type); + return 0; +} + static inline void unwrap_notificationdesc(FACTNotificationDescription *fd, const XACT_NOTIFICATION_DESCRIPTION *xd) { @@ -1134,43 +1161,42 @@ static inline void unwrap_notificationdesc(FACTNotificationDescription *fd, memset(fd, 0, sizeof(*fd)); + fd->type = fact_notification_type_from_xact(xd->type); + + /* we can't use a switch statement, because the constants are static const + * variables, and some compilers can't deal with that */ + /* Supports SoundBank, Cue index, Cue instance */ - if (xd->type == XACTNOTIFICATIONTYPE_CUEPREPARED || xd->type == XACTNOTIFICATIONTYPE_CUEPLAY || - xd->type == XACTNOTIFICATIONTYPE_CUESTOP || xd->type == XACTNOTIFICATIONTYPE_CUEDESTROYED || - xd->type == XACTNOTIFICATIONTYPE_MARKER || xd->type == XACTNOTIFICATIONTYPE_LOCALVARIABLECHANGED) + if (fd->type == FACTNOTIFICATIONTYPE_CUEPREPARED || fd->type == FACTNOTIFICATIONTYPE_CUEPLAY || + fd->type == FACTNOTIFICATIONTYPE_CUESTOP || fd->type == FACTNOTIFICATIONTYPE_CUEDESTROYED || + fd->type == FACTNOTIFICATIONTYPE_MARKER || fd->type == FACTNOTIFICATIONTYPE_LOCALVARIABLECHANGED) { flags = NOTIFY_SoundBank | NOTIFY_cueIndex | NOTIFY_Cue; } /* Supports WaveBank */ - else if (xd->type == XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED || xd->type == XACTNOTIFICATIONTYPE_WAVEBANKPREPARED || - xd->type == XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT) + else if (fd->type == FACTNOTIFICATIONTYPE_WAVEBANKDESTROYED || fd->type == FACTNOTIFICATIONTYPE_WAVEBANKPREPARED || + fd->type == FACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT) { flags = NOTIFY_WaveBank; } /* Supports NOTIFY_SoundBank */ - else if (xd->type == XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED) + else if (fd->type == FACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED) { flags = NOTIFY_SoundBank; } /* Supports SoundBank, SoundBank, Cue index, Cue instance, WaveBank, Wave instance */ - else if (xd->type == XACTNOTIFICATIONTYPE_WAVEPLAY || xd->type == XACTNOTIFICATIONTYPE_WAVESTOP) - { - flags = NOTIFY_SoundBank | NOTIFY_cueIndex | NOTIFY_Cue | NOTIFY_WaveBank | NOTIFY_Wave; - } -#if XACT3_VER >= 0x0205 - else if (xd->type == XACTNOTIFICATIONTYPE_WAVELOOPED) + else if (fd->type == FACTNOTIFICATIONTYPE_WAVEPLAY || fd->type == FACTNOTIFICATIONTYPE_WAVESTOP || + fd->type == FACTNOTIFICATIONTYPE_WAVELOOPED) { flags = NOTIFY_SoundBank | NOTIFY_cueIndex | NOTIFY_Cue | NOTIFY_WaveBank | NOTIFY_Wave; } /* Supports WaveBank, Wave index, Wave instance */ - else if (xd->type == XACTNOTIFICATIONTYPE_WAVEPREPARED || xd->type == XACTNOTIFICATIONTYPE_WAVEDESTROYED) + else if (fd->type == FACTNOTIFICATIONTYPE_WAVEPREPARED || fd->type == FACTNOTIFICATIONTYPE_WAVEDESTROYED) { flags = NOTIFY_WaveBank | NOTIFY_waveIndex | NOTIFY_Wave; } -#endif /* We have to unwrap the FACT object first! */ - fd->type = xd->type; fd->flags = xd->flags; fd->pvContext = xd->pvContext; if (flags & NOTIFY_cueIndex)

1 0

Gijs Vermeulen : dbghelp: Implement SymFromNameW().
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 8d260b40fca92a3423b7764a8b6b803e8c74b46d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d260b40fca92a3423b7764a… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Apr 22 12:20:18 2021 +0200 dbghelp: Implement SymFromNameW(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50829 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/symbol.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index b17c7b18655..73455c547e8 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -75,7 +75,7 @@ @ stdcall SymFromIndex(long int64 long ptr) @ stdcall SymFromIndexW(long int64 long ptr) @ stdcall SymFromName(long str ptr) -@ stub SymFromNameW +@ stdcall SymFromNameW(long wstr ptr) @ stub SymFromToken @ stub SymFromTokenW @ stdcall SymFunctionTableAccess(long long) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 2ca85a6d6e8..b2b4d578910 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1404,6 +1404,39 @@ BOOL WINAPI SymFromName(HANDLE hProcess, PCSTR Name, PSYMBOL_INFO Symbol) return FALSE; } +/*********************************************************************** + * SymFromNameW (DBGHELP.@) + */ +BOOL WINAPI SymFromNameW(HANDLE process, const WCHAR *name, SYMBOL_INFOW *symbol) +{ + SYMBOL_INFO *si; + DWORD len; + char *tmp; + BOOL ret; + + TRACE("(%p, %s, %p)\n", process, debugstr_w(name), symbol); + + len = sizeof(*si) + symbol->MaxNameLen * sizeof(WCHAR); + if (!(si = HeapAlloc(GetProcessHeap(), 0, len))) return FALSE; + + len = WideCharToMultiByte(CP_ACP, 0, name, -1, NULL, 0, NULL, NULL); + if (!(tmp = HeapAlloc(GetProcessHeap(), 0, len))) + { + HeapFree(GetProcessHeap(), 0, si); + return FALSE; + } + WideCharToMultiByte(CP_ACP, 0, name, -1, tmp, len, NULL, NULL); + + si->SizeOfStruct = sizeof(*si); + si->MaxNameLen = symbol->MaxNameLen; + if ((ret = SymFromName(process, tmp, si))) + copy_symbolW(symbol, si); + + HeapFree(GetProcessHeap(), 0, tmp); + HeapFree(GetProcessHeap(), 0, si); + return ret; +} + /*********************************************************************** * SymGetSymFromName64 (DBGHELP.@) */

1 0

Zebediah Figura : wined3d: Move the wined3d_device_context_get_depth_stencil_view() declaration to the correct place alphabetically.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 9429d9d38d8121beabdbd2c85fbb7c17b65c058a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9429d9d38d8121beabdbd2c8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 21 21:56:08 2021 -0500 wined3d: Move the wined3d_device_context_get_depth_stencil_view() declaration to the correct place alphabetically. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/wined3d.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index de96ff0601b..89c0d75c1eb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2385,8 +2385,6 @@ struct wined3d_shader_resource_view * __cdecl wined3d_device_get_cs_resource_vie struct wined3d_sampler * __cdecl wined3d_device_get_cs_sampler(const struct wined3d_device *device, unsigned int idx); struct wined3d_unordered_access_view * __cdecl wined3d_device_get_cs_uav(const struct wined3d_device *device, unsigned int idx); -struct wined3d_rendertarget_view * __cdecl wined3d_device_context_get_depth_stencil_view( - const struct wined3d_device_context *context); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, struct wined3d_caps *caps); HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); @@ -2549,6 +2547,8 @@ struct wined3d_buffer * __cdecl wined3d_device_context_get_constant_buffer(const enum wined3d_shader_type shader_type, unsigned int idx); struct wined3d_depth_stencil_state * __cdecl wined3d_device_context_get_depth_stencil_state( const struct wined3d_device_context *context, unsigned int *stencil_ref); +struct wined3d_rendertarget_view * __cdecl wined3d_device_context_get_depth_stencil_view( + const struct wined3d_device_context *context); struct wined3d_buffer * __cdecl wined3d_device_context_get_index_buffer(const struct wined3d_device_context *context, enum wined3d_format_id *format, unsigned int *offset); struct wined3d_query * __cdecl wined3d_device_context_get_predication(struct wined3d_device_context *context,

1 0

Andrey Turkin : ieframe: Implement IWebBrowser2::get_LocationName().
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 92713253ab4662127c5c1e2b7f35b358585cc215 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92713253ab4662127c5c1e2b… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Thu Apr 22 18:48:17 2021 +0200 ieframe: Implement IWebBrowser2::get_LocationName(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12457 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 15 +++++++++++++++ dlls/ieframe/webbrowser.c | 21 +++++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index ab0345b79b5..864a8baf27f 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -263,6 +263,19 @@ static void _test_LocationURL(unsigned line, IWebBrowser2 *wb, const WCHAR *exur } } +#define test_LocationName(a,b) _test_LocationName(__LINE__,a,b) +static void _test_LocationName(unsigned line, IWebBrowser2 *wb, const WCHAR *exname) +{ + BSTR name = (void*)0xdeadbeef; + HRESULT hres; + + hres = IWebBrowser2_get_LocationName(wb, &name); + ok_(__FILE__,line) (hres == (*exname ? S_OK : S_FALSE), "get_LocationName failed: %08x\n", hres); + ok_(__FILE__,line) (!lstrcmpW(name, exname) || broken(is_http && !lstrcmpW(name, current_url)) /* Win10 2004 */, + "expected %s, got %s\n", wine_dbgstr_w(exname), wine_dbgstr_w(name)); + SysFreeString(name); +} + #define test_ready_state(a,b) _test_ready_state(__LINE__,a,b) static void _test_ready_state(unsigned line, READYSTATE exstate, VARIANT_BOOL expect_busy) { @@ -2800,11 +2813,13 @@ static void test_ConnectionPoint(IWebBrowser2 *unk, BOOL init) static void test_Navigate2(IWebBrowser2 *webbrowser, const WCHAR *nav_url) { + const WCHAR *title = L"WineHQ - Run Windows applications on Linux, BSD, Solaris and Mac OS X"; VARIANT url; BOOL is_file; HRESULT hres; test_LocationURL(webbrowser, is_first_load ? L"" : current_url); + test_LocationName(webbrowser, is_first_load ? L"" : (is_http ? title : current_url)); test_ready_state(is_first_load ? READYSTATE_UNINITIALIZED : READYSTATE_COMPLETE, VARIANT_FALSE); is_http = !memcmp(nav_url, "http:", 5); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 87b74b8e01f..26ce666b4ba 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -539,8 +539,25 @@ static HRESULT WINAPI WebBrowser_put_Height(IWebBrowser2 *iface, LONG Height) static HRESULT WINAPI WebBrowser_get_LocationName(IWebBrowser2 *iface, BSTR *LocationName) { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, LocationName); - return E_NOTIMPL; + IHTMLDocument2 *doc; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, LocationName); + + if(This->doc_host.document && + SUCCEEDED(IUnknown_QueryInterface(This->doc_host.document, &IID_IHTMLDocument2, (void **)&doc))) { + hres = IHTMLDocument2_get_title(doc, LocationName); + if(hres == S_OK && !SysStringLen(*LocationName)) { + SysFreeString(*LocationName); + hres = get_location_url(&This->doc_host, LocationName); + } + IHTMLDocument2_Release(doc); + } else { + *LocationName = SysAllocString(L""); + hres = S_FALSE; + } + + return hres; } static HRESULT WINAPI WebBrowser_get_LocationURL(IWebBrowser2 *iface, BSTR *LocationURL)

1 0

Jacek Caban : winegcc: Use -idirafter for system include paths.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 5a1d836def24043b4e7afcdc8cf1342223957edf URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a1d836def24043b4e7afcdc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 22 18:30:52 2021 +0200 winegcc: Use -idirafter for system include paths. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50996 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 694e2544a24..bf72b612034 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -904,6 +904,7 @@ no_compat_defines: const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; const char *root = opts->isysroot ? opts->isysroot : opts->sysroot ? opts->sysroot : ""; const char *isystem = gcc_defs ? "-isystem" : "-I"; + const char *idirafter = gcc_defs ? "-idirafter" : "-I"; if (opts->use_msvcrt) { @@ -915,17 +916,16 @@ no_compat_defines: } strarray_add(comp_args, "-D__MSVCRT__"); } - if (includedir) strarray_add( comp_args, strmake( "%s%s/wine/windows", isystem, includedir )); - for (j = 0; j < ARRAY_SIZE(incl_dirs); j++) + if (includedir) { - if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue; - strarray_add(comp_args, strmake( "%s%s%s/wine/windows", isystem, root, incl_dirs[j] )); + strarray_add( comp_args, strmake( "%s%s/wine/windows", isystem, includedir )); + strarray_add( comp_args, strmake( "%s%s", idirafter, includedir )); } - if (includedir) strarray_add( comp_args, strmake( "%s%s", isystem, includedir )); for (j = 0; j < ARRAY_SIZE(incl_dirs); j++) { if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue; - strarray_add(comp_args, strmake( "%s%s%s", isystem, root, incl_dirs[j] )); + strarray_add(comp_args, strmake( "%s%s%s/wine/windows", isystem, root, incl_dirs[j] )); + strarray_add(comp_args, strmake( "%s%s%s", idirafter, root, incl_dirs[j] )); } } else if (opts->wine_objdir)

1 0

Jacek Caban : mshtml: Introduce ES6 JavaScript mode and use it in IE11 compat mode.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 6e292a745f8b7305e0c747bb2a6c718aada47c7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e292a745f8b7305e0c747bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 22 01:46:51 2021 +0200 mshtml: Introduce ES6 JavaScript mode and use it in IE11 compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.h | 3 ++- dlls/mshtml/script.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 02420349d8d..94f8440362e 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -42,9 +42,10 @@ #define SCRIPTLANGUAGEVERSION_HTML 0x400 /* - * This is Wine jscript extension for ES5 compatible mode. Allowed only in HTML mode. + * This is Wine jscript extension for ES5 and ES6 compatible mode. Allowed only in HTML mode. */ #define SCRIPTLANGUAGEVERSION_ES5 0x102 +#define SCRIPTLANGUAGEVERSION_ES6 0x103 typedef struct _jsval_t jsval_t; typedef struct _jsstr_t jsstr_t; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index ec739c4777f..8f7f502e121 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -66,6 +66,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); /* See jscript.h in jscript.dll. */ #define SCRIPTLANGUAGEVERSION_HTML 0x400 #define SCRIPTLANGUAGEVERSION_ES5 0x102 +#define SCRIPTLANGUAGEVERSION_ES6 0x103 struct ScriptHost { IActiveScriptSite IActiveScriptSite_iface; @@ -154,7 +155,9 @@ static BOOL init_script_engine(ScriptHost *script_host) compat_mode = lock_document_mode(script_host->window->doc); script_mode = compat_mode < COMPAT_MODE_IE8 ? SCRIPTLANGUAGEVERSION_5_7 : SCRIPTLANGUAGEVERSION_5_8; if(IsEqualGUID(&script_host->guid, &CLSID_JScript)) { - if(compat_mode >= COMPAT_MODE_IE9) + if(compat_mode >= COMPAT_MODE_IE11) + script_mode = SCRIPTLANGUAGEVERSION_ES6; + else if(compat_mode >= COMPAT_MODE_IE9) script_mode = SCRIPTLANGUAGEVERSION_ES5; script_mode |= SCRIPTLANGUAGEVERSION_HTML; }

1 0

Jacek Caban : jscript: Add Set object stub implementation.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 8dd582ebebaf2f179e15f1a95a6a43594f7479d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dd582ebebaf2f179e15f1a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 22 01:47:35 2021 +0200 jscript: Add Set object stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/Makefile.in | 1 + dlls/jscript/global.c | 5 +- dlls/jscript/jscript.c | 5 ++ dlls/jscript/jscript.h | 5 +- dlls/jscript/object.c | 1 + dlls/jscript/set.c | 143 ++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 23 ++++++ 7 files changed, 181 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index f2ab3243823..c81d97c1552 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -27,6 +27,7 @@ C_SRCS = \ number.c \ object.c \ regexp.c \ + set.c \ string.c \ vbarray.c diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 33869cd5fc6..2665bece04a 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -1114,5 +1114,8 @@ HRESULT init_global(script_ctx_t *ctx) return hres; hres = jsdisp_define_data_property(ctx->global, L"Infinity", const_flags, jsval_number(INFINITY)); - return hres; + if(FAILED(hres)) + return hres; + + return init_set_constructor(ctx); } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 67a25d1714b..7a037d09b2d 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -483,6 +483,11 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) This->ctx->site = NULL; } + if(This->ctx->set_prototype) { + jsdisp_release(This->ctx->set_prototype); + This->ctx->set_prototype = NULL; + } + if(This->ctx->object_prototype) { jsdisp_release(This->ctx->object_prototype); This->ctx->object_prototype = NULL; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 94f8440362e..d64d927c227 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -130,7 +130,8 @@ typedef enum { JSCLASS_STRING, JSCLASS_ARGUMENTS, JSCLASS_VBARRAY, - JSCLASS_JSON + JSCLASS_JSON, + JSCLASS_SET, } jsclass_t; jsdisp_t *iface_to_jsdisp(IDispatch*) DECLSPEC_HIDDEN; @@ -466,6 +467,7 @@ struct _script_ctx_t { jsdisp_t *regexp_constr; jsdisp_t *string_constr; jsdisp_t *vbarray_constr; + jsdisp_t *set_prototype; }; void script_release(script_ctx_t*) DECLSPEC_HIDDEN; @@ -478,6 +480,7 @@ static inline void script_addref(script_ctx_t *ctx) HRESULT init_global(script_ctx_t*) DECLSPEC_HIDDEN; HRESULT init_function_constr(script_ctx_t*,jsdisp_t*) DECLSPEC_HIDDEN; HRESULT create_object_prototype(script_ctx_t*,jsdisp_t**) DECLSPEC_HIDDEN; +HRESULT init_set_constructor(script_ctx_t*) DECLSPEC_HIDDEN; HRESULT create_activex_constr(script_ctx_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_array_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index fd5c67833d8..46d50000cc3 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -47,6 +47,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u L"[object String]", L"[object Object]", L"[object Object]", + L"[object Object]", L"[object Object]" }; diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c new file mode 100644 index 00000000000..ec22b69eb91 --- /dev/null +++ b/dlls/jscript/set.c @@ -0,0 +1,143 @@ +/* + * Copyright 2021 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "jscript.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +typedef struct { + jsdisp_t dispex; +} SetInstance; + +static HRESULT Set_add(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", jsthis); + return E_NOTIMPL; +} + +static HRESULT Set_clear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", jsthis); + return E_NOTIMPL; +} + +static HRESULT Set_delete(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", jsthis); + return E_NOTIMPL; +} + +static HRESULT Set_forEach(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", jsthis); + return E_NOTIMPL; +} + +static HRESULT Set_has(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", jsthis); + return E_NOTIMPL; +} + +static HRESULT Set_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const builtin_prop_t Set_props[] = { + {L"add", Set_add, PROPF_METHOD|1}, + {L"clear", Set_clear, PROPF_METHOD}, + {L"delete" , Set_delete, PROPF_METHOD|1}, + {L"forEach", Set_forEach, PROPF_METHOD|1}, + {L"has", Set_has, PROPF_METHOD|1}, +}; + +static const builtin_info_t Set_prototype_info = { + JSCLASS_SET, + {NULL, Set_value, 0}, + ARRAY_SIZE(Set_props), + Set_props, + NULL, + NULL +}; + +static const builtin_info_t Set_info = { + JSCLASS_SET, + {NULL, Set_value, 0}, + 0, NULL, + NULL, + NULL +}; + +static HRESULT Set_constructor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + SetInstance *set; + HRESULT hres; + + switch(flags) { + case DISPATCH_CONSTRUCT: + TRACE("\n"); + + if(!(set = heap_alloc_zero(sizeof(*set)))) + return E_OUTOFMEMORY; + + hres = init_dispex(&set->dispex, ctx, &Set_info, ctx->set_prototype); + if(FAILED(hres)) + return hres; + + *r = jsval_obj(&set->dispex); + return S_OK; + + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } +} + +HRESULT init_set_constructor(script_ctx_t *ctx) +{ + jsdisp_t *constructor; + HRESULT hres; + + if(ctx->version < SCRIPTLANGUAGEVERSION_ES6) + return S_OK; + + hres = create_dispex(ctx, &Set_prototype_info, ctx->object_prototype, &ctx->set_prototype); + if(FAILED(hres)) + return hres; + + hres = create_builtin_constructor(ctx, Set_constructor, L"Set", NULL, + PROPF_CONSTR, ctx->set_prototype, &constructor); + if(FAILED(hres)) + return hres; + + hres = jsdisp_define_data_property(ctx->global, L"Set", PROPF_WRITABLE, + jsval_obj(constructor)); + jsdisp_release(constructor); + return hres; +} diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index bd1255bc960..35b4a001fed 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -115,6 +115,7 @@ sync_test("window_props", function() { test_exposed("getSelection", v >= 9); test_exposed("onfocusout", v >= 9); test_exposed("getComputedStyle", v >= 9); + test_exposed("Set", v >= 11); if(v >= 9) /* FIXME: native exposes it in all compat modes */ test_exposed("performance", true); }); @@ -597,3 +598,25 @@ sync_test("func_scope", function() { }catch(e) {} })(o); }); + +sync_test("set_obj", function() { + if(!("Set" in window)) return; + + var s = new Set, r; + ok(Object.getPrototypeOf(s) === Set.prototype, "unexpected Set prototype"); + + function test_length(name, len) { + ok(Set.prototype[name].length === len, "Set.prototype." + name + " = " + Set.prototype[name].length); + } + test_length("add", 1); + test_length("clear", 0); + test_length("delete", 1); + test_length("forEach", 1); + test_length("has", 1); + ok(!("entries" in s), "entries are in Set"); + ok(!("keys" in s), "keys are in Set"); + ok(!("values" in s), "values are in Set"); + + r = Object.prototype.toString.call(s); + ok(r === "[object Object]", "toString returned " + r); +});

1 0

Jacek Caban : mshtml: Add IDOMEvent::isTrusted implementation.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 4f358c40b25c38f95bc34239724a7dde09cb2dc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f358c40b25c38f95bc34239… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 22 01:48:56 2021 +0200 mshtml: Add IDOMEvent::isTrusted implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 9 +++++++-- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/events.js | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 748202a7a44..51b976c2077 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1058,8 +1058,11 @@ static HRESULT WINAPI DOMEvent_stopImmediatePropagation(IDOMEvent *iface) static HRESULT WINAPI DOMEvent_get_isTrusted(IDOMEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = variant_bool(This->trusted); + return S_OK; } static HRESULT WINAPI DOMEvent_put_cancelBubble(IDOMEvent *iface, VARIANT_BOOL v) @@ -2294,6 +2297,7 @@ HRESULT create_event_from_nsevent(nsIDOMEvent *nsevent, compat_mode_t compat_mod if(!event) return E_OUTOFMEMORY; + event->trusted = TRUE; *ret_event = event; return S_OK; } @@ -2342,6 +2346,7 @@ HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEven return E_OUTOFMEMORY; event->event_id = event_id; + event->trusted = TRUE; *ret_event = event; return S_OK; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 617b15b6c49..ae3131e48b2 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -86,6 +86,7 @@ typedef struct DOMEvent { BOOL prevent_default; BOOL stop_propagation; BOOL stop_immediate_propagation; + BOOL trusted; DOM_EVENT_PHASE phase; IHTMLEventObj *event_obj; diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index d4b6b96be0c..6d451a641c2 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -316,6 +316,7 @@ sync_test("prevent_default", function() { a.addEventListener("click", function(e) { calls += "a,"; ok(e.defaultPrevented === true, "e.defaultPrevented = " + e.defaultPrevented); + ok(e.isTrusted === true, "isTrusted = " + e.isTrusted); }, true); calls = ""; @@ -386,12 +387,14 @@ sync_test("init_event", function() { ok(e.type === "", "type = " + e.type); ok(e.cancelable === false, "cancelable = " + e.cancelable); ok(e.bubbles === false, "bubbles = " + e.bubbles); + ok(e.isTrusted === false, "isTrusted = " + e.isTrusted); e.initEvent("test", true, false); ok(e.type === "test", "type = " + e.type); ok(e.cancelable === false, "cancelable = " + e.cancelable); ok(e.bubbles === true, "bubbles = " + e.bubbles); ok(e.defaultPrevented === false, "defaultPrevented = " + e.defaultPrevented); + ok(e.isTrusted === false, "isTrusted = " + e.isTrusted); e.preventDefault(); ok(e.defaultPrevented === false, "defaultPrevented = " + e.defaultPrevented); @@ -406,6 +409,7 @@ sync_test("init_event", function() { elem.addEventListener("NewTest", function(event) { ok(e === event, "e != event"); + ok(e.isTrusted === false, "isTrusted = " + e.isTrusted); e.preventDefault(); ok(e.defaultPrevented === true, "defaultPrevented = " + e.defaultPrevented);

1 0

Jacek Caban : mshtml: Introduce timer_type enum.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 8b6a3f554a216fb0bb876bea1483befd9b2fabf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b6a3f554a216fb0bb876bea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 22 01:49:02 2021 +0200 mshtml: Introduce timer_type enum. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 8 ++++---- dlls/mshtml/mshtml_private.h | 7 ++++++- dlls/mshtml/task.c | 6 ++++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 9da2f7ccbae..e535cd54bd6 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1734,7 +1734,7 @@ static HRESULT WINAPI HTMLWindow3_detachEvent(IHTMLWindow3 *iface, BSTR event, I } static HRESULT window_set_timer(HTMLInnerWindow *This, VARIANT *expr, LONG msec, VARIANT *language, - BOOL interval, LONG *timer_id) + enum timer_type timer_type, LONG *timer_id) { IDispatch *disp = NULL; HRESULT hres; @@ -1757,7 +1757,7 @@ static HRESULT window_set_timer(HTMLInnerWindow *This, VARIANT *expr, LONG msec, if(!disp) return E_FAIL; - hres = set_task_timer(This, msec, interval, disp, timer_id); + hres = set_task_timer(This, msec, timer_type, disp, timer_id); IDispatch_Release(disp); return hres; @@ -1770,7 +1770,7 @@ static HRESULT WINAPI HTMLWindow3_setTimeout(IHTMLWindow3 *iface, VARIANT *expre TRACE("(%p)->(%s %d %s %p)\n", This, debugstr_variant(expression), msec, debugstr_variant(language), timerID); - return window_set_timer(This->inner_window, expression, msec, language, FALSE, timerID); + return window_set_timer(This->inner_window, expression, msec, language, TIMER_TIMEOUT, timerID); } static HRESULT WINAPI HTMLWindow3_setInterval(IHTMLWindow3 *iface, VARIANT *expression, LONG msec, @@ -1780,7 +1780,7 @@ static HRESULT WINAPI HTMLWindow3_setInterval(IHTMLWindow3 *iface, VARIANT *expr TRACE("(%p)->(%p %d %p %p)\n", This, expression, msec, language, timerID); - return window_set_timer(This->inner_window, expression, msec, language, TRUE, timerID); + return window_set_timer(This->inner_window, expression, msec, language, TIMER_INTERVAL, timerID); } static HRESULT WINAPI HTMLWindow3_print(IHTMLWindow3 *iface) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index adb71014acb..4cbddb68022 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1213,7 +1213,12 @@ LONG get_task_target_magic(void) DECLSPEC_HIDDEN; HRESULT push_task(task_t*,task_proc_t,task_proc_t,LONG) DECLSPEC_HIDDEN; void remove_target_tasks(LONG) DECLSPEC_HIDDEN; -HRESULT set_task_timer(HTMLInnerWindow*,LONG,BOOL,IDispatch*,LONG*) DECLSPEC_HIDDEN; +enum timer_type { + TIMER_TIMEOUT, + TIMER_INTERVAL, +}; + +HRESULT set_task_timer(HTMLInnerWindow*,LONG,enum timer_type,IDispatch*,LONG*) DECLSPEC_HIDDEN; HRESULT clear_task_timer(HTMLInnerWindow*,DWORD) DECLSPEC_HIDDEN; BOOL parse_compat_version(const WCHAR*,compat_mode_t*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index f9d06407fb3..c26f3754fd4 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -41,6 +41,7 @@ typedef struct { DWORD id; DWORD time; DWORD interval; + enum timer_type type; IDispatch *disp; struct list entry; @@ -162,7 +163,7 @@ static BOOL queue_timer(thread_data_t *thread_data, task_timer_t *timer) return FALSE; } -HRESULT set_task_timer(HTMLInnerWindow *window, LONG msec, BOOL interval, IDispatch *disp, LONG *id) +HRESULT set_task_timer(HTMLInnerWindow *window, LONG msec, enum timer_type timer_type, IDispatch *disp, LONG *id) { thread_data_t *thread_data; task_timer_t *timer; @@ -184,7 +185,8 @@ HRESULT set_task_timer(HTMLInnerWindow *window, LONG msec, BOOL interval, IDispa timer->id = id_cnt++; timer->window = window; timer->time = tc + msec; - timer->interval = interval ? msec : 0; + timer->interval = timer_type == TIMER_INTERVAL ? msec : 0; + timer->type = timer_type; list_init(&timer->entry); IDispatch_AddRef(disp);

1 0

Jacek Caban : mshtml: Factor out get_time_stamp helper.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 37a236870388fb1ba3e5e29ecef3f8d0a2a8cd5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=37a236870388fb1ba3e5e29e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 22 01:49:11 2021 +0200 mshtml: Factor out get_time_stamp helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 8 +------- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/task.c | 11 +++++++++++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 51b976c2077..b3b95083f80 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2208,12 +2208,8 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, compat_mode_t compat_mode, ev { dispex_static_data_t *dispex_data = &DOMEvent_dispex; DOMEvent *event = NULL; - FILETIME time; nsresult nsres; - /* 1601 to 1970 is 369 years plus 89 leap days */ - const ULONGLONG time_epoch = (ULONGLONG)(369 * 365 + 89) * 86400 * 1000; - if(check_event_iface(nsevent, &IID_nsIDOMCustomEvent)) { DOMCustomEvent *custom_event = heap_alloc_zero(sizeof(*custom_event)); if(!custom_event) @@ -2247,9 +2243,7 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, compat_mode_t compat_mode, ev } nsIDOMEvent_AddRef(event->nsevent = nsevent); - GetSystemTimeAsFileTime(&time); - event->time_stamp = (((ULONGLONG)time.dwHighDateTime<<32) + time.dwLowDateTime) / 10000 - - time_epoch; + event->time_stamp = get_time_stamp(); nsres = nsIDOMEvent_QueryInterface(nsevent, &IID_nsIDOMUIEvent, (void**)&event->ui_event); if(NS_SUCCEEDED(nsres)) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4cbddb68022..9d1737cc81f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1212,6 +1212,7 @@ HWND get_thread_hwnd(void) DECLSPEC_HIDDEN; LONG get_task_target_magic(void) DECLSPEC_HIDDEN; HRESULT push_task(task_t*,task_proc_t,task_proc_t,LONG) DECLSPEC_HIDDEN; void remove_target_tasks(LONG) DECLSPEC_HIDDEN; +ULONGLONG get_time_stamp(void) DECLSPEC_HIDDEN; enum timer_type { TIMER_TIMEOUT, diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index c26f3754fd4..b7616058461 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -380,3 +380,14 @@ thread_data_t *get_thread_data(BOOL create) return thread_data; } + +ULONGLONG get_time_stamp(void) +{ + FILETIME time; + + /* 1601 to 1970 is 369 years plus 89 leap days */ + const ULONGLONG time_epoch = (ULONGLONG)(369 * 365 + 89) * 86400 * 1000; + + GetSystemTimeAsFileTime(&time); + return (((ULONGLONG)time.dwHighDateTime << 32) + time.dwLowDateTime) / 10000 - time_epoch; +}

1 0