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

Zebediah Figura : winebus.sys: Return success from IRP_MN_START_DEVICE on the child PDO.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 1fdcf1f18390fa83649d95ca1bfcc29fd4b15b1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fdcf1f18390fa83649d95ca… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 19 23:37:09 2021 -0500 winebus.sys: Return success from IRP_MN_START_DEVICE on the child PDO. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 97a333dc8c3..acd166758e7 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -607,6 +607,10 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) status = STATUS_SUCCESS; break; + case IRP_MN_START_DEVICE: + status = STATUS_SUCCESS; + break; + case IRP_MN_REMOVE_DEVICE: { struct pnp_device *pnp_device = ext->pnp_device;

1 0

Zebediah Figura : hidclass.sys: Defer creating a child device until IRP_MN_START_DEVICE.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: c5565a74c3441645d0e1da3fe6d6d5acc38c47a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5565a74c3441645d0e1da3f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 19 23:37:10 2021 -0500 hidclass.sys: Defer creating a child device until IRP_MN_START_DEVICE. This is necessary to allow the Hauppauge CIR receiver driver for cx2310x drivers (hcw10cir.sys) to start. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 91 ++++++++++++++++++++++-------------- dlls/ntoskrnl.exe/tests/driver_hid.c | 3 +- 2 files changed, 57 insertions(+), 37 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 7b365d267ed..de6f409a16b 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -99,17 +99,11 @@ static UINT32 alloc_rawinput_handle(void) static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *bus_pdo) { - WCHAR device_id[MAX_DEVICE_ID_LEN], instance_id[MAX_DEVICE_ID_LEN], pdo_name[255]; - BASE_DEVICE_EXTENSION *ext, *pdo_ext; - HID_DEVICE_ATTRIBUTES attr = {0}; - DEVICE_OBJECT *fdo, *child_pdo; - UNICODE_STRING string; - USAGE page, usage; + WCHAR device_id[MAX_DEVICE_ID_LEN], instance_id[MAX_DEVICE_ID_LEN]; + BASE_DEVICE_EXTENSION *ext; + DEVICE_OBJECT *fdo; NTSTATUS status; minidriver *minidriver; - HID_DESCRIPTOR descriptor; - BYTE *reportDescriptor; - INT i; if ((status = get_device_id(bus_pdo, BusQueryDeviceID, device_id))) { @@ -148,30 +142,48 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b return status; } + IoAttachDeviceToDeviceStack(fdo, bus_pdo); + fdo->Flags &= ~DO_DEVICE_INITIALIZING; + + return STATUS_SUCCESS; +} + +static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) +{ + BASE_DEVICE_EXTENSION *fdo_ext = fdo->DeviceExtension, *pdo_ext; + HID_DEVICE_ATTRIBUTES attr = {0}; + HID_DESCRIPTOR descriptor; + DEVICE_OBJECT *child_pdo; + BYTE *reportDescriptor; + UNICODE_STRING string; + WCHAR pdo_name[255]; + USAGE page, usage; + NTSTATUS status; + INT i; + status = call_minidriver(IOCTL_HID_GET_DEVICE_ATTRIBUTES, fdo, NULL, 0, &attr, sizeof(attr)); if (status != STATUS_SUCCESS) { ERR("Minidriver failed to get Attributes(%x)\n",status); - IoDeleteDevice(fdo); - return status; + return; } - swprintf(pdo_name, ARRAY_SIZE(pdo_name), L"\\Device\\HID#%p&%p", driver, bus_pdo); + swprintf(pdo_name, ARRAY_SIZE(pdo_name), L"\\Device\\HID#%p&%p", fdo->DriverObject, + fdo_ext->u.fdo.hid_ext.PhysicalDeviceObject); RtlInitUnicodeString(&string, pdo_name); - if ((status = IoCreateDevice(driver, sizeof(*ext), &string, 0, 0, FALSE, &child_pdo))) + if ((status = IoCreateDevice(fdo->DriverObject, sizeof(*pdo_ext), &string, 0, 0, FALSE, &child_pdo))) { ERR("Failed to create child PDO, status %#x.\n", status); - IoDeleteDevice(fdo); - return status; + return; } - ext->u.fdo.child_pdo = child_pdo; + fdo_ext->u.fdo.child_pdo = child_pdo; pdo_ext = child_pdo->DeviceExtension; pdo_ext->u.pdo.parent_fdo = fdo; InitializeListHead(&pdo_ext->u.pdo.irp_queue); KeInitializeSpinLock(&pdo_ext->u.pdo.irp_queue_lock); - wcscpy(pdo_ext->device_id, ext->device_id); - wcscpy(pdo_ext->instance_id, ext->instance_id); + wcscpy(pdo_ext->device_id, fdo_ext->device_id); + wcscpy(pdo_ext->instance_id, fdo_ext->instance_id); pdo_ext->u.pdo.information.VendorID = attr.VendorID; pdo_ext->u.pdo.information.ProductID = attr.ProductID; @@ -183,8 +195,7 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b { ERR("Cannot get Device Descriptor(%x)\n",status); IoDeleteDevice(child_pdo); - IoDeleteDevice(fdo); - return status; + return; } for (i = 0; i < descriptor.bNumDescriptors; i++) if (descriptor.DescriptorList[i].bReportType == HID_REPORT_DESCRIPTOR_TYPE) @@ -194,8 +205,7 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b { ERR("No Report Descriptor found in reply\n"); IoDeleteDevice(child_pdo); - IoDeleteDevice(fdo); - return status; + return; } reportDescriptor = HeapAlloc(GetProcessHeap(), 0, descriptor.DescriptorList[i].wReportLength); @@ -206,8 +216,7 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b ERR("Cannot get Report Descriptor(%x)\n",status); HeapFree(GetProcessHeap(), 0, reportDescriptor); IoDeleteDevice(child_pdo); - IoDeleteDevice(fdo); - return status; + return; } pdo_ext->u.pdo.preparsed_data = ParseDescriptor(reportDescriptor, descriptor.DescriptorList[i].wReportLength); @@ -216,15 +225,12 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b { ERR("Cannot parse Report Descriptor\n"); IoDeleteDevice(child_pdo); - IoDeleteDevice(fdo); - return STATUS_NOT_SUPPORTED; + return; } pdo_ext->u.pdo.information.DescriptorSize = pdo_ext->u.pdo.preparsed_data->dwSize; - IoAttachDeviceToDeviceStack(fdo, bus_pdo); - - IoInvalidateDeviceRelations(bus_pdo, BusRelations); + IoInvalidateDeviceRelations(fdo_ext->u.fdo.hid_ext.PhysicalDeviceObject, BusRelations); page = pdo_ext->u.pdo.preparsed_data->caps.UsagePage; usage = pdo_ext->u.pdo.preparsed_data->caps.Usage; @@ -241,9 +247,6 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b sizeof(HID_XFER_PACKET) + pdo_ext->u.pdo.preparsed_data->caps.InputReportByteLength); HID_StartDeviceThread(child_pdo); - - fdo->Flags &= ~DO_DEVICE_INITIALIZING; - return STATUS_SUCCESS; } static NTSTATUS fdo_pnp(DEVICE_OBJECT *device, IRP *irp) @@ -259,6 +262,7 @@ static NTSTATUS fdo_pnp(DEVICE_OBJECT *device, IRP *irp) case IRP_MN_QUERY_DEVICE_RELATIONS: { DEVICE_RELATIONS *devices; + DEVICE_OBJECT *child; if (stack->Parameters.QueryDeviceRelations.Type != BusRelations) return minidriver->PNPDispatch(device, irp); @@ -270,9 +274,16 @@ static NTSTATUS fdo_pnp(DEVICE_OBJECT *device, IRP *irp) return STATUS_NO_MEMORY; } - devices->Objects[0] = ext->u.fdo.child_pdo; - call_fastcall_func1(ObfReferenceObject, ext->u.fdo.child_pdo); - devices->Count = 1; + if ((child = ext->u.fdo.child_pdo)) + { + devices->Objects[0] = ext->u.fdo.child_pdo; + call_fastcall_func1(ObfReferenceObject, ext->u.fdo.child_pdo); + devices->Count = 1; + } + else + { + devices->Count = 0; + } irp->IoStatus.Information = (ULONG_PTR)devices; irp->IoStatus.u.Status = STATUS_SUCCESS; @@ -280,6 +291,16 @@ static NTSTATUS fdo_pnp(DEVICE_OBJECT *device, IRP *irp) return IoCallDriver(ext->u.fdo.hid_ext.NextDeviceObject, irp); } + case IRP_MN_START_DEVICE: + { + NTSTATUS ret; + + if ((ret = minidriver->PNPDispatch(device, irp))) + return ret; + create_child(minidriver, device); + return STATUS_SUCCESS; + } + case IRP_MN_REMOVE_DEVICE: { NTSTATUS ret; diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 92637f9d0bc..44ec1b09526 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -111,8 +111,7 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) if (winetest_debug > 1) trace("ioctl %#x\n", code); - todo_wine_if (code != IOCTL_HID_READ_REPORT) - ok(got_start_device, "expected IRP_MN_START_DEVICE before any ioctls\n"); + ok(got_start_device, "expected IRP_MN_START_DEVICE before any ioctls\n"); irp->IoStatus.Information = 0;

