November 2017 - Wine-Commits

Alexandre Julliard : include: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 667b150a98a5df15302749cb5243568b8ffa1564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=667b150a98a5df15302749cb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:20:27 2017 +0100 include: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/oledlg.h | 4 ++-- include/rpcndr.h | 2 +- include/vfw.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/oledlg.h b/include/oledlg.h index f009d76..80829ec 100644 --- a/include/oledlg.h +++ b/include/oledlg.h @@ -967,8 +967,8 @@ BOOL WINAPI OleUIAddVerbMenuW(LPOLEOBJECT lpOleObj, LPCWSTR lpszShortType, HMEN UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA lpOleUIPasteSpecial); UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW lpOleUIPasteSpecial); #define OleUIPasteSpecial WINELIB_NAME_AW(OleUIPasteSpecial) -INT __cdecl OleUIPromptUserA(INT,HWND, ...); -INT __cdecl OleUIPromptUserW(INT,HWND, ...); +INT WINAPIV OleUIPromptUserA(INT,HWND, ...); +INT WINAPIV OleUIPromptUserW(INT,HWND, ...); #define OleUIPromptUser WINELIB_NAME_AW(OleUIPromptUser) #ifdef __cplusplus diff --git a/include/rpcndr.h b/include/rpcndr.h index 9029950..0f751d7 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -114,7 +114,7 @@ typedef UINT64 MIDL_uhyper; typedef unsigned char boolean; #define __RPC_CALLEE WINAPI -#define RPC_VAR_ENTRY __cdecl +#define RPC_VAR_ENTRY WINAPIV #define NDR_SHAREABLE static #define MIDL_ascii_strlen(s) strlen(s) diff --git a/include/vfw.h b/include/vfw.h index aa3d4f5..cec5345 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -1082,10 +1082,10 @@ BOOL WINAPI AVISaveOptions(HWND hWnd,UINT uFlags,INT nStream, PAVISTREAM *ppavi,LPAVICOMPRESSOPTIONS *ppOptions); HRESULT WINAPI AVISaveOptionsFree(INT nStreams,LPAVICOMPRESSOPTIONS*ppOptions); -HRESULT CDECL AVISaveA(LPCSTR szFile, CLSID *pclsidHandler, +HRESULT WINAPIV AVISaveA(LPCSTR szFile, CLSID *pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...); -HRESULT CDECL AVISaveW(LPCWSTR szFile, CLSID *pclsidHandler, +HRESULT WINAPIV AVISaveW(LPCWSTR szFile, CLSID *pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...); #define AVISave WINELIB_NAME_AW(AVISave)

1 0

Alexandre Julliard : msvcrt: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 7726157e19f030690c209e59cd1102a6d0e243a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7726157e19f030690c209e59c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:19:18 2017 +0100 msvcrt: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/msvcp_main.c | 4 +-- dlls/msvcr120/tests/msvcr120.c | 2 +- dlls/msvcr90/tests/msvcr90.c | 4 +-- dlls/msvcrt/console.c | 4 +-- dlls/msvcrt/except_i386.c | 2 +- dlls/msvcrt/file.c | 26 +++++++------- dlls/msvcrt/msvcrt.h | 12 +++---- dlls/msvcrt/process.c | 32 ++++++++--------- dlls/msvcrt/scanf.c | 80 +++++++++++++++++++++--------------------- dlls/msvcrt/scheduler.c | 2 +- dlls/msvcrt/tests/printf.c | 22 ++++++------ dlls/msvcrt/tests/scanf.c | 2 +- dlls/msvcrt/wcs.c | 42 +++++++++++----------- dlls/ucrtbase/tests/printf.c | 12 +++---- include/msvcrt/conio.h | 8 ++--- include/msvcrt/crtdbg.h | 2 +- include/msvcrt/crtdefs.h | 4 +++ include/msvcrt/io.h | 12 +++---- include/msvcrt/process.h | 48 ++++++++++++------------- include/msvcrt/stdio.h | 62 ++++++++++++++++---------------- include/msvcrt/wchar.h | 50 +++++++++++++------------- 21 files changed, 218 insertions(+), 214 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7726157e19f030690c209…

