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

Rémi Bernon : hidclass.sys: Rename IO_STATUS_BLOCK irp_status to io.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 88bc48fbac52e5f6c20f1ed0c57ce597baa0dacb URL: https://source.winehq.org/git/wine.git/?a=commit;h=88bc48fbac52e5f6c20f1ed0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 5 10:36:04 2021 +0200 hidclass.sys: Rename IO_STATUS_BLOCK irp_status to io. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index ab449b9b0d9..f1b0083fffd 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -177,9 +177,8 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) static DWORD CALLBACK hid_device_thread(void *args) { DEVICE_OBJECT *device = (DEVICE_OBJECT*)args; - - IO_STATUS_BLOCK irp_status; HID_XFER_PACKET *packet; + IO_STATUS_BLOCK io; DWORD rc; BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; @@ -196,9 +195,9 @@ static DWORD CALLBACK hid_device_thread(void *args) packet->reportId = 0; call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, packet, - sizeof(*packet), &irp_status ); + sizeof(*packet), &io ); - if (irp_status.Status == STATUS_SUCCESS) + if (io.Status == STATUS_SUCCESS) { RingBuffer_Write(ext->u.pdo.ring_buffer, packet); hid_device_send_input(device, packet); @@ -221,15 +220,15 @@ static DWORD CALLBACK hid_device_thread(void *args) while(1) { call_minidriver( IOCTL_HID_READ_REPORT, ext->u.pdo.parent_fdo, NULL, 0, - packet->reportBuffer, report_size, &irp_status ); + packet->reportBuffer, report_size, &io ); rc = WaitForSingleObject(ext->u.pdo.halt_event, 0); if (rc == WAIT_OBJECT_0) exit_now = TRUE; - if (!exit_now && irp_status.Status == STATUS_SUCCESS) + if (!exit_now && io.Status == STATUS_SUCCESS) { - packet->reportBufferLen = irp_status.Information; + packet->reportBufferLen = io.Information; if (ext->u.pdo.preparsed_data->reports[0].reportID) packet->reportId = packet->reportBuffer[0]; else

1 0