1 0

Zhiyi Zhang : gdi32/tests: Test GdiAlphaBlend() for enhanced metafiles.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 0893240da52ac60bdeef6bc3cbac03f46454ae24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0893240da52ac60bdeef6bc3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 20 09:09:18 2021 +0100 gdi32/tests: Test GdiAlphaBlend() for enhanced metafiles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 713 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 712 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0893240da52ac60bdeef…

1 0

Zhiyi Zhang : gdi32: Implement EMFDRV_AlphaBlend().
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 8ae18d055a8af864087f08f127d7d93ad6eafbae URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ae18d055a8af864087f08f1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 20 09:09:19 2021 +0100 gdi32: Implement EMFDRV_AlphaBlend(). Fix a bug that Tally produces a blank print preview when images have to be scaled. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/bitblt.c | 88 ++++++++++++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 + dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/tests/metafile.c | 4 +- 4 files changed, 92 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index 1fc5c0b1040..597a6110abd 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -27,6 +27,94 @@ #include "enhmetafiledrv.h" #include "wine/debug.h" +BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, + PHYSDEV dev_src, struct bitblt_coords *src, BLENDFUNCTION func ) +{ + unsigned char src_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *src_info = (BITMAPINFO *)src_buffer; + UINT bits_size, bmi_size, emr_size, size, bpp; + struct gdi_image_bits bits; + EMRALPHABLEND *emr; + BITMAPINFO *bmi; + DC *dc_src; + DWORD err; + BOOL ret = FALSE; + + dc_src = get_physdev_dc(dev_src); + dev_src = GET_DC_PHYSDEV(dc_src, pGetImage); + err = dev_src->funcs->pGetImage(dev_src, src_info, &bits, src); + if (err) + { + SetLastError(err); + return FALSE; + } + + bpp = src_info->bmiHeader.biBitCount; + if (bpp <= 8) + bmi_size = sizeof(BITMAPINFOHEADER) + (1 << bpp) * sizeof(RGBQUAD); + else if (bpp == 16 || bpp == 32) + bmi_size = sizeof(BITMAPINFOHEADER) + 3 * sizeof(RGBQUAD); + else + bmi_size = sizeof(BITMAPINFOHEADER); + emr_size = sizeof(EMRALPHABLEND); + bits_size = src_info->bmiHeader.biSizeImage; + size = emr_size + bmi_size + bits_size; + + emr = HeapAlloc(GetProcessHeap(), 0, size); + if (!emr) goto err; + + emr->emr.iType = EMR_ALPHABLEND; + emr->emr.nSize = size; + emr->rclBounds.left = dst->log_x; + emr->rclBounds.top = dst->log_y; + emr->rclBounds.right = dst->log_x + dst->log_width - 1; + emr->rclBounds.bottom = dst->log_y + dst->log_height - 1; + emr->xDest = dst->log_x; + emr->yDest = dst->log_y; + emr->cxDest = dst->log_width; + emr->cyDest = dst->log_height; + emr->xSrc = src->log_x; + emr->ySrc = src->log_y; + emr->cxSrc = src->log_width; + emr->cySrc = src->log_height; + emr->dwRop = *(DWORD *)&func; + GetTransform(dev_src->hdc, 0x204, &emr->xformSrc); + emr->crBkColorSrc = GetBkColor(dev_src->hdc); + emr->iUsageSrc = DIB_RGB_COLORS; + emr->offBmiSrc = emr_size; + emr->cbBmiSrc = bmi_size; + emr->offBitsSrc = emr_size + bmi_size; + emr->cbBitsSrc = bits_size; + + bmi = (BITMAPINFO *)((BYTE *)emr + emr->offBmiSrc); + memcpy(bmi, src_info, bmi_size); + memcpy((BYTE *)emr + emr->offBitsSrc, bits.ptr, bits_size); + + bmi->bmiHeader.biClrUsed = 0; + if (bmi->bmiHeader.biCompression == BI_RGB && bmi->bmiHeader.biBitCount == 16) + { + bmi->bmiHeader.biCompression = BI_BITFIELDS; + ((DWORD *)bmi->bmiColors)[0] = 0xf800; + ((DWORD *)bmi->bmiColors)[1] = 0x07e0; + ((DWORD *)bmi->bmiColors)[2] = 0x001f; + } + else if (bmi->bmiHeader.biCompression == BI_RGB && bmi->bmiHeader.biBitCount == 32) + { + bmi->bmiHeader.biCompression = BI_BITFIELDS; + ((DWORD *)bmi->bmiColors)[0] = 0xff0000; + ((DWORD *)bmi->bmiColors)[1] = 0x00ff00; + ((DWORD *)bmi->bmiColors)[2] = 0x0000ff; + } + + ret = EMFDRV_WriteRecord(dev_dst, (EMR *)emr); + if (ret) EMFDRV_UpdateBBox(dev_dst, &emr->rclBounds); + +err: + HeapFree(GetProcessHeap(), 0, emr); + if (bits.free) bits.free(&bits); + return ret; +} + BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) { EMRBITBLT emr; diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index ec83d29c735..253f96cd8ec 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -58,6 +58,8 @@ extern DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) DECLSPEC_H /* Metafile driver functions */ extern BOOL CDECL EMFDRV_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, + PHYSDEV dev_src, struct bitblt_coords *src, BLENDFUNCTION func ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT start, FLOAT sweep ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index cf9fb923633..07416db265e 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -38,7 +38,7 @@ static const struct gdi_dc_funcs emfdrv_driver = { NULL, /* pAbortDoc */ EMFDRV_AbortPath, /* pAbortPath */ - NULL, /* pAlphaBlend */ + EMFDRV_AlphaBlend, /* pAlphaBlend */ EMFDRV_AngleArc, /* pAngleArc */ EMFDRV_Arc, /* pArc */ EMFDRV_ArcTo, /* pArcTo */ diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index ec9c7894574..9340e20444a 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -5001,15 +5001,13 @@ static void test_emf_AlphaBlend(void) ret = BitBlt(hdc_bitmap, 0, 0, bitmap_width, bitmap_height, 0, 0, 0, BLACKNESS); ok(ret, "Test %d: BitBlt failed, error %d\n", test_idx, GetLastError()); ret = GdiAlphaBlend(hdc_emf, 0, 0, bitmap_width, bitmap_height, hdc_bitmap, 0, 0, 400, 400, blend); - todo_wine ok(ret, "Test %d: GdiAlphaBlend failed, error %d\n", test_idx, GetLastError()); hemf = CloseEnhMetaFile(hdc_emf); ok(!!hemf, "Test %d: CloseEnhMetaFile failed, %d\n", test_idx, GetLastError()); sprintf(comment, "test_emf_AlphaBlend() test %d", test_idx); - if (ret) - ret = compare_emf_bits(hemf, tests[test_idx].bits, tests[test_idx].bits_count, comment, FALSE); + ret = compare_emf_bits(hemf, tests[test_idx].bits, tests[test_idx].bits_count, comment, FALSE); if (ret) { dump_emf_bits(hemf, comment);

