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

Rémi Bernon : hidclass.sys: Return irp->IoStatus.Information from minidriver.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: ecf6a16b8e9e983f0bc55d1acfe40abfe157f33b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecf6a16b8e9e983f0bc55d1a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 3 18:55:22 2021 +0200 hidclass.sys: Return irp->IoStatus.Information from minidriver. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 5 ----- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 76d8898f00e..61126571ac6 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -526,12 +526,7 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) sizeof(*packet), &irp->IoStatus ); if (irp->IoStatus.Status == STATUS_SUCCESS) - { irp->IoStatus.Status = copy_packet_into_buffer( packet, buffer, buffer_len, &out_length ); - irp->IoStatus.Information = out_length; - } - else - irp->IoStatus.Information = 0; free(packet); break; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 91fa7e73c88..02f37773c67 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2475,7 +2475,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled value = caps.InputReportByteLength * 2; ret = sync_ioctl(file, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, report, &value); ok(ret, "IOCTL_HID_GET_INPUT_REPORT failed, last error %u\n", GetLastError()); - todo_wine ok(value == 3, "got length %u, expected 3\n", value); + ok(value == 3, "got length %u, expected 3\n", value); ok(report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id);

1 0

Gabriel Ivăncescu : jscript: Fix GetIDsOfNames for more than one name.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 678789c72f20ba9a85bfb78ad62be2634b5a8cac URL: https://source.winehq.org/git/wine.git/?a=commit;h=678789c72f20ba9a85bfb78a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Aug 4 18:51:46 2021 +0300 jscript: Fix GetIDsOfNames for more than one name. Names after the first one are supposed to retrieve DISPIDs for parameters, but it doesn't seem to be implemented on Windows. 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/jscript/dispex.c | 18 ++++++++---- dlls/jscript/tests/jscript.c | 68 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 3955ed34cd2..345bcd22020 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1489,13 +1489,21 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - for(i=0; i < cNames; i++) { - hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, rgszNames[i], 0, rgDispId+i); - if(FAILED(hres)) - return hres; + if(cNames == 0) + return S_OK; + + hres = jsdisp_get_id(This, rgszNames[0], 0, rgDispId); + if(FAILED(hres)) + return hres; + + /* DISPIDs for parameters don't seem to be supported */ + if(cNames > 1) { + for(i = 1; i < cNames; i++) + rgDispId[i] = DISPID_UNKNOWN; + hres = DISP_E_UNKNOWNNAME; } - return S_OK; + return hres; } static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index e96127fbc5e..b5803aed87d 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -924,6 +924,73 @@ static void test_aggregation(void) ok(!unk || broken(unk != NULL), "unk = %p\n", unk); } +static void test_param_ids(void) +{ + static const WCHAR *const names1[] = { L"test", L"c", L"foo", L"b", L"a" }; + static const WCHAR *const names2[] = { L"test", L"bar" }; + static const WCHAR *const names3[] = { L"bar", L"test" }; + DISPID id[ARRAY_SIZE(names1)]; + IActiveScriptParse *parser; + IActiveScript *script; + IDispatchEx *disp; + HRESULT hr; + + script = create_jscript(); + + hr = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parser); + ok(hr == S_OK, "Could not get IActiveScriptParse iface: %08x\n", hr); + + SET_EXPECT(GetLCID); + hr = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hr == S_OK, "SetScriptSite failed: %08x\n", hr); + CHECK_CALLED(GetLCID); + + SET_EXPECT(OnStateChange_INITIALIZED); + hr = IActiveScriptParse_InitNew(parser); + ok(hr == S_OK, "InitNew failed: %08x\n", hr); + CHECK_CALLED(OnStateChange_INITIALIZED); + + SET_EXPECT(OnStateChange_CONNECTED); + hr = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); + ok(hr == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hr); + CHECK_CALLED(OnStateChange_CONNECTED); + + parse_script(parser, L"function test(a, b, c, foo) { return a + b + c - foo; }\nfunction bar() { }"); + disp = get_script_dispatch(script, NULL); + + hr = IDispatchEx_GetIDsOfNames(disp, &IID_NULL, (WCHAR**)names1, ARRAY_SIZE(names1), 0, id); + ok(hr == DISP_E_UNKNOWNNAME, "GetIDsOfNames returned %08x, expected %08x\n", hr, DISP_E_UNKNOWNNAME); + ok(id[0] > 0, "Unexpected DISPID for \"test\": %d\n", id[0]); + ok(id[4] == DISPID_UNKNOWN, "Unexpected DISPID for \"a\" parameter: %d\n", id[4]); + ok(id[3] == DISPID_UNKNOWN, "Unexpected DISPID for \"b\" parameter: %d\n", id[3]); + ok(id[1] == DISPID_UNKNOWN, "Unexpected DISPID for \"c\" parameter: %d\n", id[1]); + ok(id[2] == DISPID_UNKNOWN, "Unexpected DISPID for \"foo\" parameter: %d\n", id[2]); + + hr = IDispatchEx_GetIDsOfNames(disp, &IID_NULL, (WCHAR**)names2, ARRAY_SIZE(names2), 0, id); + ok(hr == DISP_E_UNKNOWNNAME, "GetIDsOfNames returned %08x, expected %08x\n", hr, DISP_E_UNKNOWNNAME); + ok(id[0] > 0, "Unexpected DISPID for \"test\": %d\n", id[0]); + ok(id[1] == DISPID_UNKNOWN, "Unexpected DISPID for \"bar\": %d\n", id[1]); + + hr = IDispatchEx_GetIDsOfNames(disp, &IID_NULL, (WCHAR**)names3, ARRAY_SIZE(names3), 0, id); + ok(hr == DISP_E_UNKNOWNNAME, "GetIDsOfNames returned %08x, expected %08x\n", hr, DISP_E_UNKNOWNNAME); + ok(id[0] > 0, "Unexpected DISPID for \"bar\": %d\n", id[0]); + ok(id[1] == DISPID_UNKNOWN, "Unexpected DISPID for \"test\": %d\n", id[1]); + + IDispatchEx_Release(disp); + IActiveScriptParse_Release(parser); + + SET_EXPECT(OnStateChange_DISCONNECTED); + SET_EXPECT(OnStateChange_INITIALIZED); + SET_EXPECT(OnStateChange_CLOSED); + hr = IActiveScript_Close(script); + ok(hr == S_OK, "Close failed: %08x\n", hr); + CHECK_CALLED(OnStateChange_DISCONNECTED); + CHECK_CALLED(OnStateChange_INITIALIZED); + CHECK_CALLED(OnStateChange_CLOSED); + + IActiveScript_Release(script); +} + static void test_code_persistence(void) { IActiveScriptParse *parse; @@ -2251,6 +2318,7 @@ START_TEST(jscript) test_jscript2(); test_jscript_uninitializing(); test_aggregation(); + test_param_ids(); test_code_persistence(); test_named_items(); test_typeinfo(NULL);