Rémi Bernon : hidclass.sys: Always copy InputReportByteLength bytes into read buffer.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: e8c6f130714a96783c684f51e031bb062aba73cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8c6f130714a96783c684f51… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 5 10:36:05 2021 +0200 hidclass.sys: Always copy InputReportByteLength bytes into read buffer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 60 +++++++++++--------------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 15 +++++----- 2 files changed, 25 insertions(+), 50 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index f1b0083fffd..a465cc53369 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -77,32 +77,6 @@ static void WINAPI read_cancel_routine(DEVICE_OBJECT *device, IRP *irp) IoCompleteRequest(irp, IO_NO_INCREMENT); } -static NTSTATUS copy_packet_into_buffer(HID_XFER_PACKET *packet, BYTE* buffer, ULONG buffer_length, ULONG *out_length) -{ - BOOL zero_id = (packet->reportId == 0); - - *out_length = 0; - - if ((zero_id && buffer_length > packet->reportBufferLen) || - (!zero_id && buffer_length >= packet->reportBufferLen)) - { - if (packet->reportId != 0) - { - memcpy(buffer, packet->reportBuffer, packet->reportBufferLen); - *out_length = packet->reportBufferLen; - } - else - { - buffer[0] = 0; - memcpy(&buffer[1], packet->reportBuffer, packet->reportBufferLen); - *out_length = packet->reportBufferLen + 1; - } - return STATUS_SUCCESS; - } - else - return STATUS_BUFFER_OVERFLOW; -} - static void hid_device_send_input(DEVICE_OBJECT *device, HID_XFER_PACKET *packet) { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; @@ -145,24 +119,24 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) IRP *irp; BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; UINT buffer_size = RingBuffer_GetBufferSize(ext->u.pdo.ring_buffer); + const WINE_HIDP_PREPARSED_DATA *data = ext->u.pdo.preparsed_data; HID_XFER_PACKET *packet; packet = malloc(buffer_size); while((irp = pop_irp_from_queue(ext))) { - int ptr; - ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); + BYTE *buffer = irp->AssociatedIrp.SystemBuffer, *dst = buffer; + int ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); RingBuffer_Read(ext->u.pdo.ring_buffer, ptr, packet, &buffer_size); if (buffer_size) { - ULONG out_length; - IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); - packet->reportBuffer = (BYTE *)packet + sizeof(*packet); TRACE_(hid_report)("Processing Request (%i)\n",ptr); - irp->IoStatus.Status = copy_packet_into_buffer( packet, irp->AssociatedIrp.SystemBuffer, irpsp->Parameters.Read.Length, &out_length ); - irp->IoStatus.Information = out_length; + if (!data->reports[0].reportID) *dst++ = 0; + memcpy( dst, packet + 1, data->caps.InputReportByteLength - (dst - buffer) ); + irp->IoStatus.Information = packet->reportBufferLen; + irp->IoStatus.Status = STATUS_SUCCESS; } else { @@ -483,8 +457,7 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) HID_XFER_PACKET *packet; ULONG buffer_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; UINT packet_size = sizeof(*packet) + buffer_len; - BYTE *buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); - ULONG out_length; + BYTE *buffer = MmGetSystemAddressForMdlSafe( irp->MdlAddress, NormalPagePriority ), *dst = buffer; if (!buffer) { @@ -510,7 +483,10 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) sizeof(*packet), &irp->IoStatus ); if (irp->IoStatus.Status == STATUS_SUCCESS) - irp->IoStatus.Status = copy_packet_into_buffer( packet, buffer, buffer_len, &out_length ); + { + if (!data->reports[0].reportID) *dst++ = 0; + memcpy( dst, packet + 1, data->caps.InputReportByteLength - (dst - buffer) ); + } free(packet); break; } @@ -568,6 +544,7 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) const WINE_HIDP_PREPARSED_DATA *data = ext->u.pdo.preparsed_data; UINT buffer_size = RingBuffer_GetBufferSize(ext->u.pdo.ring_buffer); IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); + BYTE *buffer = irp->AssociatedIrp.SystemBuffer, *dst = buffer; NTSTATUS status; int ptr = -1; BOOL removed; @@ -599,13 +576,10 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) if (buffer_size) { - IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); - ULONG out_length; - packet->reportBuffer = (BYTE *)packet + sizeof(*packet); - TRACE_(hid_report)("Got Packet %p %i\n", packet->reportBuffer, packet->reportBufferLen); - - irp->IoStatus.Status = copy_packet_into_buffer( packet, irp->AssociatedIrp.SystemBuffer, irpsp->Parameters.Read.Length, &out_length ); - irp->IoStatus.Information = out_length; + if (!data->reports[0].reportID) *dst++ = 0; + memcpy( dst, packet + 1, data->caps.InputReportByteLength - (dst - buffer) ); + irp->IoStatus.Information = packet->reportBufferLen; + irp->IoStatus.Status = STATUS_SUCCESS; } else { diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 02f37773c67..aa22d72828c 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2684,9 +2684,9 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled memset(report, 0xcd, sizeof(report)); SetLastError(0xdeadbeef); ret = ReadFile(file, report, caps.InputReportByteLength, &value, NULL); - todo_wine ok(ret, "ReadFile failed, last error %u\n", GetLastError()); + ok(ret, "ReadFile failed, last error %u\n", GetLastError()); todo_wine ok(value == (report_id ? 3 : 4), "ReadFile returned %x\n", value); - todo_wine ok(report[0] == report_id, "unexpected report data\n"); + ok(report[0] == report_id, "unexpected report data\n"); overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); overlapped2.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); @@ -2695,9 +2695,9 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled SetLastError(0xdeadbeef); while (ReadFile(async_file, report, caps.InputReportByteLength, NULL, &overlapped)) ResetEvent(overlapped.hEvent); - todo_wine ok(GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError()); + ok(GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError()); ret = GetOverlappedResult(async_file, &overlapped, &value, TRUE); - todo_wine ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); + ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); todo_wine ok(value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value); ResetEvent(overlapped.hEvent); @@ -2716,13 +2716,14 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled /* wait for first report to be ready */ ret = GetOverlappedResult(async_file, &overlapped, &value, TRUE); - todo_wine ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); + ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); todo_wine ok(value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value); /* second report should be ready and the same */ ret = GetOverlappedResult(async_file, &overlapped2, &value, FALSE); - todo_wine ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); + ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); todo_wine ok(value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value); - todo_wine ok(memcmp(report, buffer + caps.InputReportByteLength, caps.InputReportByteLength), "expected different report\n"); + ok(memcmp(report, buffer + caps.InputReportByteLength, caps.InputReportByteLength), + "expected different report\n"); ok(!memcmp(report, buffer, caps.InputReportByteLength), "expected identical reports\n"); CloseHandle(overlapped.hEvent);

