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

Dmitry Kislyuk : vbscript: Support conversion to string in InStr.
by Alexandre Julliard Aug. 4, 2020

Aug. 4, 2020

Module: wine Branch: master Commit: 626a38b570188e5c12c86ab628c9b1e576f25e62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=626a38b570188e5c12c86ab6… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Tue Aug 4 12:14:52 2020 -0500 vbscript: Support conversion to string in InStr. Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 34 ++++++++++++++++++++++------------ dlls/vbscript/tests/api.vbs | 6 ++++++ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index e41c2ff7b3..abb4b7933b 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1624,7 +1624,7 @@ static HRESULT Global_InStr(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, { VARIANT *startv, *str1v, *str2v; BSTR str1, str2; - int ret, start = 0, mode = 0; + int ret = -1, start = 0, mode = 0; HRESULT hres; TRACE("args_cnt=%u\n", args_cnt); @@ -1673,23 +1673,33 @@ static HRESULT Global_InStr(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, return return_null(res); if(V_VT(str1v) != VT_BSTR) { - FIXME("Unsupported str1 type %s\n", debugstr_variant(str1v)); - return E_NOTIMPL; + hres = to_string(str1v, &str1); + if(FAILED(hres)) + return hres; } - str1 = V_BSTR(str1v); + else + str1 = V_BSTR(str1v); if(V_VT(str2v) != VT_BSTR) { - FIXME("Unsupported str2 type %s\n", debugstr_variant(str2v)); - return E_NOTIMPL; + hres = to_string(str2v, &str2); + if(FAILED(hres)){ + if(V_VT(str1v) != VT_BSTR) + SysFreeString(str1); + return hres; + } } - str2 = V_BSTR(str2v); - - if(start >= SysStringLen(str1)) - return return_int(res, 0); + else + str2 = V_BSTR(str2v); - ret = FindStringOrdinal(FIND_FROMSTART, str1 + start, SysStringLen(str1)-start, - str2, SysStringLen(str2), mode); + if(start < SysStringLen(str1)) { + ret = FindStringOrdinal(FIND_FROMSTART, str1 + start, SysStringLen(str1)-start, + str2, SysStringLen(str2), mode); + } + if(V_VT(str1v) != VT_BSTR) + SysFreeString(str1); + if(V_VT(str2v) != VT_BSTR) + SysFreeString(str2); return return_int(res, ++ret ? ret+start : 0); } diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 3f50195bdc..0c37c3c843 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -429,6 +429,12 @@ Call ok(x = 8, "InStr returned " & x) x = InStr(1, "abc" & Chr(0) & "ABC", Chr(0) & "a", 1) Call ok(x = 4, "InStr returned " & x) +x = InStr(1, 23456, 45, 0) +Call ok(x = 3, "InStr returned " & x) + +x = InStr(1, "23456", 34, 1) +Call ok(x = 2, "InStr returned " & x) + x = InStrRev("bcabcd", "bc") Call ok(x = 4, "InStrRev returned " & x)

1 0

Gabriel Ivăncescu : msscript.ocx: Implement the ScriptModule enumerator.
by Alexandre Julliard Aug. 4, 2020

Aug. 4, 2020

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

Nikolay Sivov : combase: Move CreateErrorInfo() function.
by Alexandre Julliard Aug. 4, 2020

Aug. 4, 2020

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 ScriptControl::get_CodeObject.
by Alexandre Julliard Aug. 4, 2020

Aug. 4, 2020

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

Gabriel Ivăncescu : msscript.ocx: Move ScriptControl::Run implementation into a helper.
by Alexandre Julliard Aug. 4, 2020

Aug. 4, 2020

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

Louis Lenders : api-ms-win-core-file-fromapp-l1-1-0: Add dll.
by Alexandre Julliard Aug. 4, 2020

Aug. 4, 2020

Module: wine Branch: master Commit: 0f040213280a9e20c4c4510e5b906c7a919d6593 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f040213280a9e20c4c4510e… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat Jul 11 10:52:01 2020 +0200 api-ms-win-core-file-fromapp-l1-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-fromapp-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-file-fromapp-l1-1-0.spec | 11 +++++++++++ tools/make_specfiles | 1 + 5 files changed, 16 insertions(+) diff --git a/configure b/configure index 9b66ddd2b8..f7fbde0d65 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_fromapp_l1_1_0 enable_api_ms_win_core_file_l1_1_0 enable_api_ms_win_core_file_l1_2_0 enable_api_ms_win_core_file_l1_2_1 @@ -20318,6 +20319,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-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 wine_fn_config_makefile dlls/api-ms-win-core-file-l1-2-1 enable_api_ms_win_core_file_l1_2_1 diff --git a/configure.ac b/configure.ac index ab183b9d14..890184151d 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-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) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-file-l1-2-1) diff --git a/dlls/api-ms-win-core-file-fromapp-l1-1-0/Makefile.in b/dlls/api-ms-win-core-file-fromapp-l1-1-0/Makefile.in new file mode 100644 index 0000000000..15294e7fad --- /dev/null +++ b/dlls/api-ms-win-core-file-fromapp-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-file-fromapp-l1-1-0.dll diff --git a/dlls/api-ms-win-core-file-fromapp-l1-1-0/api-ms-win-core-file-fromapp-l1-1-0.spec b/dlls/api-ms-win-core-file-fromapp-l1-1-0/api-ms-win-core-file-fromapp-l1-1-0.spec new file mode 100644 index 0000000000..e0f5875885 --- /dev/null +++ b/dlls/api-ms-win-core-file-fromapp-l1-1-0/api-ms-win-core-file-fromapp-l1-1-0.spec @@ -0,0 +1,11 @@ +@ stub CopyFileFromAppW +@ stub CreateDirectoryFromAppW +@ stub CreateFile2FromAppW +@ stub CreateFileFromAppW +@ stub DeleteFileFromAppW +@ stub FindFirstFileExFromAppW +@ stub GetFileAttributesExFromAppW +@ stub MoveFileFromAppW +@ stub RemoveDirectoryFromAppW +@ stub ReplaceFileFromAppW +@ stub SetFileAttributesFromAppW diff --git a/tools/make_specfiles b/tools/make_specfiles index d0ac39b4e6..a740a60c4c 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-fromapp-l1-1-0", "api-ms-win-core-handle-l1-1-0", "api-ms-win-core-heap-l1-1-0", "api-ms-win-core-heap-l1-2-0",

