wine-commits October 2016

wine-commits@winehq.org

2 participants
451 discussions

Aric Stewart : winebus.sys: Implement IOCTL_HID_SET_OUTPUT_REPORT for hidraw.
by Alexandre Julliard 27 Oct '16

27 Oct '16

Module: wine Branch: master Commit: 253204570e65331dc4f4278f544f2b5f69c950d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=253204570e65331dc4f4278f5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 27 08:37:41 2016 -0500 winebus.sys: Implement IOCTL_HID_SET_OUTPUT_REPORT for hidraw. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_udev.c | 18 ++++++++++++++++++ dlls/winebus.sys/main.c | 10 ++++++++++ 3 files changed, 29 insertions(+) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index dcebd96..18bebcf 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -26,6 +26,7 @@ typedef struct NTSTATUS (*get_reportdescriptor)(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length); NTSTATUS (*get_string)(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length); NTSTATUS (*begin_report_processing)(DEVICE_OBJECT *device); + NTSTATUS (*set_output_report)(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written); } platform_vtbl; void *get_platform_private(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 664ce58..be8e93f 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -284,12 +284,30 @@ static NTSTATUS begin_report_processing(DEVICE_OBJECT *device) return STATUS_SUCCESS; } +static NTSTATUS hidraw_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) +{ + struct platform_private* ext = impl_from_DEVICE_OBJECT(device); + ssize_t rc; + rc = write(ext->device_fd, report, length); + if (rc > 0) + { + *written = rc; + return STATUS_SUCCESS; + } + else + { + *written = 0; + return STATUS_UNSUCCESSFUL; + } +} + static const platform_vtbl hidraw_vtbl = { compare_platform_device, hidraw_get_reportdescriptor, hidraw_get_string, begin_report_processing, + hidraw_set_output_report, }; static void try_add_device(struct udev_device *dev) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 29de07a..802122f 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -531,6 +531,16 @@ NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) LeaveCriticalSection(&ext->report_cs); break; } + case IOCTL_HID_SET_OUTPUT_REPORT: + case IOCTL_HID_WRITE_REPORT: + { + HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); + TRACE_(hid_report)("IOCTL_HID_WRITE_REPORT / IOCTL_HID_SET_OUTPUT_REPORT\n"); + irp->IoStatus.u.Status = status = ext->vtbl->set_output_report( + device, packet->reportId, packet->reportBuffer, + packet->reportBufferLen, &irp->IoStatus.Information); + break; + } default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode;

1 0

Sebastian Lackner : hidclass.sys: Fix memory leak in hid_device_thread.
by Alexandre Julliard 27 Oct '16

27 Oct '16

