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

Rémi Bernon : hidclass.sys: Remove old reports from WINE_HIDP_PREPARSED_DATA.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: wine Branch: master Commit: 9ef00c9353a1bda6b3737e135e80a66fcae5ab84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ef00c9353a1bda6b3737e13… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 9 10:32:41 2021 +0200 hidclass.sys: Remove old reports from WINE_HIDP_PREPARSED_DATA. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 2 +- dlls/hidclass.sys/descriptor.c | 482 +++++------------------------------------ dlls/hidclass.sys/device.c | 2 +- include/wine/hid.h | 31 +-- 4 files changed, 60 insertions(+), 457 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9ef00c9353a1bda6b373…

1 0

Hugh McMaster : conhost: Use correct size when storing font FaceName in the registry.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: wine Branch: master Commit: bd9db4b6de30bbbb8c357f7401ae609c3a688c2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd9db4b6de30bbbb8c357f74… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 9 21:52:29 2021 +1000 conhost: Use correct size when storing font FaceName in the registry. 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/window.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 4033eefa313..5881ad9c3ad 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -303,7 +303,8 @@ static void save_registry_key( HKEY key, const struct console_config *config ) val = config->edition_mode; RegSetValueExW( key, L"EditionMode", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); - RegSetValueExW( key, L"FaceName", 0, REG_SZ, (BYTE *)&config->face_name, sizeof(config->face_name) ); + RegSetValueExW( key, L"FaceName", 0, REG_SZ, (BYTE *)&config->face_name, + (lstrlenW(config->face_name) + 1) * sizeof(WCHAR) ); val = config->font_pitch_family; RegSetValueExW( key, L"FontPitchFamily", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );

1 0

Ziqing Hui : d2d1: Implement d2d_effect_GetInputCount().
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: wine Branch: master Commit: d6fe15b8f5110dcf29d561b457a5e805c25093d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6fe15b8f5110dcf29d561b4… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sun Aug 8 12:40:32 2021 +0800 d2d1: Implement d2d_effect_GetInputCount(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 5 ++++- dlls/d2d1/device.c | 8 +++++++- dlls/d2d1/effect.c | 25 +++++++++++++++++++++---- dlls/d2d1/tests/d2d1.c | 2 +- 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index ce99e7c3432..48d15dfcf22 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -572,9 +572,12 @@ struct d2d_effect LONG refcount; ID2D1Factory *factory; + ID2D1Image **inputs; + size_t inputs_size; + size_t input_count; }; -void d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) DECLSPEC_HIDDEN; +HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) DECLSPEC_HIDDEN; static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 0647bc57fc3..d8704f1b43b 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1887,13 +1887,19 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceCont { struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); struct d2d_effect *object; + HRESULT hr; FIXME("iface %p, effect_id %s, effect %p stub!\n", iface, debugstr_guid(effect_id), effect); if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - d2d_effect_init(object, context->factory); + if (FAILED(hr = d2d_effect_init(object, context->factory))) + { + WARN("Failed to initialize effect, hr %#x.\n", hr); + heap_free(object); + return hr; + } TRACE("Created effect %p.\n", object); *effect = &object->ID2D1Effect_iface; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 40dd2187953..acf83ab1b02 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -25,6 +25,12 @@ static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) return CONTAINING_RECORD(iface, struct d2d_effect, ID2D1Effect_iface); } +static void d2d_effect_cleanup(struct d2d_effect *effect) +{ + heap_free(effect->inputs); + ID2D1Factory_Release(effect->factory); +} + static HRESULT STDMETHODCALLTYPE d2d_effect_QueryInterface(ID2D1Effect *iface, REFIID iid, void **out) { struct d2d_effect *effect = impl_from_ID2D1Effect(iface); @@ -72,7 +78,7 @@ static ULONG STDMETHODCALLTYPE d2d_effect_Release(ID2D1Effect *iface) if (!refcount) { - ID2D1Factory_Release(effect->factory); + d2d_effect_cleanup(effect); heap_free(effect); } @@ -183,9 +189,11 @@ static void STDMETHODCALLTYPE d2d_effect_GetInput(ID2D1Effect *iface, UINT32 ind static UINT32 STDMETHODCALLTYPE d2d_effect_GetInputCount(ID2D1Effect *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_effect *effect = impl_from_ID2D1Effect(iface); - return 0; + TRACE("iface %p.\n", iface); + + return effect->input_count; } static void STDMETHODCALLTYPE d2d_effect_GetOutput(ID2D1Effect *iface, ID2D1Image **output) @@ -269,10 +277,19 @@ static const ID2D1ImageVtbl d2d_effect_image_vtbl = d2d_effect_image_GetFactory, }; -void d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) +HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) { effect->ID2D1Effect_iface.lpVtbl = &d2d_effect_vtbl; effect->ID2D1Image_iface.lpVtbl = &d2d_effect_image_vtbl; effect->refcount = 1; + + effect->input_count = 1; + if (!d2d_array_reserve((void **)&effect->inputs, &effect->inputs_size, + effect->input_count, sizeof(*effect->inputs))) + return E_OUTOFMEMORY; + memset(effect->inputs, 0, sizeof(*effect->inputs) * effect->input_count); + ID2D1Factory_AddRef(effect->factory = factory); + + return S_OK; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 146952d7418..64d9765e866 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9802,7 +9802,7 @@ static void test_effect(BOOL d3d11) } input_count = ID2D1Effect_GetInputCount(effect); - todo_wine + todo_wine_if(test->default_input_count != 1) ok (input_count == test->default_input_count, "Got unexpected input count %u, expected %u.\n", input_count, test->default_input_count);

