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

Zebediah Figura : krnl386: Remove unused support for WCB16_REGS_LONG.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 3338972febac68504fe60da158605dd038387b8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3338972febac68504fe60da1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 4 10:21:20 2021 -0500 krnl386: Remove unused support for WCB16_REGS_LONG. This was introduced in 3a5b7cf105f52c3a2936be09e318c4177454bcc9 as way to expose wine_call_to_16_regs_long(); however, the same commit changed the only user to use WCB16_REGS instead. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/wowthunk.c | 19 ++++--------------- include/wownt32.h | 1 - 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index 73d1565c573..5bd9d7aecd4 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -400,7 +400,7 @@ BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags, memcpy( stack, pArgs, cbArgs ); - if (dwFlags & (WCB16_REGS|WCB16_REGS_LONG)) + if (dwFlags & WCB16_REGS) { CONTEXT *context = (CONTEXT *)pdwRetCode; @@ -420,20 +420,9 @@ BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags, } /* push return address */ - if (dwFlags & WCB16_REGS_LONG) - { - stack -= sizeof(DWORD); - *((DWORD *)stack) = HIWORD(call16_ret_addr); - stack -= sizeof(DWORD); - *((DWORD *)stack) = LOWORD(call16_ret_addr); - cbArgs += 2 * sizeof(DWORD); - } - else - { - stack -= sizeof(SEGPTR); - *((SEGPTR *)stack) = call16_ret_addr; - cbArgs += sizeof(SEGPTR); - } + stack -= sizeof(SEGPTR); + *((SEGPTR *)stack) = call16_ret_addr; + cbArgs += sizeof(SEGPTR); _EnterWin16Lock(); wine_call_to_16_regs( context, cbArgs, call16_handler ); diff --git a/include/wownt32.h b/include/wownt32.h index 51b1108d1c9..ddfa9b562b7 100644 --- a/include/wownt32.h +++ b/include/wownt32.h @@ -150,7 +150,6 @@ WORD WINAPI WOWHandle16(HANDLE,WOW_HANDLE_TYPE); /* Wine extensions: call register function, context ptr is passed in the return value LPDWORD */ #define WCB16_REGS 2 -#define WCB16_REGS_LONG 4 /* function uses 32-bit lret */ DWORD WINAPI WOWCallback16(DWORD,DWORD); BOOL WINAPI WOWCallback16Ex(DWORD,DWORD,DWORD,LPVOID,LPDWORD);

1 0

Gabriel Ivăncescu : jscript: Fix GetIDsOfNames for more than one name.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

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