Module: wine Branch: master Commit: 3f5e8715b31569b113e05e11a29915f4e3ad4b89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f5e8715b31569b113e05e11a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 26 21:55:10 2016 +0200 hidclass.sys: Fix memory leak in hid_device_thread. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 6d9b0d4..5dd5ebb 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -256,6 +256,7 @@ static DWORD CALLBACK hid_device_thread(void *args) IRP *irp; IO_STATUS_BLOCK irp_status; + HID_XFER_PACKET *packet; DWORD rc; HANDLE events[2]; NTSTATUS ntrc; @@ -264,16 +265,16 @@ static DWORD CALLBACK hid_device_thread(void *args) events[0] = CreateEventA(NULL, TRUE, FALSE, NULL); events[1] = ext->halt_event; + packet = HeapAlloc(GetProcessHeap(), 0, sizeof(*packet) + ext->preparseData->caps.InputReportByteLength); + packet->reportBuffer = (BYTE *)packet + sizeof(*packet); + if (ext->information.Polled) { while(1) { - HID_XFER_PACKET *packet; ResetEvent(events[0]); - packet = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*packet) + ext->preparseData->caps.InputReportByteLength); packet->reportBufferLen = ext->preparseData->caps.InputReportByteLength; - packet->reportBuffer = ((BYTE*)packet) + sizeof(*packet); packet->reportId = 0; irp = IoBuildDeviceIoControlRequest(IOCTL_HID_GET_INPUT_REPORT, @@ -306,22 +307,12 @@ static DWORD CALLBACK hid_device_thread(void *args) { INT exit_now = FALSE; - HID_XFER_PACKET *packet; - packet = HeapAlloc(GetProcessHeap(), 0, sizeof(*packet) + ext->preparseData->caps.InputReportByteLength); - packet->reportBufferLen = ext->preparseData->caps.InputReportByteLength; - packet->reportBuffer = ((BYTE*)packet) + sizeof(*packet); - packet->reportId = 0; - while(1) { - BYTE *buffer; - - buffer = HeapAlloc(GetProcessHeap(), 0, ext->preparseData->caps.InputReportByteLength); - ResetEvent(events[0]); irp = IoBuildDeviceIoControlRequest(IOCTL_HID_READ_REPORT, - device, NULL, 0, buffer, + device, NULL, 0, packet->reportBuffer, ext->preparseData->caps.InputReportByteLength, TRUE, NULL, &irp_status); @@ -339,8 +330,8 @@ static DWORD CALLBACK hid_device_thread(void *args) if (!exit_now && irp->IoStatus.u.Status == STATUS_SUCCESS) { - packet->reportId = buffer[0]; - memcpy(packet->reportBuffer, buffer, ext->preparseData->caps.InputReportByteLength); + packet->reportBufferLen = irp->IoStatus.Information; + packet->reportId = packet->reportBuffer[0]; RingBuffer_Write(ext->ring_buffer, packet); HID_Device_processQueue(device); } @@ -350,10 +341,9 @@ static DWORD CALLBACK hid_device_thread(void *args) if (exit_now) break; } - - HeapFree(GetProcessHeap(), 0, packet); } + /* FIXME: releasing packet requires IRP cancellation support */ CloseHandle(events[0]); TRACE("Device thread exiting\n");

1 0

Sebastian Lackner : hidclass.sys: Fix memory leak in call_minidriver.
by Alexandre Julliard 27 Oct '16

27 Oct '16

Module: wine Branch: master Commit: b70dd1aa86563f10a00a10d9c7a0d8baebf7aa2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b70dd1aa86563f10a00a10d9c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 26 21:53:20 2016 +0200 hidclass.sys: Fix memory leak in call_minidriver. Before 54002103763188b5c5b1fd1210ad4cf09ef80bf9, the output buffer was released because UserIosb != NULL. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/main.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c index f5a60e9..1742cfe 100644 --- a/dlls/hidclass.sys/main.c +++ b/dlls/hidclass.sys/main.c @@ -98,18 +98,10 @@ NTSTATUS call_minidriver(ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG IRP *irp; IO_STATUS_BLOCK irp_status; NTSTATUS status; - void *buffer = NULL; - HANDLE event = CreateEventA(NULL, FALSE, FALSE, NULL); - if (out_size) - { - buffer = HeapAlloc(GetProcessHeap(), 0, out_size); - memcpy(buffer, out_buff, out_size); - } - irp = IoBuildDeviceIoControlRequest(code, device, in_buff, in_size, - buffer, out_size, TRUE, NULL, &irp_status); + out_buff, out_size, TRUE, NULL, &irp_status); IoSetCompletionRoutine(irp, internalComplete, event, TRUE, TRUE, TRUE); status = IoCallDriver(device, irp); @@ -117,7 +109,6 @@ NTSTATUS call_minidriver(ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG if (status == STATUS_PENDING) WaitForSingleObject(event, INFINITE); - memcpy(out_buff, buffer, out_size); status = irp->IoStatus.u.Status; IoCompleteRequest(irp, IO_NO_INCREMENT );

1 0

Sebastian Lackner : hidclass.sys: Update reportBuffer pointer after reading packet from ringbuffer.
by Alexandre Julliard 27 Oct '16

27 Oct '16

Module: wine Branch: master Commit: 9581f4c15a84d6b425e0689f8cdc20c6d90627d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9581f4c15a84d6b425e0689f8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 26 21:52:58 2016 +0200 hidclass.sys: Update reportBuffer pointer after reading packet from ringbuffer. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index bc871b9..6d9b0d4 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -218,6 +218,7 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) if (buffer_size) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); + packet->reportBuffer = (BYTE *)packet + sizeof(*packet); TRACE_(hid_report)("Processing Request (%i)\n",ptr); if (irpsp->Parameters.Read.Length >= packet->reportBufferLen) { @@ -645,6 +646,7 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) if (buffer_size) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + packet->reportBuffer = (BYTE *)packet + sizeof(*packet); TRACE_(hid_report)("Got Packet %p %i\n", packet->reportBuffer, packet->reportBufferLen); if (irpsp->Parameters.Read.Length >= packet->reportBufferLen) {

1 0

Aric Stewart : hid: Implement HidD_SetOutputReport.
by Alexandre Julliard 26 Oct '16

26 Oct '16

Module: wine Branch: master Commit: fc1485b86b8554cacb0066162feee094de799583 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc1485b86b8554cacb0066162… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 26 12:46:12 2016 -0500 hid: Implement HidD_SetOutputReport. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ dlls/hidclass.sys/device.c | 12 ++++++------ include/ddk/hidsdi.h | 1 + 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 2131af2..91a83f6 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -17,7 +17,7 @@ @ stub HidD_SetConfiguration @ stdcall HidD_SetFeature(long ptr long) @ stdcall HidD_SetNumInputBuffers(long long) -@ stub HidD_SetOutputReport +@ stdcall HidD_SetOutputReport(long ptr long) @ stdcall HidP_GetButtonCaps(long ptr ptr ptr) @ stdcall HidP_GetCaps(ptr ptr) @ stub HidP_GetData diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 31220ec..99665dd 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -133,3 +133,9 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT *PreparsedData = data; return TRUE; } + +BOOLEAN WINAPI HidD_SetOutputReport(HANDLE HidDeviceObject, void *ReportBuffer, ULONG ReportBufferLength) +{ + TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); + return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, NULL, NULL); +} diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 45f88eb..bc871b9 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -463,21 +463,20 @@ static NTSTATUS HID_get_feature(DEVICE_OBJECT *device, IRP *irp) return rc; } -static NTSTATUS HID_set_feature(DEVICE_OBJECT *device, IRP *irp) +static NTSTATUS HID_set_to_device(DEVICE_OBJECT *device, IRP *irp) { - IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); HID_XFER_PACKET packet; NTSTATUS rc; - irp->IoStatus.Information = 0; - TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", device, irpsp->Parameters.DeviceIoControl.InputBufferLength, irp->AssociatedIrp.SystemBuffer); packet.reportBuffer = irp->AssociatedIrp.SystemBuffer; packet.reportId = ((char*)irp->AssociatedIrp.SystemBuffer)[0]; packet.reportBufferLen = irpsp->Parameters.DeviceIoControl.InputBufferLength; TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet.reportId, packet.reportBufferLen, packet.reportBuffer); - rc = call_minidriver(IOCTL_HID_SET_FEATURE, device, &packet, sizeof(packet), NULL, 0); + rc = call_minidriver(irpsp->Parameters.DeviceIoControl.IoControlCode, + device, NULL, 0, &packet, sizeof(packet)); irp->IoStatus.u.Status = rc; if (irp->IoStatus.u.Status == STATUS_SUCCESS) @@ -609,7 +608,8 @@ NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) rc = HID_get_feature(device, irp); break; case IOCTL_HID_SET_FEATURE: - rc = HID_set_feature(device, irp); + case IOCTL_HID_SET_OUTPUT_REPORT: + rc = HID_set_to_device(device, irp); break; default: { diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 75f2e3b..8b3b5a2 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -45,5 +45,6 @@ BOOLEAN WINAPI HidD_SetNumInputBuffers(HANDLE HidDeviceObject, ULONG NumberBuffe BOOLEAN WINAPI HidD_GetPreparsedData( HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData); BOOLEAN WINAPI HidD_FreePreparsedData(PHIDP_PREPARSED_DATA PreparsedData); BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr); +BOOLEAN WINAPI HidD_SetOutputReport(HANDLE HidDeviceObject, void *ReportBuffer, ULONG ReportBufferLength); #endif /* __WINE_HIDSDI_H */