1 0

Jacek Caban : jscript: Added support for VT_UI2 VARIANT types.
by Alexandre Julliard Nov. 1, 2017

Nov. 1, 2017

Module: wine Branch: master Commit: 4fc0f2aa3848b5cb41a851400a1cfe757441fdb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fc0f2aa3848b5cb41a851400… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 1 16:43:37 2017 +0100 jscript: Added support for VT_UI2 VARIANT types. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsutils.c | 3 +++ dlls/jscript/tests/run.c | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index edfebcf..48628bd 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -297,6 +297,9 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) case VT_I2: *r = jsval_number(V_I2(var)); return S_OK; + case VT_UI2: + *r = jsval_number(V_UI2(var)); + return S_OK; case VT_INT: *r = jsval_number(V_INT(var)); return S_OK; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 1d42c54..bd5e341 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1315,7 +1315,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; case DISPID_GLOBAL_TESTARGTYPES: { - VARIANT args[7], v; + VARIANT args[8], v; DISPPARAMS dp = {args, NULL, sizeof(args)/sizeof(*args), 0}; HRESULT hres; @@ -1357,6 +1357,8 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_VARIANTREF(args+5) = &v; V_VT(args+6) = VT_R4; V_R4(args+6) = 0.5; + V_VT(args+7) = VT_UI2; + V_R4(args+7) = 3; V_VT(&v) = VT_I4; V_I4(&v) = 2; hres = IDispatch_Invoke(V_DISPATCH(pdp->rgvarg), DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); @@ -2647,7 +2649,7 @@ static BOOL run_tests(void) SET_EXPECT(global_testargtypes_i); parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp," - "function(r4,i4ref,ui4,nullunk,d,i,s) {" + "function(ui2,r4,i4ref,ui4,nullunk,d,i,s) {" " ok(getVT(i) === 'VT_I4', 'getVT(i) = ' + getVT(i));" " ok(getVT(s) === 'VT_I4', 'getVT(s) = ' + getVT(s));" " ok(getVT(d) === 'VT_DISPATCH', 'getVT(d) = ' + getVT(d));" @@ -2659,6 +2661,7 @@ static BOOL run_tests(void) " ok(i4ref === 2, 'i4ref = ' + i4ref);" " ok(r4 === 0.5, 'r4 = ' + r4);" " ok(getVT(r4) === 'VT_R8', 'getVT(r4) = ' + getVT(r4));" + " ok(getVT(ui2) === 'VT_I4', 'getVT(ui2) = ' + getVT(ui2));" "});"); CHECK_CALLED(global_testargtypes_i);

1 0

Zebediah Figura : regedit: Always start the GUI as 64-bit when on a 64-bit prefix.
by Alexandre Julliard Nov. 1, 2017

Nov. 1, 2017

Module: wine Branch: master Commit: 25c78b61de4a0beccbb9a6f556a1656c8dac7785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c78b61de4a0beccbb9a6f55… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 31 18:27:21 2017 -0500 regedit: Always start the GUI as 64-bit when on a 64-bit prefix. Same as we do with winecfg. This should help to eliminate some confusion with users who may want to edit keys with WOW64 redirection (e.g. Software\\Wine\\Drives). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/main.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 8f82580..460a951 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -24,10 +24,13 @@ #include <stdlib.h> #include <stdio.h> #include <fcntl.h> +#include "wine/debug.h" #define REGEDIT_DECLARE_FUNCTIONS #include "main.h" +WINE_DEFAULT_DEBUG_CHANNEL(regedit); + WCHAR g_pszDefaultValueName[64]; BOOL ProcessCmdLine(WCHAR *cmdline); @@ -138,11 +141,36 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi { MSG msg; HACCEL hAccel; + BOOL is_wow64; if (ProcessCmdLine(GetCommandLineW())) { return 0; } + if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) + { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR filename[MAX_PATH]; + void *redir; + DWORD exit_code; + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + GetModuleFileNameW( 0, filename, MAX_PATH ); + + Wow64DisableWow64FsRedirection( &redir ); + if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + { + WINE_TRACE( "restarting %s\n", wine_dbgstr_w(filename) ); + WaitForSingleObject( pi.hProcess, INFINITE ); + GetExitCodeProcess( pi.hProcess, &exit_code ); + ExitProcess( exit_code ); + } + else WINE_ERR( "failed to restart 64-bit %s, err %d\n", wine_dbgstr_w(filename), GetLastError() ); + Wow64RevertWow64FsRedirection( redir ); + } + /* Initialize global strings */ LoadStringW(hInstance, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); LoadStringW(hInstance, IDS_REGISTRY_DEFAULT_VALUE, g_pszDefaultValueName, COUNT_OF(g_pszDefaultValueName));

1 0

Alexandre Julliard : configure: Require floating point support on ARM.
by Alexandre Julliard Nov. 1, 2017

Nov. 1, 2017

Module: wine Branch: master Commit: 05fad4b75171291619381bafe9acfbe71890e72c URL: http://source.winehq.org/git/wine.git/?a=commit;h=05fad4b75171291619381bafe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 1 09:52:26 2017 +0100 configure: Require floating point support on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 23 +++++++++++++++++++++++ configure.ac | 5 +++++ 2 files changed, 28 insertions(+) diff --git a/configure b/configure index 00b0087..cb21f2a 100755 --- a/configure +++ b/configure @@ -5265,6 +5265,29 @@ rm -f core conftest.err conftest.$ac_objext \ CFLAGS="$CFLAGS -marm" TARGETFLAGS="-marm" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports floating point" >&5 +$as_echo_n "checking whether $CC supports floating point... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +asm("vmrs r2,fpscr"); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "You need a target with floating point support to build Wine for ARM." "$LINENO" 5 +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ;; i[3456789]86*) enable_win16=${enable_win16:-yes} diff --git a/configure.ac b/configure.ac index 3039c94..29f4cd1 100644 --- a/configure.ac +++ b/configure.ac @@ -179,6 +179,11 @@ case $host in AC_MSG_ERROR([You need a target with Thumb support to build Wine for ARM.])]) CFLAGS="$CFLAGS -marm" AC_SUBST(TARGETFLAGS,"-marm") + AC_MSG_CHECKING([whether $CC supports floating point]) + WINE_TRY_ASM_LINK(["vmrs r2,fpscr"],,, + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([You need a target with floating point support to build Wine for ARM.])]) ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes}

1 0

Jacek Caban : mshtml: Expose IEventTarget to scripts.
by Alexandre Julliard Nov. 1, 2017

Nov. 1, 2017

Module: wine Branch: master Commit: 1366b33c81527b5d4762da6b3f7083058eb910a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1366b33c81527b5d4762da6b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 1 16:44:02 2017 +0100 mshtml: Expose IEventTarget to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 6 ++++++ dlls/mshtml/htmlnode.c | 2 ++ dlls/mshtml/htmlwindow.c | 11 +++++++++- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/documentmode.js | 44 +++++++++++++++++++++++++++++++++++++++ dlls/mshtml/xmlhttprequest.c | 5 +++-- 6 files changed, 67 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ee85eca..d57ff19 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2205,6 +2205,12 @@ HRESULT EventTarget_QI(EventTarget *event_target, REFIID riid, void **ppv) return E_NOINTERFACE; } +void EventTarget_init_dispex_info(dispex_data_t *dispex_info, compat_mode_t compat_mode) +{ + if(compat_mode >= COMPAT_MODE_IE9) + dispex_info_add_interface(dispex_info, IEventTarget_tid, NULL); +} + static int event_id_cmp(const void *key, const struct wine_rb_entry *entry) { return (INT_PTR)key - WINE_RB_ENTRY_VALUE(entry, listener_container_t, entry)->event_id; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 8f03b4a..70b0d0d 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1425,6 +1425,8 @@ void HTMLDOMNode_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { if(mode >= COMPAT_MODE_IE9) dispex_info_add_interface(info, IHTMLDOMNode3_tid, NULL); + + EventTarget_init_dispex_info(info, mode); } static const cpc_entry_t HTMLDOMNode_cpc[] = {{NULL}}; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b174de2..759f1b6 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3016,6 +3016,14 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD return hres; } +static compat_mode_t HTMLWindow_get_compat_mode(DispatchEx *dispex) +{ + HTMLInnerWindow *This = impl_from_DispatchEx(dispex); + + This->doc->document_mode_locked = TRUE; + return This->doc->document_mode; +} + static void HTMLWindow_bind_event(DispatchEx *dispex, eventid_t eid) { HTMLInnerWindow *This = impl_from_DispatchEx(dispex); @@ -3025,6 +3033,7 @@ static void HTMLWindow_bind_event(DispatchEx *dispex, eventid_t eid) static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) { dispex_info_add_interface(info, IHTMLWindow5_tid, NULL); + EventTarget_init_dispex_info(info, compat_mode); } static IHTMLEventObj *HTMLWindow_set_current_event(DispatchEx *dispex, IHTMLEventObj *event) @@ -3038,7 +3047,7 @@ static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { NULL, NULL, HTMLWindow_invoke, - NULL, + HTMLWindow_get_compat_mode, NULL }, HTMLWindow_bind_event, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2098b78..98daa65 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -129,6 +129,7 @@ typedef struct EventTarget EventTarget; XIID(IDocumentSelector) \ XIID(IElementSelector) \ XIID(IElementTraversal) \ + XIID(IEventTarget) \ XIID(IHTMLAnchorElement) \ XIID(IHTMLAreaElement) \ XIID(IHTMLAttributeCollection) \ @@ -1041,6 +1042,7 @@ void HTMLFrameBase_Init(HTMLFrameBase*,HTMLDocumentNode*,nsIDOMHTMLElement*,disp void EventTarget_Init(EventTarget*,IUnknown*,dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; HRESULT EventTarget_QI(EventTarget*,REFIID,void**) DECLSPEC_HIDDEN; +void EventTarget_init_dispex_info(dispex_data_t*,compat_mode_t) DECLSPEC_HIDDEN; HRESULT HTMLDOMNode_QI(HTMLDOMNode*,REFIID,void**) DECLSPEC_HIDDEN; void HTMLDOMNode_destructor(HTMLDOMNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index aaf052b..beee493 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -38,6 +38,9 @@ function test_elem_props() { test_exposed("onsubmit", v >= 9); test_exposed("getElementsByClassName", v >= 9); test_exposed("removeAttributeNS", v >= 9); + test_exposed("addEventListener", v >= 9); + test_exposed("removeEventListener", v >= 9); + test_exposed("dispatchEvent", v >= 9); next_test(); } @@ -56,6 +59,9 @@ function test_doc_props() { test_exposed("prefix", v >= 9); test_exposed("defaultView", v >= 9); test_exposed("head", v >= 9); + test_exposed("addEventListener", v >= 9); + test_exposed("removeEventListener", v >= 9); + test_exposed("dispatchEvent", v >= 9); test_exposed("parentWindow", true); if(v >= 9) ok(document.defaultView === document.parentWindow, "defaultView != parentWindow"); @@ -63,6 +69,42 @@ function test_doc_props() { next_test(); } +function test_window_props() { + function test_exposed(prop, expect) { + if(expect) + ok(prop in window, prop + " not found in window."); + else + ok(!(prop in window), prop + " found in window."); + } + + var v = document.documentMode; + + test_exposed("addEventListener", v >= 9); + test_exposed("removeEventListener", v >= 9); + test_exposed("dispatchEvent", v >= 9); + + next_test(); +} + +function test_xhr_props() { + var xhr = new XMLHttpRequest(); + + function test_exposed(prop, expect) { + if(expect) + ok(prop in xhr, prop + " not found in XMLHttpRequest."); + else + ok(!(prop in xhr), prop + " found in XMLHttpRequest."); + } + + var v = document.documentMode; + + test_exposed("addEventListener", v >= 9); + test_exposed("removeEventListener", v >= 9); + test_exposed("dispatchEvent", v >= 9); + + next_test(); +} + function test_elem_by_id() { document.body.innerHTML = '<form id="testid" name="testname"></form>'; @@ -156,6 +198,8 @@ var tests = [ test_iframe_doc_mode, test_elem_props, test_doc_props, + test_window_props, + test_xhr_props, test_elem_by_id, test_conditional_comments ]; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index bbe2833..393a569 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -785,7 +785,8 @@ static const tid_t HTMLXMLHttpRequest_iface_tids[] = { static dispex_static_data_t HTMLXMLHttpRequest_dispex = { &HTMLXMLHttpRequest_event_target_vtbl.dispex_vtbl, DispHTMLXMLHttpRequest_tid, - HTMLXMLHttpRequest_iface_tids + HTMLXMLHttpRequest_iface_tids, + EventTarget_init_dispex_info }; @@ -898,7 +899,7 @@ static HRESULT WINAPI HTMLXMLHttpRequestFactory_create(IHTMLXMLHttpRequestFactor ret->IHTMLXMLHttpRequest_iface.lpVtbl = &HTMLXMLHttpRequestVtbl; ret->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; EventTarget_Init(&ret->event_target, (IUnknown*)&ret->IHTMLXMLHttpRequest_iface, - &HTMLXMLHttpRequest_dispex, COMPAT_MODE_NONE); + &HTMLXMLHttpRequest_dispex, This->window->doc->document_mode); ret->ref = 1; *p = &ret->IHTMLXMLHttpRequest_iface;

1 0

Jacek Caban : mshtml: Added DOMContentLoaded event implementation.
by Alexandre Julliard Nov. 1, 2017

Nov. 1, 2017

Module: wine Branch: master Commit: 0c0dd3d5821ce57a68c987275d084891cf9f98f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0dd3d5821ce57a68c987275… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 1 16:43:53 2017 +0100 mshtml: Added DOMContentLoaded event implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 10 +++++++--- dlls/mshtml/htmlevent.h | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index f9d2460..ee85eca 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -89,6 +89,7 @@ static const WCHAR selectstartW[] = {'s','e','l','e','c','t','s','t','a','r','t' static const WCHAR selectionchangeW[] = {'s','e','l','e','c','t','i','o','n','c','h','a','n','g','e',0}; static const WCHAR submitW[] = {'s','u','b','m','i','t',0}; static const WCHAR unloadW[] = {'u','n','l','o','a','d',0}; +static const WCHAR DOMContentLoadedW[] = {'D','O','M','C','o','n','t','e','n','t','L','o','a','d','e','d',0}; static const WCHAR EventW[] = {'E','v','e','n','t',0}; static const WCHAR UIEventW[] = {'U','I','E','v','e','n','t',0}; @@ -150,6 +151,8 @@ static const event_info_t event_info[] = { EVENT_FIXME | EVENT_BUBBLES}, {dblclickW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONDBLCLICK, EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, + {DOMContentLoadedW, EVENT_TYPE_EVENT, 0, + EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, {dragW, EVENT_TYPE_DRAG, DISPID_EVMETH_ONDRAG, EVENT_FIXME | EVENT_BUBBLES | EVENT_CANCELABLE}, {dragstartW, EVENT_TYPE_DRAG, DISPID_EVMETH_ONDRAGSTART, @@ -227,7 +230,7 @@ static eventid_t attr_to_eid(const WCHAR *str) return EVENTID_LAST; for(i=0; i < sizeof(event_info)/sizeof(event_info[0]); i++) { - if(!strcmpW(event_info[i].name, str+2)) + if(!strcmpW(event_info[i].name, str+2) && event_info[i].dispid) return i; } @@ -1298,7 +1301,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) event_listener_t *listener, listeners_buf[8], *listeners = listeners_buf; unsigned listeners_cnt, listeners_size; ConnectionPointContainer *cp_container = NULL; - const event_target_vtbl_t *vtbl; + const event_target_vtbl_t *vtbl = NULL; VARIANT v; HRESULT hres; @@ -1446,7 +1449,8 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) if(event->phase == DEP_CAPTURING_PHASE) return; - if((vtbl = dispex_get_vtbl(&event_target->dispex)) && vtbl->get_cp_container) + if(event_info[eid].dispid && (vtbl = dispex_get_vtbl(&event_target->dispex)) + && vtbl->get_cp_container) cp_container = vtbl->get_cp_container(&event_target->dispex); if(cp_container) { if(cp_container->cps) { diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index eaf42eb..7dfc7ad 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -26,6 +26,7 @@ typedef enum { EVENTID_CONTEXTMENU, EVENTID_DATAAVAILABLE, EVENTID_DBLCLICK, + EVENTID_DOMCONTENTLOADED, EVENTID_DRAG, EVENTID_DRAGSTART, EVENTID_ERROR,

1 0

Piotr Caban : wine.inf: Add Windows Messaging Subsystem MAPI registry key.
by Alexandre Julliard Nov. 1, 2017

Nov. 1, 2017

Module: wine Branch: master Commit: bc865fa41a56dfb54b0ed59c02bf180fa764a4c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc865fa41a56dfb54b0ed59c0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 31 19:42:53 2017 +0100 wine.inf: Add Windows Messaging Subsystem MAPI registry key. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 10e8d0a..d88e4ff 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -679,6 +679,7 @@ HKLM,Software\Microsoft\SystemCertificates,,16 HKLM,Software\Microsoft\TermServLicensing,,16 HKLM,Software\Microsoft\Transaction Server,,16 HKLM,Software\Microsoft\WBEM,"Installation Directory",2,"%11%\wbem" +HKLM,Software\Microsoft\Windows Messaging Subsystem,"MAPI",2,"1" HKLM,Software\Policies,,16 HKLM,Software\Registered Applications,,16 HKLM,System\CurrentControlSet\Control\hivelist,,16

1 0

Jacek Caban : mshtml/tests: Added script IE9+ event tests.
by Alexandre Julliard Nov. 1, 2017

Nov. 1, 2017

Module: wine Branch: master Commit: 01dcb6584790ea3b37b3e69e2430eb64fe65979d URL: http://source.winehq.org/git/wine.git/?a=commit;h=01dcb6584790ea3b37b3e69e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 1 16:44:11 2017 +0100 mshtml/tests: Added script IE9+ event tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.js | 278 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 3 + dlls/mshtml/tests/script.c | 1 + 3 files changed, 282 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=01dcb6584790ea3b37b3e…

1 0

Donna Whisnant : oleaut32: Add ARM support to DispCallFunc().
by Alexandre Julliard Nov. 1, 2017

Nov. 1, 2017

Module: wine Branch: master Commit: 0b393119bb868dba303359ba6cbca2d2447a75d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b393119bb868dba303359ba6… Author: Donna Whisnant <dewhisna(a)dewtronics.com> Date: Sat Oct 28 13:00:32 2017 -0500 oleaut32: Add ARM support to DispCallFunc(). Signed-off-by: Donna Whisnant <dewhisna(a)dewtronics.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 206 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ebf6d85..86da3e3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6422,6 +6422,41 @@ __ASM_GLOBAL_FUNC( call_method, /* same function but returning floating point */ static double (CDECL * const call_double_method)(void*,int,const DWORD_PTR*) = (void *)call_method; +#elif defined(__arm__) + +extern LONGLONG CDECL call_method( void *func, int nb_stk_args, const DWORD *stk_args, const DWORD *reg_args ); +__ASM_GLOBAL_FUNC( call_method, + /* r0 = *func + * r1 = nb_stk_args + * r2 = *stk_args (pointer to 'nb_stk_args' DWORD values to push on stack) + * r3 = *reg_args (pointer to 8, 64-bit d0-d7 (double) values OR as 16, 32-bit s0-s15 (float) values, followed by 4, 32-bit (DWORD) r0-r3 values) + */ + + "push {fp, lr}\n\t" /* Save frame pointer and return address (stack still aligned to 8 bytes) */ + "mov fp, sp\n\t" /* Save stack pointer as our frame for cleaning the stack on return */ + + "lsls r1, r1, #2\n\t" /* r1 = nb_stk_args * sizeof(DWORD) */ + "beq 1f\n\t" /* Skip allocation if no stack args */ + "add r2, r2, r1\n" /* Calculate ending address of incoming stack data */ + "2:\tldr ip, [r2, #-4]!\n\t" /* Get next value */ + "str ip, [sp, #-4]!\n\t" /* Push it on the stack */ + "subs r1, r1, #4\n\t" /* Decrement count */ + "bgt 2b\n\t" /* Loop till done */ + + "1:\tvldm r3!, {s0-s15}\n\t" /* Load the s0-s15/d0-d7 arguments */ + "mov ip, r0\n\t" /* Save the function call address to ip before we nuke r0 with arguments to pass */ + "ldm r3, {r0-r3}\n\t" /* Load the r0-r3 arguments */ + + "blx ip\n\t" /* Call the target function */ + + "mov sp, fp\n\t" /* Clean the stack using fp */ + "pop {fp, pc}\n\t" /* Restore fp and return */ + ) + +/* same function but returning single/double floating point */ +static float (CDECL * const call_float_method)(void *, int, const DWORD *, const DWORD *) = (void *)call_method; +static double (CDECL * const call_double_method)(void *, int, const DWORD *, const DWORD *) = (void *)call_method; + #endif /* __x86_64__ */ static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt) @@ -6813,6 +6848,177 @@ DispCallFunc( TRACE("retval: %s\n", debugstr_variant(pvargResult)); return S_OK; +#elif defined(__arm__) + int argspos; + void *func; + UINT i; + DWORD *args; + struct { + union { + float s[16]; + double d[8]; + } sd; + DWORD r[4]; + } regs; + int rcount; /* 32-bit register index count */ + int scount; /* single-precision float register index count (will be incremented twice for doubles, plus alignment) */ + + TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n", + pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult)); + + if (cc != CC_STDCALL && cc != CC_CDECL) + { + FIXME("unsupported calling convention %d\n",cc); + return E_INVALIDARG; + } + + argspos = 0; + rcount = 0; + scount = 0; + + /* Determine if we need to pass a pointer for the return value as arg 0. If so, do that */ + /* first as it will need to be in the 'r' registers: */ + switch (vtReturn) + { + case VT_DECIMAL: + case VT_VARIANT: + regs.r[rcount++] = (DWORD)pvargResult; /* arg 0 is a pointer to the result */ + break; + case VT_HRESULT: + WARN("invalid return type %u\n", vtReturn); + return E_INVALIDARG; + default: /* And all others are in 'r', 's', or 'd' registers or have no return value */ + break; + } + + if (pvInstance) + { + const FARPROC *vtable = *(FARPROC **)pvInstance; + func = vtable[oVft/sizeof(void *)]; + regs.r[rcount++] = (DWORD)pvInstance; /* the This pointer is always the first parameter */ + } + else func = (void *)oVft; + + /* maximum size for an argument is sizeof(VARIANT). Also allow for return pointer and stack alignment. */ + args = heap_alloc( sizeof(VARIANT) * cActuals + sizeof(DWORD) * 4 ); + + for (i = 0; i < cActuals; i++) + { + VARIANT *arg = prgpvarg[i]; + DWORD *pdwarg = (DWORD *)(arg); /* a reinterpret_cast of the variant, used for copying structures when they are split between registers and stack */ + int ntemp; /* Used for counting words split between registers and stack */ + + switch (prgvt[i]) + { + case VT_EMPTY: + break; + case VT_R4: /* these must be 4-byte aligned, and put in 's' regs or stack, as they are single-floats */ + if (scount < 16) + regs.sd.s[scount++] = V_R4(arg); + else + args[argspos++] = V_UI4(arg); + break; + case VT_R8: /* these must be 8-byte aligned, and put in 'd' regs or stack, as they are double-floats */ + case VT_DATE: + if (scount < 15) + { + scount += (scount % 2); /* align scount to next whole double */ + regs.sd.d[scount/2] = V_R8(arg); + scount += 2; + } + else + { + scount = 16; /* Make sure we flag that all 's' regs are full */ + argspos += (argspos % 2); /* align argspos to 8-bytes */ + memcpy( &args[argspos], &V_R8(arg), sizeof(V_R8(arg)) ); + argspos += sizeof(V_R8(arg)) / sizeof(DWORD); + } + break; + case VT_I8: /* these must be 8-byte aligned, and put in 'r' regs or stack, as they are long-longs */ + case VT_UI8: + case VT_CY: + if (rcount < 3) + { + rcount += (rcount % 2); /* align rcount to 8-byte register pair */ + memcpy( &regs.r[rcount], &V_UI8(arg), sizeof(V_UI8(arg)) ); + rcount += sizeof(V_UI8(arg)) / sizeof(DWORD); + } + else + { + rcount = 4; /* Make sure we flag that all 'r' regs are full */ + argspos += (argspos % 2); /* align argspos to 8-bytes */ + memcpy( &args[argspos], &V_UI8(arg), sizeof(V_UI8(arg)) ); + argspos += sizeof(V_UI8(arg)) / sizeof(DWORD); + } + break; + case VT_DECIMAL: /* these structures are 8-byte aligned, and put in 'r' regs or stack, can be split between the two */ + case VT_VARIANT: + /* 8-byte align 'r' and/or stack: */ + if (rcount < 3) + rcount += (rcount % 2); + else + { + rcount = 4; + argspos += (argspos % 2); + } + ntemp = sizeof(*arg) / sizeof(DWORD); + while (ntemp > 0) + { + if (rcount < 4) + regs.r[rcount++] = *pdwarg++; + else + args[argspos++] = *pdwarg++; + --ntemp; + } + break; + case VT_BOOL: /* VT_BOOL is 16-bit but BOOL is 32-bit, needs to be extended */ + if (rcount < 4) + regs.r[rcount++] = V_BOOL(arg); + else + args[argspos++] = V_BOOL(arg); + break; + default: + if (rcount < 4) + regs.r[rcount++] = V_UI4(arg); + else + args[argspos++] = V_UI4(arg); + break; + } + TRACE("arg %u: type %s %s\n", i, debugstr_vt(prgvt[i]), debugstr_variant(arg)); + } + + argspos += (argspos % 2); /* Make sure stack function alignment is 8-byte */ + + TRACE("rcount: %d, scount: %d, argspos: %d\n", rcount, scount, argspos); + + switch (vtReturn) + { + case VT_EMPTY: /* EMPTY = no return value */ + case VT_DECIMAL: /* DECIMAL and VARIANT already have a pointer argument passed (see above) */ + case VT_VARIANT: + call_method( func, argspos, args, (DWORD*)&regs ); + break; + case VT_R4: + V_R4(pvargResult) = call_float_method( func, argspos, args, (DWORD*)&regs ); + break; + case VT_R8: + case VT_DATE: + V_R8(pvargResult) = call_double_method( func, argspos, args, (DWORD*)&regs ); + break; + case VT_I8: + case VT_UI8: + case VT_CY: + V_UI8(pvargResult) = call_method( func, argspos, args, (DWORD*)&regs ); + break; + default: + V_UI4(pvargResult) = call_method( func, argspos, args, (DWORD*)&regs ); + break; + } + heap_free( args ); + if (vtReturn != VT_VARIANT) V_VT(pvargResult) = vtReturn; + TRACE("retval: %s\n", debugstr_variant(pvargResult)); + return S_OK; + #else FIXME( "(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d)): not implemented for this CPU\n", pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult));

1 0