Rémi Bernon : hidclass.sys: Pass IO_STATUS_BLOCK parameter to call_minidriver.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 00008c9d48e16f43cfd048b9ea73b470fca8a4c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00008c9d48e16f43cfd048b9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 3 18:55:21 2021 +0200 hidclass.sys: Pass IO_STATUS_BLOCK parameter to call_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 | 20 ++++++++++++-------- dlls/hidclass.sys/hid.h | 3 ++- dlls/hidclass.sys/pnp.c | 28 +++++++++++++--------------- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 1ebe44f3f14..76d8898f00e 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -312,8 +312,8 @@ static void handle_minidriver_string( BASE_DEVICE_EXTENSION *ext, IRP *irp, SHOR InputBuffer = MAKELONG(index, 0); - irp->IoStatus.Status = call_minidriver( IOCTL_HID_GET_STRING, ext->u.pdo.parent_fdo, ULongToPtr( InputBuffer ), - sizeof(InputBuffer), buffer, sizeof(buffer) ); + call_minidriver( IOCTL_HID_GET_STRING, ext->u.pdo.parent_fdo, ULongToPtr( InputBuffer ), + sizeof(InputBuffer), buffer, sizeof(buffer), &irp->IoStatus ); if (irp->IoStatus.Status == STATUS_SUCCESS) { @@ -351,7 +351,8 @@ static void HID_get_feature( BASE_DEVICE_EXTENSION *ext, IRP *irp ) TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet->reportId, packet->reportBufferLen, packet->reportBuffer); - irp->IoStatus.Status = call_minidriver( IOCTL_HID_GET_FEATURE, ext->u.pdo.parent_fdo, NULL, 0, packet, sizeof(*packet) ); + call_minidriver( IOCTL_HID_GET_FEATURE, ext->u.pdo.parent_fdo, NULL, 0, packet, sizeof(*packet), + &irp->IoStatus ); if (irp->IoStatus.Status == STATUS_SUCCESS) { @@ -400,8 +401,8 @@ static void HID_set_to_device( DEVICE_OBJECT *device, IRP *irp ) TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet.reportId, packet.reportBufferLen, packet.reportBuffer); - irp->IoStatus.Status = call_minidriver( irpsp->Parameters.DeviceIoControl.IoControlCode, - ext->u.pdo.parent_fdo, NULL, 0, &packet, sizeof(packet) ); + call_minidriver( irpsp->Parameters.DeviceIoControl.IoControlCode, ext->u.pdo.parent_fdo, NULL, + 0, &packet, sizeof(packet), &irp->IoStatus ); if (irp->IoStatus.Status == STATUS_SUCCESS) irp->IoStatus.Information = irpsp->Parameters.DeviceIoControl.InputBufferLength; @@ -521,7 +522,8 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) packet->reportBuffer = (BYTE *)packet + sizeof(*packet); packet->reportBufferLen = buffer_len - 1; - irp->IoStatus.Status = call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, packet, sizeof(*packet) ); + call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, packet, + sizeof(*packet), &irp->IoStatus ); if (irp->IoStatus.Status == STATUS_SUCCESS) { @@ -658,7 +660,8 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) packet.reportBuffer = &((BYTE*)irp->AssociatedIrp.SystemBuffer)[1]; packet.reportBufferLen = irpsp->Parameters.Read.Length - 1; - irp->IoStatus.Status = call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, &packet, sizeof(packet) ); + call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, &packet, + sizeof(packet), &irp->IoStatus ); if (irp->IoStatus.Status == STATUS_SUCCESS) { @@ -731,7 +734,8 @@ NTSTATUS WINAPI pdo_write(DEVICE_OBJECT *device, IRP *irp) TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet.reportId, packet.reportBufferLen, packet.reportBuffer); - irp->IoStatus.Status = call_minidriver( IOCTL_HID_WRITE_REPORT, ext->u.pdo.parent_fdo, NULL, 0, &packet, sizeof(packet) ); + call_minidriver( IOCTL_HID_WRITE_REPORT, ext->u.pdo.parent_fdo, NULL, 0, &packet, + sizeof(packet), &irp->IoStatus ); if (irp->IoStatus.Status == STATUS_SUCCESS) irp->IoStatus.Information = irpsp->Parameters.Write.Length; diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 19ac7091065..f0982d508e3 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -108,7 +108,8 @@ typedef struct _minidriver PDRIVER_DISPATCH PNPDispatch; } minidriver; -NTSTATUS call_minidriver(ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in_size, void *out_buff, ULONG out_size) DECLSPEC_HIDDEN; +void call_minidriver( ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in_size, + void *out_buff, ULONG out_size, IO_STATUS_BLOCK *io ) DECLSPEC_HIDDEN; /* Internal device functions */ void HID_StartDeviceThread(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 2f5fe5de4eb..e5a38dafc1c 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -188,14 +188,15 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) BYTE *reportDescriptor; UNICODE_STRING string; WCHAR pdo_name[255]; + IO_STATUS_BLOCK io; USAGE page, usage; NTSTATUS status; INT i; - status = call_minidriver(IOCTL_HID_GET_DEVICE_ATTRIBUTES, fdo, NULL, 0, &attr, sizeof(attr)); - if (status != STATUS_SUCCESS) + call_minidriver( IOCTL_HID_GET_DEVICE_ATTRIBUTES, fdo, NULL, 0, &attr, sizeof(attr), &io ); + if (io.Status != STATUS_SUCCESS) { - ERR("Minidriver failed to get Attributes(%x)\n",status); + ERR( "Minidriver failed to get attributes, status %#x.\n", io.Status ); return; } @@ -204,7 +205,7 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) RtlInitUnicodeString(&string, pdo_name); if ((status = IoCreateDevice(fdo->DriverObject, sizeof(*pdo_ext), &string, 0, 0, FALSE, &child_pdo))) { - ERR("Failed to create child PDO, status %#x.\n", status); + ERR( "Failed to create child PDO, status %#x.\n", io.Status ); return; } fdo_ext->u.fdo.child_pdo = child_pdo; @@ -221,8 +222,8 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) pdo_ext->u.pdo.information.VersionNumber = attr.VersionNumber; pdo_ext->u.pdo.information.Polled = minidriver->minidriver.DevicesArePolled; - status = call_minidriver(IOCTL_HID_GET_DEVICE_DESCRIPTOR, fdo, NULL, 0, &descriptor, sizeof(descriptor)); - if (status != STATUS_SUCCESS) + call_minidriver( IOCTL_HID_GET_DEVICE_DESCRIPTOR, fdo, NULL, 0, &descriptor, sizeof(descriptor), &io ); + if (io.Status != STATUS_SUCCESS) { ERR("Cannot get Device Descriptor(%x)\n",status); IoDeleteDevice(child_pdo); @@ -240,9 +241,9 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) } reportDescriptor = malloc(descriptor.DescriptorList[i].wReportLength); - status = call_minidriver(IOCTL_HID_GET_REPORT_DESCRIPTOR, fdo, NULL, 0, - reportDescriptor, descriptor.DescriptorList[i].wReportLength); - if (status != STATUS_SUCCESS) + call_minidriver( IOCTL_HID_GET_REPORT_DESCRIPTOR, fdo, NULL, 0, reportDescriptor, + descriptor.DescriptorList[i].wReportLength, &io ); + if (io.Status != STATUS_SUCCESS) { ERR("Cannot get Report Descriptor(%x)\n",status); free(reportDescriptor); @@ -606,19 +607,16 @@ NTSTATUS WINAPI HidRegisterMinidriver(HID_MINIDRIVER_REGISTRATION *registration) return STATUS_SUCCESS; } -NTSTATUS call_minidriver(ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in_size, void *out_buff, ULONG out_size) +void call_minidriver( ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in_size, + void *out_buff, ULONG out_size, IO_STATUS_BLOCK *io ) { IRP *irp; - IO_STATUS_BLOCK io; KEVENT event; KeInitializeEvent(&event, NotificationEvent, FALSE); - irp = IoBuildDeviceIoControlRequest(code, device, in_buff, in_size, - out_buff, out_size, TRUE, &event, &io); + irp = IoBuildDeviceIoControlRequest( code, device, in_buff, in_size, out_buff, out_size, TRUE, &event, io ); if (IoCallDriver(device, irp) == STATUS_PENDING) KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); - - return io.Status; }

