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

Jacek Caban : jscript: Add Set object stub implementation.
by Alexandre Julliard April 22, 2021

April 22, 2021

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

Zebediah Figura : windows.media.devices: Link directly to combase.
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: 923af67f24f9b7d552f2c4380c8bd359d4b6de41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=923af67f24f9b7d552f2c438… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 21 20:35:00 2021 -0500 windows.media.devices: Link directly to combase. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.devices/tests/Makefile.in | 2 +- dlls/windows.media.devices/tests/devices.c | 60 ++++++++-------------------- 2 files changed, 17 insertions(+), 45 deletions(-) diff --git a/dlls/windows.media.devices/tests/Makefile.in b/dlls/windows.media.devices/tests/Makefile.in index 42aa4ac9b10..4d107889dad 100644 --- a/dlls/windows.media.devices/tests/Makefile.in +++ b/dlls/windows.media.devices/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = windows.media.devices.dll -IMPORTS = ole32 +IMPORTS = combase C_SRCS = \ devices.c diff --git a/dlls/windows.media.devices/tests/devices.c b/dlls/windows.media.devices/tests/devices.c index f3777944848..d8acc638837 100644 --- a/dlls/windows.media.devices/tests/devices.c +++ b/dlls/windows.media.devices/tests/devices.c @@ -37,13 +37,6 @@ #include "wine/test.h" -static HRESULT (WINAPI *pRoGetActivationFactory)(HSTRING, REFIID, void **); -static HRESULT (WINAPI *pRoInitialize)(RO_INIT_TYPE); -static void (WINAPI *pRoUninitialize)(void); -static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); -static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); -static WCHAR *(WINAPI *pWindowsGetStringRawBuffer)(HSTRING, UINT32 *); - static HRESULT (WINAPI *pActivateAudioInterfaceAsync)(const WCHAR *path, REFIID riid, PROPVARIANT *params, IActivateAudioInterfaceCompletionHandler *done_handler, @@ -141,12 +134,12 @@ static void test_MediaDeviceStatics(void) HRESULT hr; DWORD dr; - hr = pWindowsCreateString(media_device_statics_name, wcslen(media_device_statics_name), &str); + hr = WindowsCreateString(media_device_statics_name, wcslen(media_device_statics_name), &str); ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); - hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); ok(hr == S_OK, "RoGetActivationFactory failed, hr %#x\n", hr); - pWindowsDeleteString(str); + WindowsDeleteString(str); /* interface tests */ hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); @@ -182,12 +175,12 @@ static void test_MediaDeviceStatics(void) if (g_default_capture_id) { - ok(wcsstr(pWindowsGetStringRawBuffer(str, NULL), g_default_capture_id) != NULL, + ok(wcsstr(WindowsGetStringRawBuffer(str, NULL), g_default_capture_id) != NULL, "Expected to find substring of default capture id in %s\n", - wine_dbgstr_w(pWindowsGetStringRawBuffer(str, NULL))); + wine_dbgstr_w(WindowsGetStringRawBuffer(str, NULL))); /* returned id does not work in GetDevice... */ - hr = IMMDeviceEnumerator_GetDevice(g_mmdevenum, pWindowsGetStringRawBuffer(str, NULL), &mmdev); + hr = IMMDeviceEnumerator_GetDevice(g_mmdevenum, WindowsGetStringRawBuffer(str, NULL), &mmdev); ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08x\n", hr); /* ...but does work in ActivateAudioInterfaceAsync */ @@ -199,7 +192,7 @@ static void test_MediaDeviceStatics(void) strcpy(async_activate_test.msg_pfx, "capture_activate"); EnterCriticalSection(&async_activate_test.lock); - hr = pActivateAudioInterfaceAsync(pWindowsGetStringRawBuffer(str, NULL), + hr = pActivateAudioInterfaceAsync(WindowsGetStringRawBuffer(str, NULL), &IID_IAudioClient2, NULL, &async_activate_done, &async_activate_test.op); ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); LeaveCriticalSection(&async_activate_test.lock); @@ -212,7 +205,7 @@ static void test_MediaDeviceStatics(void) ok(async_activate_test.result_iface != NULL, "Expected to get WASAPI interface, but got NULL\n"); IUnknown_Release(async_activate_test.result_iface); - pWindowsDeleteString(str); + WindowsDeleteString(str); } /* test default render device creation */ @@ -223,12 +216,12 @@ static void test_MediaDeviceStatics(void) if (g_default_render_id) { - ok(wcsstr(pWindowsGetStringRawBuffer(str, NULL), g_default_render_id) != NULL, + ok(wcsstr(WindowsGetStringRawBuffer(str, NULL), g_default_render_id) != NULL, "Expected to find substring of default render id in %s\n", - wine_dbgstr_w(pWindowsGetStringRawBuffer(str, NULL))); + wine_dbgstr_w(WindowsGetStringRawBuffer(str, NULL))); /* returned id does not work in GetDevice... */ - hr = IMMDeviceEnumerator_GetDevice(g_mmdevenum, pWindowsGetStringRawBuffer(str, NULL), &mmdev); + hr = IMMDeviceEnumerator_GetDevice(g_mmdevenum, WindowsGetStringRawBuffer(str, NULL), &mmdev); ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08x\n", hr); /* ...but does work in ActivateAudioInterfaceAsync */ @@ -240,7 +233,7 @@ static void test_MediaDeviceStatics(void) strcpy(async_activate_test.msg_pfx, "render_activate"); EnterCriticalSection(&async_activate_test.lock); - hr = pActivateAudioInterfaceAsync(pWindowsGetStringRawBuffer(str, NULL), + hr = pActivateAudioInterfaceAsync(WindowsGetStringRawBuffer(str, NULL), &IID_IAudioClient2, NULL, &async_activate_done, &async_activate_test.op); ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); LeaveCriticalSection(&async_activate_test.lock); @@ -253,7 +246,7 @@ static void test_MediaDeviceStatics(void) ok(async_activate_test.result_iface != NULL, "Expected to get WASAPI interface, but got NULL\n"); IUnknown_Release(async_activate_test.result_iface); - pWindowsDeleteString(str); + WindowsDeleteString(str); } /* cleanup */ @@ -264,31 +257,10 @@ static void test_MediaDeviceStatics(void) START_TEST(devices) { - HMODULE combase, mmdevapi; + HMODULE mmdevapi; IMMDevice *mmdev; HRESULT hr; - if (!(combase = LoadLibraryW(L"combase.dll"))) - { - win_skip("Failed to load combase.dll, skipping tests\n"); - return; - } - -#define LOAD_FUNCPTR(x) \ - if (!(p##x = (void*)GetProcAddress(combase, #x))) \ - { \ - win_skip("Failed to find %s in combase.dll, skipping tests.\n", #x); \ - return; \ - } - - LOAD_FUNCPTR(RoGetActivationFactory); - LOAD_FUNCPTR(RoInitialize); - LOAD_FUNCPTR(RoUninitialize); - LOAD_FUNCPTR(WindowsCreateString); - LOAD_FUNCPTR(WindowsDeleteString); - LOAD_FUNCPTR(WindowsGetStringRawBuffer); -#undef LOAD_FUNCPTR - if (!(mmdevapi = LoadLibraryW(L"mmdevapi.dll"))) { win_skip("Failed to load mmdevapi.dll, skipping tests\n"); @@ -305,7 +277,7 @@ START_TEST(devices) LOAD_FUNCPTR(ActivateAudioInterfaceAsync); #undef LOAD_FUNCPTR - hr = pRoInitialize(RO_INIT_MULTITHREADED); + hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, @@ -340,5 +312,5 @@ START_TEST(devices) CoTaskMemFree(g_default_render_id); IMMDeviceEnumerator_Release(g_mmdevenum); - pRoUninitialize(); + RoUninitialize(); }