1 0

Aric Stewart : winebus.sys: Handle device reports for hidraw devices.
by Alexandre Julliard 26 Oct '16

26 Oct '16

Module: wine Branch: master Commit: 1a81022f4e6359f4d6009057db1636041eabada9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a81022f4e6359f4d6009057d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 26 10:49:41 2016 -0500 winebus.sys: Handle device reports for hidraw devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 2 + dlls/winebus.sys/bus_udev.c | 75 +++++++++++++++++++ dlls/winebus.sys/main.c | 173 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 238 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a81022f4e6359f4d6009…

1 0

Ken Thomases : winemac: Use min() rather than MIN(), which is not reliably defined.
by Alexandre Julliard 26 Oct '16

26 Oct '16

Module: wine Branch: master Commit: 2a09548b5925f09e5709c13c005c6ca9a7d2e86b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a09548b5925f09e5709c13c0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 26 10:58:35 2016 -0500 winemac: Use min() rather than MIN(), which is not reliably defined. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index fc0d60c..d6a8c1f 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -439,7 +439,7 @@ static int bitmap_info_size(const BITMAPINFO *info, WORD coloruse) } else /* assume BITMAPINFOHEADER */ { - colors = MIN(info->bmiHeader.biClrUsed, 256); + colors = min(info->bmiHeader.biClrUsed, 256); if (!colors && (info->bmiHeader.biBitCount <= 8)) colors = 1 << info->bmiHeader.biBitCount; if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3;

1 0

Henri Verbeet : wined3d: Get rid of WINED3DFMT_FLAG_GETDC.
by Alexandre Julliard 26 Oct '16

26 Oct '16

Module: wine Branch: master Commit: 6196e944a281f9e387535a8d070ab2a7ba605400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6196e944a281f9e387535a8d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 26 15:20:24 2016 +0200 wined3d: Get rid of WINED3DFMT_FLAG_GETDC. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4e7bb88..c56558d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3637,7 +3637,6 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_RENDERTARGET 0x00000010 #define WINED3DFMT_FLAG_FBO_ATTACHABLE 0x00000040 #define WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB 0x00000080 -#define WINED3DFMT_FLAG_GETDC 0x00000100 #define WINED3DFMT_FLAG_FLOAT 0x00000200 #define WINED3DFMT_FLAG_BUMPMAP 0x00000400 #define WINED3DFMT_FLAG_SRGB_READ 0x00000800

1 0

Andrew Eikum : d2d1/tests: Add FillContainsPoint() tests.
by Alexandre Julliard 26 Oct '16

26 Oct '16

Module: wine Branch: master Commit: aea8f9d6107621e2436b93acb2158405e2a75343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aea8f9d6107621e2436b93acb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 26 15:20:23 2016 +0200 d2d1/tests: Add FillContainsPoint() tests. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d9d240c..b49ed7d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1313,12 +1313,12 @@ static void test_path_geometry(void) ID3D10Device1 *device; IDXGISurface *surface; ID2D1Factory *factory; + BOOL match, contains; D2D1_COLOR_F color; ULONG refcount; UINT32 count; HWND window; HRESULT hr; - BOOL match; if (!(device = create_device())) { @@ -1537,6 +1537,29 @@ static void test_path_geometry(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); match = compare_surface(surface, "3aace1b22aae111cb577614fed16e4eb1650dba5"); ok(match, "Surface does not match.\n"); + + /* Edge test. */ + set_point(&point, 94.0f, 620.0f); + contains = TRUE; + hr = ID2D1TransformedGeometry_FillContainsPoint(transformed_geometry, point, NULL, 0.0f, &contains); + ok(hr == S_OK, "FillContainsPoint failed, hr %#x.\n", hr); + ok(!contains, "Got unexpected contains %#x.\n", contains); + + set_point(&point, 95.0f, 620.0f); + contains = FALSE; + hr = ID2D1TransformedGeometry_FillContainsPoint(transformed_geometry, point, NULL, 0.0f, &contains); + ok(hr == S_OK, "FillContainsPoint failed, hr %#x.\n", hr); + ok(contains == TRUE, "Got unexpected contains %#x.\n", contains); + + /* With transformation matrix. */ + set_matrix_identity(&matrix); + translate_matrix(&matrix, -10.0f, 0.0f); + set_point(&point, 85.0f, 620.0f); + contains = FALSE; + hr = ID2D1TransformedGeometry_FillContainsPoint(transformed_geometry, point, &matrix, 0.0f, &contains); + ok(hr == S_OK, "FillContainsPoint failed, hr %#x.\n", hr); + ok(contains == TRUE, "Got unexpected contains %#x.\n", contains); + ID2D1TransformedGeometry_Release(transformed_geometry); ID2D1PathGeometry_Release(geometry);

1 0

Andrew Eikum : d2d1: Implement d2d_path_geometry_FillContainsPoint().
by Alexandre Julliard 26 Oct '16

26 Oct '16

Module: wine Branch: master Commit: 2e08bc0ffca7ca425caf7c38afbe4503fad272dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e08bc0ffca7ca425caf7c38a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 26 15:20:22 2016 +0200 d2d1: Implement d2d_path_geometry_FillContainsPoint(). Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 23 +++++++++++++++++++++++ dlls/d2d1/geometry.c | 22 +++++++++++++++++++--- dlls/d2d1/render_target.c | 6 ------ 3 files changed, 42 insertions(+), 9 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index b49fce4..8497ea8 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -357,4 +357,27 @@ static inline void d2d_matrix_multiply(D2D_MATRIX_3X2_F *a, const D2D_MATRIX_3X2 a->_32 = tmp._31 * b->_12 + tmp._32 * b->_22 + b->_32; } +/* Dst must be different from src. */ +static inline BOOL d2d_matrix_invert(D2D_MATRIX_3X2_F *dst, const D2D_MATRIX_3X2_F *src) +{ + float d = src->_11 * src->_22 - src->_21 * src->_12; + + if (d == 0.0f) + return FALSE; + dst->_11 = src->_22 / d; + dst->_21 = -src->_21 / d; + dst->_31 = (src->_21 * src->_32 - src->_31 * src->_22) / d; + dst->_12 = -src->_12 / d; + dst->_22 = src->_11 / d; + dst->_32 = -(src->_11 * src->_32 - src->_31 * src->_12) / d; + + return TRUE; +} + +static inline void d2d_point_transform(D2D1_POINT_2F *dst, const D2D1_MATRIX_3X2_F *matrix, float x, float y) +{ + dst->x = x * matrix->_11 + y * matrix->_21 + matrix->_31; + dst->y = x * matrix->_12 + y * matrix->_22 + matrix->_32; +} + #endif /* __WINE_D2D1_PRIVATE_H */ diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 57dcce2..385e171 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -1924,9 +1924,11 @@ static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_Close(ID2D1GeometrySink *ifac } done: - d2d_path_geometry_free_figures(geometry); if (FAILED(hr)) + { + d2d_path_geometry_free_figures(geometry); geometry->u.path.state = D2D_GEOMETRY_STATE_ERROR; + } return hr; } @@ -2112,10 +2114,24 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_StrokeContainsPoint(ID2D1Path static HRESULT STDMETHODCALLTYPE d2d_path_geometry_FillContainsPoint(ID2D1PathGeometry *iface, D2D1_POINT_2F point, const D2D1_MATRIX_3X2_F *transform, float tolerance, BOOL *contains) { - FIXME("iface %p, point {%.8e, %.8e}, transform %p, tolerance %.8e, contains %p stub!\n", + struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface); + D2D1_MATRIX_3X2_F g_i; + + TRACE("iface %p, point {%.8e, %.8e}, transform %p, tolerance %.8e, contains %p.\n", iface, point.x, point.y, transform, tolerance, contains); - return E_NOTIMPL; + if (transform) + { + if (!d2d_matrix_invert(&g_i, transform)) + return D2DERR_UNSUPPORTED_OPERATION; + d2d_point_transform(&point, &g_i, point.x, point.y); + } + + *contains = !!d2d_path_geometry_point_inside(geometry, &point); + + TRACE("-> %#x.\n", *contains); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_path_geometry_CompareWithGeometry(ID2D1PathGeometry *iface, diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index bc31f4d..798dd0d 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -48,12 +48,6 @@ static void d2d_point_set(D2D1_POINT_2F *dst, float x, float y) dst->y = y; } -static void d2d_point_transform(D2D1_POINT_2F *dst, const D2D1_MATRIX_3X2_F *matrix, float x, float y) -{ - dst->x = x * matrix->_11 + y * matrix->_21 + matrix->_31; - dst->y = x * matrix->_12 + y * matrix->_22 + matrix->_32; -} - static void d2d_rect_expand(D2D1_RECT_F *dst, const D2D1_POINT_2F *point) { if (point->x < dst->left)

1 0

← Newer
1
2
3
4
5
6
7
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2016