October 2015 - Wine-Commits

André Hentschel : Add WWN 401
by Jeremy Newman Oct. 14, 2015

Oct. 14, 2015

Module: website Branch: master Commit: ecd2dc3ab5b1e7985f4788c6a586856c357e2f52 URL: http://source.winehq.org/git/website.git/?a=commit;h=ecd2dc3ab5b1e7985f4788… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 14 20:19:15 2015 +0200 Add WWN 401 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2015101401.xml | 10 ++ news/en/2015101401.xml | 10 ++ wwn/en/wn20151014_401.xml | 402 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 422 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=ecd2dc3ab5b1e7985f…

1 0

Joachim Priesner : user32: msgbox: Make buttons an own control group.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 217fe9cfad062912c3a824f3d24e444788ade3c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=217fe9cfad062912c3a824f3d… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Mon Oct 12 16:57:49 2015 +0200 user32: msgbox: Make buttons an own control group. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/msgbox.c | 11 ++++++++++- dlls/user32/user32.rc | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 7fb17bd..00f2bd9 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -115,12 +115,14 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) TRACE_(msgbox)("%s\n", debugstr_w(lpszText)); SetWindowTextW(GetDlgItem(hwnd, MSGBOX_IDTEXT), lpszText); - /* Remove not selected buttons */ + /* Remove not selected buttons and assign the WS_GROUP style to the first button */ + hItem = 0; switch(lpmb->dwStyle & MB_TYPEMASK) { case MB_OK: DestroyWindow(GetDlgItem(hwnd, IDCANCEL)); /* fall through */ case MB_OKCANCEL: + hItem = GetDlgItem(hwnd, IDOK); DestroyWindow(GetDlgItem(hwnd, IDABORT)); DestroyWindow(GetDlgItem(hwnd, IDRETRY)); DestroyWindow(GetDlgItem(hwnd, IDIGNORE)); @@ -130,6 +132,7 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) DestroyWindow(GetDlgItem(hwnd, IDCONTINUE)); break; case MB_ABORTRETRYIGNORE: + hItem = GetDlgItem(hwnd, IDABORT); DestroyWindow(GetDlgItem(hwnd, IDOK)); DestroyWindow(GetDlgItem(hwnd, IDCANCEL)); DestroyWindow(GetDlgItem(hwnd, IDYES)); @@ -141,6 +144,7 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) DestroyWindow(GetDlgItem(hwnd, IDCANCEL)); /* fall through */ case MB_YESNOCANCEL: + hItem = GetDlgItem(hwnd, IDYES); DestroyWindow(GetDlgItem(hwnd, IDOK)); DestroyWindow(GetDlgItem(hwnd, IDABORT)); DestroyWindow(GetDlgItem(hwnd, IDRETRY)); @@ -149,6 +153,7 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) DestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN)); break; case MB_RETRYCANCEL: + hItem = GetDlgItem(hwnd, IDRETRY); DestroyWindow(GetDlgItem(hwnd, IDOK)); DestroyWindow(GetDlgItem(hwnd, IDABORT)); DestroyWindow(GetDlgItem(hwnd, IDIGNORE)); @@ -158,6 +163,7 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) DestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN)); break; case MB_CANCELTRYCONTINUE: + hItem = GetDlgItem(hwnd, IDCANCEL); DestroyWindow(GetDlgItem(hwnd, IDOK)); DestroyWindow(GetDlgItem(hwnd, IDABORT)); DestroyWindow(GetDlgItem(hwnd, IDIGNORE)); @@ -165,6 +171,9 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) DestroyWindow(GetDlgItem(hwnd, IDNO)); DestroyWindow(GetDlgItem(hwnd, IDRETRY)); } + + if (hItem) SetWindowLongW(hItem, GWL_STYLE, GetWindowLongW(hItem, GWL_STYLE) | WS_GROUP); + /* Set the icon */ switch(lpmb->dwStyle & MB_ICONMASK) { case MB_ICONEXCLAMATION: diff --git a/dlls/user32/user32.rc b/dlls/user32/user32.rc index d281d53..5c67585 100644 --- a/dlls/user32/user32.rc +++ b/dlls/user32/user32.rc @@ -75,7 +75,6 @@ MSGBOX DIALOG 100, 80, 216, 168 STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN ICON "", MSGBOX_IDICON, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE - LTEXT "", MSGBOX_IDTEXT, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX PUSHBUTTON "OK", IDOK, 16, 56, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 74, 56, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Abort", IDABORT, 132, 56, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP @@ -86,6 +85,7 @@ BEGIN PUSHBUTTON "&Try Again", IDTRYAGAIN, 422, 56, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Continue", IDCONTINUE, 480, 56, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Help", IDHELP, 538, 56, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "", MSGBOX_IDTEXT, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX END MDI_MOREWINDOWS DIALOG 20, 20, 232, 122

1 0

Joachim Priesner : user32: msgbox: Rearrange buttons for correct tab order.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 0fc175344466dffa1bebc69bbc9e5cfd8c277425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fc175344466dffa1bebc69bb… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Mon Oct 12 16:57:52 2015 +0200 user32: msgbox: Rearrange buttons for correct tab order. Tab order is the order of the controls in the dialog template, so arrange them in a way that buttons appear in the correct order for all possible combination of buttons (specified by the MB_* constants). Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user32.rc | 10 +++++----- po/ar.po | 20 ++++++++++---------- po/bg.po | 20 ++++++++++---------- po/ca.po | 20 ++++++++++---------- po/cs.po | 20 ++++++++++---------- po/da.po | 20 ++++++++++---------- po/de.po | 20 ++++++++++---------- po/el.po | 20 ++++++++++---------- po/en.po | 20 ++++++++++---------- po/en_US.po | 20 ++++++++++---------- po/eo.po | 20 ++++++++++---------- po/es.po | 20 ++++++++++---------- po/fa.po | 20 ++++++++++---------- po/fi.po | 20 ++++++++++---------- po/fr.po | 20 ++++++++++---------- po/he.po | 20 ++++++++++---------- po/hi.po | 20 ++++++++++---------- po/hr.po | 20 ++++++++++---------- po/hu.po | 20 ++++++++++---------- po/it.po | 20 ++++++++++---------- po/ja.po | 20 ++++++++++---------- po/ko.po | 20 ++++++++++---------- po/lt.po | 20 ++++++++++---------- po/ml.po | 20 ++++++++++---------- po/nb_NO.po | 20 ++++++++++---------- po/nl.po | 20 ++++++++++---------- po/or.po | 20 ++++++++++---------- po/pa.po | 20 ++++++++++---------- po/pl.po | 20 ++++++++++---------- po/pt_BR.po | 20 ++++++++++---------- po/pt_PT.po | 20 ++++++++++---------- po/rm.po | 20 ++++++++++---------- po/ro.po | 20 ++++++++++---------- po/ru.po | 20 ++++++++++---------- po/sk.po | 20 ++++++++++---------- po/sl.po | 20 ++++++++++---------- po/sr_RS(a)cyrillic.po | 20 ++++++++++---------- po/sr_RS(a)latin.po | 20 ++++++++++---------- po/sv.po | 20 ++++++++++---------- po/te.po | 20 ++++++++++---------- po/th.po | 20 ++++++++++---------- po/tr.po | 20 ++++++++++---------- po/uk.po | 20 ++++++++++---------- po/wa.po | 20 ++++++++++---------- po/wine.pot | 20 ++++++++++---------- po/zh_CN.po | 20 ++++++++++---------- po/zh_TW.po | 20 ++++++++++---------- 47 files changed, 465 insertions(+), 465 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0fc175344466dffa1bebc…

1 0

Huw Davies : setupapi/tests: Use RegQueryValueEx so that tests run on Win XP.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 45c987d962e18637b916057e783f864f51e90f35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c987d962e18637b916057e7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 14 12:45:14 2015 +0100 setupapi/tests: Use RegQueryValueEx so that tests run on Win XP. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/install.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 10161f0..d12d683 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -732,7 +732,8 @@ static void check_dirid(int dirid, LPCSTR expected) char buffer[sizeof(dirid_inf)+11]; char path[MAX_PATH], actual[MAX_PATH]; LONG ret; - DWORD size; + DWORD size, type; + HKEY key; sprintf(buffer, dirid_inf, dirid); @@ -742,8 +743,16 @@ static void check_dirid(int dirid, LPCSTR expected) run_cmdline("DefaultInstall", 128, path); size = sizeof(actual); - ret = RegGetValueA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest", "dirid", - RRF_RT_REG_SZ|RRF_ZEROONFAILURE, NULL, &actual, &size); + actual[0] = '\0'; + ret = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest", &key); + if (ret == ERROR_SUCCESS) + { + ret = RegQueryValueExA(key, "dirid", NULL, &type, (BYTE*)&actual, &size); + RegCloseKey(key); + if (type != REG_SZ) + ret = ERROR_FILE_NOT_FOUND; + } + ok(ret == ERROR_SUCCESS, "Failed getting value for dirid %i, err=%d\n", dirid, ret); ok(!strcmp(actual, expected), "Expected path for dirid %i was \"%s\", got \"%s\"\n", dirid, expected, actual);