1 0

Rémi Bernon : ntdll: Make sure unix_name is zero terminated (valgrind).
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: b3f6f21d01b281cb928538237eea5c39ec7c0b08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3f6f21d01b281cb92853823… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 22 08:21:11 2021 +0200 ntdll: Make sure unix_name is zero terminated (valgrind). In nt_to_unix_file_name_no_root. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 488f7485ad8..e32de57190b 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3290,6 +3290,7 @@ static NTSTATUS nt_to_unix_file_name_no_root( const UNICODE_STRING *nameW, char if (prefix_len == name_len) /* no subdir, plain DOS device */ { + unix_name[pos + ret] = 0; *unix_name_ret = unix_name; return get_dos_device( unix_name_ret, pos ); }

1 0

Zebediah Figura : windows.media.speech: Link directly to combase.
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: e01ad1d275572edf96cc50bb6bb4b344c568aa2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e01ad1d275572edf96cc50bb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 21 20:35:01 2021 -0500 windows.media.speech: Link directly to combase. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/Makefile.in | 2 +- dlls/windows.media.speech/tests/speech.c | 50 ++++++----------------------- 2 files changed, 11 insertions(+), 41 deletions(-) diff --git a/dlls/windows.media.speech/tests/Makefile.in b/dlls/windows.media.speech/tests/Makefile.in index f3e458f53d1..2ee10d3db21 100644 --- a/dlls/windows.media.speech/tests/Makefile.in +++ b/dlls/windows.media.speech/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = windows.media.speech.dll -IMPORTS = uuid +IMPORTS = combase uuid C_SRCS = \ speech.c diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 1c48c5bf933..c949b35900b 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -34,13 +34,6 @@ #include "wine/test.h" -static HRESULT (WINAPI *pRoActivateInstance)(HSTRING, IInspectable **); -static HRESULT (WINAPI *pRoGetActivationFactory)(HSTRING, REFIID, void **); -static HRESULT (WINAPI *pRoInitialize)(RO_INIT_TYPE); -static void (WINAPI *pRoUninitialize)(void); -static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); -static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); - static void test_SpeechSynthesizer(void) { static const WCHAR *speech_synthesizer_name = L"Windows.Media.SpeechSynthesis.SpeechSynthesizer"; @@ -55,13 +48,13 @@ static void test_SpeechSynthesizer(void) HRESULT hr; UINT32 size; - hr = pRoInitialize(RO_INIT_MULTITHREADED); + hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); - hr = pWindowsCreateString(speech_synthesizer_name, wcslen(speech_synthesizer_name), &str); + hr = WindowsCreateString(speech_synthesizer_name, wcslen(speech_synthesizer_name), &str); ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); - hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); ok(hr == S_OK, "RoGetActivationFactory failed, hr %#x\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); @@ -116,9 +109,9 @@ static void test_SpeechSynthesizer(void) IInspectable_Release(inspectable); IActivationFactory_Release(factory); - pWindowsDeleteString(str); + WindowsDeleteString(str); - pRoUninitialize(); + RoUninitialize(); } static void test_VoiceInformation(void) @@ -129,45 +122,22 @@ static void test_VoiceInformation(void) HSTRING str; HRESULT hr; - hr = pRoInitialize(RO_INIT_MULTITHREADED); + hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); - hr = pWindowsCreateString(voice_information_name, wcslen(voice_information_name), &str); + hr = WindowsCreateString(voice_information_name, wcslen(voice_information_name), &str); ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); - hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); ok(hr == REGDB_E_CLASSNOTREG, "RoGetActivationFactory returned unexpected hr %#x\n", hr); - pWindowsDeleteString(str); + WindowsDeleteString(str); - pRoUninitialize(); + RoUninitialize(); } START_TEST(speech) { - HMODULE combase; - - if (!(combase = LoadLibraryW(L"combase.dll"))) - { - win_skip("Failed to load combase.dll, skipping tests\n"); - return; - } - -#define LOAD_FUNCPTR(x) \ - if (!(p##x = (void*)GetProcAddress(combase, #x))) \ - { \ - win_skip("Failed to find %s in combase.dll, skipping tests.\n", #x); \ - return; \ - } - - LOAD_FUNCPTR(RoActivateInstance); - LOAD_FUNCPTR(RoGetActivationFactory); - LOAD_FUNCPTR(RoInitialize); - LOAD_FUNCPTR(RoUninitialize); - LOAD_FUNCPTR(WindowsCreateString); - LOAD_FUNCPTR(WindowsDeleteString); -#undef LOAD_FUNCPTR - test_SpeechSynthesizer(); test_VoiceInformation(); }

1 0

Zebediah Figura : dbghelp: Link directly to __unDName.
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: b70f9680c40d9726e39f75cf1b21e150c45e8975 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b70f9680c40d9726e39f75cf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 21 20:25:00 2021 -0500 dbghelp: Link directly to __unDName. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 706d088aec0..2ca85a6d6e8 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1782,25 +1782,8 @@ BOOL WINAPI SymUnDName64(PIMAGEHLP_SYMBOL64 sym, PSTR UnDecName, DWORD UnDecName UNDNAME_COMPLETE) != 0; } -static void * CDECL und_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } -static void CDECL und_free (void* ptr) { HeapFree(GetProcessHeap(), 0, ptr); } - -static char *und_name(char *buffer, const char *mangled, int buflen, unsigned short flags) -{ - /* undocumented from msvcrt */ - static HANDLE hMsvcrt; - static char* (CDECL *p_undname)(char*, const char*, int, void* (CDECL*)(size_t), void (CDECL*)(void*), unsigned short); - static const WCHAR szMsvcrt[] = {'m','s','v','c','r','t','.','d','l','l',0}; - - if (!p_undname) - { - if (!hMsvcrt) hMsvcrt = LoadLibraryW(szMsvcrt); - if (hMsvcrt) p_undname = (void*)GetProcAddress(hMsvcrt, "__unDName"); - if (!p_undname) return NULL; - } - - return p_undname(buffer, mangled, buflen, und_alloc, und_free, flags); -} +extern char * CDECL __unDName(char *buffer, const char *mangled, int len, + void * (CDECL *pfn_alloc)(size_t), void (CDECL *pfn_free)(void *), unsigned short flags); /*********************************************************************** * UnDecorateSymbolName (DBGHELP.@) @@ -1813,7 +1796,7 @@ DWORD WINAPI UnDecorateSymbolName(const char *decorated_name, char *undecorated_ if (!undecorated_name || !undecorated_length) return 0; - if (!und_name(undecorated_name, decorated_name, undecorated_length, flags)) + if (!__unDName(undecorated_name, decorated_name, undecorated_length, malloc, free, flags)) return 0; return strlen(undecorated_name); } @@ -1837,12 +1820,12 @@ DWORD WINAPI UnDecorateSymbolNameW(const WCHAR *decorated_name, WCHAR *undecorat if ((buf = HeapAlloc(GetProcessHeap(), 0, len))) { WideCharToMultiByte(CP_ACP, 0, decorated_name, -1, buf, len, NULL, NULL); - if ((ptr = und_name(NULL, buf, 0, flags))) + if ((ptr = __unDName(NULL, buf, 0, malloc, free, flags))) { MultiByteToWideChar(CP_ACP, 0, ptr, -1, undecorated_name, undecorated_length); undecorated_name[undecorated_length - 1] = 0; ret = lstrlenW(undecorated_name); - und_free(ptr); + free(ptr); } HeapFree(GetProcessHeap(), 0, buf); }

1 0

Jacek Caban : mshtml: Add window.requestAnimationFrame semi-stub implementation.
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: 101822c04b4f3f5e22cc6cb4655df64a70e13505 URL: https://source.winehq.org/git/wine.git/?a=commit;h=101822c04b4f3f5e22cc6cb4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 22 01:52:53 2021 +0200 mshtml: Add window.requestAnimationFrame semi-stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 29 +++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/task.c | 30 +++++++++++++++++++++++++----- dlls/mshtml/tests/documentmode.js | 1 + dlls/mshtml/tests/dom.js | 10 ++++++++++ 5 files changed, 66 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e535cd54bd6..4c57d457e41 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3170,6 +3170,9 @@ HRESULT search_window_props(HTMLInnerWindow *This, BSTR bstrName, DWORD grfdex, return DISP_E_UNKNOWNNAME; } +/* DISPIDs not exposed by interfaces */ +#define DISPID_IHTMLWINDOW_IE10_REQUESTANIMATIONFRAME 1300 + static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { HTMLWindow *This = impl_from_IDispatchEx(iface); @@ -3186,6 +3189,13 @@ static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, if(hres != DISP_E_UNKNOWNNAME) return hres; + if(dispex_compat_mode(&window->event_target.dispex) >= COMPAT_MODE_IE10 && + !wcscmp(bstrName, L"requestAnimationFrame")) { + TRACE("requestAnimationFrame\n"); + *pid = DISPID_IHTMLWINDOW_IE10_REQUESTANIMATIONFRAME; + return S_OK; + } + if(This->outer_window) { HTMLOuterWindow *frame; @@ -3272,6 +3282,25 @@ static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID return IDispatchEx_InvokeEx(&window->event_target.dispex.IDispatchEx_iface, id, lcid, wFlags, &dp, pvarRes, pei, pspCaller); } + case DISPID_IHTMLWINDOW_IE10_REQUESTANIMATIONFRAME: { + HRESULT hres; + LONG r; + + FIXME("requestAnimationFrame: semi-stub\n"); + + if(!(wFlags & DISPATCH_METHOD) || pdp->cArgs != 1 || pdp->cNamedArgs) { + FIXME("unsupported args\n"); + return E_INVALIDARG; + } + + hres = window_set_timer(window, pdp->rgvarg, 50, NULL, TIMER_ANIMATION_FRAME, &r); + if(SUCCEEDED(hres) && pvarRes) { + V_VT(pvarRes) = VT_I4; + V_I4(pvarRes) = r; + } + + return hres; + } } return IDispatchEx_InvokeEx(&window->event_target.dispex.IDispatchEx_iface, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9d1737cc81f..7bc645e549f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1217,6 +1217,7 @@ ULONGLONG get_time_stamp(void) DECLSPEC_HIDDEN; enum timer_type { TIMER_TIMEOUT, TIMER_INTERVAL, + TIMER_ANIMATION_FRAME, }; HRESULT set_task_timer(HTMLInnerWindow*,LONG,enum timer_type,IDispatch*,LONG*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index b7616058461..28cb88ab5f1 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -218,9 +218,20 @@ HRESULT clear_task_timer(HTMLInnerWindow *window, DWORD id) return S_OK; } -static void call_timer_disp(IDispatch *disp) +static const char *debugstr_timer_type(enum timer_type type) +{ + switch(type) { + case TIMER_TIMEOUT: return "timeout"; + case TIMER_INTERVAL: return "interval"; + case TIMER_ANIMATION_FRAME: return "animation-frame"; + DEFAULT_UNREACHABLE; + } +} + +static void call_timer_disp(IDispatch *disp, enum timer_type timer_type) { DISPPARAMS dp = {NULL, NULL, 0, 0}; + VARIANT timestamp; EXCEPINFO ei; VARIANT res; HRESULT hres; @@ -228,12 +239,19 @@ static void call_timer_disp(IDispatch *disp) V_VT(&res) = VT_EMPTY; memset(&ei, 0, sizeof(ei)); - TRACE(">>>\n"); + if(timer_type == TIMER_ANIMATION_FRAME) { + dp.cArgs = 1; + dp.rgvarg = &timestamp; + V_VT(&timestamp) = VT_R8; + V_R8(&timestamp) = get_time_stamp(); + } + + TRACE("%p %s >>>\n", disp, debugstr_timer_type(timer_type)); hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, &res, &ei, NULL); if(hres == S_OK) - TRACE("<<<\n"); + TRACE("%p %s <<<\n", disp, debugstr_timer_type(timer_type)); else - WARN("<<< %08x\n", hres); + WARN("%p %s <<< %08x\n", disp, debugstr_timer_type(timer_type), hres); VariantClear(&res); } @@ -241,6 +259,7 @@ static void call_timer_disp(IDispatch *disp) static LRESULT process_timer(void) { thread_data_t *thread_data; + enum timer_type timer_type; IDispatch *disp; DWORD tc; task_timer_t *timer=NULL, *last_timer; @@ -273,6 +292,7 @@ static LRESULT process_timer(void) disp = timer->disp; IDispatch_AddRef(disp); + timer_type = timer->type; if(timer->interval) { timer->time += timer->interval; @@ -281,7 +301,7 @@ static LRESULT process_timer(void) release_task_timer(thread_data->thread_hwnd, timer); } - call_timer_disp(disp); + call_timer_disp(disp, timer_type); IDispatch_Release(disp); }while(!list_empty(&thread_data->timer_list)); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 35b4a001fed..7074b1f62f2 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("requestAnimationFrame", v >= 10); test_exposed("Set", v >= 11); if(v >= 9) /* FIXME: native exposes it in all compat modes */ test_exposed("performance", true); diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index f5e4f393b58..b30d1a8fbed 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -448,3 +448,13 @@ sync_test("elem_props", function() { elem.accessKey = "q"; ok(elem.accessKey === "q", "accessKey = " + elem.accessKey + " expected q"); }); + +async_test("animation_frame", function() { + var id = requestAnimationFrame(function(x) { + ok(this === window, "this != window"); + ok(typeof(x) === "number", "x = " + x); + ok(arguments.length === 1, "arguments.lenght = " + arguments.length); + next_test(); + }); + ok(typeof(id) === "number", "id = " + id); +});