1 0

Zhiyi Zhang : gdi32/tests: Test text extents for enhanced metafiles.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: aadf11fb4f4cf0d562f46077d51277020f88b646 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aadf11fb4f4cf0d562f46077… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 20 09:09:20 2021 +0100 gdi32/tests: Test text extents for enhanced metafiles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 9340e20444a..545cdef69b6 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -5023,6 +5023,56 @@ static void test_emf_AlphaBlend(void) ReleaseDC(0, hdc); } +static void test_emf_text_extents(void) +{ + static const XFORM xform = {0.5f, 0.0f, 0.0f, 0.5f, 0.0f, 0.0f}; + HFONT font, old_font, old_font2; + LOGFONTW logfont = {0}; + HENHMETAFILE emf; + SIZE size, size2; + HDC dc, emf_dc; + BOOL ret; + + dc = GetDC(0); + emf_dc = CreateEnhMetaFileW(dc, NULL, NULL, NULL); + ok(!!emf_dc, "CreateEnhMetaFileW failed, error %d\n", GetLastError()); + + logfont.lfWeight = FW_NORMAL; + logfont.lfHeight = 20; + lstrcpyW(logfont.lfFaceName, L"Tahoma"); + font = CreateFontIndirectW(&logfont); + ok(!!font, "CreateFontIndirectW failed, error %d\n", GetLastError()); + + old_font = SelectObject(dc, font); + old_font2 = SelectObject(emf_dc, font); + + ret = SetGraphicsMode(dc, GM_ADVANCED); + ok(ret, "SetGraphicsMode failed, error %d\n", GetLastError()); + ret = SetGraphicsMode(emf_dc, GM_ADVANCED); + ok(ret, "SetGraphicsMode failed, error %d\n", GetLastError()); + + ret = ModifyWorldTransform(dc, &xform, MWT_RIGHTMULTIPLY); + ok(ret, "ModifyWorldTransform failed, error %d\n", GetLastError()); + ret = ModifyWorldTransform(emf_dc, &xform, MWT_RIGHTMULTIPLY); + ok(ret, "ModifyWorldTransform failed, error %d\n", GetLastError()); + + ret = GetTextExtentPoint32W(dc, L"W", 1, &size); + ok(ret, "GetTextExtentPoint32W failed, error %d\n", GetLastError()); + ret = GetTextExtentPoint32W(emf_dc, L"W", 1, &size2); + ok(ret, "GetTextExtentPoint32W failed, error %d\n", GetLastError()); +todo_wine + ok(size2.cx == size.cx && size2.cy == size.cy, "Expected size %dx%d, got %dx%d\n", + size.cx, size.cy, size2.cx, size2.cy); + + SelectObject(emf_dc, old_font2); + SelectObject(dc, old_font); + DeleteObject(font); + emf = CloseEnhMetaFile(emf_dc); + ok(!!emf, "CloseEnhMetaFile failed, error %d\n", GetLastError()); + DeleteEnhMetaFile(emf); + ReleaseDC(0, dc); +} + START_TEST(metafile) { init_function_pointers(); @@ -5041,6 +5091,7 @@ START_TEST(metafile) test_emf_PolyPolyline(); test_emf_GradientFill(); test_emf_WorldTransform(); + test_emf_text_extents(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC();

1 0

Zhiyi Zhang : gdi32: Move common SetLayout() code to nulldrv_SetLayout().
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 1543be811dddba2c0961856833b2471f9df9fbe9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1543be811dddba2c09618568… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 20 09:09:21 2021 +0100 gdi32: Move common SetLayout() code to nulldrv_SetLayout(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 12 +----------- dlls/gdi32/driver.c | 13 ++++++++++++- dlls/gdi32/enhmfdrv/dc.c | 4 +++- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 830fabf6e78..eb9dbf85668 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1922,17 +1922,7 @@ DWORD WINAPI SetLayout(HDC hdc, DWORD layout) if (dc) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetLayout ); - layout = physdev->funcs->pSetLayout( physdev, layout ); - if (layout != GDI_ERROR) - { - oldlayout = dc->layout; - dc->layout = layout; - if (layout != oldlayout) - { - if (layout & LAYOUT_RTL) dc->MapMode = MM_ANISOTROPIC; - DC_UpdateXforms( dc ); - } - } + oldlayout = physdev->funcs->pSetLayout( physdev, layout ); release_dc_ptr( dc ); } diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 09b051cd6fa..a2ebd018bca 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -795,7 +795,18 @@ static void CDECL nulldrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) static DWORD CDECL nulldrv_SetLayout( PHYSDEV dev, DWORD layout ) { - return layout; + DC *dc = get_nulldrv_dc( dev ); + DWORD old_layout; + + old_layout = dc->layout; + dc->layout = layout; + if (layout != old_layout) + { + if (layout & LAYOUT_RTL) dc->MapMode = MM_ANISOTROPIC; + DC_UpdateXforms( dc ); + } + + return old_layout; } static BOOL CDECL nulldrv_SetDeviceGammaRamp( PHYSDEV dev, void *ramp ) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 2a749418829..72b6afeee8b 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -334,12 +334,14 @@ BOOL CDECL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, DWORD CDECL EMFDRV_SetLayout( PHYSDEV dev, DWORD layout ) { + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetMapMode ); EMRSETLAYOUT emr; emr.emr.iType = EMR_SETLAYOUT; emr.emr.nSize = sizeof(emr); emr.iMode = layout; - return EMFDRV_WriteRecord( dev, &emr.emr ) ? layout : GDI_ERROR; + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return GDI_ERROR; + return next->funcs->pSetLayout( next, layout ); } BOOL CDECL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform)