1 0

Ziqing Hui : d2d1: Implement d2d_effect_GetInput().
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: wine Branch: master Commit: 8bf26038381169ea589327c03899f9d5b29ecb50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bf26038381169ea589327c0… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sun Aug 8 12:40:36 2021 +0800 d2d1: Implement d2d_effect_GetInput(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/effect.c | 9 ++++++++- dlls/d2d1/tests/d2d1.c | 7 +------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 951ad9c5101..560d87479a9 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -214,7 +214,14 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_SetInputCount(ID2D1Effect *iface, UI static void STDMETHODCALLTYPE d2d_effect_GetInput(ID2D1Effect *iface, UINT32 index, ID2D1Image **input) { - FIXME("iface %p, index %u, input %p stub!\n", iface, index, input); + struct d2d_effect *effect = impl_from_ID2D1Effect(iface); + + TRACE("iface %p, index %u, input %p.\n", iface, index, input); + + if (index < effect->input_count && effect->inputs[index]) + ID2D1Image_AddRef(*input = effect->inputs[index]); + else + *input = NULL; } static UINT32 STDMETHODCALLTYPE d2d_effect_GetInputCount(ID2D1Effect *iface) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 36882dc4918..a6f7ac88d0d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9824,7 +9824,6 @@ static void test_effect(BOOL d3d11) { winetest_push_context("Input %u", j); ID2D1Effect_GetInput(effect, j, &image_a); - todo_wine ok(image_a == NULL, "Got unexpected image_a %p.\n", image_a); winetest_pop_context(); } @@ -9845,14 +9844,11 @@ static void test_effect(BOOL d3d11) ID2D1Effect_GetInput(effect, j, &image_a); if (j == 0) { - todo_wine ok(image_a == (ID2D1Image *)bitmap, "Got unexpected image_a %p.\n", image_a); - if (image_a == (ID2D1Image *)bitmap) - ID2D1Image_Release(image_a); + ID2D1Image_Release(image_a); } else { - todo_wine ok(image_a == NULL, "Got unexpected image_a %p.\n", image_a); } winetest_pop_context(); @@ -9864,7 +9860,6 @@ static void test_effect(BOOL d3d11) image_a = (ID2D1Image *)0xdeadbeef; ID2D1Effect_SetInput(effect, j, (ID2D1Image *)bitmap, FALSE); ID2D1Effect_GetInput(effect, j, &image_a); - todo_wine ok(image_a == NULL, "Got unexpected image_a %p.\n", image_a); winetest_pop_context(); }

1 0

Hugh McMaster : kernel32/tests: Fix rounding error when calculating console font size.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: wine Branch: master Commit: 9ce8aafdae85be6e79c152f7118d8204becae10b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ce8aafdae85be6e79c152f7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 9 23:27:45 2021 +1000 kernel32/tests: Fix rounding error when calculating console font size. 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> --- dlls/kernel32/tests/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 6ee00aa49a6..bd5cad428bc 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3579,8 +3579,8 @@ static void test_GetConsoleFontSize(HANDLE std_output) ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); GetClientRect(GetConsoleWindow(), &r); GetConsoleScreenBufferInfo(std_output, &csbi); - font_width = (r.right - r.left + 1) / csbi.srWindow.Right; - font_height = (r.bottom - r.top + 1) / csbi.srWindow.Bottom; + font_width = (r.right - r.left) / (csbi.srWindow.Right - csbi.srWindow.Left + 1); + font_height = (r.bottom - r.top) / (csbi.srWindow.Bottom - csbi.srWindow.Top + 1); ok(c.X == font_width, "got %d, expected %d\n", c.X, font_width); ok(c.Y == font_height, "got %d, expected %d\n", c.Y, font_height);