1 0

Piotr Caban : msvcrt: Don't reset x87 in x86_64 fpreset.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: f53b2095f36f1753b9a50d4dcb2eeab6c8c796cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f53b2095f36f1753b9a50d4d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 4 18:04:56 2021 +0200 msvcrt: Don't reset x87 in x86_64 fpreset. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d45327b8f1f..c385dd036b7 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5901,7 +5901,7 @@ int CDECL _finite(double num) */ void CDECL _fpreset(void) { -#if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) +#if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) const unsigned int x86_cw = 0x27f; __asm__ __volatile__( "fninit; fldcw %0" : : "m" (x86_cw) ); if (sse2_supported) @@ -5909,6 +5909,9 @@ void CDECL _fpreset(void) unsigned int cw = _MCW_EM, sw = 0; _setfp_sse(&cw, ~0, &sw, ~0); } +#elif defined(__x86_64__) + unsigned int cw = _MCW_EM, sw = 0; + _setfp_sse(&cw, ~0, &sw, ~0); #else FIXME( "not implemented\n" ); #endif

1 0

Martin Storsjö : msvcrt: Implement fesetenv for arm.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 8c022396191b94472223b4f22f37dda14991a227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c022396191b94472223b4f2… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Aug 4 18:04:37 2021 +0200 msvcrt: Implement fesetenv for arm. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 64ca7197101..19c057cac1d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5731,7 +5731,7 @@ static __msvcrt_ulong fenv_encode(unsigned int x, unsigned int y) return x | y; } -#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && !defined(__SOFTFP__)) static BOOL fenv_decode(__msvcrt_ulong enc, unsigned int *x, unsigned int *y) { if (enc & 0x20) @@ -6069,6 +6069,32 @@ int CDECL fesetenv(const fenv_t *env) __asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) ); _control87(fp_cw, 0xffffffff); return 0; +#elif defined(__arm__) && !defined(__SOFTFP__) + DWORD fpscr; + unsigned int tmp, fp_cw, fp_stat; + + if (!env->_Fe_ctl && !env->_Fe_stat) { + _fpreset(); + return 0; + } + + if (!fenv_decode(env->_Fe_ctl, &tmp, &fp_cw)) + return 1; + if (!fenv_decode(env->_Fe_stat, &tmp, &fp_stat)) + return 1; + + _control87(_MCW_EM, _MCW_EM); + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpscr) ); + fpscr &= ~0x9f; + if (fp_stat & _SW_INVALID) fpscr |= 0x1; + if (fp_stat & _SW_ZERODIVIDE) fpscr |= 0x2; + if (fp_stat & _SW_OVERFLOW) fpscr |= 0x4; + if (fp_stat & _SW_UNDERFLOW) fpscr |= 0x8; + if (fp_stat & _SW_INEXACT) fpscr |= 0x10; + if (fp_stat & _SW_DENORMAL) fpscr |= 0x80; + __asm__ __volatile__( "vmsr fpscr, %0" :: "r" (fpscr) ); + _control87(fp_cw, 0xffffffff); + return 0; #else FIXME( "not implemented\n" ); #endif