1 0

Piotr Caban : msvcrt: Introduce _setfp_sse helper to access mxcsr register.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 24fb503e2f9d3c87c6bcaeb6e02043873c5a8294 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24fb503e2f9d3c87c6bcaeb6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 4 18:04:42 2021 +0200 msvcrt: Introduce _setfp_sse helper to access mxcsr register. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 275 ++++++++++++++++++++++------------------------------- 1 file changed, 115 insertions(+), 160 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=24fb503e2f9d3c87c6bc…

1 0

Gabriel Ivăncescu : vbscript: Fix GetIDsOfNames for more than one name.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 3559fe7366037defaaaaeed0f308eb00b4d4be1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3559fe7366037defaaaaeed0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Aug 4 18:51:47 2021 +0300 vbscript: Fix GetIDsOfNames for more than one name. Names after the first one are supposed to retrieve DISPIDs for parameters, but it doesn't seem to be implemented on Windows. 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/vbscript/tests/vbscript.c | 69 ++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 18 ++++++++--- 2 files changed, 82 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 8e6f0995c59..a3cd77c13e8 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -751,6 +751,74 @@ static void test_scriptdisp(void) ok(!ref, "ref = %d\n", ref); } +static void test_param_ids(void) +{ + static const WCHAR *const names1[] = { L"test", L"c", L"foo", L"b", L"a" }; + static const WCHAR *const names2[] = { L"test", L"bar" }; + static const WCHAR *const names3[] = { L"bar", L"test" }; + DISPID id[ARRAY_SIZE(names1)]; + IActiveScriptParse *parser; + IActiveScript *vbscript; + IDispatchEx *script_disp; + HRESULT hr; + + vbscript = create_vbscript(); + + hr = IActiveScript_QueryInterface(vbscript, &IID_IActiveScriptParse, (void**)&parser); + ok(hr == S_OK, "Could not get IActiveScriptParse iface: %08x\n", hr); + + SET_EXPECT(GetLCID); + hr = IActiveScript_SetScriptSite(vbscript, &ActiveScriptSite); + ok(hr == S_OK, "SetScriptSite failed: %08x\n", hr); + CHECK_CALLED(GetLCID); + + SET_EXPECT(OnStateChange_INITIALIZED); + hr = IActiveScriptParse_InitNew(parser); + ok(hr == S_OK, "InitNew failed: %08x\n", hr); + CHECK_CALLED(OnStateChange_INITIALIZED); + + SET_EXPECT(OnStateChange_CONNECTED); + hr = IActiveScript_SetScriptState(vbscript, SCRIPTSTATE_CONNECTED); + ok(hr == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hr); + CHECK_CALLED(OnStateChange_CONNECTED); + + parse_script(parser, "function test(byval a, byval b, byval c, byval foo)\ntest = a + b + c - foo\nend function\n" + "function bar\nend function"); + script_disp = get_script_dispatch(vbscript, NULL); + + hr = IDispatchEx_GetIDsOfNames(script_disp, &IID_NULL, (WCHAR**)names1, ARRAY_SIZE(names1), 0, id); + ok(hr == DISP_E_UNKNOWNNAME, "GetIDsOfNames returned %08x, expected %08x\n", hr, DISP_E_UNKNOWNNAME); + ok(id[0] > 0, "Unexpected DISPID for \"test\": %d\n", id[0]); + ok(id[4] == DISPID_UNKNOWN, "Unexpected DISPID for \"a\" parameter: %d\n", id[4]); + ok(id[3] == DISPID_UNKNOWN, "Unexpected DISPID for \"b\" parameter: %d\n", id[3]); + ok(id[1] == DISPID_UNKNOWN, "Unexpected DISPID for \"c\" parameter: %d\n", id[1]); + ok(id[2] == DISPID_UNKNOWN, "Unexpected DISPID for \"foo\" parameter: %d\n", id[2]); + + hr = IDispatchEx_GetIDsOfNames(script_disp, &IID_NULL, (WCHAR**)names2, ARRAY_SIZE(names2), 0, id); + ok(hr == DISP_E_UNKNOWNNAME, "GetIDsOfNames returned %08x, expected %08x\n", hr, DISP_E_UNKNOWNNAME); + ok(id[0] > 0, "Unexpected DISPID for \"test\": %d\n", id[0]); + ok(id[1] == DISPID_UNKNOWN, "Unexpected DISPID for \"bar\": %d\n", id[1]); + + hr = IDispatchEx_GetIDsOfNames(script_disp, &IID_NULL, (WCHAR**)names3, ARRAY_SIZE(names3), 0, id); + ok(hr == DISP_E_UNKNOWNNAME, "GetIDsOfNames returned %08x, expected %08x\n", hr, DISP_E_UNKNOWNNAME); + ok(id[0] > 0, "Unexpected DISPID for \"bar\": %d\n", id[0]); + ok(id[1] == DISPID_UNKNOWN, "Unexpected DISPID for \"test\": %d\n", id[1]); + + IDispatchEx_Release(script_disp); + IActiveScriptParse_Release(parser); + + SET_EXPECT(OnStateChange_DISCONNECTED); + SET_EXPECT(OnStateChange_INITIALIZED); + SET_EXPECT(OnStateChange_CLOSED); + hr = IActiveScript_Close(vbscript); + ok(hr == S_OK, "Close failed: %08x\n", hr); + CHECK_CALLED(OnStateChange_DISCONNECTED); + CHECK_CALLED(OnStateChange_INITIALIZED); + CHECK_CALLED(OnStateChange_CLOSED); + + IActiveScript_Release(vbscript); +} + static void test_code_persistence(void) { IActiveScriptParse *parser; @@ -2641,6 +2709,7 @@ START_TEST(vbscript) test_vbscript_release(); test_vbscript_simplecreate(); test_vbscript_initializing(); + test_param_ids(); test_named_items(); test_scriptdisp(); test_code_persistence(); diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index ee4875f4e01..6b9a1a0a5d0 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -1344,13 +1344,21 @@ static HRESULT WINAPI ScriptDisp_GetIDsOfNames(IDispatchEx *iface, REFIID riid, TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - for(i=0; i < cNames; i++) { - hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, rgszNames[i], 0, rgDispId+i); - if(FAILED(hres)) - return hres; + if(cNames == 0) + return S_OK; + + hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, rgszNames[0], 0, rgDispId); + if(FAILED(hres)) + return hres; + + /* DISPIDs for parameters don't seem to be supported */ + if(cNames > 1) { + for(i = 1; i < cNames; i++) + rgDispId[i] = DISPID_UNKNOWN; + hres = DISP_E_UNKNOWNNAME; } - return S_OK; + return hres; } static HRESULT WINAPI ScriptDisp_Invoke(IDispatchEx *iface, DISPID dispIdMember, REFIID riid, LCID lcid,

1 0

Alexandre Julliard : wow64cpu: Restore the full 32-bit context when changed externally.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: e30f091f3b2acbd133edb599a72b4bea381c0b55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e30f091f3b2acbd133edb599… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 4 12:13:21 2021 +0200 wow64cpu: Restore the full 32-bit context when changed externally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 3 +++ dlls/wow64cpu/cpu.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/wow64cpu/wow64cpu.spec | 4 ++-- include/winternl.h | 2 ++ 4 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index bfc5b34a464..d02a7946945 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1957,12 +1957,15 @@ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) } if (flags & CONTEXT_I386_CONTROL) { + WOW64_CPURESERVED *cpu = NtCurrentTeb()->TlsSlots[WOW64_TLS_CPURESERVED]; + wow_frame->Esp = context->Esp; wow_frame->Ebp = context->Ebp; wow_frame->Eip = context->Eip; wow_frame->EFlags = context->EFlags; wow_frame->SegCs = cs32_sel; wow_frame->SegSs = ds64_sel; + cpu->Flags |= WOW64_CPURESERVED_FLAG_RESET_STATE; } if (flags & CONTEXT_I386_SEGMENTS) { diff --git a/dlls/wow64cpu/cpu.c b/dlls/wow64cpu/cpu.c index df292221117..8293d596ec4 100644 --- a/dlls/wow64cpu/cpu.c +++ b/dlls/wow64cpu/cpu.c @@ -82,13 +82,33 @@ __ASM_GLOBAL_FUNC( syscall_32to64, "movl 0xa0(%r13),%esi\n\t" /* context->Esi */ "movl 0xa4(%r13),%ebx\n\t" /* context->Ebx */ "movl 0xb4(%r13),%ebp\n\t" /* context->Ebp */ + "btrl $0,-4(%r13)\n\t" /* cpu->Flags & WOW64_CPURESERVED_FLAG_RESET_STATE */ + "jc 1f\n\t" "movl 0xb8(%r13),%edx\n\t" /* context->Eip */ "movl %edx,(%rsp)\n\t" "movl 0xbc(%r13),%edx\n\t" /* context->SegCs */ "movl %edx,4(%rsp)\n\t" "movl 0xc4(%r13),%r14d\n\t" /* context->Esp */ "xchgq %r14,%rsp\n\t" - "ljmp *(%r14)" ) + "ljmp *(%r14)\n" + "1:\tmovq %rsp,%r14\n\t" + "movl 0xa8(%r13),%edx\n\t" /* context->Edx */ + "movl 0xac(%r13),%ecx\n\t" /* context->Ecx */ + "movl 0xc8(%r13),%eax\n\t" /* context->SegSs */ + "movq %rax,0x20(%rsp)\n\t" + "mov %ax,%ds\n\t" + "mov %ax,%es\n\t" + "mov 0x90(%r13),%fs\n\t" /* context->SegFs */ + "movl 0xc4(%r13),%eax\n\t" /* context->Esp */ + "movq %rax,0x18(%rsp)\n\t" + "movl 0xc0(%r13),%eax\n\t" /* context->EFlags */ + "movq %rax,0x10(%rsp)\n\t" + "movl 0xbc(%r13),%eax\n\t" /* context->SegCs */ + "movq %rax,0x8(%rsp)\n\t" + "movl 0xb8(%r13),%eax\n\t" /* context->Eip */ + "movq %rax,(%rsp)\n\t" + "movl 0xb0(%r13),%eax\n\t" /* context->Eax */ + "iretq" ) /********************************************************************** @@ -137,3 +157,21 @@ void * WINAPI BTCpuGetBopCode(void) { return code_buffer; } + + +/********************************************************************** + * BTCpuGetContext (wow64cpu.@) + */ +NTSTATUS WINAPI BTCpuGetContext( HANDLE thread, HANDLE process, void *unknown, I386_CONTEXT *ctx ) +{ + return NtQueryInformationThread( thread, ThreadWow64Context, ctx, sizeof(*ctx), NULL ); +} + + +/********************************************************************** + * BTCpuSetContext (wow64cpu.@) + */ +NTSTATUS WINAPI BTCpuSetContext( HANDLE thread, HANDLE process, void *unknown, I386_CONTEXT *ctx ) +{ + return NtSetInformationThread( thread, ThreadWow64Context, ctx, sizeof(*ctx) ); +} diff --git a/dlls/wow64cpu/wow64cpu.spec b/dlls/wow64cpu/wow64cpu.spec index ba0abb7a8ed..b86481563f2 100644 --- a/dlls/wow64cpu/wow64cpu.spec +++ b/dlls/wow64cpu/wow64cpu.spec @@ -1,8 +1,8 @@ @ stdcall BTCpuGetBopCode() -#@ stub BTCpuGetContext +@ stdcall BTCpuGetContext(long long ptr ptr) @ stdcall BTCpuProcessInit() #@ stub BTCpuResetToConsistentState -#@ stub BTCpuSetContext +@ stdcall BTCpuSetContext(long long ptr ptr) @ stdcall BTCpuSimulate() #@ stub BTCpuTurboThunkControl #@ stub TurboDispatchJumpAddressEnd diff --git a/include/winternl.h b/include/winternl.h index 9dff3a98bed..a048b9546ee 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3727,6 +3727,8 @@ typedef struct _WOW64_CPURESERVED /* CONTEXT_EX *context_ex */ } WOW64_CPURESERVED, *PWOW64_CPURESERVED; +#define WOW64_CPURESERVED_FLAG_RESET_STATE 1 + typedef struct _WOW64_CPU_AREA_INFO { void *Context;

