June 2021 - Wine-Devel - list.winehq.org

[PATCH 1/2] winebus.sys: Add some buttons to HID mouse input report.
by Rémi Bernon June 4, 2021

June 4, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 99f834d2f40..a572d11f822 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -476,12 +476,13 @@ static NTSTATUS mouse_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, { TRACE("buffer %p, length %u.\n", buffer, length); - *ret_length = sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL); - if (length < sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL)) + *ret_length = sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS) + sizeof(REPORT_TAIL); + if (length < sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS) + sizeof(REPORT_TAIL)) return STATUS_BUFFER_TOO_SMALL; memcpy(buffer, REPORT_HEADER, sizeof(REPORT_HEADER)); - memcpy(buffer + sizeof(REPORT_HEADER), REPORT_TAIL, sizeof(REPORT_TAIL)); + add_button_block(buffer + sizeof(REPORT_HEADER), 1, 3); + memcpy(buffer + sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS), REPORT_TAIL, sizeof(REPORT_TAIL)); buffer[IDX_HEADER_PAGE] = HID_USAGE_PAGE_GENERIC; buffer[IDX_HEADER_USAGE] = HID_USAGE_GENERIC_MOUSE; -- 2.31.0

1 1

[PATCH 1/5] hidclass.sys: Use msvcrt allocation functions.
by Rémi Bernon June 4, 2021