1 0

Jacek Caban : gdi32: Use NtGdiExcludeClipRect for ExcludeClipRect implementation.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 92e7cc1e03b1caf967ab011ed3791add670fbbbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=92e7cc1e03b1caf967ab011e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 11:21:13 2021 +0200 gdi32: Use NtGdiExcludeClipRect for ExcludeClipRect implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/clipping.c | 34 ++++++++++++++++------------------ dlls/gdi32/enhmfdrv/dc.c | 6 ++---- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 4 ++++ dlls/gdi32/gdidc.c | 14 ++++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 40 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 9e03635a103..bea2c7f8cfc 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -191,17 +191,7 @@ INT CDECL nulldrv_ExtSelectClipRgn( PHYSDEV dev, HRGN rgn, INT mode ) INT CDECL nulldrv_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { - DC *dc = get_nulldrv_dc( dev ); - RECT rect = get_clip_rect( dc, left, top, right, bottom ); - INT ret; - HRGN rgn; - - if (!(rgn = CreateRectRgnIndirect( &rect ))) return ERROR; - if (!dc->hClipRgn) create_default_clip_region( dc ); - ret = NtGdiCombineRgn( dc->hClipRgn, dc->hClipRgn, rgn, RGN_DIFF ); - DeleteObject( rgn ); - if (ret != ERROR) update_dc_clipping( dc ); - return ret; + return ERROR; } INT CDECL nulldrv_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) @@ -296,21 +286,29 @@ INT WINAPI NtGdiOffsetClipRgn( HDC hdc, INT x, INT y ) /*********************************************************************** - * ExcludeClipRect (GDI32.@) + * NtGdiExcludeClipRect (win32u.@) */ -INT WINAPI ExcludeClipRect( HDC hdc, INT left, INT top, - INT right, INT bottom ) +INT WINAPI NtGdiExcludeClipRect( HDC hdc, INT left, INT top, INT right, INT bottom ) { - PHYSDEV physdev; - INT ret; + INT ret = ERROR; + RECT rect; + HRGN rgn; DC *dc = get_dc_ptr( hdc ); TRACE("%p %d,%d-%d,%d\n", hdc, left, top, right, bottom ); if (!dc) return ERROR; update_dc( dc ); - physdev = GET_DC_PHYSDEV( dc, pExcludeClipRect ); - ret = physdev->funcs->pExcludeClipRect( physdev, left, top, right, bottom ); + + rect = get_clip_rect( dc, left, top, right, bottom ); + + if ((rgn = CreateRectRgnIndirect( &rect ))) + { + if (!dc->hClipRgn) create_default_clip_region( dc ); + ret = NtGdiCombineRgn( dc->hClipRgn, dc->hClipRgn, rgn, RGN_DIFF ); + DeleteObject( rgn ); + if (ret != ERROR) update_dc_clipping( dc ); + } release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 4b51a140c27..8508f6296be 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -146,9 +146,8 @@ BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ) return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } -INT CDECL EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +INT EMFDC_ExcludeClipRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pExcludeClipRect ); EMREXCLUDECLIPRECT emr; emr.emr.iType = EMR_EXCLUDECLIPRECT; @@ -157,8 +156,7 @@ INT CDECL EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT emr.rclClip.top = top; emr.rclClip.right = right; emr.rclClip.bottom = bottom; - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return ERROR; - return next->funcs->pExcludeClipRect( next, left, top, right, bottom ); + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL EMFDC_IntersectClipRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index d0d7ad14878..08936a73f8f 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -70,7 +70,6 @@ extern BOOL CDECL EMFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, I INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR str, UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 80326fe0d04..17179dd37ba 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -57,7 +57,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pEndPath */ NULL, /* pEnumFonts */ NULL, /* pEnumICMProfiles */ - EMFDRV_ExcludeClipRect, /* pExcludeClipRect */ + NULL, /* pExcludeClipRect */ NULL, /* pExtDeviceMode */ NULL, /* pExtEscape */ NULL, /* pExtFloodFill */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 58ea438a582..b0136e9c898 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -47,6 +47,8 @@ extern BOOL METADC_Arc( HDC hdc, INT left, INT top, INT right, INT bottom, extern BOOL METADC_Chord( HDC hdc, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL METADC_Ellipse( HDC hdc, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; +extern BOOL METADC_ExcludeClipRect( HDC hdc, INT left, INT top, INT right, + INT bottom ) DECLSPEC_HIDDEN; extern BOOL METADC_ExtFloodFill( HDC hdc, INT x, INT y, COLORREF color, UINT fill_type ) DECLSPEC_HIDDEN; extern BOOL METADC_ExtTextOut( HDC hdc, INT x, INT y, UINT flags, const RECT *rect, @@ -92,6 +94,8 @@ extern BOOL EMFDC_CloseFigure( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_Ellipse( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL EMFDC_EndPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_ExcludeClipRect( DC_ATTR *dc_attr, INT left, INT top, INT right, + INT bottom ) DECLSPEC_HIDDEN; extern BOOL EMFDC_ExtFloodFill( DC_ATTR *dc_attr, INT x, INT y, COLORREF color, UINT fill_type ) DECLSPEC_HIDDEN; extern BOOL EMFDC_ExtTextOut( DC_ATTR *dc_attr, INT x, INT y, UINT flags, const RECT *rect, diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index c1743498934..716b5ee28a5 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1075,6 +1075,20 @@ INT WINAPI OffsetClipRgn( HDC hdc, INT x, INT y ) return NtGdiOffsetClipRgn( hdc, x, y ); } +/*********************************************************************** + * ExcludeClipRect (GDI32.@) + */ +INT WINAPI ExcludeClipRect( HDC hdc, INT left, INT top, INT right, INT bottom ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_ExcludeClipRect( hdc, left, top, right, bottom ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_ExcludeClipRect( dc_attr, left, top, right, bottom )) + return FALSE; + return NtGdiExcludeClipRect( hdc, left, top, right, bottom ); +} + /*********************************************************************** * GdiSetPixelFormat (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index fde7bacfd11..363274a40b0 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -75,9 +75,9 @@ BOOL METADC_IntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bottom return metadc_param4( hdc, META_INTERSECTCLIPRECT, left, top, right, bottom ); } -INT CDECL MFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +BOOL METADC_ExcludeClipRect( HDC hdc, INT left, INT top, INT right, INT bottom ) { - return MFDRV_MetaParam4( dev, META_EXCLUDECLIPRECT, left, top, right, bottom ); + return metadc_param4( hdc, META_EXCLUDECLIPRECT, left, top, right, bottom ); } BOOL METADC_OffsetClipRgn( HDC hdc, INT x, INT y ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 01e1ee92c98..db508ea3dbd 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -122,7 +122,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_EndPath, /* pEndPath */ NULL, /* pEnumFonts */ NULL, /* pEnumICMProfiles */ - MFDRV_ExcludeClipRect, /* pExcludeClipRect */ + NULL, /* pExcludeClipRect */ NULL, /* pExtDeviceMode */ MFDRV_ExtEscape, /* pExtEscape */ NULL, /* pExtFloodFill */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 5b5d17859fa..17fd626c5ec 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -83,7 +83,6 @@ extern BOOL CDECL MFDRV_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : gdi32: Use NtGdiOffsetClipRgn for OffsetClipRgn implementation.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 112fe018bf84769f089f459dd7cf5c23c931177c URL: https://source.winehq.org/git/wine.git/?a=commit;h=112fe018bf84769f089f459d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 11:20:53 2021 +0200 gdi32: Use NtGdiOffsetClipRgn for OffsetClipRgn implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/clipping.c | 33 +++++++++++++-------------------- dlls/gdi32/enhmfdrv/dc.c | 6 ++---- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 13 +++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 34 insertions(+), 30 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 30ce88fe41c..9e03635a103 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -211,18 +211,7 @@ INT CDECL nulldrv_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT CDECL nulldrv_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) { - DC *dc = get_nulldrv_dc( dev ); - INT ret = NULLREGION; - - if (dc->hClipRgn) - { - x = MulDiv( x, dc->attr->vport_ext.cx, dc->attr->wnd_ext.cx ); - y = MulDiv( y, dc->attr->vport_ext.cy, dc->attr->wnd_ext.cy ); - if (dc->attr->layout & LAYOUT_RTL) x = -x; - ret = NtGdiOffsetRgn( dc->hClipRgn, x, y ); - update_dc_clipping( dc ); - } - return ret; + return ERROR; } @@ -283,20 +272,24 @@ void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect, /*********************************************************************** - * OffsetClipRgn (GDI32.@) + * NtGdiOffsetClipRgn (win32u.@) */ -INT WINAPI OffsetClipRgn( HDC hdc, INT x, INT y ) +INT WINAPI NtGdiOffsetClipRgn( HDC hdc, INT x, INT y ) { - PHYSDEV physdev; - INT ret; + INT ret = NULLREGION; DC *dc = get_dc_ptr( hdc ); - TRACE("%p %d,%d\n", hdc, x, y ); - if (!dc) return ERROR; update_dc( dc ); - physdev = GET_DC_PHYSDEV( dc, pOffsetClipRgn ); - ret = physdev->funcs->pOffsetClipRgn( physdev, x, y ); + + if (dc->hClipRgn) + { + x = MulDiv( x, dc->attr->vport_ext.cx, dc->attr->wnd_ext.cx ); + y = MulDiv( y, dc->attr->vport_ext.cy, dc->attr->wnd_ext.cy ); + if (dc->attr->layout & LAYOUT_RTL) x = -x; + ret = NtGdiOffsetRgn( dc->hClipRgn, x, y ); + update_dc_clipping( dc ); + } release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 68f8e1445cb..4b51a140c27 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -174,17 +174,15 @@ BOOL EMFDC_IntersectClipRect( DC_ATTR *dc_attr, INT left, INT top, INT right, IN return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } -INT CDECL EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) +BOOL EMFDC_OffsetClipRgn( DC_ATTR *dc_attr, INT x, INT y ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pOffsetClipRgn ); EMROFFSETCLIPRGN emr; emr.emr.iType = EMR_OFFSETCLIPRGN; emr.emr.nSize = sizeof(emr); emr.ptlOffset.x = x; emr.ptlOffset.y = y; - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return ERROR; - return next->funcs->pOffsetClipRgn( next, x, y ); + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } INT CDECL EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 9986d44dd85..d0d7ad14878 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -85,7 +85,6 @@ extern BOOL CDECL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, U extern BOOL CDECL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 79a505c7701..80326fe0d04 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -99,7 +99,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_LineTo, /* pLineTo */ EMFDRV_ModifyWorldTransform, /* pModifyWorldTransform */ NULL, /* pMoveTo */ - EMFDRV_OffsetClipRgn, /* pOffsetClipRgn */ + NULL, /* pOffsetClipRgn */ EMFDRV_OffsetViewportOrgEx, /* pOffsetViewportOrgEx */ EMFDRV_OffsetWindowOrgEx, /* pOffsetWindowOrgEx */ NULL, /* pPaintRgn */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index cc7dbec910f..58ea438a582 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -59,6 +59,7 @@ extern BOOL METADC_IntersectClipRect( HDC hdc, INT left, INT top, INT right, extern BOOL METADC_InvertRgn( HDC hdc, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL METADC_LineTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_MoveTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL METADC_OffsetClipRgn( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_PaintRgn( HDC hdc, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL METADC_PatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop ); extern BOOL METADC_Pie( HDC hdc, INT left, INT top, INT right, INT bottom, @@ -105,6 +106,7 @@ extern BOOL EMFDC_IntersectClipRect( DC_ATTR *dc_attr, INT left, INT top, INT ri extern BOOL EMFDC_InvertRgn( DC_ATTR *dc_attr, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL EMFDC_LineTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_MoveTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_OffsetClipRgn( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PaintRgn( DC_ATTR *dc_attr, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PatBlt( DC_ATTR *dc_attr, INT left, INT top, INT width, INT height, DWORD rop ); extern BOOL EMFDC_PolyBezier( DC_ATTR *dc_attr, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 72990ef18e3..c1743498934 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1062,6 +1062,19 @@ INT WINAPI IntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bottom return NtGdiIntersectClipRect( hdc, left, top, right, bottom ); } +/*********************************************************************** + * OffsetClipRgn (GDI32.@) + */ +INT WINAPI OffsetClipRgn( HDC hdc, INT x, INT y ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_OffsetClipRgn( hdc, x, y ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_OffsetClipRgn( dc_attr, x, y )) return FALSE; + return NtGdiOffsetClipRgn( hdc, x, y ); +} + /*********************************************************************** * GdiSetPixelFormat (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 93924c98216..fde7bacfd11 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -80,9 +80,9 @@ INT CDECL MFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT return MFDRV_MetaParam4( dev, META_EXCLUDECLIPRECT, left, top, right, bottom ); } -INT CDECL MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) +BOOL METADC_OffsetClipRgn( HDC hdc, INT x, INT y ) { - return MFDRV_MetaParam2( dev, META_OFFSETCLIPRGN, x, y ); + return metadc_param2( hdc, META_OFFSETCLIPRGN, x, y ); } DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 4c225c68e53..01e1ee92c98 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -164,7 +164,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pLineTo */ NULL, /* pModifyWorldTransform */ NULL, /* pMoveTo */ - MFDRV_OffsetClipRgn, /* pOffsetClipRgn */ + NULL, /* pOffsetClipRgn */ MFDRV_OffsetViewportOrgEx, /* pOffsetViewportOrgEx */ MFDRV_OffsetWindowOrgEx, /* pOffsetWindowOrgEx */ NULL, /* pPaintRgn */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index ec3a0ab7b6d..5b5d17859fa 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -88,7 +88,6 @@ extern INT CDECL MFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) DEC extern BOOL CDECL MFDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PolyBezier( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN;

1 0

Huw Davies : ntdll: Return STATUS_NOT_SUPPORTED if dlinfo() is not present.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 41e84b3f07a7b284a52cc5d80de0b2d920fae1e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41e84b3f07a7b284a52cc5d8… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 4 12:23:10 2021 +0100 ntdll: Return STATUS_NOT_SUPPORTED if dlinfo() is not present. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index f1dbe9f345e..8888376f2f0 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1745,6 +1745,8 @@ NTSTATUS get_builtin_init_funcs( void *handle, void **funcs, SIZE_T len, SIZE_T if (init_func) *funcs++ = init_func; for (i = 0; i < init_arraysz / sizeof(*init_array); i++) funcs[i] = init_array[i]; return STATUS_SUCCESS; +#else + return STATUS_NOT_SUPPORTED; #endif }

1 0

Alexandre Julliard : wow64: Implement Wow64ApcRoutine().
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

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 support for jumping to 32-bit code in Wow64LdrpInitialize().
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

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