1 0

Aric Stewart : hidclass.sys: Stub to handle IRP_MJ_WRITE on HID devices.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: a89aa77653dbc0b680029fca51fc120c90f291d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a89aa77653dbc0b680029fca5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 8 14:34:49 2015 -0500 hidclass.sys: Stub to handle IRP_MJ_WRITE on HID devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 15 +++++++++++++++ dlls/hidclass.sys/hid.h | 1 + dlls/hidclass.sys/main.c | 1 + 3 files changed, 17 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 358e950..f2f5f06 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -571,6 +571,21 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) return rc; } +NTSTATUS WINAPI HID_Device_write(DEVICE_OBJECT *device, IRP *irp) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + + irp->IoStatus.Information = 0; + + TRACE("Buffer length %i\n", irpsp->Parameters.Write.Length); + + FIXME("device %p\n", device); + + irp->IoStatus.u.Status = STATUS_SUCCESS; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_SUCCESS; +} + NTSTATUS WINAPI HID_Device_create(DEVICE_OBJECT *device, IRP *irp) { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 1c1eaf3..1fccc5b 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -86,6 +86,7 @@ void HID_StartDeviceThread(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; +NTSTATUS WINAPI HID_Device_write(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; NTSTATUS WINAPI HID_Device_create(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; NTSTATUS WINAPI HID_Device_close(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c index 4be4409..b124218 100644 --- a/dlls/hidclass.sys/main.c +++ b/dlls/hidclass.sys/main.c @@ -70,6 +70,7 @@ NTSTATUS WINAPI HidRegisterMinidriver(HID_MINIDRIVER_REGISTRATION *registration) registration->DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = HID_Device_ioctl; registration->DriverObject->MajorFunction[IRP_MJ_READ] = HID_Device_read; + registration->DriverObject->MajorFunction[IRP_MJ_WRITE] = HID_Device_write; registration->DriverObject->MajorFunction[IRP_MJ_CREATE] = HID_Device_create; registration->DriverObject->MajorFunction[IRP_MJ_CLOSE] = HID_Device_close;

1 0

Aric Stewart : hidclass.sys: Add a processing thread for HID devices.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 35938ed8be6c7d2ba05c4779cd8c1c64889487d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35938ed8be6c7d2ba05c4779c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 8 14:34:35 2015 -0500 hidclass.sys: Add a processing thread for HID devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/buffer.c | 21 ++++++ dlls/hidclass.sys/device.c | 174 +++++++++++++++++++++++++++++++++++++++++++++ dlls/hidclass.sys/hid.h | 2 + dlls/hidclass.sys/pnp.c | 2 + 4 files changed, 199 insertions(+) diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c index af59284..d7770f6 100644 --- a/dlls/hidclass.sys/buffer.c +++ b/dlls/hidclass.sys/buffer.c @@ -140,3 +140,24 @@ void RingBuffer_RemovePointer(struct ReportRingBuffer *ring, UINT index) ring->pointers[index] = 0xffffffff; LeaveCriticalSection(&ring->lock); } + +void RingBuffer_Write(struct ReportRingBuffer *ring, void *data) +{ + UINT i; + + EnterCriticalSection(&ring->lock); + memcpy(&ring->buffer[ring->end * ring->buffer_size], data, ring->buffer_size); + ring->end++; + if (ring->end == ring->size) + ring->end = 0; + if (ring->start == ring->end) + { + ring->start++; + if (ring->start == ring->size) + ring->start = 0; + } + for (i = 0; i < ring->pointer_alloc; i++) + if (ring->pointers[i] == ring->end) + ring->pointers[i] = ring->start; + LeaveCriticalSection(&ring->lock); +} diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index b0982f0..358e950 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -198,6 +198,180 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device IoDeleteDevice(device); } +static void HID_Device_processQueue(DEVICE_OBJECT *device) +{ + LIST_ENTRY *entry; + IRP *irp; + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + UINT buffer_size = RingBuffer_GetBufferSize(ext->ring_buffer); + HID_XFER_PACKET *packet; + + packet = HeapAlloc(GetProcessHeap(), 0, buffer_size); + + entry = RemoveHeadList(&ext->irp_queue); + while(entry != &ext->irp_queue) + { + int ptr; + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); + + RingBuffer_Read(ext->ring_buffer, ptr, packet, &buffer_size); + if (buffer_size) + { + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); + TRACE_(hid_report)("Processing Request (%i)\n",ptr); + if (irpsp->Parameters.Read.Length >= packet->reportBufferLen) + { + memcpy(irp->AssociatedIrp.SystemBuffer, packet->reportBuffer, packet->reportBufferLen); + irp->IoStatus.Information = packet->reportBufferLen; + irp->IoStatus.u.Status = STATUS_SUCCESS; + } + else + { + irp->IoStatus.Information = 0; + irp->IoStatus.u.Status = STATUS_BUFFER_OVERFLOW; + } + } + else + { + irp->IoStatus.Information = 0; + irp->IoStatus.u.Status = STATUS_UNSUCCESSFUL; + } + IoCompleteRequest( irp, IO_NO_INCREMENT ); + entry = RemoveHeadList(&ext->irp_queue); + } + HeapFree(GetProcessHeap(), 0, packet); +} + +static NTSTATUS WINAPI read_Completion(DEVICE_OBJECT *deviceObject, IRP *irp, void *context ) +{ + SetEvent(irp->UserEvent); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +static DWORD CALLBACK hid_device_thread(void *args) +{ + DEVICE_OBJECT *device = (DEVICE_OBJECT*)args; + + IRP *irp; + IO_STATUS_BLOCK irp_status; + IO_STACK_LOCATION *irpsp; + DWORD rc; + HANDLE events[2]; + NTSTATUS ntrc; + + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + events[0] = CreateEventA(NULL, FALSE, FALSE, NULL); + events[1] = ext->halt_event; + + 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, + device, NULL, 0, packet, sizeof(packet), TRUE, events[0], + &irp_status); + + irpsp = IoGetNextIrpStackLocation(irp); + irpsp->CompletionRoutine = read_Completion; + irpsp->Control = SL_INVOKE_ON_SUCCESS | SL_INVOKE_ON_ERROR; + + ntrc = IoCallDriver(device, irp); + + if (ntrc == STATUS_PENDING) + rc = WaitForMultipleObjects(2, events, FALSE, INFINITE); + + if (irp->IoStatus.u.Status == STATUS_SUCCESS) + { + RingBuffer_Write(ext->ring_buffer, packet); + HID_Device_processQueue(device); + } + + IoCompleteRequest(irp, IO_NO_INCREMENT ); + + rc = WaitForSingleObject(ext->halt_event, ext->poll_interval); + + if (rc == WAIT_OBJECT_0) + break; + else if (rc != WAIT_TIMEOUT) + ERR("Wait returned unexpected value %x\n",rc); + } + } + else + { + 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, + ext->preparseData->caps.InputReportByteLength, TRUE, events[0], + &irp_status); + + irpsp = IoGetNextIrpStackLocation(irp); + irpsp->CompletionRoutine = read_Completion; + irpsp->Control = SL_INVOKE_ON_SUCCESS | SL_INVOKE_ON_ERROR; + + ntrc = IoCallDriver(device, irp); + + if (ntrc == STATUS_PENDING) + { + rc = WaitForMultipleObjects(2, events, FALSE, INFINITE); + + if (rc == WAIT_OBJECT_0 + 1) + exit_now = TRUE; + } + + if (!exit_now && irp->IoStatus.u.Status == STATUS_SUCCESS) + { + packet->reportId = buffer[0]; + memcpy(packet->reportBuffer, buffer, ext->preparseData->caps.InputReportByteLength); + RingBuffer_Write(ext->ring_buffer, packet); + HID_Device_processQueue(device); + } + + IoCompleteRequest(irp, IO_NO_INCREMENT ); + + if (exit_now) + break; + } + + HeapFree(GetProcessHeap(), 0, packet); + } + + CloseHandle(events[0]); + + TRACE("Device thread exiting\n"); + return 1; +} + +void HID_StartDeviceThread(DEVICE_OBJECT *device) +{ + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + ext->halt_event = CreateEventA(NULL, FALSE, FALSE, NULL); + ext->thread = CreateThread(NULL, 0, hid_device_thread, device, 0, NULL); +} + static NTSTATUS handle_IOCTL_HID_GET_COLLECTION_INFORMATION(IRP *irp, BASE_DEVICE_EXTENSION *base) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 41b9937..1c1eaf3 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -56,6 +56,7 @@ typedef struct _BASE_DEVICE_EXTENSTION { /* Minidriver Specific stuff will end up here */ } BASE_DEVICE_EXTENSION; +void RingBuffer_Write(struct ReportRingBuffer *buffer, void *data) DECLSPEC_HIDDEN; UINT RingBuffer_AddPointer(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; void RingBuffer_RemovePointer(struct ReportRingBuffer *ring, UINT index) DECLSPEC_HIDDEN; void RingBuffer_Read(struct ReportRingBuffer *buffer, UINT index, void *output, UINT *size) DECLSPEC_HIDDEN; @@ -81,6 +82,7 @@ minidriver* find_minidriver(DRIVER_OBJECT* driver) DECLSPEC_HIDDEN; NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT **device) DECLSPEC_HIDDEN; NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device, LPCWSTR serial, LPCWSTR index) DECLSPEC_HIDDEN; void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device) DECLSPEC_HIDDEN; +void HID_StartDeviceThread(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 7f73e05..c3d6f64 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -165,6 +165,8 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) ext->ring_buffer = RingBuffer_Create(sizeof(HID_XFER_PACKET) + ext->preparseData->caps.InputReportByteLength); + HID_StartDeviceThread(device); + return STATUS_SUCCESS; }