1 0

Rémi Bernon : hidclass.sys: Adjust buffer length according to report IDs usage.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 1f3fdb3cb637d0fffc5034e6362d2f191c5edf80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f3fdb3cb637d0fffc5034e6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 5 10:36:06 2021 +0200 hidclass.sys: Adjust buffer length according to report IDs usage. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 117 ++++++++++++++++++++--------------- dlls/ntoskrnl.exe/tests/driver_hid.c | 4 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 10 +-- 3 files changed, 72 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f3fdb3cb637d0fffc50…

1 0

Rémi Bernon : hidclass.sys: Introduce new hid_device_xfer_report helper.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 6fd356e009faa11456f811de2f2aa399837ecb59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fd356e009faa11456f811de… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 5 10:36:07 2021 +0200 hidclass.sys: Introduce new hid_device_xfer_report helper. >From HID_IOCTL_GET_INPUT_REPORT code, to factor report buffer transfer, and use it for HID_IOCTL_GET_FEATURE. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 100 ++++++++++++----------------------- dlls/ntoskrnl.exe/tests/driver_hid.c | 3 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 10 ++-- 3 files changed, 39 insertions(+), 74 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index a7cb6a843e0..81ddd7e6d7e 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -299,46 +299,48 @@ static void handle_minidriver_string( BASE_DEVICE_EXTENSION *ext, IRP *irp, SHOR } } -static void HID_get_feature( BASE_DEVICE_EXTENSION *ext, IRP *irp ) +static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP *irp ) { - IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); - HID_XFER_PACKET *packet; - DWORD len; - BYTE *out_buffer; - - irp->IoStatus.Information = 0; + const WINE_HIDP_PREPARSED_DATA *preparsed = ext->u.pdo.preparsed_data; + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); + ULONG report_len = 0, buffer_len = stack->Parameters.DeviceIoControl.OutputBufferLength; + BYTE *buffer = MmGetSystemAddressForMdlSafe( irp->MdlAddress, NormalPagePriority ); + BYTE report_id = HID_INPUT_VALUE_CAPS( preparsed )->report_id; + HID_XFER_PACKET packet; - out_buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); - TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", ext, irpsp->Parameters.DeviceIoControl.OutputBufferLength, out_buffer); + switch (code) + { + case IOCTL_HID_GET_INPUT_REPORT: + report_len = preparsed->caps.InputReportByteLength; + break; + case IOCTL_HID_GET_FEATURE: + report_len = preparsed->caps.FeatureReportByteLength; + break; + } - if (!irpsp->Parameters.DeviceIoControl.OutputBufferLength || !out_buffer) + if (!buffer) { - irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + irp->IoStatus.Status = STATUS_INVALID_USER_BUFFER; + return; + } + if (buffer_len < report_len) + { + irp->IoStatus.Status = STATUS_INVALID_PARAMETER; return; } - len = sizeof(*packet) + irpsp->Parameters.DeviceIoControl.OutputBufferLength; - packet = malloc(len); - packet->reportBufferLen = irpsp->Parameters.DeviceIoControl.OutputBufferLength; - packet->reportBuffer = ((BYTE*)packet) + sizeof(*packet); - packet->reportId = out_buffer[0]; - - TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet->reportId, packet->reportBufferLen, packet->reportBuffer); - - call_minidriver( IOCTL_HID_GET_FEATURE, ext->u.pdo.parent_fdo, NULL, 0, packet, sizeof(*packet), - &irp->IoStatus ); + packet.reportId = buffer[0]; + packet.reportBuffer = buffer; + packet.reportBufferLen = buffer_len; - if (irp->IoStatus.Status == STATUS_SUCCESS) + if (!report_id) { - irp->IoStatus.Information = packet->reportBufferLen; - memcpy(out_buffer, packet->reportBuffer, packet->reportBufferLen); + packet.reportId = 0; + packet.reportBuffer++; + packet.reportBufferLen--; } - else - irp->IoStatus.Information = 0; - - TRACE_(hid_report)( "Result 0x%x get %li bytes\n", irp->IoStatus.Status, irp->IoStatus.Information ); - free(packet); + call_minidriver( code, ext->u.pdo.parent_fdo, NULL, 0, &packet, sizeof(packet), &irp->IoStatus ); } static void HID_set_to_device( DEVICE_OBJECT *device, IRP *irp ) @@ -390,10 +392,9 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; - const WINE_HIDP_PREPARSED_DATA *data = ext->u.pdo.preparsed_data; - BYTE report_id = HID_INPUT_VALUE_CAPS( data )->report_id; NTSTATUS status; BOOL removed; + ULONG code; KIRQL irql; irp->IoStatus.Information = 0; @@ -411,7 +412,7 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) return STATUS_DELETE_PENDING; } - switch (irpsp->Parameters.DeviceIoControl.IoControlCode) + switch ((code = irpsp->Parameters.DeviceIoControl.IoControlCode)) { case IOCTL_HID_GET_POLL_FREQUENCY_MSEC: TRACE("IOCTL_HID_GET_POLL_FREQUENCY_MSEC\n"); @@ -469,38 +470,6 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) handle_IOCTL_HID_GET_COLLECTION_DESCRIPTOR( irp, ext ); break; } - case IOCTL_HID_GET_INPUT_REPORT: - { - HID_XFER_PACKET packet; - ULONG buffer_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; - BYTE *buffer = MmGetSystemAddressForMdlSafe( irp->MdlAddress, NormalPagePriority ); - - if (!buffer) - { - irp->IoStatus.Status = STATUS_INVALID_USER_BUFFER; - break; - } - if (buffer_len < data->caps.InputReportByteLength) - { - irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - break; - } - - packet.reportId = buffer[0]; - packet.reportBuffer = buffer; - packet.reportBufferLen = buffer_len; - - if (!report_id) - { - packet.reportId = 0; - packet.reportBuffer++; - packet.reportBufferLen--; - } - - call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, &packet, - sizeof(packet), &irp->IoStatus ); - break; - } case IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS: { irp->IoStatus.Information = 0; @@ -527,7 +496,8 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) break; } case IOCTL_HID_GET_FEATURE: - HID_get_feature( ext, irp ); + case IOCTL_HID_GET_INPUT_REPORT: + hid_device_xfer_report( ext, code, irp ); break; case IOCTL_HID_SET_FEATURE: case IOCTL_HID_SET_OUTPUT_REPORT: diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 831b08c5c97..d268b62d288 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -570,9 +570,8 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(!in_size, "got input size %u\n", in_size); ok(out_size == sizeof(*packet), "got output size %u\n", out_size); - todo_wine_if(packet->reportId == 0x5a || packet->reportId == 0xa5) + todo_wine_if(packet->reportId == 0x5a) ok(packet->reportId == report_id, "got id %u\n", packet->reportId); - todo_wine_if(packet->reportBufferLen == 16) ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 17d82fa3482..f5ebf21b7f9 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2486,13 +2486,11 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled SetLastError(0xdeadbeef); ret = HidD_GetFeature(file, report, 0); ok(!ret, "HidD_GetFeature succeeded\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetFeature returned error %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetFeature returned error %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = HidD_GetFeature(file, report, caps.FeatureReportByteLength - 1); - todo_wine ok(!ret, "HidD_GetFeature succeeded\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), "HidD_GetFeature returned error %u\n", GetLastError()); @@ -2510,21 +2508,19 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled else { ok(ret, "HidD_GetFeature failed, last error %u\n", GetLastError()); - todo_wine ok(buffer[0] == 0x5a, "got buffer[0] %x, expected 0x5a\n", (BYTE)buffer[0]); + ok(buffer[0] == 0x5a, "got buffer[0] %x, expected 0x5a\n", (BYTE)buffer[0]); } SetLastError(0xdeadbeef); ret = HidD_GetFeature(file, report, caps.FeatureReportByteLength); ok(ret, "HidD_GetFeature failed, last error %u\n", GetLastError()); - todo_wine_if(!report_id) ok(report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id); value = caps.FeatureReportByteLength * 2; SetLastError(0xdeadbeef); ret = sync_ioctl(file, IOCTL_HID_GET_FEATURE, NULL, 0, report, &value); ok(ret, "IOCTL_HID_GET_FEATURE failed, last error %u\n", GetLastError()); - todo_wine ok(value == 3, "got length %u, expected 3\n", value); - todo_wine_if(!report_id) + ok(value == 3, "got length %u, expected 3\n", value); ok(report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id);

1 0

Rémi Bernon : xinput1_3: Introduce new find_opened_device helper.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 828b9b8cc49fe24a306235c056a38c7ae079560f URL: https://source.winehq.org/git/wine.git/?a=commit;h=828b9b8cc49fe24a306235c0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 5 17:12:06 2021 +0200 xinput1_3: Introduce new find_opened_device helper. To look for already opened device, or available device index. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 0f4dec44ee3..e7a77813c71 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -71,6 +71,20 @@ struct hid_platform_private { static DWORD last_check = 0; +static BOOL find_opened_device(xinput_controller *devices, SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail, int *free_slot) +{ + struct hid_platform_private *private; + int i; + + *free_slot = XUSER_MAX_COUNT; + for (i = XUSER_MAX_COUNT; i > 0; i--) + { + if (!(private = devices[i - 1].platform_private)) *free_slot = i - 1; + else if (!wcscmp(detail->DevicePath, private->device_path)) return TRUE; + } + return FALSE; +} + static void MarkUsage(struct hid_platform_private *private, WORD usage, LONG min, LONG max, USHORT bits) { struct axis_info info = {min, max-min, bits}; @@ -219,7 +233,7 @@ void HID_find_gamepads(xinput_controller *devices) HIDP_CAPS caps; NTSTATUS status; DWORD idx; - int i, open_device_idx; + int i; idx = GetTickCount(); if ((idx - last_check) < 2000) @@ -255,24 +269,9 @@ void HID_find_gamepads(xinput_controller *devices) if (!wcsstr(data->DevicePath, L"IG_")) continue; - open_device_idx = -1; - for (i = 0; i < XUSER_MAX_COUNT; i++) - { - struct hid_platform_private *private = devices[i].platform_private; - if (devices[i].platform_private) - { - if (!wcscmp(data->DevicePath, private->device_path)) - break; - } - else if(open_device_idx < 0) - open_device_idx = i; - } - if (i != XUSER_MAX_COUNT) - /* this device is already opened */ - continue; - if (open_device_idx < 0) - /* no open device slots */ - break; + if (find_opened_device(devices, data, &i)) continue; /* already opened */ + if (i == XUSER_MAX_COUNT) break; /* no more slots */ + device = CreateFileW(data->DevicePath, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); if (device == INVALID_HANDLE_VALUE) continue; @@ -286,7 +285,7 @@ void HID_find_gamepads(xinput_controller *devices) WARN("ignoring HID device, unsupported usage page %04x\n", caps.UsagePage); else if (caps.Usage != HID_USAGE_GENERIC_GAMEPAD && caps.Usage != HID_USAGE_GENERIC_JOYSTICK && caps.Usage != HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER) WARN("ignoring HID device, unsupported usage %04x:%04x\n", caps.UsagePage, caps.Usage); - else if (!init_controller(&devices[open_device_idx], ppd, &caps, device, data->DevicePath)) + else if (!init_controller(&devices[i], ppd, &caps, device, data->DevicePath)) WARN("ignoring HID device, failed to initialize\n"); else goto done;

1 0

Nikolay Sivov : gdi32: Use documented structure layout for EMF-to-WMF embedding records.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 0dab1e414a91fc78f9c5ff7c825bd3eafc33b829 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dab1e414a91fc78f9c5ff7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 4 19:08:34 2021 +0300 gdi32: Use documented structure layout for EMF-to-WMF embedding records. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 2 +- dlls/gdi32/metafile.c | 10 ++++------ dlls/gdi32/ntgdi_private.h | 10 ++++------ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 25ffcff93bf..b12db98d9e6 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2804,7 +2804,7 @@ static HENHMETAFILE extract_emf_from_comment( const BYTE *buf, UINT mf_size ) chunk = (emf_in_wmf_comment *)(mr->rdParm + 2); if (mr->rdFunction != META_ESCAPE || mr->rdParm[0] != MFCOMMENT) goto done; - if (chunk->magic != WMFC_MAGIC) goto done; + if (chunk->comment_id != WMFC_MAGIC) goto done; if (!emf_bits) { diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index b0428960b50..6b4df5680ba 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1096,13 +1096,11 @@ static BOOL add_mf_comment(HDC hdc, HENHMETAFILE emf) chunk = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(emf_in_wmf_comment, emf_data[max_chunk_size])); if(!chunk) goto end; - chunk->magic = WMFC_MAGIC; - chunk->unk04 = 1; - chunk->unk06 = 0; - chunk->unk08 = 0; - chunk->unk0a = 1; + chunk->comment_id = WMFC_MAGIC; + chunk->comment_type = 0x1; + chunk->version = 0x00010000; chunk->checksum = 0; /* We fixup the first chunk's checksum before returning from GetWinMetaFileBits */ - chunk->unk0e = 0; + chunk->flags = 0; chunk->num_chunks = (size + max_chunk_size - 1) / max_chunk_size; chunk->chunk_size = max_chunk_size; chunk->remaining_size = size; diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 5f3f88f870c..d256a356d01 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -462,13 +462,11 @@ extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; #include <pshpack2.h> typedef struct { - DWORD magic; /* WMFC */ - WORD unk04; /* 1 */ - WORD unk06; /* 0 */ - WORD unk08; /* 0 */ - WORD unk0a; /* 1 */ + DWORD comment_id; /* WMFC */ + DWORD comment_type; /* Always 0x00000001 */ + DWORD version; /* Always 0x00010000 */ WORD checksum; - DWORD unk0e; /* 0 */ + DWORD flags; /* Always 0 */ DWORD num_chunks; DWORD chunk_size; DWORD remaining_size;

1 0

Paul Gofman : jscript: Fix use after free in Object_defineProperty().
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: a439f7202a9c8f06deb43f81d0f8704caf408162 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a439f7202a9c8f06deb43f81… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Aug 5 01:28:49 2021 +0300 jscript: Fix use after free in Object_defineProperty(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index c8c0572c839..169b47caea4 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -470,11 +470,15 @@ static HRESULT Object_defineProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl }else { hres = JS_E_OBJECT_EXPECTED; } - jsstr_release(name_str); + if(FAILED(hres)) + { + jsstr_release(name_str); return hres; + } hres = jsdisp_define_property(obj, name, &prop_desc); + jsstr_release(name_str); release_property_descriptor(&prop_desc); if(SUCCEEDED(hres) && r) *r = jsval_obj(jsdisp_addref(obj));

1 0

Arkadiusz Hiler : dinput/tests: Make overlapped format tests more robust.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 5cb70e73f070def227f47bb307c1d5a483fc898c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cb70e73f070def227f47bb3… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Thu Aug 5 13:55:29 2021 +0300 dinput/tests: Make overlapped format tests more robust. Both Acquire() and event processing with DirectInput seem to be asynchronous. In most cases we can just keep hammering GetDeviceData() until the event gets processed. Things get pretty racy around Acquire() though. If we fire event right after the device is acquired we can find ourselves in one of the three situations: 1. Event happened after acquiring has completed - the wait will suffice. 2. Event happened before acquiring did any real work - the device will pick up the state as if the event was processed, but there's nothing in GetDeviceData(). Because of that we cannot fail on wait. 3. Event happened somewhere in the middle of acquiring - we ended up both missing the event for GetDeviceData() and we have outdated state. Sending event again will register as if the button was not already pressed. This change covers all three scenarios. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/device.c | 73 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 61 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index 6307957b6e2..b21a02dfe56 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -343,11 +343,54 @@ static void pump_messages(void) } } +#define wait_for_device_data_and_discard(device) wait_for_device_data_and_discard_(__LINE__, device) +static BOOL wait_for_device_data_and_discard_(int line, IDirectInputDeviceA *device) +{ + DWORD cnt; + HRESULT hr; + DWORD start_time; + + pump_messages(); + + start_time = GetTickCount(); + do + { + cnt = 10; + hr = IDirectInputDevice_GetDeviceData(device, sizeof(DIDEVICEOBJECTDATA_DX3), NULL, &cnt, 0); + ok_(__FILE__, line)(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceData() failed: %08x\n", hr); + ok_(__FILE__, line)(cnt == 0 || cnt == 1, "Unexpected number of events: %d\n", cnt); + } while (cnt != 1 && (GetTickCount() - start_time < 500)); + + return cnt == 1; +} + +#define acquire_and_wait(device, valid_dik) acquire_and_wait_(__LINE__, device, valid_dik) +static void acquire_and_wait_(int line, IDirectInputDeviceA *device, DWORD valid_dik) +{ + HRESULT hr; + int tries = 2; + + hr = IDirectInputDevice_Acquire(device); + ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); + + do + { + keybd_event(0, valid_dik, KEYEVENTF_SCANCODE, 0); + } while (!wait_for_device_data_and_discard(device) && tries--); + + keybd_event(0, valid_dik, KEYEVENTF_SCANCODE|KEYEVENTF_KEYUP, 0); + ok_(__FILE__, line)(wait_for_device_data_and_discard(device), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); +} + void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) { HRESULT hr; struct overlapped_state state; IDirectInputDeviceA *keyboard = NULL; + DIPROPDWORD dp; + + SetFocus(hwnd); hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &keyboard, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); @@ -355,15 +398,21 @@ void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) /* test overlapped slider - default value 0 */ hr = IDirectInputDevice_SetDataFormat(keyboard, &overlapped_slider_format); ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); - hr = IDirectInputDevice_Acquire(keyboard); - ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); - SetFocus(hwnd); - pump_messages(); + dp.diph.dwSize = sizeof(DIPROPDWORD); + dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dp.diph.dwHow = DIPH_DEVICE; + dp.diph.dwObj = 0; + dp.dwData = 10; + hr = IDirectInputDevice_SetProperty(keyboard, DIPROP_BUFFERSIZE, &dp.diph); + ok(SUCCEEDED(hr), "IDirectInputDevice_SetProperty() failed: %08x\n", hr); + + acquire_and_wait(keyboard, DIK_F); /* press D */ keybd_event(0, DIK_D, KEYEVENTF_SCANCODE, 0); - pump_messages(); + ok(wait_for_device_data_and_discard(keyboard), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); memset(&state, 0xFF, sizeof(state)); hr = IDirectInputDevice_GetDeviceState(keyboard, sizeof(state), &state); @@ -377,7 +426,8 @@ void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) /* release D */ keybd_event(0, DIK_D, KEYEVENTF_SCANCODE|KEYEVENTF_KEYUP, 0); - pump_messages(); + ok(wait_for_device_data_and_discard(keyboard), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); hr = IDirectInputDevice_Unacquire(keyboard); ok(SUCCEEDED(hr), "IDirectInputDevice_Unacquire() failed: %08x\n", hr); @@ -385,15 +435,13 @@ void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) /* test overlapped pov - default value - 0xFFFFFFFF */ hr = IDirectInputDevice_SetDataFormat(keyboard, &overlapped_pov_format); ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); - hr = IDirectInputDevice_Acquire(keyboard); - ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); - SetFocus(hwnd); - pump_messages(); + acquire_and_wait(keyboard, DIK_F); /* press D */ keybd_event(0, DIK_D, KEYEVENTF_SCANCODE, 0); - pump_messages(); + ok(wait_for_device_data_and_discard(keyboard), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); memset(&state, 0xFF, sizeof(state)); hr = IDirectInputDevice_GetDeviceState(keyboard, sizeof(state), &state); @@ -407,7 +455,8 @@ void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) /* release D */ keybd_event(0, DIK_D, KEYEVENTF_SCANCODE|KEYEVENTF_KEYUP, 0); - pump_messages(); + ok(wait_for_device_data_and_discard(keyboard), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); if (keyboard) IUnknown_Release(keyboard); }

1 0

Hugh McMaster : conhost: Copy font properties to the new screen buffer.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 3bf6b278826f951f5d2004d991170dd8bc7fbede URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bf6b278826f951f5d2004d9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Aug 5 13:57:14 2021 +0200 conhost: Copy font properties to the new screen buffer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50187 Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 061f09989eb..ecfdd082a81 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -68,6 +68,7 @@ static void destroy_screen_buffer( struct screen_buffer *screen_buffer ) if (screen_buffer->console->active == screen_buffer) screen_buffer->console->active = NULL; wine_rb_remove( &screen_buffer_map, &screen_buffer->entry ); + free( screen_buffer->font.face_name ); free( screen_buffer->data ); free( screen_buffer ); } @@ -85,8 +86,6 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->cursor_visible = 1; screen_buffer->width = width; screen_buffer->height = height; - screen_buffer->font.weight = FW_NORMAL; - screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE; if (console->active) { @@ -96,15 +95,22 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->win.bottom = console->active->win.bottom - console->active->win.top; screen_buffer->attr = console->active->attr; screen_buffer->popup_attr = console->active->attr; + screen_buffer->font = console->active->font; + + if (!(screen_buffer->font.face_name = malloc( screen_buffer->font.face_len ))) return NULL; + memcpy( screen_buffer->font.face_name, console->active->font.face_name, + screen_buffer->font.face_len ); } else { - screen_buffer->max_width = width; - screen_buffer->max_height = height; - screen_buffer->win.right = width - 1; - screen_buffer->win.bottom = height - 1; - screen_buffer->attr = FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED; - screen_buffer->popup_attr = 0xf5; + screen_buffer->max_width = width; + screen_buffer->max_height = height; + screen_buffer->win.right = width - 1; + screen_buffer->win.bottom = height - 1; + screen_buffer->attr = FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED; + screen_buffer->popup_attr = 0xf5; + screen_buffer->font.weight = FW_NORMAL; + screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE; } if (wine_rb_put( &screen_buffer_map, LongToPtr(id), &screen_buffer->entry ))