1 0

Alex Henrie : include: Add remaining IPv4 socket options.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: wine Branch: master Commit: efb050284ae7a94b2b4f95399b6360151811c660 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efb050284ae7a94b2b4f9539… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 8 21:44:03 2021 -0600 include: Add remaining IPv4 socket options. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2ipdef.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index d5a4dab6ce0..3025a9c6fe9 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -83,6 +83,7 @@ typedef struct _INTERFACE_INFO #define IP_UNBLOCK_SOURCE 18 #define IP_PKTINFO 19 #define IP_HOPLIMIT 21 +#define IP_RECVTTL 21 #define IP_RECEIVE_BROADCAST 22 #define IP_RECVIF 24 #define IP_RECVDSTADDR 25 @@ -91,7 +92,21 @@ typedef struct _INTERFACE_INFO #define IP_DEL_IFLIST 30 #define IP_UNICAST_IF 31 #define IP_RTHDR 32 +#define IP_GET_IFLIST 33 #define IP_RECVRTHDR 38 +#define IP_TCLASS 39 +#define IP_RECVTCLASS 40 +#define IP_RECVTOS 40 +#define IP_ORIGINAL_ARRIVAL_IF 47 +#define IP_ECN 50 +#define IP_PKTINFO_EX 51 +#define IP_WFP_REDIRECT_RECORDS 60 +#define IP_WFP_REDIRECT_CONTEXT 70 +#define IP_MTU_DISCOVER 71 +#define IP_MTU 73 +#define IP_NRT_INTERFACE 74 +#define IP_RECVERR 75 +#define IP_USER_MTU 76 #else #define WS_IP_OPTIONS 1 #define WS_IP_HDRINCL 2 @@ -109,6 +124,7 @@ typedef struct _INTERFACE_INFO #define WS_IP_UNBLOCK_SOURCE 18 #define WS_IP_PKTINFO 19 #define WS_IP_HOPLIMIT 21 +#define WS_IP_RECVTTL 21 #define WS_IP_RECEIVE_BROADCAST 22 #define WS_IP_RECVIF 24 #define WS_IP_RECVDSTADDR 25 @@ -117,7 +133,21 @@ typedef struct _INTERFACE_INFO #define WS_IP_DEL_IFLIST 30 #define WS_IP_UNICAST_IF 31 #define WS_IP_RTHDR 32 +#define WS_IP_GET_IFLIST 33 #define WS_IP_RECVRTHDR 38 +#define WS_IP_TCLASS 39 +#define WS_IP_RECVTCLASS 40 +#define WS_IP_RECVTOS 40 +#define WS_IP_ORIGINAL_ARRIVAL_IF 47 +#define WS_IP_ECN 50 +#define WS_IP_PKTINFO_EX 51 +#define WS_IP_WFP_REDIRECT_RECORDS 60 +#define WS_IP_WFP_REDIRECT_CONTEXT 70 +#define WS_IP_MTU_DISCOVER 71 +#define WS_IP_MTU 73 +#define WS_IP_NRT_INTERFACE 74 +#define WS_IP_RECVERR 75 +#define WS_IP_USER_MTU 76 #endif /* USE_WS_PREFIX */ typedef struct WS(sockaddr_in6)