1 0

Aric Stewart : hidclass.sys: Implement sending IRP_MJ_PNP to the minidriver.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: fdc6db8e691f8a99655bfbaa5d52fddb93a0c6ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdc6db8e691f8a99655bfbaa5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 8 14:35:02 2015 -0500 hidclass.sys: Implement sending IRP_MJ_PNP to the minidriver. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index c3d6f64..f05c61a 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -41,6 +41,51 @@ typedef struct _NATIVE_DEVICE { static struct list tracked_devices = LIST_INIT(tracked_devices); +static NTSTATUS WINAPI internalComplete(DEVICE_OBJECT *deviceObject, IRP *irp, + void *context ) +{ + SetEvent(irp->UserEvent); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +static NTSTATUS SendDeviceIRP(DEVICE_OBJECT* device, IRP *irp) +{ + NTSTATUS status; + IO_STACK_LOCATION *irpsp; + HANDLE event = CreateEventA(NULL, FALSE, FALSE, NULL); + + irp->UserEvent = event; + irpsp = IoGetNextIrpStackLocation(irp); + irpsp->CompletionRoutine = internalComplete; + irpsp->Control = SL_INVOKE_ON_SUCCESS | SL_INVOKE_ON_ERROR; + + IoCallDriver(device, irp); + + if (irp->IoStatus.u.Status == STATUS_PENDING) + WaitForSingleObject(event, INFINITE); + + status = irp->IoStatus.u.Status; + IoCompleteRequest(irp, IO_NO_INCREMENT ); + CloseHandle(event); + return status; +} + +static NTSTATUS PNP_SendPnPIRP(DEVICE_OBJECT *device, UCHAR minor) +{ + IO_STACK_LOCATION *irpsp; + IO_STATUS_BLOCK irp_status; + + IRP *irp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, device, NULL, 0, NULL, NULL, &irp_status); + + irpsp = IoGetNextIrpStackLocation(irp); + irpsp->MinorFunction = minor; + + irpsp->Parameters.StartDevice.AllocatedResources = NULL; + irpsp->Parameters.StartDevice.AllocatedResourcesTranslated = NULL; + + return SendDeviceIRP(device, irp); +} + NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { DEVICE_OBJECT *device = NULL; @@ -80,12 +125,21 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) return status; } + status = PNP_SendPnPIRP(device, IRP_MN_START_DEVICE); + if (status != STATUS_SUCCESS) + { + ERR("Minidriver IRP_MN_START_DEVICE failed (%x)\n",status); + HID_DeleteDevice(&minidriver->minidriver, device); + return status; + } + status = call_minidriver(IOCTL_HID_GET_DEVICE_ATTRIBUTES, device, NULL, 0, &attr, sizeof(attr)); if (status != STATUS_SUCCESS) { ERR("Minidriver failed to get Attributes(%x)\n",status); + PNP_SendPnPIRP(device, IRP_MN_REMOVE_DEVICE); HID_DeleteDevice(&minidriver->minidriver, device); return status; } @@ -112,6 +166,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) if (status != STATUS_SUCCESS) { ERR("Cannot get Device Descriptor(%x)\n",status); + PNP_SendPnPIRP(device, IRP_MN_REMOVE_DEVICE); HID_DeleteDevice(&minidriver->minidriver, device); return status; } @@ -122,6 +177,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) if (i >= descriptor.bNumDescriptors) { ERR("No Report Descriptor found in reply\n"); + PNP_SendPnPIRP(device, IRP_MN_REMOVE_DEVICE); HID_DeleteDevice(&minidriver->minidriver, device); return status; } @@ -180,6 +236,7 @@ void PNP_CleanupPNP(DRIVER_OBJECT *driver) if (tracked_device->minidriver->DriverObject == driver) { list_remove(&tracked_device->entry); + PNP_SendPnPIRP(tracked_device->FDO, IRP_MN_REMOVE_DEVICE); HID_DeleteDevice(tracked_device->minidriver, tracked_device->FDO); HeapFree(GetProcessHeap(), 0, tracked_device); }