1 0

Zhiyi Zhang : gdi32: Reselect font and pen when changing world transforms for enhanced metafiles.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 3ebc7158818d6578a808b0b750683e0ce7e62f14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ebc7158818d6578a808b0b7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 20 09:09:22 2021 +0100 gdi32: Reselect font and pen when changing world transforms for enhanced metafiles. Reselect font and pen into enhanced metafile device contexts after world transform is changed so that content can be drawn using the correct size. Also modifying the world transform for enhanced metafiles doesn't generate EMR_SELECTOBJECT records according to winedump outputs. Fix an issue that Tally may produce a print preview with a too large font or with a black side bar. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 2 +- dlls/gdi32/enhmfdrv/dc.c | 78 +++++++++++++++++++++++++++++++----- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/enhmfdrv/objects.c | 2 + dlls/gdi32/tests/metafile.c | 1 - 6 files changed, 72 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3ebc7158818d6578a808…

1 0

Nikolay Sivov : mf/tests: Add some tests for EVR sink services.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: f1fd0b46f99204e4912f6b58d39678d43cfcf52d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1fd0b46f99204e4912f6b58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 20 12:05:26 2021 +0300 mf/tests: Add some tests for EVR sink services. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index bf482ae4c71..b990b4614da 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -44,6 +44,8 @@ DEFINE_GUID(MFVideoFormat_ABGR32, 0x00000020, 0x0000, 0x0010, 0x80, 0x00, 0x00, #include "mmdeviceapi.h" #include "audioclient.h" #include "evr.h" +#include "d3d9.h" +#include "evr9.h" #include "wine/test.h" @@ -4223,7 +4225,6 @@ static void test_evr(void) IMFActivate *activate; HWND window, window2; LONG sample_count; - IMFGetService *gs; IMFSample *sample; IUnknown *unk; UINT64 window3; @@ -4262,6 +4263,12 @@ static void test_evr(void) check_interface(sink, &IID_IMFClockStateSink, TRUE); check_interface(sink, &IID_IMFGetService, TRUE); check_interface(sink, &IID_IMFQualityAdvise, TRUE); + check_service_interface(sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, TRUE); + check_service_interface(sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerBitmap, TRUE); + check_service_interface(sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl, TRUE); + check_service_interface(sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl2, TRUE); + check_service_interface(sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, TRUE); + check_service_interface(sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); hr = MFGetService((IUnknown *)sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, (void **)&display_control); @@ -4444,15 +4451,6 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(flags == (MEDIASINK_CAN_PREROLL | MEDIASINK_CLOCK_REQUIRED), "Unexpected flags %#x.\n", flags); - hr = IMFMediaSink_QueryInterface(sink, &IID_IMFGetService, (void **)&gs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - - hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); - - IMFGetService_Release(gs); - hr = IMFActivate_ShutdownObject(activate); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);

1 0

Nikolay Sivov : include: Add mfplay event macros.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 11d3f6976d0c4e8c937891bc9c6c4c86e455e01e URL: https://source.winehq.org/git/wine.git/?a=commit;h=11d3f6976d0c4e8c937891bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 20 12:05:59 2021 +0300 include: Add mfplay event macros. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfplay.idl | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/include/mfplay.idl b/include/mfplay.idl index f130ce12287..7d4345e69e7 100644 --- a/include/mfplay.idl +++ b/include/mfplay.idl @@ -22,13 +22,15 @@ import "evr.idl"; interface IMFNetCredential; +typedef UINT32 MFP_CREATION_OPTIONS; + typedef [v1_enum] enum _MFP_CREATION_OPTIONS { MFP_OPTION_NONE = 0, MFP_OPTION_FREE_THREADED_CALLBACK = 0x1, MFP_OPTION_NO_MMCSS = 0x2, MFP_OPTION_NO_REMOTE_DESKTOP_OPTIMIZATION = 0x4, -} MFP_CREATION_OPTIONS; +} _MFP_CREATION_OPTIONS; typedef [v1_enum] enum MFP_MEDIAPLAYER_STATE { @@ -180,6 +182,21 @@ typedef struct MFP_ACQUIRE_USER_CREDENTIAL_EVENT IMFNetCredential *pCredential; } MFP_ACQUIRE_USER_CREDENTIAL_EVENT; +cpp_quote("#define __MFP_CAST_EVENT(hdr, tag) (((hdr)->eEventType == MFP_EVENT_TYPE_##tag) ? (MFP_##Tag##_EVENT *)(hdr) : NULL)") +cpp_quote("#define MFP_GET_PLAY_EVENT(hdr) __MFP_CAST_EVENT(hdr, PLAY)") +cpp_quote("#define MFP_GET_PAUSE_EVENT(hdr) __MFP_CAST_EVENT(hdr, PAUSE)") +cpp_quote("#define MFP_GET_STOP_EVENT(hdr) __MFP_CAST_EVENT(hdr, STOP)") +cpp_quote("#define MFP_GET_POSITION_SET_EVENT(hdr) __MFP_CAST_EVENT(hdr, POSITION_SET)") +cpp_quote("#define MFP_GET_RATE_SET_EVENT(hdr) __MFP_CAST_EVENT(hdr, RATE_SET)") +cpp_quote("#define MFP_GET_MEDIAITEM_CREATED_EVENT(hdr) __MFP_CAST_EVENT(hdr, MEDIAITEM_CREATED)") +cpp_quote("#define MFP_GET_MEDIAITEM_SET_EVENT(hdr) __MFP_CAST_EVENT(hdr, MEDIAITEM_SET)") +cpp_quote("#define MFP_GET_FRAME_STEP_EVENT(hdr) __MFP_CAST_EVENT(hdr, FRAME_STEP)") +cpp_quote("#define MFP_GET_MEDIAITEM_CLEARED_EVENT(hdr) __MFP_CAST_EVENT(hdr, MEDIAITEM_CLEARED)") +cpp_quote("#define MFP_GET_MF_EVENT(hdr) __MFP_CAST_EVENT(hdr, MF)") +cpp_quote("#define MFP_GET_ERROR_EVENT(hdr) __MFP_CAST_EVENT(hdr, ERROR)") +cpp_quote("#define MFP_GET_PLAYBACK_ENDED_EVENT(hdr) __MFP_CAST_EVENT(hdr, PLAYBACK_ENDED)") +cpp_quote("#define MFP_GET_ACQUIRE_USER_CREDENTIAL_EVENT(hdr) __MFP_CAST_EVENT(hdr, ACQUIRE_USER_CREDENTIAL)") + [ object, uuid(766c8ffb-5fdb-4fea-a28d-b912996f51bd),

1 0

Nikolay Sivov : mfplay: Implement MFP_EVENT_TYPE_PLAYBACK_ENDED event.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 2cd0d1ec7cfec15d7f68f99b886e26b96787147b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cd0d1ec7cfec15d7f68f99b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 20 12:06:00 2021 +0300 mfplay: Implement MFP_EVENT_TYPE_PLAYBACK_ENDED event. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index d6ed6ef5c39..be51ef2d2e1 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1605,6 +1605,21 @@ static void media_player_create_forward_event(struct media_player *player, HRESU LeaveCriticalSection(&player->cs); } +static void media_player_create_playback_ended_event(struct media_player *player, HRESULT event_status, + struct media_event **event) +{ + EnterCriticalSection(&player->cs); + + if (SUCCEEDED(media_event_create(player, MFP_EVENT_TYPE_PLAYBACK_ENDED, event_status, player->item, event))) + { + if (player->item) + IMFPMediaItem_Release(player->item); + player->item = NULL; + } + + LeaveCriticalSection(&player->cs); +} + static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { @@ -1616,6 +1631,7 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba HRESULT hr, event_status; IMFPMediaItem *item = NULL; IMFTopology *topology; + unsigned int status; PROPVARIANT value; if (FAILED(hr = IMFMediaSession_EndGetEvent(player->session, result, &session_event))) @@ -1661,6 +1677,16 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba break; + case MESessionTopologyStatus: + + if (SUCCEEDED(IMFMediaEvent_GetUINT32(session_event, &MF_EVENT_TOPOLOGY_STATUS, &status)) && + status == MF_TOPOSTATUS_ENDED) + { + media_player_create_playback_ended_event(player, event_status, &event); + } + + break; + case MEBufferingStarted: case MEBufferingStopped: case MEExtendedType:

1 0