August 2020 - Wine-commits - list.winehq.org

Louis Lenders : api-ms-win-core-file-ansi-l2-1-0: Add dll.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: 470e4828d114420a82e19ed3a7e4d550da8c4706 URL: https://source.winehq.org/git/wine.git/?a=commit;h=470e4828d114420a82e19ed3… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat Jul 11 10:52:02 2020 +0200 api-ms-win-core-file-ansi-l2-1-0: Add dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49477 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-file-ansi-l2-1-0/Makefile.in | 1 + .../api-ms-win-core-file-ansi-l2-1-0.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) diff --git a/configure b/configure index f7fbde0d65..13c2078221 100755 --- a/configure +++ b/configure @@ -944,6 +944,7 @@ enable_api_ms_win_core_errorhandling_l1_1_2 enable_api_ms_win_core_errorhandling_l1_1_3 enable_api_ms_win_core_fibers_l1_1_0 enable_api_ms_win_core_fibers_l1_1_1 +enable_api_ms_win_core_file_ansi_l2_1_0 enable_api_ms_win_core_file_fromapp_l1_1_0 enable_api_ms_win_core_file_l1_1_0 enable_api_ms_win_core_file_l1_2_0 @@ -20319,6 +20320,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-errorhandling-l1-1-2 enable_api_ms_ wine_fn_config_makefile dlls/api-ms-win-core-errorhandling-l1-1-3 enable_api_ms_win_core_errorhandling_l1_1_3 wine_fn_config_makefile dlls/api-ms-win-core-fibers-l1-1-0 enable_api_ms_win_core_fibers_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-fibers-l1-1-1 enable_api_ms_win_core_fibers_l1_1_1 +wine_fn_config_makefile dlls/api-ms-win-core-file-ansi-l2-1-0 enable_api_ms_win_core_file_ansi_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-file-fromapp-l1-1-0 enable_api_ms_win_core_file_fromapp_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-file-l1-1-0 enable_api_ms_win_core_file_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-file-l1-2-0 enable_api_ms_win_core_file_l1_2_0 diff --git a/configure.ac b/configure.ac index 890184151d..d54857181e 100644 --- a/configure.ac +++ b/configure.ac @@ -2862,6 +2862,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-errorhandling-l1-1-2) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-errorhandling-l1-1-3) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-fibers-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-fibers-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-file-ansi-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-file-fromapp-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-file-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-file-l1-2-0) diff --git a/dlls/api-ms-win-core-file-ansi-l2-1-0/Makefile.in b/dlls/api-ms-win-core-file-ansi-l2-1-0/Makefile.in new file mode 100644 index 0000000000..087fadd251 --- /dev/null +++ b/dlls/api-ms-win-core-file-ansi-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-file-ansi-l2-1-0.dll diff --git a/dlls/api-ms-win-core-file-ansi-l2-1-0/api-ms-win-core-file-ansi-l2-1-0.spec b/dlls/api-ms-win-core-file-ansi-l2-1-0/api-ms-win-core-file-ansi-l2-1-0.spec new file mode 100644 index 0000000000..0eb7398aff --- /dev/null +++ b/dlls/api-ms-win-core-file-ansi-l2-1-0/api-ms-win-core-file-ansi-l2-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall CopyFileExA(str str ptr ptr ptr long) kernel32.CopyFileExA +@ stdcall ReplaceFileA(str str str long ptr ptr) kernel32.ReplaceFileA diff --git a/tools/make_specfiles b/tools/make_specfiles index a740a60c4c..2af4606984 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -237,6 +237,7 @@ my @dll_groups = "api-ms-win-core-file-l2-1-0", "api-ms-win-core-file-l2-1-1", "api-ms-win-core-file-l2-1-2", + "api-ms-win-core-file-ansi-l2-1-0", "api-ms-win-core-file-fromapp-l1-1-0", "api-ms-win-core-handle-l1-1-0", "api-ms-win-core-heap-l1-1-0",

1 0