1 0

Austin English : kernel32: Add GetCurrentPackagePath stub.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 06104aec963f827ddd4f9d41d1ae72983779859f URL: https://source.winehq.org/git/wine.git/?a=commit;h=06104aec963f827ddd4f9d41… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jul 30 02:50:08 2021 -0500 kernel32: Add GetCurrentPackagePath stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51374 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/version.c | 10 ++++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec index 99d1d9f3835..9d5546ed315 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec @@ -7,7 +7,7 @@ @ stdcall GetCurrentPackageFullName(ptr ptr) kernel32.GetCurrentPackageFullName @ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId @ stub GetCurrentPackageInfo -@ stub GetCurrentPackagePath +@ stdcall GetCurrentPackagePath(ptr ptr) kernel32.GetCurrentPackagePath @ stub GetPackageApplicationIds @ stdcall GetPackageFamilyName(long ptr ptr) kernel32.GetPackageFamilyName @ stdcall GetPackageFullName(long ptr ptr) kernel32.GetPackageFullName diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0f474504bfe..6c02b17c7cf 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -630,6 +630,7 @@ @ stdcall GetCurrentPackageFamilyName(ptr ptr) kernelbase.GetCurrentPackageFamilyName @ stdcall GetCurrentPackageFullName(ptr ptr) kernelbase.GetCurrentPackageFullName @ stdcall GetCurrentPackageId(ptr ptr) kernelbase.GetCurrentPackageId +@ stdcall GetCurrentPackagePath(ptr ptr) kernelbase.GetCurrentPackagePath @ stdcall -norelay GetCurrentProcess() KERNEL32_GetCurrentProcess @ stdcall -norelay GetCurrentProcessId() KERNEL32_GetCurrentProcessId @ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 94a648f65aa..e1fb19eceb0 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -463,7 +463,7 @@ @ stdcall GetCurrentPackageFullName(ptr ptr) @ stdcall GetCurrentPackageId(ptr ptr) # @ stub GetCurrentPackageInfo -# @ stub GetCurrentPackagePath +@ stdcall GetCurrentPackagePath(ptr ptr) # @ stub GetCurrentPackageResourcesContext # @ stub GetCurrentPackageSecurityContext @ stdcall -norelay GetCurrentProcess() kernelbase_GetCurrentProcess diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index 96349708989..a5a1f67087f 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -1551,6 +1551,16 @@ LONG WINAPI /* DECLSPEC_HOTPATCH */ GetCurrentPackageId( UINT32 *len, BYTE *buff } +/*********************************************************************** + * GetCurrentPackagePath (kernelbase.@) + */ +LONG WINAPI /* DECLSPEC_HOTPATCH */ GetCurrentPackagePath( UINT32 *length, WCHAR *path ) +{ + FIXME( "(%p %p): stub\n", length, path ); + return APPMODEL_ERROR_NO_PACKAGE; +} + + /*********************************************************************** * GetPackageFullName (kernelbase.@) */

1 0