1 0

Derek Lesho : ntoskrnl.exe: Implement KeInitializeApc.
by Alexandre Julliard Aug. 4, 2020

Aug. 4, 2020

Module: wine Branch: master Commit: 2a578eaeb61047a8e4f4a4ffc47e275de475b6ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a578eaeb61047a8e4f4a4ff… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Jul 16 10:17:10 2020 -0500 ntoskrnl.exe: Implement KeInitializeApc. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 33 +++++++++++++++++++++++++++++++++ include/ddk/wdm.h | 7 +++++++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 584a8283ea..2376226dc6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -564,7 +564,7 @@ @ stub KeI386ReleaseLid @ stub KeI386SetGdtSelector @ stub KeIcacheFlushCount -@ stub KeInitializeApc +@ stdcall KeInitializeApc(ptr ptr long ptr ptr ptr long ptr) @ stub KeInitializeDeviceQueue @ stdcall KeInitializeDpc(ptr ptr ptr) @ stdcall KeInitializeEvent(ptr long long) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 7f19ce7571..c67c4f0157 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -33,6 +33,7 @@ #include "wine/asm.h" #include "wine/debug.h" #include "wine/heap.h" +#include "wine/server.h" #include "ntoskrnl_private.h" @@ -663,6 +664,38 @@ void WINAPI KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *queue ) } #endif +/*********************************************************************** + * KeInitializeApc (NTOSKRNL.EXE.@) + */ +void WINAPI KeInitializeApc(PRKAPC apc, PRKTHREAD thread, KAPC_ENVIRONMENT env, PKKERNEL_ROUTINE krnl_routine, + PKRUNDOWN_ROUTINE rundown_routine, PKNORMAL_ROUTINE normal_routine, KPROCESSOR_MODE apc_mode, PVOID ctx) +{ + TRACE("apc %p thread %p env %u krnl_routine %p rundown_routine %p normal_routine %p apc_mode %u ctx %p\n", + apc, thread, env, krnl_routine, rundown_routine, normal_routine, apc_mode, ctx); + + if (env != OriginalApcEnvironment) + FIXME("Unhandled APC_ENVIRONMENT\n"); + + apc->Type = 18; + apc->Size = sizeof(*apc); + apc->Thread = thread; + apc->ApcStateIndex = env; + apc->KernelRoutine = krnl_routine; + apc->RundownRoutine = rundown_routine; + apc->NormalRoutine = normal_routine; + apc->Inserted = FALSE; + if (apc->NormalRoutine) + { + apc->ApcMode = apc_mode; + apc->NormalContext = ctx; + } + else + { + apc->ApcMode = KernelMode; + apc->NormalContext = NULL; + } +} + static KSPIN_LOCK cancel_lock; /*********************************************************************** diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 176b432644..9fcb138701 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -464,6 +464,13 @@ typedef struct _DRIVER_OBJECT *PDRIVER_OBJECT; /* Irp definitions */ typedef UCHAR KIRQL, *PKIRQL; typedef CCHAR KPROCESSOR_MODE; +typedef enum _KAPC_ENVIRONMENT +{ + OriginalApcEnvironment, + AttachedApcEnvironment, + CurrentApcEnvironment, + InsertApcEnvironment +} KAPC_ENVIRONMENT, *PKAPC_ENVIRONMENT; typedef VOID (WINAPI *PDRIVER_CANCEL)( IN struct _DEVICE_OBJECT *DeviceObject,