1 0

Rémi Bernon : hidclass.sys: Rewrite IOCTL_HID_WRITE_REPORT using hid_device_xfer_report.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: wine Branch: master Commit: 94e59451022b7f468e3b51e3dda3680bcdcbe37c URL: https://source.winehq.org/git/wine.git/?a=commit;h=94e59451022b7f468e3b51e3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 9 10:32:40 2021 +0200 hidclass.sys: Rewrite IOCTL_HID_WRITE_REPORT using hid_device_xfer_report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 69 +++++------------------------------- dlls/ntoskrnl.exe/tests/driver_hid.c | 8 ----- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 5 +-- 3 files changed, 9 insertions(+), 73 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 44965e118a2..8c0883bbec4 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -320,6 +320,10 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP buffer_len = stack->Parameters.DeviceIoControl.InputBufferLength; buffer = irp->AssociatedIrp.SystemBuffer; break; + case IOCTL_HID_WRITE_REPORT: + buffer_len = stack->Parameters.Write.Length; + buffer = irp->AssociatedIrp.SystemBuffer; + break; } switch (code) @@ -330,6 +334,7 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP caps_end = caps + preparsed->value_caps_count[HidP_Input]; break; case IOCTL_HID_SET_OUTPUT_REPORT: + case IOCTL_HID_WRITE_REPORT: report_len = preparsed->caps.OutputReportByteLength; caps = HID_OUTPUT_VALUE_CAPS( preparsed ); caps_end = caps + preparsed->value_caps_count[HidP_Output]; @@ -379,7 +384,9 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP break; case IOCTL_HID_SET_FEATURE: case IOCTL_HID_SET_OUTPUT_REPORT: + case IOCTL_HID_WRITE_REPORT: call_minidriver( code, ext->u.pdo.parent_fdo, NULL, sizeof(packet), &packet, 0, &irp->IoStatus ); + if (code == IOCTL_HID_WRITE_REPORT && packet.reportId) irp->IoStatus.Information--; break; } } @@ -611,70 +618,10 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) NTSTATUS WINAPI pdo_write(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; - HID_XFER_PACKET packet; NTSTATUS status; - ULONG max_len; - BOOL removed; - KIRQL irql; - - KeAcquireSpinLock(&ext->u.pdo.lock, &irql); - removed = ext->u.pdo.removed; - KeReleaseSpinLock(&ext->u.pdo.lock, irql); - - if (removed) - { - irp->IoStatus.Status = STATUS_DELETE_PENDING; - IoCompleteRequest(irp, IO_NO_INCREMENT); - return STATUS_DELETE_PENDING; - } - - if (!irpsp->Parameters.Write.Length) - { - irp->IoStatus.Status = STATUS_INVALID_USER_BUFFER; - IoCompleteRequest( irp, IO_NO_INCREMENT ); - return STATUS_INVALID_USER_BUFFER; - } - - if (irpsp->Parameters.Write.Length < data->caps.OutputReportByteLength) - { - irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - IoCompleteRequest( irp, IO_NO_INCREMENT ); - return STATUS_INVALID_PARAMETER; - } - - irp->IoStatus.Information = 0; - - TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", device, irpsp->Parameters.Write.Length, irp->AssociatedIrp.SystemBuffer); - packet.reportId = ((BYTE*)irp->AssociatedIrp.SystemBuffer)[0]; - if (packet.reportId == 0) - { - packet.reportBuffer = &((BYTE*)irp->AssociatedIrp.SystemBuffer)[1]; - packet.reportBufferLen = irpsp->Parameters.Write.Length - 1; - max_len = data->caps.OutputReportByteLength; - } - else - { - packet.reportBuffer = irp->AssociatedIrp.SystemBuffer; - packet.reportBufferLen = irpsp->Parameters.Write.Length; - max_len = (data->reports[data->reportIdx[HidP_Output][packet.reportId]].bitSize + 7) / 8; - } - if (packet.reportBufferLen > max_len) - packet.reportBufferLen = max_len; - - TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet.reportId, packet.reportBufferLen, packet.reportBuffer); - - call_minidriver( IOCTL_HID_WRITE_REPORT, ext->u.pdo.parent_fdo, NULL, 0, &packet, - sizeof(packet), &irp->IoStatus ); - - if (irp->IoStatus.Status == STATUS_SUCCESS) - irp->IoStatus.Information = irpsp->Parameters.Write.Length; - else - irp->IoStatus.Information = 0; - TRACE_(hid_report)( "Result 0x%x wrote %li bytes\n", irp->IoStatus.Status, irp->IoStatus.Information ); + hid_device_xfer_report( ext, IOCTL_HID_WRITE_REPORT, irp ); status = irp->IoStatus.Status; IoCompleteRequest( irp, IO_NO_INCREMENT ); diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 83f546aa972..8111af23c06 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -503,22 +503,14 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) HID_XFER_PACKET *packet = irp->UserBuffer; ULONG expected_size = 2; - todo_wine ok(in_size == sizeof(*packet), "got input size %u\n", in_size); - todo_wine ok(!out_size, "got output size %u\n", out_size); ok(packet->reportBufferLen >= expected_size, "got report size %u\n", packet->reportBufferLen); if (report_id) - { - todo_wine_if(packet->reportBuffer[0] == 0xa5) ok(packet->reportBuffer[0] == report_id, "got report id %x\n", packet->reportBuffer[0]); - } else - { - todo_wine ok(packet->reportBuffer[0] == 0xcd, "got first byte %x\n", packet->reportBuffer[0]); - } irp->IoStatus.Information = 3; ret = STATUS_SUCCESS; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 4909ab202a6..d49f6fe3c7e 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2630,11 +2630,8 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled ret = WriteFile(file, report, caps.OutputReportByteLength * 2, &value, NULL); if (report_id || broken(!ret) /* w7u */) { - todo_wine ok(!ret, "WriteFile succeeded\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "WriteFile returned error %u\n", GetLastError()); - todo_wine ok(value == 0, "WriteFile wrote %u\n", value); SetLastError(0xdeadbeef); report[0] = report_id; @@ -2649,7 +2646,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled else { ok(ret, "WriteFile failed, last error %u\n", GetLastError()); - todo_wine ok(value == 3, "WriteFile wrote %u\n", value); + ok(value == 3, "WriteFile wrote %u\n", value); }