June 4, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidclass.sys/buffer.c | 23 ++++++++++++----------- dlls/hidclass.sys/descriptor.c | 18 +++++++++--------- dlls/hidclass.sys/device.c | 23 ++++++++++++----------- dlls/hidclass.sys/pnp.c | 13 +++++++------ 4 files changed, 40 insertions(+), 37 deletions(-) diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c index eccc3ed0c4e..5d15d44ffea 100644 --- a/dlls/hidclass.sys/buffer.c +++ b/dlls/hidclass.sys/buffer.c @@ -18,6 +18,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #define NONAMELESSUNION #include "hid.h" @@ -50,26 +51,26 @@ struct ReportRingBuffer* RingBuffer_Create(UINT buffer_size) TRACE("Create Ring Buffer with buffer size %i\n",buffer_size); - ring = HeapAlloc(GetProcessHeap(), 0, sizeof(*ring)); + ring = malloc(sizeof(*ring)); if (!ring) return NULL; ring->start = ring->end = 0; ring->size = BASE_BUFFER_SIZE; ring->buffer_size = buffer_size; ring->pointer_alloc = 2; - ring->pointers = HeapAlloc(GetProcessHeap(), 0, sizeof(UINT) * ring->pointer_alloc); + ring->pointers = malloc(sizeof(UINT) * ring->pointer_alloc); if (!ring->pointers) { - HeapFree(GetProcessHeap(), 0, ring); + free(ring); return NULL; } for (i = 0; i < ring->pointer_alloc; i++) ring->pointers[i] = POINTER_UNUSED; - ring->buffer = HeapAlloc(GetProcessHeap(), 0, buffer_size * ring->size); + ring->buffer = malloc(buffer_size * ring->size); if (!ring->buffer) { - HeapFree(GetProcessHeap(), 0, ring->pointers); - HeapFree(GetProcessHeap(), 0, ring); + free(ring->pointers); + free(ring); return NULL; } InitializeCriticalSection(&ring->lock); @@ -79,11 +80,11 @@ struct ReportRingBuffer* RingBuffer_Create(UINT buffer_size) void RingBuffer_Destroy(struct ReportRingBuffer *ring) { - HeapFree(GetProcessHeap(), 0, ring->buffer); - HeapFree(GetProcessHeap(), 0, ring->pointers); + free(ring->buffer); + free(ring->pointers); ring->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&ring->lock); - HeapFree(GetProcessHeap(), 0, ring); + free(ring); } UINT RingBuffer_GetBufferSize(struct ReportRingBuffer *ring) @@ -113,13 +114,13 @@ NTSTATUS RingBuffer_SetSize(struct ReportRingBuffer *ring, UINT size) if (ring->pointers[i] != POINTER_UNUSED) ring->pointers[i] = 0; } - new_buffer = HeapAlloc(GetProcessHeap(), 0, ring->buffer_size * size); + new_buffer = malloc(ring->buffer_size * size); if (!new_buffer) { LeaveCriticalSection(&ring->lock); return STATUS_NO_MEMORY; } - HeapFree(GetProcessHeap(), 0, ring->buffer); + free(ring->buffer); ring->buffer = new_buffer; ring->size = size; LeaveCriticalSection(&ring->lock); diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index c02988494fd..ab92540994a 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -507,7 +507,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l case TAG_MAIN_FEATURE: for (j = 0; j < caps->ReportCount; j++) { - feature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*feature)); + feature = calloc(1, sizeof(*feature)); list_add_tail(&collection->features, &feature->entry); if (bTag == TAG_MAIN_INPUT) feature->type = HidP_Input; @@ -532,7 +532,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l break; case TAG_MAIN_COLLECTION: { - struct collection *subcollection = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct collection)); + struct collection *subcollection = calloc(1, sizeof(struct collection)); list_add_tail(&collection->collections, &subcollection->entry); subcollection->parent = collection; /* Only set our collection once... @@ -598,7 +598,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l break; case TAG_GLOBAL_PUSH: { - struct caps_stack *saved = HeapAlloc(GetProcessHeap(), 0, sizeof(*saved)); + struct caps_stack *saved = malloc(sizeof(*saved)); saved->caps = *caps; TRACE("Push\n"); list_add_tail(stack, &saved->entry); @@ -615,7 +615,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l saved = LIST_ENTRY(tail, struct caps_stack, entry); *caps = saved->caps; list_remove(tail); - HeapFree(GetProcessHeap(), 0, saved); + free(saved); } else ERR("Pop but no stack!\n"); @@ -928,7 +928,7 @@ static WINE_HIDP_PREPARSED_DATA* build_PreparseData(struct collection *base_coll nodes_offset = size; size += node_count * sizeof(WINE_HID_LINK_COLLECTION_NODE); - data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + data = calloc(1, size); data->magic = HID_MAGIC; data->dwSize = size; data->caps.Usage = base_collection->caps.u.NotRange.Usage; @@ -953,9 +953,9 @@ static void free_collection(struct collection *collection) LIST_FOR_EACH_ENTRY_SAFE(fentry, fnext, &collection->features, struct feature, entry) { list_remove(&fentry->entry); - HeapFree(GetProcessHeap(), 0, fentry); + free(fentry); } - HeapFree(GetProcessHeap(), 0, collection); + free(collection); } WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) @@ -983,7 +983,7 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) list_init(&caps_stack); - base = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*base)); + base = calloc(1, sizeof(*base)); base->index = 1; list_init(&base->features); list_init(&base->collections); @@ -1001,7 +1001,7 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) LIST_FOR_EACH_ENTRY_SAFE(entry, cursor, &caps_stack, struct caps_stack, entry) { list_remove(&entry->entry); - HeapFree(GetProcessHeap(), 0, entry); + free(entry); } } diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 4d031ffcaa0..e2ca635833d 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "hid.h" @@ -115,7 +116,7 @@ static void hid_device_send_input(DEVICE_OBJECT *device, HID_XFER_PACKET *packet data_size = offsetof(RAWINPUT, data.hid.bRawData) + packet->reportBufferLen; if (!(id = ext->u.pdo.preparsed_data->reports[0].reportID)) data_size += 1; - if (!(rawinput = HeapAlloc(GetProcessHeap(), 0, data_size))) + if (!(rawinput = malloc(data_size))) { ERR("Failed to allocate rawinput data!\n"); return; @@ -138,7 +139,7 @@ static void hid_device_send_input(DEVICE_OBJECT *device, HID_XFER_PACKET *packet input.u.hi.wParamL = 0; __wine_send_input(0, &input, rawinput); - HeapFree(GetProcessHeap(), 0, rawinput); + free(rawinput); } static void HID_Device_processQueue(DEVICE_OBJECT *device) @@ -148,7 +149,7 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) UINT buffer_size = RingBuffer_GetBufferSize(ext->u.pdo.ring_buffer); HID_XFER_PACKET *packet; - packet = HeapAlloc(GetProcessHeap(), 0, buffer_size); + packet = malloc(buffer_size); while((irp = pop_irp_from_queue(ext))) { @@ -174,7 +175,7 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) } IoCompleteRequest( irp, IO_NO_INCREMENT ); } - HeapFree(GetProcessHeap(), 0, packet); + free(packet); } static DWORD CALLBACK hid_device_thread(void *args) @@ -189,7 +190,7 @@ static DWORD CALLBACK hid_device_thread(void *args) BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; USHORT report_size = ext->u.pdo.preparsed_data->caps.InputReportByteLength; - packet = HeapAlloc(GetProcessHeap(), 0, sizeof(*packet) + report_size); + packet = malloc(sizeof(*packet) + report_size); packet->reportBuffer = (BYTE *)packet + sizeof(*packet); if (ext->u.pdo.information.Polled) @@ -347,7 +348,7 @@ static NTSTATUS HID_get_feature(BASE_DEVICE_EXTENSION *ext, IRP *irp) TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", ext, irpsp->Parameters.DeviceIoControl.OutputBufferLength, out_buffer); len = sizeof(*packet) + irpsp->Parameters.DeviceIoControl.OutputBufferLength; - packet = HeapAlloc(GetProcessHeap(), 0, len); + packet = malloc(len); packet->reportBufferLen = irpsp->Parameters.DeviceIoControl.OutputBufferLength; packet->reportBuffer = ((BYTE*)packet) + sizeof(*packet); packet->reportId = out_buffer[0]; @@ -367,7 +368,7 @@ static NTSTATUS HID_get_feature(BASE_DEVICE_EXTENSION *ext, IRP *irp) TRACE_(hid_report)("Result 0x%x get %li bytes\n", rc, irp->IoStatus.Information); - HeapFree(GetProcessHeap(), 0, packet); + free(packet); return rc; } @@ -496,7 +497,7 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) BYTE *buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); ULONG out_length; - packet = HeapAlloc(GetProcessHeap(), 0, packet_size); + packet = malloc(packet_size); if (ext->u.pdo.preparsed_data->reports[0].reportID) packet->reportId = buffer[0]; @@ -514,7 +515,7 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) else irp->IoStatus.Information = 0; irp->IoStatus.u.Status = rc; - HeapFree(GetProcessHeap(), 0, packet); + free(packet); break; } case IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS: @@ -578,7 +579,7 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); int ptr = -1; - packet = HeapAlloc(GetProcessHeap(), 0, buffer_size); + packet = malloc(buffer_size); ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); irp->IoStatus.Information = 0; @@ -639,7 +640,7 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) IoCompleteRequest(irp, IO_NO_INCREMENT); } } - HeapFree(GetProcessHeap(), 0, packet); + free(packet); return rc; } diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index b5862a01593..f372f8ffdf5 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -21,6 +21,7 @@ #define NONAMELESSUNION #include <unistd.h> #include <stdarg.h> +#include <stdlib.h> #include "initguid.h" #include "hid.h" #include "devguid.h" @@ -239,19 +240,19 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) return; } - reportDescriptor = HeapAlloc(GetProcessHeap(), 0, descriptor.DescriptorList[i].wReportLength); + reportDescriptor = malloc(descriptor.DescriptorList[i].wReportLength); status = call_minidriver(IOCTL_HID_GET_REPORT_DESCRIPTOR, fdo, NULL, 0, reportDescriptor, descriptor.DescriptorList[i].wReportLength); if (status != STATUS_SUCCESS) { ERR("Cannot get Report Descriptor(%x)\n",status); - HeapFree(GetProcessHeap(), 0, reportDescriptor); + free(reportDescriptor); IoDeleteDevice(child_pdo); return; } pdo_ext->u.pdo.preparsed_data = ParseDescriptor(reportDescriptor, descriptor.DescriptorList[i].wReportLength); - HeapFree(GetProcessHeap(), 0, reportDescriptor); + free(reportDescriptor); if (!pdo_ext->u.pdo.preparsed_data) { ERR("Cannot parse Report Descriptor\n"); @@ -475,7 +476,7 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) } CloseHandle(ext->u.pdo.halt_event); - HeapFree(GetProcessHeap(), 0, ext->u.pdo.preparsed_data); + free(ext->u.pdo.preparsed_data); if (ext->u.pdo.ring_buffer) RingBuffer_Destroy(ext->u.pdo.ring_buffer); @@ -561,7 +562,7 @@ static void WINAPI driver_unload(DRIVER_OBJECT *driver) if (md->DriverUnload) md->DriverUnload(md->minidriver.DriverObject); list_remove(&md->entry); - HeapFree(GetProcessHeap(), 0, md); + free(md); } } @@ -569,7 +570,7 @@ NTSTATUS WINAPI HidRegisterMinidriver(HID_MINIDRIVER_REGISTRATION *registration) { minidriver *driver; - if (!(driver = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*driver)))) + if (!(driver = calloc(1, sizeof(*driver)))) return STATUS_NO_MEMORY; driver->DriverUnload = registration->DriverObject->DriverUnload; -- 2.31.0