1 0

Alexandre Julliard : wow64: Make the syscall dispatcher point to the wow64cpu syscall wrapper.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 9f24bc44bcb5e147e46a74de4e8d570641aa1377 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f24bc44bcb5e147e46a74de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 4 12:06:27 2021 +0200 wow64: Make the syscall dispatcher point to the wow64cpu syscall wrapper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 2fd9f309b1b..e120ed022cd 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -62,8 +62,16 @@ struct mem_header BYTE data[1]; }; +static void **pWow64Transition; +static void **p__wine_syscall_dispatcher; static SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock; +/* cpu backend dll functions */ +static void * (WINAPI *pBTCpuGetBopCode)(void); +static void (WINAPI *pBTCpuProcessInit)(void); +static void (WINAPI *pBTCpuSimulate)(void); + + void *dummy = RtlUnwind; BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) @@ -400,9 +408,17 @@ static void process_init(void) GET_PTR( LdrSystemDllInitBlock ); module = (HMODULE)(ULONG_PTR)pLdrSystemDllInitBlock->ntdll_handle; + GET_PTR( Wow64Transition ); + GET_PTR( __wine_syscall_dispatcher ); init_syscall_table( module ); - load_cpu_dll(); + module = load_cpu_dll(); + GET_PTR( BTCpuGetBopCode ); + GET_PTR( BTCpuProcessInit ); + GET_PTR( BTCpuSimulate ); + + pBTCpuProcessInit(); + *pWow64Transition = *p__wine_syscall_dispatcher = pBTCpuGetBopCode(); init_file_redirects();