Nikolay Sivov : combase: Move HGLOBAL marshalling functions.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: f6f9dd81a7b600b5a2b85c1a3db897ad23b4ab97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6f9dd81a7b600b5a2b85c1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 4 17:02:36 2020 +0300 combase: Move HGLOBAL marshalling functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 4 + dlls/combase/usrmarshal.c | 219 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/ole32.spec | 8 +- dlls/ole32/usrmarshal.c | 219 ---------------------------------------------- 4 files changed, 227 insertions(+), 223 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f6f9dd81a7b600b5a2b8…

1 0

Nikolay Sivov : combase: Move HACCEL marshalling functions.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: 4ae64d59de4502b538d32186384179089609bcd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ae64d59de4502b538d32186… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 4 17:02:37 2020 +0300 combase: Move HACCEL marshalling functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 4 +++ dlls/combase/usrmarshal.c | 1 + dlls/ole32/ole32.spec | 8 ++--- dlls/ole32/usrmarshal.c | 74 ----------------------------------------------- 4 files changed, 9 insertions(+), 78 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 3c0955f705..f1aaa44205 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -185,6 +185,10 @@ @ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream @ stub GetHookInterface @ stdcall GetRestrictedErrorInfo(ptr) +@ stdcall HACCEL_UserFree(ptr ptr) +@ stdcall HACCEL_UserMarshal(ptr ptr ptr) +@ stdcall HACCEL_UserSize(ptr long ptr) +@ stdcall HACCEL_UserUnmarshal(ptr ptr ptr) @ stdcall HBITMAP_UserFree(ptr ptr) @ stdcall HBITMAP_UserMarshal(ptr ptr ptr) @ stdcall HBITMAP_UserSize(ptr long ptr) diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c index 7c77cc1a80..8bea32cdd5 100644 --- a/dlls/combase/usrmarshal.c +++ b/dlls/combase/usrmarshal.c @@ -134,6 +134,7 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle) handle_UserFree(pFlags, (HANDLE *)handle); \ } +IMPL_WIREM_HANDLE(HACCEL) IMPL_WIREM_HANDLE(HBRUSH) IMPL_WIREM_HANDLE(HDC) IMPL_WIREM_HANDLE(HICON) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index c3ee8f27f2..9a6ec7cb71 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -123,10 +123,10 @@ @ stdcall GetHGlobalFromStream(ptr ptr) @ stub GetHookInterface @ stdcall GetRunningObjectTable(long ptr) -@ stdcall HACCEL_UserFree(ptr ptr) -@ stdcall HACCEL_UserMarshal(ptr ptr ptr) -@ stdcall HACCEL_UserSize(ptr long ptr) -@ stdcall HACCEL_UserUnmarshal(ptr ptr ptr) +@ stdcall HACCEL_UserFree(ptr ptr) combase.HACCEL_UserFree +@ stdcall HACCEL_UserMarshal(ptr ptr ptr) combase.HACCEL_UserMarshal +@ stdcall HACCEL_UserSize(ptr long ptr) combase.HACCEL_UserSize +@ stdcall HACCEL_UserUnmarshal(ptr ptr ptr) combase.HACCEL_UserUnmarshal @ stdcall HBITMAP_UserFree(ptr ptr) combase.HBITMAP_UserFree @ stdcall HBITMAP_UserMarshal(ptr ptr ptr) combase.HBITMAP_UserMarshal @ stdcall HBITMAP_UserSize(ptr long ptr) combase.HBITMAP_UserSize diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index a5daa94983..c58053489b 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -82,80 +82,6 @@ static const char* debugstr_user_flags(ULONG *pFlags) return wine_dbg_sprintf("MAKELONG(%s, 0x%04x)", loword, HIWORD(*pFlags)); } -static ULONG handle_UserSize(ULONG *pFlags, ULONG StartingSize, HANDLE *handle) -{ - if (LOWORD(*pFlags) == MSHCTX_DIFFERENTMACHINE) - { - ERR("can't remote a local handle\n"); - RaiseException(RPC_S_INVALID_TAG, 0, 0, NULL); - return StartingSize; - } - - ALIGN_LENGTH(StartingSize, 3); - return StartingSize + sizeof(RemotableHandle); -} - -static unsigned char * handle_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HANDLE *handle) -{ - RemotableHandle *remhandle; - if (LOWORD(*pFlags) == MSHCTX_DIFFERENTMACHINE) - { - ERR("can't remote a local handle\n"); - RaiseException(RPC_S_INVALID_TAG, 0, 0, NULL); - return pBuffer; - } - - ALIGN_POINTER(pBuffer, 3); - remhandle = (RemotableHandle *)pBuffer; - remhandle->fContext = WDT_INPROC_CALL; - remhandle->u.hInproc = (LONG_PTR)*handle; - return pBuffer + sizeof(RemotableHandle); -} - -static unsigned char * handle_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HANDLE *handle) -{ - RemotableHandle *remhandle; - - ALIGN_POINTER(pBuffer, 3); - remhandle = (RemotableHandle *)pBuffer; - if (remhandle->fContext != WDT_INPROC_CALL) - RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); - *handle = (HANDLE)(LONG_PTR)remhandle->u.hInproc; - return pBuffer + sizeof(RemotableHandle); -} - -static void handle_UserFree(ULONG *pFlags, HANDLE *handle) -{ - /* nothing to do */ -} - -#define IMPL_WIREM_HANDLE(type) \ - ULONG __RPC_USER type##_UserSize(ULONG *pFlags, ULONG StartingSize, type *handle) \ - { \ - TRACE("(%s, %d, %p\n", debugstr_user_flags(pFlags), StartingSize, handle); \ - return handle_UserSize(pFlags, StartingSize, (HANDLE *)handle); \ - } \ - \ - unsigned char * __RPC_USER type##_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, type *handle) \ - { \ - TRACE("(%s, %p, &%p\n", debugstr_user_flags(pFlags), pBuffer, *handle); \ - return handle_UserMarshal(pFlags, pBuffer, (HANDLE *)handle); \ - } \ - \ - unsigned char * __RPC_USER type##_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, type *handle) \ - { \ - TRACE("(%s, %p, %p\n", debugstr_user_flags(pFlags), pBuffer, handle); \ - return handle_UserUnmarshal(pFlags, pBuffer, (HANDLE *)handle); \ - } \ - \ - void __RPC_USER type##_UserFree(ULONG *pFlags, type *handle) \ - { \ - TRACE("(%s, &%p\n", debugstr_user_flags(pFlags), *handle); \ - handle_UserFree(pFlags, (HANDLE *)handle); \ - } - -IMPL_WIREM_HANDLE(HACCEL) - /****************************************************************************** * HMETAFILE_UserSize [OLE32.@] *