1 0

Aric Stewart : hidclass.sys: Implement IOCTL_GET(SET) _NUM_DEVICE_INPUT_BUFFERS.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: b95027f0481b164cec2fbc45cca2da4c3d1dcb14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b95027f0481b164cec2fbc45c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 8 14:35:27 2015 -0500 hidclass.sys: Implement IOCTL_GET(SET)_NUM_DEVICE_INPUT_BUFFERS. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/buffer.c | 35 +++++++++++++++++++++++++++++++++++ dlls/hidclass.sys/device.c | 28 ++++++++++++++++++++++++++++ dlls/hidclass.sys/hid.h | 2 ++ 3 files changed, 65 insertions(+) diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c index d7770f6..23636e0 100644 --- a/dlls/hidclass.sys/buffer.c +++ b/dlls/hidclass.sys/buffer.c @@ -27,6 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); #define BASE_BUFFER_SIZE 32 +#define MIN_BUFFER_SIZE 2 +#define MAX_BUFFER_SIZE 512 struct ReportRingBuffer { @@ -85,6 +87,39 @@ UINT RingBuffer_GetBufferSize(struct ReportRingBuffer *ring) return ring->buffer_size; } +UINT RingBuffer_GetSize(struct ReportRingBuffer *ring) +{ + return ring->size; +} + +NTSTATUS RingBuffer_SetSize(struct ReportRingBuffer *ring, UINT size) +{ + BYTE* new_buffer; + int i; + + if (size < MIN_BUFFER_SIZE || size > MAX_BUFFER_SIZE || size == ring->size) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection(&ring->lock); + ring->start = ring->end = 0; + for (i = 0; i < ring->pointer_alloc; i++) + { + if (ring->pointers[i] != 0xffffffff) + ring->pointers[i] = 0; + } + new_buffer = HeapAlloc(GetProcessHeap(), 0, ring->buffer_size * size); + if (!new_buffer) + { + LeaveCriticalSection(&ring->lock); + return STATUS_NO_MEMORY; + } + HeapFree(GetProcessHeap(), 0, ring->buffer); + ring->buffer = new_buffer; + ring->size = size; + LeaveCriticalSection(&ring->lock); + return STATUS_SUCCESS; +} + void RingBuffer_Read(struct ReportRingBuffer *ring, UINT index, void *output, UINT *size) { void *ret = NULL; diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index f2f5f06..e7e7e11 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -512,6 +512,34 @@ NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.u.Status = STATUS_SUCCESS; break; } + case IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS: + { + irp->IoStatus.Information = 0; + + if (irpsp->Parameters.DeviceIoControl.InputBufferLength != sizeof(ULONG)) + { + irp->IoStatus.u.Status = rc = STATUS_BUFFER_OVERFLOW; + } + else + { + rc = RingBuffer_SetSize(extension->ring_buffer, *(ULONG*)irp->AssociatedIrp.SystemBuffer); + irp->IoStatus.u.Status = rc; + } + break; + } + case IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS: + { + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + { + irp->IoStatus.u.Status = rc = STATUS_BUFFER_TOO_SMALL; + } + else + { + *(ULONG*)irp->AssociatedIrp.SystemBuffer = RingBuffer_GetSize(extension->ring_buffer); + rc = irp->IoStatus.u.Status = STATUS_SUCCESS; + } + break; + } default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 1fccc5b..0dcc3a6 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -61,8 +61,10 @@ UINT RingBuffer_AddPointer(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; void RingBuffer_RemovePointer(struct ReportRingBuffer *ring, UINT index) DECLSPEC_HIDDEN; void RingBuffer_Read(struct ReportRingBuffer *buffer, UINT index, void *output, UINT *size) DECLSPEC_HIDDEN; UINT RingBuffer_GetBufferSize(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; +UINT RingBuffer_GetSize(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; void RingBuffer_Destroy(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; struct ReportRingBuffer* RingBuffer_Create(UINT buffer_size) DECLSPEC_HIDDEN; +NTSTATUS RingBuffer_SetSize(struct ReportRingBuffer *buffer, UINT size) DECLSPEC_HIDDEN; typedef struct _minidriver {