1 0

Jacek Caban : mshtml: Introduce timer_type enum.
by Alexandre Julliard April 22, 2021

April 22, 2021

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: Add IDOMEvent::isTrusted implementation.
by Alexandre Julliard April 22, 2021

April 22, 2021

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 ES6 JavaScript mode and use it in IE11 compat mode.
by Alexandre Julliard April 22, 2021

April 22, 2021

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

Francois Gouget : ws2_32/tests: Load GetHostNameW() dynamically.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 6ccd501503770d00d327fd0a292b05ec9bf1a640 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ccd501503770d00d327fd0a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 21 20:15:52 2021 +0200 ws2_32/tests: Load GetHostNameW() dynamically. It is not available on Windows 7 and lower. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5a1a271b099..61af5b0183a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -71,6 +71,7 @@ static int (WINAPI *pGetAddrInfoExW)(const WCHAR *name, const WCHAR *servname, struct timeval *timeout, OVERLAPPED *overlapped, LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine, HANDLE *handle); static int (WINAPI *pGetAddrInfoExOverlappedResult)(OVERLAPPED *overlapped); +static int (WINAPI *pGetHostNameW)(WCHAR *, int); static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG); static PCWSTR(WINAPI *pInetNtopW)(INT,LPVOID,LPWSTR,ULONG); static int (WINAPI *pInetPtonA)(INT,LPCSTR,LPVOID); @@ -1203,6 +1204,7 @@ static void Init (void) pFreeAddrInfoExW = (void *)GetProcAddress(hws2_32, "FreeAddrInfoExW"); pGetAddrInfoExW = (void *)GetProcAddress(hws2_32, "GetAddrInfoExW"); pGetAddrInfoExOverlappedResult = (void *)GetProcAddress(hws2_32, "GetAddrInfoExOverlappedResult"); + pGetHostNameW = (void *)GetProcAddress(hws2_32, "GetHostNameW"); pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); pInetNtopW = (void *)GetProcAddress(hws2_32, "InetNtopW"); pInetPtonA = (void *)GetProcAddress(hws2_32, "inet_pton"); @@ -4328,26 +4330,31 @@ static void test_GetHostNameW(void) WCHAR name[256]; int ret, len; + if (!pGetHostNameW) + { + win_skip("GetHostNameW() not present\n"); + return; + } WSASetLastError(0xdeadbeef); - ret = GetHostNameW(NULL, 256); + ret = pGetHostNameW(NULL, 256); ok(ret == -1, "GetHostNameW() returned %d\n", ret); ok(WSAGetLastError() == WSAEFAULT, "GetHostNameW with null buffer " "failed with %d, expected %d\n", WSAGetLastError(), WSAEFAULT); - ret = GetHostNameW(name, sizeof(name)); + ret = pGetHostNameW(name, sizeof(name)); ok(ret == 0, "GetHostNameW() call failed: %d\n", WSAGetLastError()); len = wcslen(name); WSASetLastError(0xdeadbeef); wcscpy(name, L"deadbeef"); - ret = GetHostNameW(name, len); + ret = pGetHostNameW(name, len); ok(ret == -1, "GetHostNameW() returned %d\n", ret); ok(!wcscmp(name, L"deadbeef"), "name changed unexpected!\n"); ok(WSAGetLastError() == WSAEFAULT, "GetHostNameW with insufficient length " "failed with %d, expected %d\n", WSAGetLastError(), WSAEFAULT); len++; - ret = GetHostNameW(name, len); + ret = pGetHostNameW(name, len); ok(ret == 0, "GetHostNameW() call failed: %d\n", WSAGetLastError()); }

1 0