2 6

[PATCH] rsaenh: Fix a typo in a comment.
by Haoyang Chen June 4, 2021

June 4, 2021

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/rsaenh/rsaenh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 705419526fe..a4deb80b0e1 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2695,7 +2695,7 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash, pbData[*pdwDataLen-1] <= *pdwDataLen) { BOOL padOkay = TRUE; - /* check that every bad byte has the same value */ + /* check that every pad byte has the same value */ for (i = 1; padOkay && i < pbData[*pdwDataLen-1]; i++) if (pbData[*pdwDataLen - i - 1] != pbData[*pdwDataLen - 1]) padOkay = FALSE; -- 2.20.1

1 0

[PATCH 1/4] user32/tests: Use winetest contexts to simplify test_string().
by Francois Gouget June 4, 2021

June 4, 2021

This ensures all traces have the relevant context information, in particular the OpenClipboard() checks, and simplifies the ok() calls. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/user32/tests/clipboard.c | 36 +++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index d75e8fc3c32..878b9c66427 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -2043,6 +2043,7 @@ static void test_string_data(void) for (i = 0; i < ARRAY_SIZE(test_data); i++) { + winetest_push_context("%d", i); /* 1-byte Unicode strings crash on Win64 */ #ifdef _WIN64 if (!test_data[i].strA[0] && test_data[i].len < sizeof(WCHAR)) continue; @@ -2059,7 +2060,7 @@ static void test_string_data(void) memcpy( bufferA, test_data[i].strA, test_data[i].len ); bufferA[test_data[i].len - 1] = 0; ok( !memcmp( data, bufferA, test_data[i].len ), - "%u: wrong data %.*s\n", i, test_data[i].len, (char *)data ); + "wrong data %.*s\n", test_data[i].len, (char *)data ); } else { @@ -2068,12 +2069,13 @@ static void test_string_data(void) memcpy( bufferW, test_data[i].strW, test_data[i].len ); bufferW[(test_data[i].len + 1) / sizeof(WCHAR) - 1] = 0; ok( !memcmp( data, bufferW, test_data[i].len ), - "%u: wrong data %s\n", i, wine_dbgstr_wn( data, (test_data[i].len + 1) / sizeof(WCHAR) )); + "wrong data %s\n", wine_dbgstr_wn( data, (test_data[i].len + 1) / sizeof(WCHAR) )); } r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); sprintf( cmd, "string_data %u", i ); run_process( cmd ); + winetest_pop_context(); } } @@ -2085,53 +2087,55 @@ static void test_string_data_process( int i ) char bufferA[12]; WCHAR bufferW[12]; + winetest_push_context("%d", i); r = OpenClipboard( 0 ); ok( r, "gle %d\n", GetLastError() ); if (test_data[i].strA[0]) { data = GetClipboardData( CF_TEXT ); - ok( data != 0, "%u: could not get data\n", i ); + ok( data != 0, "could not get data\n" ); len = GlobalSize( data ); - ok( len == test_data[i].len, "%u: wrong size %u / %u\n", i, len, test_data[i].len ); + ok( len == test_data[i].len, "wrong size %u / %u\n", len, test_data[i].len ); memcpy( bufferA, test_data[i].strA, test_data[i].len ); bufferA[test_data[i].len - 1] = 0; - ok( !memcmp( data, bufferA, len ), "%u: wrong data %.*s\n", i, len, (char *)data ); + ok( !memcmp( data, bufferA, len ), "wrong data %.*s\n", len, (char *)data ); data = GetClipboardData( CF_UNICODETEXT ); - ok( data != 0, "%u: could not get data\n", i ); + ok( data != 0, "could not get data\n" ); len = GlobalSize( data ); len2 = MultiByteToWideChar( CP_ACP, 0, bufferA, test_data[i].len, bufferW, ARRAY_SIZE(bufferW) ); - ok( len == len2 * sizeof(WCHAR), "%u: wrong size %u / %u\n", i, len, len2 ); - ok( !memcmp( data, bufferW, len ), "%u: wrong data %s\n", i, wine_dbgstr_wn( data, len2 )); + ok( len == len2 * sizeof(WCHAR), "wrong size %u / %u\n", len, len2 ); + ok( !memcmp( data, bufferW, len ), "wrong data %s\n", wine_dbgstr_wn( data, len2 )); } else { data = GetClipboardData( CF_UNICODETEXT ); - ok( data != 0, "%u: could not get data\n", i ); + ok( data != 0, "could not get data\n" ); len = GlobalSize( data ); - ok( len == test_data[i].len, "%u: wrong size %u / %u\n", i, len, test_data[i].len ); + ok( len == test_data[i].len, "wrong size %u / %u\n", len, test_data[i].len ); memcpy( bufferW, test_data[i].strW, test_data[i].len ); bufferW[(test_data[i].len + 1) / sizeof(WCHAR) - 1] = 0; ok( !memcmp( data, bufferW, len ), - "%u: wrong data %s\n", i, wine_dbgstr_wn( data, (len + 1) / sizeof(WCHAR) )); + "wrong data %s\n", wine_dbgstr_wn( data, (len + 1) / sizeof(WCHAR) )); data = GetClipboardData( CF_TEXT ); if (test_data[i].len >= sizeof(WCHAR)) { - ok( data != 0, "%u: could not get data\n", i ); + ok( data != 0, "could not get data\n" ); len = GlobalSize( data ); len2 = WideCharToMultiByte( CP_ACP, 0, bufferW, test_data[i].len / sizeof(WCHAR), bufferA, ARRAY_SIZE(bufferA), NULL, NULL ); bufferA[len2 - 1] = 0; - ok( len == len2, "%u: wrong size %u / %u\n", i, len, len2 ); - ok( !memcmp( data, bufferA, len ), "%u: wrong data %.*s\n", i, len, (char *)data ); + ok( len == len2, "wrong size %u / %u\n", len, len2 ); + ok( !memcmp( data, bufferA, len ), "wrong data %.*s\n", len, (char *)data ); } else { - ok( !data, "%u: got data for empty string\n", i ); - ok( IsClipboardFormatAvailable( CF_TEXT ), "%u: text not available\n", i ); + ok( !data, "got data for empty string\n" ); + ok( IsClipboardFormatAvailable( CF_TEXT ), "text not available\n" ); } } r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); + winetest_pop_context(); } START_TEST(clipboard) -- 2.20.1

3 10

[PATCH] winegstreamer: Improve reported supported rates values for the media source.
by Nikolay Sivov June 4, 2021

June 4, 2021

From: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Supersedes 207103 and 207104. dlls/mfplat/tests/mfplat.c | 61 +++++++++++++++++++++++++++++++ dlls/winegstreamer/media_source.c | 17 ++++----- 2 files changed, 69 insertions(+), 9 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ae9bd60c6df..7f049aa90bb 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -655,12 +655,15 @@ static void test_source_resolver(void) IMFStreamDescriptor *sd; IUnknown *cancel_cookie; IMFByteStream *stream; + IMFGetService *get_service; + IMFRateSupport *rate_support; WCHAR pathW[MAX_PATH]; int i, sample_count; WCHAR *filename; PROPVARIANT var; HRESULT hr; GUID guid; + float rate; if (!pMFCreateSourceResolver) { @@ -766,6 +769,62 @@ static void test_source_resolver(void) check_interface(mediasource, &IID_IMFGetService, TRUE); check_service_interface(mediasource, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); + + hr = IMFMediaSource_QueryInterface(mediasource, &IID_IMFGetService, (void**)&get_service); + ok(hr == S_OK, "Failed to get service interface, hr %#x.\n", hr); + + hr = IMFGetService_GetService(get_service, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void**)&rate_support); + ok(hr == S_OK, "Failed to get rate support interface, hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr); + ok(rate == 1e6f, "Unexpected fastest rate %f.\n", rate); + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr); + ok(rate == 1e6f, "Unexpected fastest rate %f.\n", rate); + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr); + ok(rate == -1e6f, "Unexpected fastest rate %f.\n", rate); + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr); + ok(rate == -1e6f, "Unexpected fastest rate %f.\n", rate); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate); + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate); + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate); + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate); + + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, 0.0f, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, 0.0f, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, 1.0f, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 1.0f, "Unexpected rate %f.\n", rate); + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, -1.0f, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == -1.0f, "Unexpected rate %f.\n", rate); + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, 1e6f + 1.0f, &rate); + ok(hr == MF_E_UNSUPPORTED_RATE, "Unexpected hr %#x.\n", hr); + ok(rate == 1e6f + 1.0f || broken(rate == 1e6f) /* Win7 */, "Unexpected %f.\n", rate); + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, -1e6f, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == -1e6f, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, -1e6f - 1.0f, &rate); + ok(hr == MF_E_UNSUPPORTED_RATE, "Unexpected hr %#x.\n", hr); + ok(rate == -1e6f - 1.0f || broken(rate == -1e6f) /* Win7 */, "Unexpected rate %f.\n", rate); + check_service_interface(mediasource, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, TRUE); hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, &descriptor); ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr); @@ -879,6 +938,8 @@ todo_wine hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, NULL); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFRateSupport_Release(rate_support); + IMFGetService_Release(get_service); IMFMediaSource_Release(mediasource); IMFByteStream_Release(stream); diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index e153c8e9161..cb8fa12c2ce 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -933,7 +933,7 @@ static HRESULT WINAPI media_source_rate_support_GetSlowestRate(IMFRateSupport *i { TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); - *rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f; + *rate = 0.0f; return S_OK; } @@ -942,21 +942,20 @@ static HRESULT WINAPI media_source_rate_support_GetFastestRate(IMFRateSupport *i { TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); - *rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f; + *rate = direction == MFRATE_FORWARD ? 1e6f : -1e6f; return S_OK; } -static HRESULT WINAPI media_source_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, float *nearest_support_rate) +static HRESULT WINAPI media_source_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, + float *nearest_rate) { - const float supported_rate = rate >= 0.0f ? 1.0f : -1.0f; + TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_rate); - TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_support_rate); + if (nearest_rate) + *nearest_rate = rate; - if (nearest_support_rate) - *nearest_support_rate = supported_rate; - - return rate == supported_rate ? S_OK : MF_E_UNSUPPORTED_RATE; + return rate >= -1e6f && rate <= 1e6f ? S_OK : MF_E_UNSUPPORTED_RATE; } static const IMFRateSupportVtbl media_source_rate_support_vtbl = -- 2.30.2

1 0

[PATCH v2] msxml3/tests: add some regex tests
by Damjan Jovanovic June 4, 2021

June 4, 2021

Adds tests for all non-standard escape sequences used by MSXML I could find, such as "\$" (bug 29685), "\uNNNN" (bug 43581) and 13 others. A patch to libxml2 implementing all those sequences is already available: https://gitlab.gnome.org/GNOME/libxml2/-/merge_requests/116 Try 2 also tests MSXML40 where available (earlier versions can't be tested as they don't support XSD schemas), calls the function "test_regex()", and tests how the \uNNNN escape sequence handles non-BMP characters in surrogate pairs. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/msxml3/tests/schema.c | 154 +++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+)

2 1

[PATCH] winegstreamer: Fix assert condition.
by Nikolay Sivov June 4, 2021

June 4, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Count can potentially reach 6, there is 5 raw types + 1 base type. dlls/winegstreamer/media_source.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index e153c8e9161..d3d156fc9cb 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -832,7 +832,7 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) type_count = 1; } - assert(type_count < ARRAY_SIZE(stream_types)); + assert(type_count <= ARRAY_SIZE(stream_types)); if (!type_count) { -- 2.30.2

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras June 4, 2021

June 4, 2021

1 0

[PATCH] ntdll: Fix a file descriptor leak.
by Robin Ebert June 3, 2021

June 3, 2021

Signed-off-by: Robin Ebert <ebertrobin2002(a)gmail.com> --- dlls/ntdll/unix/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index cfc5780b082..a157aa1ede6 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1252,7 +1252,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc if (in_size < sizeof(*params)) { - return STATUS_BUFFER_TOO_SMALL; + status = STATUS_BUFFER_TOO_SMALL; break; } -- 2.20.1

1 0

[PATCH v2 1/6] ntoskrnl.exe/tests: Silent a todo_wine failing test after a while.
by Rémi Bernon June 3, 2021

June 3, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: * Fix spurious failures first. * Don't try NULL preparsed data, it crashes old windows versions. * Squash new HidP_Get*Caps tests together, add a few more with specific caps lookup. dlls/ntoskrnl.exe/tests/driver_hid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 44ec1b09526..79b3e708752 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -103,6 +103,7 @@ static const unsigned char report_descriptor[] = static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) { + static int test_failed = 0; IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); const ULONG in_size = stack->Parameters.DeviceIoControl.InputBufferLength; const ULONG out_size = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -176,7 +177,7 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_READ_REPORT: ok(!in_size, "got input size %u\n", in_size); - todo_wine ok(out_size == 2, "got output size %u\n", out_size); + if (test_failed++ < 10) todo_wine ok(out_size == 2, "got output size %u\n", out_size); ret = STATUS_NOT_IMPLEMENTED; break; -- 2.31.0

3 25