1 0

Derek Lesho : ntoskrnl.exe: Implement ObOpenObjectByName.
by Alexandre Julliard Aug. 4, 2020

Aug. 4, 2020

Module: wine Branch: master Commit: 65df36c1151306db5a8fb86623b74c49d33a3649 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65df36c1151306db5a8fb866… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Jul 16 10:17:08 2020 -0500 ntoskrnl.exe: Implement ObOpenObjectByName. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 32 ++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index fa85979d0b..e94feabc82 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2806,6 +2806,38 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, } +/******************************************************************** + * ObOpenObjectByName (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ObOpenObjectByName(POBJECT_ATTRIBUTES attr, POBJECT_TYPE type, + KPROCESSOR_MODE mode, ACCESS_STATE *access_state, + ACCESS_MASK access, PVOID ctx, HANDLE *handle) +{ + NTSTATUS status; + void *object; + + TRACE( "attr(%p %s %x) %p %u %p %u %p %p\n", attr->RootDirectory, debugstr_us(attr->ObjectName), + attr->Attributes, type, mode, access_state, access, ctx, handle ); + + if (mode != KernelMode) + { + FIXME( "UserMode access not implemented\n" ); + return STATUS_NOT_IMPLEMENTED; + } + + if (attr->RootDirectory) FIXME( "RootDirectory unhandled\n" ); + + status = ObReferenceObjectByName(attr->ObjectName, attr->Attributes, access_state, access, type, mode, ctx, &object ); + if (status != STATUS_SUCCESS) + return status; + + status = ObOpenObjectByPointer(object, attr->Attributes, access_state, access, type, mode, handle); + + ObDereferenceObject(object); + return status; +} + + /*********************************************************************** * ObReferenceObjectByPointer (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0f65490b48..030bdbcedf 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -835,7 +835,7 @@ @ stub ObInsertObject @ stub ObLogSecurityDescriptor @ stub ObMakeTemporaryObject -@ stub ObOpenObjectByName +@ stdcall ObOpenObjectByName(ptr ptr long ptr long ptr ptr) @ stdcall ObOpenObjectByPointer(ptr long ptr long ptr long ptr) @ stdcall ObQueryNameString(ptr ptr long ptr) @ stub ObQueryObjectAuditingByHandle

1 0

Dmitry Timoshkov : ieframe: Deactivate UI when processing IOleObject::DoVerb(OLEIVERB_HIDE).
by Alexandre Julliard Aug. 4, 2020

Aug. 4, 2020

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

Jacek Caban : ntdll: Move InterlockedCompareExchange128 support to winnt.h.
by Alexandre Julliard Aug. 4, 2020

Aug. 4, 2020

Module: wine Branch: master Commit: b59bf31f61ed93a0c2f166af0af0c0d557d7466b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b59bf31f61ed93a0c2f166af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 31 15:37:39 2020 +0200 ntdll: Move InterlockedCompareExchange128 support to winnt.h. Also properly declare intrinsic on msvc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtl.c | 26 ++++---------------------- include/winnt.h | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index c32c63a880..ca4fea8420 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -98,24 +98,6 @@ static const int hex_table[] = { -1, 10, 11, 12, 13, 14, 15 /* 0x60-0x66 */ }; -#if defined(_WIN64) && !defined(_MSC_VER) -static inline unsigned char _InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare) -{ - unsigned char ret; -#ifdef __x86_64__ - __asm__ __volatile__( "lock cmpxchg16b %0; setz %b2" - : "=m" (dest[0]), "=m" (dest[1]), "=r" (ret), - "=a" (compare[0]), "=d" (compare[1]) - : "m" (dest[0]), "m" (dest[1]), "3" (compare[0]), "4" (compare[1]), - "c" (xchg_high), "b" (xchg_low) ); -#else - ret = __sync_bool_compare_and_swap( (__int128 *)dest, *(__int128 *)compare, - ((__int128)xchg_high << 64) | xchg_low ); -#endif - return ret; -} -#endif - /* * resource functions */ @@ -1627,7 +1609,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedFlushSList(PSLIST_HEADER list) { old = *list; new.Header16.Sequence = old.Header16.Sequence + 1; - } while (!_InterlockedCompareExchange128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); + } while (!InterlockedCompareExchange128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); return (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4); #else if (!list->s.Next.Next) return NULL; @@ -1657,7 +1639,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedPushEntrySList(PSLIST_HEADER list, PSLIST_ENTR entry->Next = (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4); new.Header16.Depth = old.Header16.Depth + 1; new.Header16.Sequence = old.Header16.Sequence + 1; - } while (!_InterlockedCompareExchange128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); + } while (!InterlockedCompareExchange128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); return (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4); #else new.s.Next.Next = entry; @@ -1697,7 +1679,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedPopEntrySList(PSLIST_HEADER list) { } __ENDTRY - } while (!_InterlockedCompareExchange128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); + } while (!InterlockedCompareExchange128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); #else do { @@ -1736,7 +1718,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedPushListSListEx(PSLIST_HEADER list, PSLIST_ENT new.Header16.Depth = old.Header16.Depth + count; new.Header16.Sequence = old.Header16.Sequence + 1; last->Next = (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4); - } while (!_InterlockedCompareExchange128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); + } while (!InterlockedCompareExchange128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); return (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4); #else new.s.Next.Next = first; diff --git a/include/winnt.h b/include/winnt.h index e1cf78420a..6aef97595d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6769,6 +6769,38 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #endif +#ifdef _WIN64 + +#if defined(_MSC_VER) + +#define InterlockedCompareExchange128 _InterlockedCompareExchange128 +static inline unsigned char _InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare); +#pragma intrinsic(_InterlockedCompareExchange128) + +#elif defined(__x86_64__) + +static inline unsigned char InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare) +{ + unsigned char ret; + __asm__ __volatile__( "lock cmpxchg16b %0; setz %b2" + : "=m" (dest[0]), "=m" (dest[1]), "=r" (ret), + "=a" (compare[0]), "=d" (compare[1]) + : "m" (dest[0]), "m" (dest[1]), "3" (compare[0]), "4" (compare[1]), + "c" (xchg_high), "b" (xchg_low) ); + return ret; +} + +#elif defined(__GNUC__) + +static inline unsigned char InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare) +{ + return __sync_bool_compare_and_swap( (__int128 *)dest, *(__int128 *)compare, ((__int128)xchg_high << 64) | xchg_low ); +} + +#endif + +#endif /* _WIN64 */ + #ifdef __cplusplus } #endif

1 0