1 0

Alexandre Julliard : wow64: Add support for jumping to 32-bit code in Wow64LdrpInitialize().
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: ae21ddb0240fbe917473cc92669ac09e356197e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae21ddb0240fbe917473cc92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 4 12:25:52 2021 +0200 wow64: Add support for jumping to 32-bit code in Wow64LdrpInitialize(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/process.c | 15 ++++++++++++ dlls/wow64/sync.c | 9 ++++++++ dlls/wow64/syscall.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++------ dlls/wow64/syscall.h | 2 ++ 4 files changed, 83 insertions(+), 7 deletions(-) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 44380535d9c..764a2ba46ca 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -309,6 +309,21 @@ NTSTATUS WINAPI wow64_NtAssignProcessToJobObject( UINT *args ) } +/********************************************************************** + * wow64_NtContinue + */ +NTSTATUS WINAPI wow64_NtContinue( UINT *args ) +{ + void *context = get_ptr( &args ); + BOOLEAN alertable = get_ulong( &args ); + + NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, + context, get_machine_context_size( current_machine )); + if (alertable) NtTestAlert(); + return STATUS_SUCCESS; +} + + /********************************************************************** * wow64_NtCreateThread */ diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index 1b4c3c864c3..400deeb8422 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -1461,6 +1461,15 @@ NTSTATUS WINAPI wow64_NtTerminateJobObject( UINT *args ) } +/********************************************************************** + * wow64_NtTestAlert + */ +NTSTATUS WINAPI wow64_NtTestAlert( UINT *args ) +{ + return NtTestAlert(); +} + + /********************************************************************** * wow64_NtWaitForDebugEvent */ diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index e120ed022cd..6f443557e16 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -393,7 +393,7 @@ static HMODULE load_cpu_dll(void) /********************************************************************** * process_init */ -static void process_init(void) +static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **context ) { HMODULE module; UNICODE_STRING str; @@ -421,11 +421,63 @@ static void process_init(void) *pWow64Transition = *p__wine_syscall_dispatcher = pBTCpuGetBopCode(); init_file_redirects(); + return TRUE; #undef GET_PTR } +/********************************************************************** + * thread_init + */ +static void thread_init(void) +{ + /* update initial context to jump to 32-bit LdrInitializeThunk (cf. 32-bit call_init_thunk) */ + switch (current_machine) + { + case IMAGE_FILE_MACHINE_I386: + { + I386_CONTEXT *ctx_ptr, ctx = { CONTEXT_I386_ALL }; + ULONG *stack; + + NtQueryInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx), NULL ); + ctx_ptr = (I386_CONTEXT *)ULongToPtr( ctx.Esp ) - 1; + *ctx_ptr = ctx; + + stack = (ULONG *)ctx_ptr; + *(--stack) = 0; + *(--stack) = 0; + *(--stack) = 0; + *(--stack) = PtrToUlong( ctx_ptr ); + *(--stack) = 0xdeadbabe; + ctx.Esp = PtrToUlong( stack ); + ctx.Eip = pLdrSystemDllInitBlock->pLdrInitializeThunk; + NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx) ); + } + break; + + case IMAGE_FILE_MACHINE_ARMNT: + { + ARM_CONTEXT *ctx_ptr, ctx = { CONTEXT_ARM_ALL }; + + NtQueryInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx), NULL ); + ctx_ptr = (ARM_CONTEXT *)ULongToPtr( ctx.Sp & ~15 ) - 1; + *ctx_ptr = ctx; + + ctx.R0 = PtrToUlong( ctx_ptr ); + ctx.Sp = PtrToUlong( ctx_ptr ); + ctx.Pc = pLdrSystemDllInitBlock->pLdrInitializeThunk; + NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx) ); + } + break; + + default: + ERR( "not supported machine %x\n", current_machine ); + NtTerminateProcess( GetCurrentProcess(), STATUS_INVALID_IMAGE_FORMAT ); + } +} + + /********************************************************************** * free_temp_data */ @@ -500,11 +552,9 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON */ void WINAPI Wow64LdrpInitialize( CONTEXT *context ) { - static BOOL init_done; + static RTL_RUN_ONCE init_done; - if (!init_done) - { - init_done = TRUE; - process_init(); - } + RtlRunOnceExecuteOnce( &init_done, process_init, NULL, NULL ); + thread_init(); + pBTCpuSimulate(); } diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 782a7a78c18..f794d35cee4 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -43,6 +43,7 @@ SYSCALL_ENTRY( NtClose ) \ SYSCALL_ENTRY( NtCompleteConnectPort ) \ SYSCALL_ENTRY( NtConnectPort ) \ + SYSCALL_ENTRY( NtContinue ) \ SYSCALL_ENTRY( NtCreateDebugObject ) \ SYSCALL_ENTRY( NtCreateDirectoryObject ) \ SYSCALL_ENTRY( NtCreateEvent ) \ @@ -217,6 +218,7 @@ SYSCALL_ENTRY( NtTerminateJobObject ) \ SYSCALL_ENTRY( NtTerminateProcess ) \ SYSCALL_ENTRY( NtTerminateThread ) \ + SYSCALL_ENTRY( NtTestAlert ) \ SYSCALL_ENTRY( NtUnloadDriver ) \ SYSCALL_ENTRY( NtUnloadKey ) \ SYSCALL_ENTRY( NtUnlockFile ) \

1 0

Alexandre Julliard : wow64: Implement Wow64ApcRoutine().
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 477478f79ce901a74a22d43f5dab83da22cea46c URL: https://source.winehq.org/git/wine.git/?a=commit;h=477478f79ce901a74a22d43f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 4 16:39:22 2021 +0200 wow64: Implement Wow64ApcRoutine(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 6f443557e16..364e1a778dd 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -543,7 +543,71 @@ void * WINAPI Wow64AllocateTemp( SIZE_T size ) */ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CONTEXT *context ) { - FIXME( "stub %lx %lx %lx\n", arg1, arg2, arg3 ); + NTSTATUS retval; + +#ifdef __x86_64__ + retval = context->Rax; +#elif defined(__aarch64__) + retval = context->X0; +#endif + + /* cf. 32-bit call_user_apc_dispatcher */ + switch (current_machine) + { + case IMAGE_FILE_MACHINE_I386: + { + struct apc_stack_layout + { + ULONG ret; + ULONG context_ptr; + ULONG arg1; + ULONG arg2; + ULONG arg3; + ULONG func; + I386_CONTEXT context; + } *stack; + I386_CONTEXT ctx = { CONTEXT_I386_FULL }; + + NtQueryInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx), NULL ); + stack = (struct apc_stack_layout *)ULongToPtr( ctx.Esp & ~3 ) - 1; + stack->context_ptr = PtrToUlong( &stack->context ); + stack->func = arg1 >> 32; + stack->arg1 = arg1; + stack->arg2 = arg2; + stack->arg3 = arg3; + stack->context = ctx; + stack->context.Eax = retval; + ctx.Esp = PtrToUlong( stack ); + ctx.Eip = pLdrSystemDllInitBlock->pKiUserApcDispatcher; + NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx) ); + } + break; + + case IMAGE_FILE_MACHINE_ARMNT: + { + struct apc_stack_layout + { + ULONG func; + ULONG align[3]; + ARM_CONTEXT context; + } *stack; + ARM_CONTEXT ctx = { CONTEXT_ARM_FULL }; + + NtQueryInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx), NULL ); + stack = (struct apc_stack_layout *)ULongToPtr( ctx.Sp & ~15 ) - 1; + stack->func = arg1 >> 32; + stack->context = ctx; + stack->context.R0 = retval; + ctx.Sp = PtrToUlong( stack ); + ctx.Pc = pLdrSystemDllInitBlock->pKiUserApcDispatcher; + ctx.R0 = PtrToUlong( &stack->context ); + ctx.R1 = arg1; + ctx.R2 = arg2; + ctx.R3 = arg3; + NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx) ); + } + break; + } }

1 0

Alexandre Julliard : wow64: Add thunks for a few misc syscalls.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 4f0d8b697bf6665f358f05e3ad962b720b70adc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f0d8b697bf6665f358f05e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 4 15:11:08 2021 +0200 wow64: Add thunks for a few misc syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/file.c | 34 ++++++++++++++++++++++++++++++++++ dlls/wow64/process.c | 22 ++++++++++++++++++++++ dlls/wow64/security.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/wow64/sync.c | 11 +++++++++++ dlls/wow64/syscall.c | 12 ++++++++++++ dlls/wow64/syscall.h | 9 +++++++++ dlls/wow64/system.c | 17 +++++++++++++++++ dlls/wow64/virtual.c | 18 ++++++++++++++++++ include/winternl.h | 1 + 9 files changed, 164 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f0d8b697bf6665f358f…

1 0

Paul Gofman : kernelbase: Fix copy size for delete_privs in CreateRestrictedToken().
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: d63e0b7084ff651a8423324c54ab98ff8669de51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d63e0b7084ff651a8423324c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Aug 4 13:43:46 2021 +0300 kernelbase: Fix copy size for delete_privs in CreateRestrictedToken(). Fixes 3D Aim Trainer crash on start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/security.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 97943048b01..36196304db3 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -662,21 +662,21 @@ BOOL WINAPI CreateRestrictedToken( HANDLE token, DWORD flags, { if (!(nt_disable_sids = heap_alloc( offsetof( TOKEN_GROUPS, Groups[disable_sid_count] ) ))) goto out; nt_disable_sids->GroupCount = disable_sid_count; - memcpy( nt_disable_sids->Groups, disable_sids, disable_sid_count * sizeof(SID_AND_ATTRIBUTES) ); + memcpy( nt_disable_sids->Groups, disable_sids, disable_sid_count * sizeof(*disable_sids) ); } if (delete_priv_count) { if (!(nt_privs = heap_alloc( offsetof( TOKEN_GROUPS, Groups[delete_priv_count] ) ))) goto out; nt_privs->PrivilegeCount = delete_priv_count; - memcpy( nt_privs->Privileges, delete_privs, delete_priv_count * sizeof(SID_AND_ATTRIBUTES) ); + memcpy( nt_privs->Privileges, delete_privs, delete_priv_count * sizeof(*delete_privs) ); } if (restrict_sid_count) { if (!(nt_restrict_sids = heap_alloc( offsetof( TOKEN_GROUPS, Groups[restrict_sid_count] ) ))) goto out; nt_restrict_sids->GroupCount = restrict_sid_count; - memcpy( nt_restrict_sids->Groups, restrict_sids, restrict_sid_count * sizeof(SID_AND_ATTRIBUTES) ); + memcpy( nt_restrict_sids->Groups, restrict_sids, restrict_sid_count * sizeof(*restrict_sids) ); } status = NtFilterToken(token, flags, nt_disable_sids, nt_privs, nt_restrict_sids, ret);

1 0