1 0

Aric Stewart : hidclass.sys: Implement sending IRP_MJ_POWER to the minidriver.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: d03b8780ca6cb39e064caab002ef20cdc742206b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03b8780ca6cb39e064caab00… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 8 14:35:15 2015 -0500 hidclass.sys: Implement sending IRP_MJ_POWER to the minidriver. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index f05c61a..1ae3bb0 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -86,6 +86,22 @@ static NTSTATUS PNP_SendPnPIRP(DEVICE_OBJECT *device, UCHAR minor) return SendDeviceIRP(device, irp); } +static NTSTATUS PNP_SendPowerIRP(DEVICE_OBJECT *device, DEVICE_POWER_STATE power) +{ + IO_STATUS_BLOCK irp_status; + IO_STACK_LOCATION *irpsp; + + IRP *irp = IoBuildSynchronousFsdRequest(IRP_MJ_POWER, device, NULL, 0, NULL, NULL, &irp_status); + + irpsp = IoGetNextIrpStackLocation(irp); + irpsp->MinorFunction = IRP_MN_SET_POWER; + + irpsp->Parameters.Power.Type = DevicePowerState; + irpsp->Parameters.Power.State.DeviceState = power; + + return SendDeviceIRP(device, irp); +} + NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { DEVICE_OBJECT *device = NULL; @@ -222,6 +238,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) ext->ring_buffer = RingBuffer_Create(sizeof(HID_XFER_PACKET) + ext->preparseData->caps.InputReportByteLength); HID_StartDeviceThread(device); + PNP_SendPowerIRP(device, PowerDeviceD0); return STATUS_SUCCESS; } @@ -236,6 +253,7 @@ void PNP_CleanupPNP(DRIVER_OBJECT *driver) if (tracked_device->minidriver->DriverObject == driver) { list_remove(&tracked_device->entry); + PNP_SendPowerIRP(tracked_device->FDO, PowerDeviceD3); PNP_SendPnPIRP(tracked_device->FDO, IRP_MN_REMOVE_DEVICE); HID_DeleteDevice(tracked_device->minidriver, tracked_device->FDO); HeapFree(GetProcessHeap(), 0, tracked_device);

1 0

Austin English : newdev: Add a stub for InstallSelectedDriver.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 8be6740b8dca447b5f75006750b21201d62c527e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be6740b8dca447b5f7500675… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 13 05:09:28 2015 -0500 newdev: Add a stub for InstallSelectedDriver. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/newdev/main.c | 14 ++++++++++++++ dlls/newdev/newdev.spec | 1 + 2 files changed, 15 insertions(+) diff --git a/dlls/newdev/main.c b/dlls/newdev/main.c index f5d8ad3..6be8cd0 100644 --- a/dlls/newdev/main.c +++ b/dlls/newdev/main.c @@ -18,8 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + #include "windef.h" #include "winerror.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "setupapi.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -35,6 +41,14 @@ BOOL WINAPI InstallNewDevice(HWND hwndParent, LPGUID ClassGuid, PDWORD pReboot) return TRUE; } +/*********************************************************************** + * InstallSelectedDriver (NEWDEV.@) + */ +BOOL WINAPI InstallSelectedDriver(HWND parent, HDEVINFO info, const WCHAR *reserved, BOOL backup, DWORD *reboot) +{ + FIXME("Stub! %p %p %s %u %p\n", parent, info, debugstr_w(reserved), backup, reboot); + return TRUE; +} /*********************************************************************** * UpdateDriverForPlugAndPlayDevicesA (NEWDEV.@) diff --git a/dlls/newdev/newdev.spec b/dlls/newdev/newdev.spec index d4d6551..ff15edd 100644 --- a/dlls/newdev/newdev.spec +++ b/dlls/newdev/newdev.spec @@ -1,3 +1,4 @@ @ stdcall InstallNewDevice(long ptr ptr) +@ stdcall InstallSelectedDriver(long ptr wstr long ptr) @ stdcall UpdateDriverForPlugAndPlayDevicesA(long str str long ptr) @ stdcall UpdateDriverForPlugAndPlayDevicesW(long wstr wstr long ptr)

1 0