1 0

Alex Henrie : include: Add IPV6_HOPOPTS and IPV6_GET_IFLIST.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: wine Branch: master Commit: cf74090cbdcf29928e5681e1cc0bb5151eb4205d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf74090cbdcf29928e5681e1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 8 21:44:04 2021 -0600 include: Add IPV6_HOPOPTS and IPV6_GET_IFLIST. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2ipdef.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index 3025a9c6fe9..0344a193dc1 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -214,6 +214,7 @@ typedef struct WS(in6_pktinfo) { #ifndef USE_WS_PREFIX #define IPV6_OPTIONS 1 +#define IPV6_HOPOPTS 1 #define IPV6_HDRINCL 2 #define IPV6_UNICAST_HOPS 4 #define IPV6_MULTICAST_IF 9 @@ -236,6 +237,7 @@ typedef struct WS(in6_pktinfo) { #define IPV6_DEL_IFLIST 30 #define IPV6_UNICAST_IF 31 #define IPV6_RTHDR 32 +#define IPV6_GET_IFLIST 33 #define IPV6_RECVRTHDR 38 #define IPV6_TCLASS 39 #define IPV6_RECVTCLASS 40 @@ -250,6 +252,7 @@ typedef struct WS(in6_pktinfo) { #define IPV6_USER_MTU 76 #else #define WS_IPV6_OPTIONS 1 +#define WS_IPV6_HOPOPTS 1 #define WS_IPV6_HDRINCL 2 #define WS_IPV6_UNICAST_HOPS 4 #define WS_IPV6_MULTICAST_IF 9 @@ -271,6 +274,7 @@ typedef struct WS(in6_pktinfo) { #define WS_IPV6_DEL_IFLIST 30 #define WS_IPV6_UNICAST_IF 31 #define WS_IPV6_RTHDR 32 +#define WS_IPV6_GET_IFLIST 33 #define WS_IPV6_RECVRTHDR 38 #define WS_IPV6_TCLASS 39 #define WS_IPV6_RECVTCLASS 40

1 0

Alex Henrie : tapi32: Add lineGetTranslateCapsW stub.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: wine Branch: master Commit: cdee7c9cd5ebf56bf153ad64597ee1c96aeec794 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdee7c9cd5ebf56bf153ad64… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 8 22:31:55 2021 -0600 tapi32: Add lineGetTranslateCapsW stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38585 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tapi32/line.c | 9 +++++++++ dlls/tapi32/tapi32.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index a44ac1a1a72..0df9746084b 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -751,6 +751,15 @@ DWORD WINAPI lineGetStatusMessages(HLINE hLine, LPDWORD lpdwLineStatus, LPDWORD return 0; } +/*********************************************************************** + * lineGetTranslateCapsW (TAPI32.@) + */ +DWORD WINAPI lineGetTranslateCapsW(HLINEAPP line_app, DWORD api_version, LINETRANSLATECAPS *caps) +{ + FIXME("(%p, %08x, %p): stub.\n", line_app, api_version, caps); + return LINEERR_OPERATIONFAILED; +} + /*********************************************************************** * lineGetTranslateCaps (TAPI32.@) * diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index 62631efe236..6c01a870479 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -67,6 +67,7 @@ @ stdcall lineGetStatusMessages(long ptr ptr) @ stdcall lineGetTranslateCaps(long long ptr) lineGetTranslateCapsA @ stdcall lineGetTranslateCapsA(long long ptr) +@ stdcall lineGetTranslateCapsW(ptr long ptr) @ stdcall lineHandoff(long str long) lineHandoffA @ stdcall lineHandoffA(long str long) @ stdcall lineHold(long)

1 0

Paul Gofman : jscript: Also add function name to its detached scope in ES5 mode.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: wine Branch: master Commit: c6a75d49369f7ae262ffbb054c9b27525f5bc406 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6a75d49369f7ae262ffbb05… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Aug 9 16:55:41 2021 +0300 jscript: Also add function name to its detached scope in ES5 mode. 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/engine.c | 4 ++++ dlls/mshtml/tests/es5.js | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index cb9ea5cd9ac..47b4e56e8e4 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -573,6 +573,7 @@ HRESULT jsval_strict_equal(jsval_t lval, jsval_t rval, BOOL *ret) static HRESULT detach_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_t *scope) { + function_code_t *func = frame->function; unsigned int i, index; HRESULT hres; @@ -591,6 +592,9 @@ static HRESULT detach_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_ scope->obj = to_disp(scope->jsobj); } + if (scope == frame->base_scope && func->name && ctx->version >= SCRIPTLANGUAGEVERSION_ES5) + jsdisp_propput_name(scope->jsobj, func->name, jsval_obj(jsdisp_addref(frame->function_instance))); + index = scope->scope_index; for(i = 0; i < frame->function->local_scopes[index].locals_cnt; i++) { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index e57aed5ca35..81c06a4145e 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1447,6 +1447,35 @@ sync_test("functions scope", function() { val = with_function(); ok(val == 8, "val != 8"); ok(w == 9, "w != 9"); + + var func, func_outer, ret; + var o = new Object(); + + func_outer = function e() + { + function func_inner() + { + ok(typeof e == "function", "typeof e == " + typeof e); + ret = e + } + func = func_inner + } + func_outer(); + func(); + ok(ret === func_outer, "ret != func_outer"); + + func_outer = function f(f) + { + function func_inner() + { + ok(typeof f == "object", "typeof f == " + typeof f); + ret = f + } + func = func_inner + } + func_outer(o); + func(); + ok(ret === o, "ret != o"); }); sync_test("console", function() {

1 0