October 2016 - Wine-Commits

Jacek Caban : xmllite: Return success when setting XmlReaderProperty_MultiLanguage property.
by Alexandre Julliard Oct. 27, 2016

Oct. 27, 2016

Module: wine Branch: master Commit: 10026466a30a7839b6d83c043febe39500132907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10026466a30a7839b6d83c043… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 27 17:34:53 2016 +0200 xmllite: Return success when setting XmlReaderProperty_MultiLanguage property. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 4 ++++ dlls/xmllite/tests/reader.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index d9ed7e8..ca090ca 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2585,6 +2585,10 @@ static HRESULT WINAPI xmlreader_SetProperty(IXmlReader* iface, UINT property, LO switch (property) { + case XmlReaderProperty_MultiLanguage: + if (value) + FIXME("Ignoring MultiLanguage %lx\n", value); + break; case XmlReaderProperty_XmlResolver: if (This->resolver) IXmlResolver_Release(This->resolver); diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 006a2f2..544afc1 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1785,6 +1785,20 @@ static void test_read_attribute(void) IXmlReader_Release(reader); } +static void test_reader_properties(void) +{ + IXmlReader *reader; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MultiLanguage, 0); + ok(hr == S_OK, "SetProperty failed: %08x\n", hr); + + IXmlReader_Release(reader); +} + START_TEST(reader) { test_reader_create(); @@ -1802,4 +1816,5 @@ START_TEST(reader) test_read_pending(); test_readvaluechunk(); test_read_xmldeclaration(); + test_reader_properties(); }

1 0

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

Oct. 27, 2016

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 Oct. 27, 2016

Oct. 27, 2016

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

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

Oct. 27, 2016

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

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

Oct. 26, 2016

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

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

Oct. 26, 2016

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

Andrey Gusev : ext-ms-win-rtcore-ntuser-dpi-l1-1-0: Add dll.
by Alexandre Julliard Oct. 26, 2016

Oct. 26, 2016

Module: wine Branch: master Commit: 108952bcd40283bdcb4764a59eb75cedefb67ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=108952bcd40283bdcb4764a59… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Oct 26 13:12:35 2016 +0300 ext-ms-win-rtcore-ntuser-dpi-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0/Makefile.in | 1 + .../ext-ms-win-rtcore-ntuser-dpi-l1-1-0.spec | 3 +++ tools/make_specfiles | 1 + 5 files changed, 8 insertions(+) diff --git a/configure b/configure index 61477ee..67adaf7 100755 --- a/configure +++ b/configure @@ -1166,6 +1166,7 @@ enable_ext_ms_win_gdi_dc_create_l1_1_1 enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_ntuser_message_l1_1_1 +enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 enable_faultrep enable_fltlib enable_fltmgr_sys @@ -17924,6 +17925,7 @@ wine_fn_config_dll ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_crea wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 wine_fn_config_dll ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 +wine_fn_config_dll ext-ms-win-rtcore-ntuser-dpi-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 wine_fn_config_dll faultrep enable_faultrep implib wine_fn_config_test dlls/faultrep/tests faultrep_test wine_fn_config_dll fltlib enable_fltlib diff --git a/configure.ac b/configure.ac index 8611740..413bd46 100644 --- a/configure.ac +++ b/configure.ac @@ -3008,6 +3008,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-message-l1-1-1) +WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0) WINE_CONFIG_DLL(faultrep,,[implib]) WINE_CONFIG_TEST(dlls/faultrep/tests) WINE_CONFIG_DLL(fltlib) diff --git a/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0/Makefile.in b/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0/Makefile.in new file mode 100644 index 0000000..9fbcf1a --- /dev/null +++ b/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-rtcore-ntuser-dpi-l1-1-0.dll diff --git a/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0/ext-ms-win-rtcore-ntuser-dpi-l1-1-0.spec b/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0/ext-ms-win-rtcore-ntuser-dpi-l1-1-0.spec new file mode 100644 index 0000000..63cecb4 --- /dev/null +++ b/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0/ext-ms-win-rtcore-ntuser-dpi-l1-1-0.spec @@ -0,0 +1,3 @@ +@ stub GetDpiForMonitorInternal +@ stub GetProcessDpiAwarenessInternal +@ stub SetProcessDpiAwarenessInternal diff --git a/tools/make_specfiles b/tools/make_specfiles index f99c6f5..649dec6 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -267,6 +267,7 @@ my @dll_groups = "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0", "ext-ms-win-ntuser-message-l1-1-1", + "ext-ms-win-rtcore-ntuser-dpi-l1-1-0", ], [ "version",

1 0

Nikolay Sivov : wincodecs: Remove stub message for implemented methods.
by Alexandre Julliard Oct. 26, 2016

Oct. 26, 2016

Module: wine Branch: master Commit: 02dbe712ee8138f3e3d8dcd4054672c10bbff1ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=02dbe712ee8138f3e3d8dcd40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 25 08:18:40 2016 +0300 wincodecs: Remove stub message for implemented methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codewevers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 4 ++-- dlls/windowscodecs/icnsformat.c | 2 +- dlls/windowscodecs/tiffformat.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 7ff6bec..e5bce44 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -1287,7 +1287,7 @@ static HRESULT WINAPI FormatConverter_GetPixelFormat(IWICFormatConverter *iface, { FormatConverter *This = impl_from_IWICFormatConverter(iface); - TRACE("(%p,%p): stub\n", iface, pPixelFormat); + TRACE("(%p,%p)\n", iface, pPixelFormat); if (This->source) memcpy(pPixelFormat, This->dst_format->guid, sizeof(GUID)); @@ -1302,7 +1302,7 @@ static HRESULT WINAPI FormatConverter_GetResolution(IWICFormatConverter *iface, { FormatConverter *This = impl_from_IWICFormatConverter(iface); - TRACE("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); + TRACE("(%p,%p,%p)\n", iface, pDpiX, pDpiY); if (This->source) return IWICBitmapSource_GetResolution(This->source, pDpiX, pDpiY); diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index 552fa39..14144f7 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -415,7 +415,7 @@ static HRESULT WINAPI IcnsFrameEncode_Commit(IWICBitmapFrameEncode *iface) OSErr ret; HRESULT hr = S_OK; - TRACE("(%p): stub\n", iface); + TRACE("(%p)\n", iface); EnterCriticalSection(&This->encoder->lock); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 1dacd87..0e2a5d5 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -626,7 +626,7 @@ static HRESULT WINAPI TiffDecoder_Initialize(IWICBitmapDecoder *iface, IStream * TIFF *tiff; HRESULT hr=S_OK; - TRACE("(%p,%p,%x): stub\n", iface, pIStream, cacheOptions); + TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); EnterCriticalSection(&This->lock);

1 0

Aric Stewart : hid: Implement HidD_SetOutputReport.
by Alexandre Julliard Oct. 26, 2016

Oct. 26, 2016

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 Oct. 26, 2016

Oct. 26, 2016

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