1 0

Nikolay Sivov : combase: Move CreateErrorInfo() function.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: 7f43de677adc41e4ebb1cd73e5c1d55f68a43a7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f43de677adc41e4ebb1cd73… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 4 17:02:38 2020 +0300 combase: Move CreateErrorInfo() function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/Makefile.in | 2 + dlls/combase/combase.spec | 2 +- dlls/combase/errorinfo.c | 356 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/errorinfo.c | 356 ---------------------------------------------- dlls/ole32/ole32.spec | 2 +- 5 files changed, 360 insertions(+), 358 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f43de677adc41e4ebb1…

1 0

Gabriel Ivăncescu : msscript.ocx: Implement the ScriptModule enumerator.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: c7aa513a3b08f18687085e26ecd591a2491b13f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7aa513a3b08f18687085e26… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 4 17:28:12 2020 +0300 msscript.ocx: Implement the ScriptModule enumerator. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 163 ++++++++++++++++++++++++++++++++++++- dlls/msscript.ocx/tests/msscript.c | 134 +++++++++++++++++++++++++++++- 2 files changed, 294 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c7aa513a3b08f1868708…

1 0

Gabriel Ivăncescu : msscript.ocx: Move ScriptControl::Run implementation into a helper.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: 5035b82f8ff47229a573416077df1437a4cf4e3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5035b82f8ff47229a5734160… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 4 17:28:13 2020 +0300 msscript.ocx: Move ScriptControl::Run implementation into a helper. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 97 +++++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 46 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 352bcab0c2..db5d97db3c 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -314,6 +314,56 @@ static HRESULT parse_script_text(ScriptModule *module, BSTR script_text, DWORD f return hr; } +static HRESULT run_procedure(ScriptModule *module, BSTR procedure_name, SAFEARRAY *args, VARIANT *res) +{ + IDispatchEx *dispex; + IDispatch *disp; + DISPPARAMS dp; + DISPID dispid; + HRESULT hr; + UINT i; + + hr = start_script(module->host); + if (FAILED(hr)) return hr; + + hr = get_script_dispatch(module, &disp); + if (FAILED(hr)) return hr; + + hr = IDispatch_GetIDsOfNames(disp, &IID_NULL, &procedure_name, 1, LOCALE_USER_DEFAULT, &dispid); + if (FAILED(hr)) return hr; + + dp.cArgs = args->rgsabound[0].cElements; + dp.rgdispidNamedArgs = NULL; + dp.cNamedArgs = 0; + dp.rgvarg = heap_alloc(dp.cArgs * sizeof(*dp.rgvarg)); + if (!dp.rgvarg) return E_OUTOFMEMORY; + + hr = SafeArrayLock(args); + if (SUCCEEDED(hr)) + { + /* The DISPPARAMS are stored in reverse order */ + for (i = 0; i < dp.cArgs; i++) + dp.rgvarg[i] = *(VARIANT*)((char*)(args->pvData) + (dp.cArgs - i - 1) * args->cbElements); + SafeArrayUnlock(args); + + hr = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if (FAILED(hr)) + { + hr = IDispatch_Invoke(disp, dispid, &IID_NULL, LOCALE_USER_DEFAULT, + DISPATCH_METHOD, &dp, res, NULL, NULL); + } + else + { + hr = IDispatchEx_InvokeEx(dispex, dispid, LOCALE_USER_DEFAULT, + DISPATCH_METHOD, &dp, res, NULL, NULL); + IDispatchEx_Release(dispex); + } + } + heap_free(dp.rgvarg); + + return hr; +} + static inline ScriptControl *impl_from_IScriptControl(IScriptControl *iface) { return CONTAINING_RECORD(iface, ScriptControl, IScriptControl_iface); @@ -1782,13 +1832,7 @@ static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR static HRESULT WINAPI ScriptControl_Run(IScriptControl *iface, BSTR procedure_name, SAFEARRAY **parameters, VARIANT *res) { ScriptControl *This = impl_from_IScriptControl(iface); - IDispatchEx *dispex; - IDispatch *disp; SAFEARRAY *sa; - DISPPARAMS dp; - DISPID dispid; - HRESULT hr; - UINT i; TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(procedure_name), parameters, res); @@ -1798,48 +1842,9 @@ static HRESULT WINAPI ScriptControl_Run(IScriptControl *iface, BSTR procedure_na V_VT(res) = VT_EMPTY; if (sa->cDims == 0) return DISP_E_BADINDEX; if (!(sa->fFeatures & FADF_VARIANT)) return DISP_E_BADVARTYPE; - - if (!This->host) return E_FAIL; - hr = start_script(This->host); - if (FAILED(hr)) return hr; - - hr = get_script_dispatch(This->modules[0], &disp); - if (FAILED(hr)) return hr; - - hr = IDispatch_GetIDsOfNames(disp, &IID_NULL, &procedure_name, 1, LOCALE_USER_DEFAULT, &dispid); - if (FAILED(hr)) return hr; - - dp.cArgs = sa->rgsabound[0].cElements; - dp.rgdispidNamedArgs = NULL; - dp.cNamedArgs = 0; - dp.rgvarg = heap_alloc(dp.cArgs * sizeof(*dp.rgvarg)); - if (!dp.rgvarg) return E_OUTOFMEMORY; - hr = SafeArrayLock(sa); - if (SUCCEEDED(hr)) - { - /* The DISPPARAMS are stored in reverse order */ - for (i = 0; i < dp.cArgs; i++) - dp.rgvarg[i] = *(VARIANT*)((char*)(sa->pvData) + (dp.cArgs - i - 1) * sa->cbElements); - SafeArrayUnlock(sa); - - hr = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - if (FAILED(hr)) - { - hr = IDispatch_Invoke(disp, dispid, &IID_NULL, LOCALE_USER_DEFAULT, - DISPATCH_METHOD, &dp, res, NULL, NULL); - } - else - { - hr = IDispatchEx_InvokeEx(dispex, dispid, LOCALE_USER_DEFAULT, - DISPATCH_METHOD, &dp, res, NULL, NULL); - IDispatchEx_Release(dispex); - } - } - heap_free(dp.rgvarg); - - return hr; + return run_procedure(This->modules[0], procedure_name, sa, res); } static const IScriptControlVtbl ScriptControlVtbl = {

1 0

Gabriel Ivăncescu : msscript.ocx: Implement ScriptModule::Run.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: a5a7ceba0e63f54812a51f8c03ab193358824fdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5a7ceba0e63f54812a51f8c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 4 17:28:14 2020 +0300 msscript.ocx: Implement ScriptModule::Run. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 13 ++++++- dlls/msscript.ocx/tests/msscript.c | 75 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index db5d97db3c..c36a5db3ec 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -885,10 +885,19 @@ static HRESULT WINAPI ScriptModule_ExecuteStatement(IScriptModule *iface, BSTR s static HRESULT WINAPI ScriptModule_Run(IScriptModule *iface, BSTR procedure_name, SAFEARRAY **parameters, VARIANT *res) { ScriptModule *This = impl_from_IScriptModule(iface); + SAFEARRAY *sa; - FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(procedure_name), parameters, res); + TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(procedure_name), parameters, res); - return E_NOTIMPL; + if (!parameters || !res) return E_POINTER; + if (!(sa = *parameters)) return E_POINTER; + + V_VT(res) = VT_EMPTY; + if (sa->cDims == 0) return DISP_E_BADINDEX; + if (!(sa->fFeatures & FADF_VARIANT)) return DISP_E_BADVARTYPE; + if (!This->host) return E_FAIL; + + return run_procedure(This, procedure_name, sa, res); } static const IScriptModuleVtbl ScriptModuleVtbl = { diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 9986fbf2f4..7f121e0073 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -2307,11 +2307,18 @@ static void test_IScriptControl_Run(void) static void test_IScriptControl_get_Modules(void) { + SAFEARRAYBOUND bnd[] = { { 2, 0 }, { 2, 0 } }; + LONG idx0_0[] = { 0, 0 }; + LONG idx0_1[] = { 1, 0 }; + LONG idx1_0[] = { 0, 1 }; + LONG idx1_1[] = { 1, 1 }; + IEnumVARIANT *enumvar, *enumvar2; IScriptModuleCollection *mods; VARIANT var, vars[3]; IScriptModule *mod; IScriptControl *sc; + SAFEARRAY *params; IUnknown *unknown; ULONG fetched; LONG count; @@ -2492,6 +2499,69 @@ static void test_IScriptControl_get_Modules(void) ok(FAILED(hr), "IScriptControl_Eval succeeded: 0x%08x.\n", hr); SysFreeString(str); + V_VT(&var) = VT_R4; + V_R4(&var) = 2.0f; + hr = IScriptModuleCollection_get_Item(mods, var, &mod); + ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); + + params = SafeArrayCreate(VT_VARIANT, 1, bnd); + ok(params != NULL, "Failed to create SafeArray.\n"); + + V_VT(&var) = VT_I4; + V_I4(&var) = 10; + SafeArrayPutElement(params, idx0_0, &var); + V_I4(&var) = 3; + SafeArrayPutElement(params, idx0_1, &var); + + str = SysAllocString(L"sub"); + hr = IScriptModule_Run(mod, str, NULL, &var); + ok(hr == E_POINTER, "IScriptModule_Run returned: 0x%08x.\n", hr); + hr = IScriptModule_Run(mod, str, &params, NULL); + ok(hr == E_POINTER, "IScriptModule_Run returned: 0x%08x.\n", hr); + + hr = IScriptControl_Run(sc, str, &params, &var); + ok(hr == DISP_E_UNKNOWNNAME, "IScriptControl_Run failed: 0x%08x.\n", hr); + hr = IScriptModule_Run(mod, str, &params, &var); + ok(hr == S_OK, "IScriptModule_Run failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 7), "V_VT(var) = %d, V_I4(var) = %d.\n", V_VT(&var), V_I4(&var)); + SysFreeString(str); + + str = SysAllocString(L"add"); + hr = IScriptControl_Run(sc, str, &params, &var); + ok(hr == S_OK, "IScriptControl_Run failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 13), "V_VT(var) = %d, V_I4(var) = %d.\n", V_VT(&var), V_I4(&var)); + hr = IScriptModule_Run(mod, str, &params, &var); + ok(hr == DISP_E_UNKNOWNNAME, "IScriptModule_Run failed: 0x%08x.\n", hr); + SysFreeString(str); + + SafeArrayDestroy(params); + params = SafeArrayCreate(VT_VARIANT, 2, bnd); + ok(params != NULL, "Failed to create SafeArray.\n"); + + V_VT(&var) = VT_I4; + V_I4(&var) = 49; + SafeArrayPutElement(params, idx0_0, &var); + V_I4(&var) = 7; + SafeArrayPutElement(params, idx0_1, &var); + V_I4(&var) = 30; + SafeArrayPutElement(params, idx1_0, &var); + V_I4(&var) = 25; + SafeArrayPutElement(params, idx1_1, &var); + + str = SysAllocString(L"sub"); + hr = IScriptModule_Run(mod, str, &params, &var); + ok(hr == S_OK, "IScriptModule_Run failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 42), "V_VT(var) = %d, V_I4(var) = %d.\n", V_VT(&var), V_I4(&var)); + + params->cDims = 0; + hr = IScriptModule_Run(mod, str, &params, &var); + ok(hr == DISP_E_BADINDEX, "IScriptModule_Run returned: 0x%08x.\n", hr); + ok(V_VT(&var) == VT_EMPTY, "V_VT(var) = %d.\n", V_VT(&var)); + params->cDims = 2; + SysFreeString(str); + + IScriptModule_Release(mod); + /* Grab a module ref and change the language to something valid */ V_VT(&var) = VT_I2; V_I2(&var) = 3; @@ -2515,7 +2585,12 @@ static void test_IScriptControl_get_Modules(void) str = SysAllocString(L"sub closed\nend sub"); hr = IScriptModule_AddCode(mod, str); ok(hr == E_FAIL, "IScriptModule_AddCode failed: 0x%08x.\n", hr); + SysFreeString(str); + str = SysAllocString(L"identifier"); + hr = IScriptModule_Run(mod, str, &params, &var); + ok(hr == E_FAIL, "IScriptModule_Run returned: 0x%08x.\n", hr); IScriptModule_Release(mod); + SafeArrayDestroy(params); SysFreeString(str); /* The enumerator is also invalid */

1 0

Gabriel Ivăncescu : msscript.ocx: Implement ScriptModule::get_CodeObject.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: 77b48fa41a93c3b42a09c2d77065c57a8b02b341 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77b48fa41a93c3b42a09c2d7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 4 17:28:15 2020 +0300 msscript.ocx: Implement ScriptModule::get_CodeObject. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 14 ++++++++++++-- dlls/msscript.ocx/tests/msscript.c | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index c36a5db3ec..94d6ddac83 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -828,10 +828,20 @@ static HRESULT WINAPI ScriptModule_get_Name(IScriptModule *iface, BSTR *pbstrNam static HRESULT WINAPI ScriptModule_get_CodeObject(IScriptModule *iface, IDispatch **ppdispObject) { ScriptModule *This = impl_from_IScriptModule(iface); + HRESULT hr; - FIXME("(%p)->(%p)\n", This, ppdispObject); + TRACE("(%p)->(%p)\n", This, ppdispObject); - return E_NOTIMPL; + if (!This->host) return E_FAIL; + + hr = start_script(This->host); + if (FAILED(hr)) return hr; + + hr = get_script_dispatch(This, ppdispObject); + if (FAILED(hr)) return hr; + + IDispatch_AddRef(*ppdispObject); + return hr; } static HRESULT WINAPI ScriptModule_get_Procedures(IScriptModule *iface, IScriptProcedureCollection **ppdispProcedures) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 7f121e0073..90f6d19231 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -549,11 +549,13 @@ static HRESULT WINAPI ActiveScript_AddTypeLib(IActiveScript *iface, REFGUID rgui return E_NOTIMPL; } +static const WCHAR *GetScriptDispatch_expected_name; static HRESULT WINAPI ActiveScript_GetScriptDispatch(IActiveScript *iface, LPCOLESTR pstrItemName, IDispatch **ppdisp) { CHECK_EXPECT(GetScriptDispatch); - ok(!pstrItemName, "pstrItemName not NULL, got %s.\n", wine_dbgstr_w(pstrItemName)); + ok(GetScriptDispatch_expected_name ? (pstrItemName && !lstrcmpW(pstrItemName, GetScriptDispatch_expected_name)) : !pstrItemName, + "pstrItemName not %s, got %s.\n", wine_dbgstr_w(GetScriptDispatch_expected_name), wine_dbgstr_w(pstrItemName)); *ppdisp = (IDispatch*)&DispatchEx; @@ -2234,6 +2236,7 @@ static void test_IScriptControl_Run(void) CHECK_CALLED(QI_IActiveScriptParse); CHECK_CALLED(InitNew); + GetScriptDispatch_expected_name = NULL; SET_EXPECT(SetScriptState_STARTED); SET_EXPECT(GetScriptDispatch); SET_EXPECT(QI_IDispatchEx); @@ -2320,9 +2323,11 @@ static void test_IScriptControl_get_Modules(void) IScriptControl *sc; SAFEARRAY *params; IUnknown *unknown; + IDispatch *disp; ULONG fetched; LONG count; HRESULT hr; + DISPID id; BSTR str; UINT i; @@ -2504,6 +2509,23 @@ static void test_IScriptControl_get_Modules(void) hr = IScriptModuleCollection_get_Item(mods, var, &mod); ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); + hr = IScriptModule_get_CodeObject(mod, &disp); + ok(hr == S_OK, "IScriptModule_get_CodeObject failed: 0x%08x.\n", hr); + + str = SysAllocString(L"sub"); + hr = IDispatch_GetIDsOfNames(disp, &IID_NULL, &str, 1, LOCALE_USER_DEFAULT, &id); + ok(hr == S_OK, "IDispatch_GetIDsOfNames failed: 0x%08x.\n", hr); + ok(id != -1, "Unexpected id %d.\n", id); + SysFreeString(str); + + str = SysAllocString(L"add"); + hr = IDispatch_GetIDsOfNames(disp, &IID_NULL, &str, 1, LOCALE_USER_DEFAULT, &id); + ok(hr == DISP_E_UNKNOWNNAME, "IDispatch_GetIDsOfNames returned: 0x%08x.\n", hr); + ok(id == -1, "Unexpected id %d.\n", id); + SysFreeString(str); + + IDispatch_Release(disp); + params = SafeArrayCreate(VT_VARIANT, 1, bnd); ok(params != NULL, "Failed to create SafeArray.\n"); @@ -2578,6 +2600,8 @@ static void test_IScriptControl_get_Modules(void) ok(count == 1, "count is not 1, got %d.\n", count); hr = IScriptModule_get_Name(mod, &str); ok(hr == E_FAIL, "IScriptModule_get_Name returned: 0x%08x.\n", hr); + hr = IScriptModule_get_CodeObject(mod, &disp); + ok(hr == E_FAIL, "IScriptModule_get_CodeObject returned: 0x%08x.\n", hr); str = SysAllocString(L"function closed() { }\n"); hr = IScriptModule_AddCode(mod, str); ok(hr == E_FAIL, "IScriptModule_AddCode failed: 0x%08x.\n", hr); @@ -2703,14 +2727,23 @@ static void test_IScriptControl_get_Modules(void) ok(unknown == (IUnknown*)&testdisp, "Unexpected IUnknown for the item: %p.\n", unknown); IUnknown_Release(unknown); + GetScriptDispatch_expected_name = str; SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(GetScriptDispatch); + hr = IScriptModule_get_CodeObject(mod, &disp); + ok(hr == S_OK, "IScriptModule_get_CodeObject failed: 0x%08x.\n", hr); + ok(disp == (IDispatch*)&DispatchEx, "Unexpected code object %p.\n", disp); + CHECK_CALLED(GetScriptDispatch); + CHECK_CALLED(SetScriptState_STARTED); + GetScriptDispatch_expected_name = NULL; + IDispatch_Release(disp); + SET_EXPECT(ParseScriptText); parse_item_name = str; parse_flags = SCRIPTTEXT_ISVISIBLE; code_str = SysAllocString(L"some code"); hr = IScriptModule_AddCode(mod, code_str); ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); - CHECK_CALLED(SetScriptState_STARTED); CHECK_CALLED(ParseScriptText); SysFreeString(code_str); SysFreeString(str);

1 0

Gabriel Ivăncescu : msscript.ocx: Implement ScriptControl::get_CodeObject.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: ad56f0c5c5a7e85558db93b3f180e8be61bd858b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad56f0c5c5a7e85558db93b3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 4 17:28:16 2020 +0300 msscript.ocx: Implement ScriptControl::get_CodeObject. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 8 +++-- dlls/msscript.ocx/tests/msscript.c | 67 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 94d6ddac83..3fc4aca2e9 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -1760,8 +1760,12 @@ static HRESULT WINAPI ScriptControl_get_Error(IScriptControl *iface, IScriptErro static HRESULT WINAPI ScriptControl_get_CodeObject(IScriptControl *iface, IDispatch **p) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if (!This->host) return E_FAIL; + + return IScriptModule_get_CodeObject(&This->modules[0]->IScriptModule_iface, p); } static HRESULT WINAPI ScriptControl_get_Procedures(IScriptControl *iface, IScriptProcedureCollection **p) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 90f6d19231..352bf78703 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -2883,6 +2883,72 @@ static void test_IScriptControl_get_Modules(void) } } +static void test_IScriptControl_get_CodeObject(void) +{ + IScriptControl *sc; + IDispatch *disp; + HRESULT hr; + BSTR str; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + hr = IScriptControl_get_CodeObject(sc, &disp); + ok(hr == E_FAIL, "IScriptControl_get_CodeObject returned: 0x%08x.\n", hr); + + str = SysAllocString(L"jscript"); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(str); + + hr = IScriptControl_get_CodeObject(sc, &disp); + ok(hr == S_OK, "IScriptControl_get_CodeObject failed: 0x%08x.\n", hr); + + IDispatch_Release(disp); + IScriptControl_Release(sc); + + if (have_custom_engine) + { + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + str = SysAllocString(L"testscript"); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(str); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + GetScriptDispatch_expected_name = NULL; + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(GetScriptDispatch); + hr = IScriptControl_get_CodeObject(sc, &disp); + ok(hr == S_OK, "IScriptControl_get_CodeObject failed: 0x%08x.\n", hr); + ok(disp == (IDispatch*)&DispatchEx, "unexpected code object %p\n", disp); + CHECK_CALLED(GetScriptDispatch); + CHECK_CALLED(SetScriptState_STARTED); + + IDispatch_Release(disp); + IActiveScriptSite_Release(site); + + SET_EXPECT(Close); + IScriptControl_Release(sc); + CHECK_CALLED(Close); + } +} + START_TEST(msscript) { IUnknown *unk; @@ -2921,6 +2987,7 @@ START_TEST(msscript) test_IScriptControl_ExecuteStatement(); test_IScriptControl_Run(); test_IScriptControl_get_Modules(); + test_IScriptControl_get_CodeObject(); init_registry(FALSE);

1 0

Dmitry Timoshkov : ieframe: Deactivate UI when processing IOleObject::DoVerb(OLEIVERB_HIDE).
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: a58b7d387894e969a3a612d82bafffe74aba6484 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a58b7d387894e969a3a612d8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 4 23:56:26 2020 +0800 ieframe: Deactivate UI when processing IOleObject::DoVerb(OLEIVERB_HIDE). This fixes an application that expects to go through full UI activation after IOleObject::DoVerb(OLEIVERB_HIDE) + IOleObject::DoVerb(OLEIVERB_UIACTIVATE). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/ieframe.h | 2 + dlls/ieframe/oleobject.c | 44 ++++++++---- dlls/ieframe/tests/webbrowser.c | 154 ++++++++++++++++++++++++++++++++++++++-- 3 files changed, 183 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a58b7d387894e969a3a6…

1 0