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

[PATCH v2 3/6] gdi32: Use a common helper for emf StretchBlt and AlphaBlend.
by Zhiyi Zhang June 7, 2021

June 7, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/bitblt.c | 129 +++++++---------------------------- 1 file changed, 23 insertions(+), 106 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index 597a6110abd..f15acaa1f14 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -27,15 +27,17 @@ #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 ) +/* Generate an EMRBITBLT, EMRSTRETCHBLT or EMRALPHABLEND record depending on the type parameter */ +static BOOL emfdrv_stretchblt( PHYSDEV dev_dst, struct bitblt_coords *dst, PHYSDEV dev_src, + struct bitblt_coords *src, DWORD rop, DWORD type ) { unsigned char src_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; BITMAPINFO *src_info = (BITMAPINFO *)src_buffer; UINT bits_size, bmi_size, emr_size, size, bpp; + EMRSTRETCHBLT *emr_stretchblt; struct gdi_image_bits bits; - EMRALPHABLEND *emr; BITMAPINFO *bmi; + EMRBITBLT *emr; DC *dc_src; DWORD err; BOOL ret = FALSE; @@ -56,14 +58,15 @@ BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, bmi_size = sizeof(BITMAPINFOHEADER) + 3 * sizeof(RGBQUAD); else bmi_size = sizeof(BITMAPINFOHEADER); - emr_size = sizeof(EMRALPHABLEND); + /* EMRSTRETCHBLT and EMRALPHABLEND have the same structure */ + emr_size = type == EMR_BITBLT ? sizeof(EMRBITBLT) : sizeof(EMRSTRETCHBLT); 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.iType = type; emr->emr.nSize = size; emr->rclBounds.left = dst->log_x; emr->rclBounds.top = dst->log_y; @@ -75,9 +78,13 @@ BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, 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; + if (type == EMR_STRETCHBLT || type == EMR_ALPHABLEND) + { + emr_stretchblt = (EMRSTRETCHBLT *)emr; + emr_stretchblt->cxSrc = src->log_width; + emr_stretchblt->cySrc = src->log_height; + } + emr->dwRop = rop; GetTransform(dev_src->hdc, 0x204, &emr->xformSrc); emr->crBkColorSrc = GetBkColor(dev_src->hdc); emr->iUsageSrc = DIB_RGB_COLORS; @@ -115,6 +122,12 @@ err: return ret; } +BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, + PHYSDEV dev_src, struct bitblt_coords *src, BLENDFUNCTION func ) +{ + return emfdrv_stretchblt(dev_dst, dst, dev_src, src, *(DWORD *)&func, EMR_ALPHABLEND); +} + BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) { EMRBITBLT emr; @@ -155,106 +168,10 @@ BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) BOOL CDECL EMFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, PHYSDEV devSrc, struct bitblt_coords *src, DWORD rop ) { - BOOL ret; - PEMRBITBLT pEMR; - UINT emrSize; - UINT bmiSize; - UINT bitsSize; - UINT size; - BITMAP BM; - WORD nBPP = 0; - LPBITMAPINFOHEADER lpBmiH; - HBITMAP hBitmap = NULL; - DWORD emrType; - - if (devSrc->funcs == devDst->funcs) return FALSE; /* can't use a metafile DC as source */ - if (src->log_width == dst->log_width && src->log_height == dst->log_height) - { - emrType = EMR_BITBLT; - emrSize = sizeof(EMRBITBLT); - } + return emfdrv_stretchblt(devDst, dst, devSrc, src, rop, EMR_BITBLT); else - { - emrType = EMR_STRETCHBLT; - emrSize = sizeof(EMRSTRETCHBLT); - } - - hBitmap = GetCurrentObject(devSrc->hdc, OBJ_BITMAP); - - if(sizeof(BITMAP) != GetObjectW(hBitmap, sizeof(BITMAP), &BM)) - return FALSE; - - nBPP = BM.bmPlanes * BM.bmBitsPixel; - if(nBPP > 8) nBPP = 24; /* FIXME Can't get 16bpp to work for some reason */ - bitsSize = get_dib_stride( BM.bmWidth, nBPP ) * BM.bmHeight; - bmiSize = sizeof(BITMAPINFOHEADER) + - (nBPP <= 8 ? 1 << nBPP : 0) * sizeof(RGBQUAD); - - size = emrSize + bmiSize + bitsSize; - - pEMR = HeapAlloc(GetProcessHeap(), 0, size); - if (!pEMR) return FALSE; - - /* Initialize EMR */ - pEMR->emr.iType = emrType; - pEMR->emr.nSize = size; - pEMR->rclBounds.left = dst->log_x; - pEMR->rclBounds.top = dst->log_y; - pEMR->rclBounds.right = dst->log_x + dst->log_width - 1; - pEMR->rclBounds.bottom = dst->log_y + dst->log_height - 1; - pEMR->xDest = dst->log_x; - pEMR->yDest = dst->log_y; - pEMR->cxDest = dst->log_width; - pEMR->cyDest = dst->log_height; - pEMR->dwRop = rop; - pEMR->xSrc = src->log_x; - pEMR->ySrc = src->log_y; - GetTransform(devSrc->hdc, 0x204, &pEMR->xformSrc); - pEMR->crBkColorSrc = GetBkColor(devSrc->hdc); - pEMR->iUsageSrc = DIB_RGB_COLORS; - pEMR->offBmiSrc = emrSize; - pEMR->offBitsSrc = emrSize + bmiSize; - pEMR->cbBmiSrc = bmiSize; - pEMR->cbBitsSrc = bitsSize; - if (emrType == EMR_STRETCHBLT) - { - PEMRSTRETCHBLT pEMRStretch = (PEMRSTRETCHBLT)pEMR; - pEMRStretch->cxSrc = src->log_width; - pEMRStretch->cySrc = src->log_height; - } - - /* Initialize BITMAPINFO structure */ - lpBmiH = (LPBITMAPINFOHEADER)((BYTE*)pEMR + pEMR->offBmiSrc); - - lpBmiH->biSize = sizeof(BITMAPINFOHEADER); - lpBmiH->biWidth = BM.bmWidth; - lpBmiH->biHeight = BM.bmHeight; - lpBmiH->biPlanes = BM.bmPlanes; - lpBmiH->biBitCount = nBPP; - /* Assume the bitmap isn't compressed and set the BI_RGB flag. */ - lpBmiH->biCompression = BI_RGB; - lpBmiH->biSizeImage = bitsSize; - lpBmiH->biYPelsPerMeter = 0; - lpBmiH->biXPelsPerMeter = 0; - lpBmiH->biClrUsed = nBPP <= 8 ? 1 << nBPP : 0; - /* Set biClrImportant to 0, indicating that all of the - device colors are important. */ - lpBmiH->biClrImportant = 0; - - /* Initialize bitmap bits */ - if (GetDIBits(devSrc->hdc, hBitmap, 0, (UINT)lpBmiH->biHeight, - (BYTE*)pEMR + pEMR->offBitsSrc, - (LPBITMAPINFO)lpBmiH, DIB_RGB_COLORS)) - { - ret = EMFDRV_WriteRecord(devDst, (EMR*)pEMR); - if (ret) EMFDRV_UpdateBBox(devDst, &(pEMR->rclBounds)); - } - else - ret = FALSE; - - HeapFree( GetProcessHeap(), 0, pEMR); - return ret; + return emfdrv_stretchblt(devDst, dst, devSrc, src, rop, EMR_STRETCHBLT); } INT CDECL EMFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT heightDst, -- 2.30.2

2 1

[PATCH v2 2/6] gdi32: Implement MFDRV_SetLayout().
by Zhiyi Zhang June 7, 2021

June 7, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/mfdrv/dc.c | 5 +++ dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 + dlls/gdi32/tests/metafile.c | 79 ++++++++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 61417bfd462..a036efe2d17 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -85,6 +85,11 @@ INT CDECL MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) return MFDRV_MetaParam2( dev, META_OFFSETCLIPRGN, x, y ); } +DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) +{ + return MFDRV_MetaParam2( dev, META_SETLAYOUT, HIWORD(layout), LOWORD(layout) ); +} + INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) { return MFDRV_MetaParam1( dev, META_SETMAPMODE, mode ); diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 2a215b70902..fe7aae631d7 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -201,7 +201,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */ - NULL, /* pSetLayout */ + MFDRV_SetLayout, /* pSetLayout */ MFDRV_SetMapMode, /* pSetMapMode */ MFDRV_SetMapperFlags, /* pSetMapperFlags */ MFDRV_SetPixel, /* pSetPixel */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 7d3d1c41da5..429b95b3f40 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -113,6 +113,7 @@ extern COLORREF CDECL MFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_H extern INT CDECL MFDRV_SetBkMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index ab823dd443d..83a10264589 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -5072,6 +5072,84 @@ static void test_emf_text_extents(void) ReleaseDC(0, dc); } +static const unsigned char MF_SETLAYOUT_BITS[] = +{ +/* Winedump output. Note that there is no META_SELECTOBJECT records after META_SETLAYOUT. + * + * METAHEADER 00000012 + * type 1 header_size 0x12 version 0x300 size 0x54 object_count 0 max_record_size 0xa parameter_count 0 + * 0001 0009 0300 002a 0000 0000 0005 0000 + * 0000 + * META_SETLAYOUT 0000000a + * 0000 0000 + * META_SETLAYOUT 0000000a + * 0001 0000 + * META_SETLAYOUT 0000000a + * 0008 0000 + * META_SETLAYOUT 0000000a + * 0000 8000 + * META_SETLAYOUT 0000000a + * 0009 0000 + * META_SETLAYOUT 0000000a + * 0001 8000 + * META_EOF 00000006 + */ + 0x01, 0x00, 0x09, 0x00, 0x00, 0x03, 0x2a, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x49, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x49, 0x01, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, + 0x00, 0x00, 0x49, 0x01, 0x08, 0x00, 0x00, 0x00, + 0x05, 0x00, 0x00, 0x00, 0x49, 0x01, 0x00, 0x00, + 0x00, 0x80, 0x05, 0x00, 0x00, 0x00, 0x49, 0x01, + 0x09, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x49, 0x01, 0x01, 0x00, 0x00, 0x80, 0x03, 0x00, + 0x00, 0x00, 0x00, 0x00 +}; + +static void test_mf_SetLayout(void) +{ + static const DWORD tests[] = + { + LAYOUT_LTR, + LAYOUT_RTL, + LAYOUT_BITMAPORIENTATIONPRESERVED, + NOMIRRORBITMAP, + LAYOUT_RTL | LAYOUT_BITMAPORIENTATIONPRESERVED, + LAYOUT_RTL | NOMIRRORBITMAP, + }; + DWORD layout; + HMETAFILE mf; + int ret, i; + HDC mf_dc; + + mf_dc = CreateMetaFileW(NULL); + ok(!!mf_dc, "CreateMetaFileW failed, error %d\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("Test %d", i); + layout = SetLayout(mf_dc, tests[i]); + ok(layout == LAYOUT_RTL, "Expected %#x, got %#x\n", tests[i], layout); + layout = GetLayout(mf_dc); + todo_wine ok(layout == GDI_ERROR, "Expected %#x, got %#x\n", GDI_ERROR, layout); + winetest_pop_context(); + } + + mf = CloseMetaFile(mf_dc); + ok(!!mf, "CloseMetaFile failed, error %d\n", GetLastError()); + + ret = compare_mf_bits(mf, MF_SETLAYOUT_BITS, sizeof(MF_SETLAYOUT_BITS), "mf_SetLayout"); + ok(!ret, "Bits mismatch\n"); + if (ret) + { + dump_mf_bits(mf, "mf_SetLayout"); + EnumMetaFile(0, mf, mf_enum_proc, 0); + } + + DeleteMetaFile(mf); +} + START_TEST(metafile) { init_function_pointers(); @@ -5103,6 +5181,7 @@ START_TEST(metafile) test_mf_ExtTextOut_on_path(); test_mf_clipping(); test_mf_GetPath(); + test_mf_SetLayout(); /* For metafile conversions */ test_mf_conversions(); -- 2.30.2

2 1

[PATCH v2 1/6] gdi32: Return correct color depth for display DCs in GetDeviceCaps().
by Zhiyi Zhang June 7, 2021

June 7, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29184 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 205834 and 205844~205848. Now that winex11.drv EnumDisplaySettingsW backend has a cache, performance shouldn't be an issue. dlls/gdi32/driver.c | 19 ++++++++++++++++++- dlls/user32/tests/monitor.c | 1 - dlls/winex11.drv/init.c | 2 -- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index a2ebd018bca..2042701dd45 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -460,7 +460,24 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) return pGetSystemMetrics ? pGetSystemMetrics( SM_CYSCREEN ) : 480; } - case BITSPIXEL: return 32; + case BITSPIXEL: + { + DEVMODEW devmode; + WCHAR *display; + DC *dc; + + if (GetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY && pEnumDisplaySettingsW) + { + dc = get_nulldrv_dc( dev ); + display = dc->display[0] ? dc->display : NULL; + memset( &devmode, 0, sizeof(devmode) ); + devmode.dmSize = sizeof(devmode); + if (pEnumDisplaySettingsW( display, ENUM_CURRENT_SETTINGS, &devmode ) + && devmode.dmFields & DM_BITSPERPEL && devmode.dmBitsPerPel) + return devmode.dmBitsPerPel; + } + return 32; + } case PLANES: return 1; case NUMBRUSHES: return -1; case NUMPENS: return -1; diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index ab03837f5e6..654f77ed617 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2068,7 +2068,6 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ dm->dmDisplayFrequency, value); value = GetDeviceCaps(hdc, BITSPIXEL); - todo_wine_if(dm->dmBitsPerPel != 32) ok_(__FILE__, line)(value == dm->dmBitsPerPel, "Expected BITSPIXEL %d, got %d.\n", dm->dmBitsPerPel, value); diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index d070c0f1171..ff3d5317697 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -162,8 +162,6 @@ static INT CDECL X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) { switch(cap) { - case BITSPIXEL: - return screen_bpp; case SIZEPALETTE: return palette_size; default: -- 2.30.2

3 2

[PATCH] gdi32/tests: Test otmEMSquare only for Truetype fonts.
by Dmitry Timoshkov June 7, 2021

June 7, 2021

It looks like GetOutlineTextMetrics no longer fails for bitmat fonts under Windows 10. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51184 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/tests/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ed0acf8243a..ffb400ba838 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -353,7 +353,8 @@ if (0) /* these metrics are scaled too, but with rounding errors */ ok(otm.otmMacDescent < 0, "otm.otmMacDescent should be < 0\n"); ok(tm.tmDescent > 0, "tm.tmDescent should be > 0\n"); ok(otm.otmMacDescent == -tm.tmDescent, "descent %d != %d\n", otm.otmMacDescent, -tm.tmDescent); - ok(otm.otmEMSquare == 2048, "expected 2048, got %d\n", otm.otmEMSquare); + if (otm.otmTextMetrics.tmPitchAndFamily & TMPF_TRUETYPE) + ok(otm.otmEMSquare == 2048, "expected 2048, got %d\n", otm.otmEMSquare); } else { -- 2.31.1

2 1

[PATCH] msvcrt: Fix logf implementation.
by Piotr Caban June 7, 2021

June 7, 2021

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=51222 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH] shell32: Fix a memory leak.
by Haidong Yu June 7, 2021

June 7, 2021

1 0

[PATCH 1/6] hid/tests: Don't print buttons after HidP_GetUsages failed.
by Rémi Bernon June 7, 2021

June 7, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This test still seems to timeout very rarely on 32bit, I couldn't reproduce locally though... dlls/hid/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index 3dd22b7f068..6693bc8bf5a 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -215,7 +215,7 @@ static void process_data(HIDP_CAPS Caps, PHIDP_PREPARSED_DATA ppd, CHAR *data, D status = HidP_GetUsages(HidP_Input, i, 0, button_pages, &usage_length, ppd, data, data_length); ok (status == HIDP_STATUS_SUCCESS || usage_length == 0, "HidP_GetUsages failed (%x) but usage length still %i\n", status, usage_length); - if (usage_length) + if (status == HIDP_STATUS_SUCCESS && usage_length) { CHAR report[50]; int count; -- 2.31.0

2 6

[PATCH] hidclass.sys: Don't crash when no buffer was provided.
by Rémi Bernon June 7, 2021

June 7, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This happens when reading a 0 byte report. It's probably not supposed to be done, but I think crashing winedevice.exe in that case isn't good either. dlls/hidclass.sys/device.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 73ea6610ab8..82366ad1888 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -345,6 +345,12 @@ static NTSTATUS HID_get_feature(BASE_DEVICE_EXTENSION *ext, IRP *irp) out_buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", ext, irpsp->Parameters.DeviceIoControl.OutputBufferLength, out_buffer); + if (!irpsp->Parameters.DeviceIoControl.OutputBufferLength || !out_buffer) + { + irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + return rc; + } + len = sizeof(*packet) + irpsp->Parameters.DeviceIoControl.OutputBufferLength; packet = malloc(len); packet->reportBufferLen = irpsp->Parameters.DeviceIoControl.OutputBufferLength; @@ -495,6 +501,12 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) BYTE *buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); ULONG out_length; + if (!irpsp->Parameters.DeviceIoControl.OutputBufferLength || !buffer) + { + irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + break; + } + packet = malloc(packet_size); if (ext->u.pdo.preparsed_data->reports[0].reportID) -- 2.31.0

1 0

[PATCH] include: Add HID haptics usage page.
by Rémi Bernon June 7, 2021

June 7, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/hidusage.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/hidusage.h b/include/hidusage.h index fc77dff2c6b..002040bddc0 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -196,6 +196,7 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_PAGE_TELEPHONY ((USAGE) 0x0B) #define HID_USAGE_PAGE_CONSUMER ((USAGE) 0x0C) #define HID_USAGE_PAGE_DIGITIZER ((USAGE) 0x0D) +#define HID_USAGE_PAGE_HAPTICS ((USAGE) 0x0E) #define HID_USAGE_PAGE_UNICODE ((USAGE) 0x10) #define HID_USAGE_PAGE_ALPHANUMERIC ((USAGE) 0x14) #define HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN ((USAGE) 0xff00) @@ -224,6 +225,33 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_TELEPHONY_KEYPAD_D ((USAGE) 0xBF) #define HID_USAGE_TELEPHONY_HOST_AVAILABLE ((USAGE) 0xF1) +#define HID_USAGE_HAPTICS_SIMPLE_CONTROLLER ((USAGE) 0x01) +#define HID_USAGE_HAPTICS_WAVEFORM_LIST ((USAGE) 0x10) +#define HID_USAGE_HAPTICS_DURATION_LIST ((USAGE) 0x11) +#define HID_USAGE_HAPTICS_AUTO_TRIGGER ((USAGE) 0x20) +#define HID_USAGE_HAPTICS_MANUAL_TRIGGER ((USAGE) 0x21) +#define HID_USAGE_HAPTICS_AUTO_ASSOCIATED_CONTROL ((USAGE) 0x22) +#define HID_USAGE_HAPTICS_INTENSITY ((USAGE) 0x23) +#define HID_USAGE_HAPTICS_REPEAT_COUNT ((USAGE) 0x24) +#define HID_USAGE_HAPTICS_RETRIGGER_PERIOD ((USAGE) 0x25) +#define HID_USAGE_HAPTICS_WAVEFORM_VENDOR_PAGE ((USAGE) 0x26) +#define HID_USAGE_HAPTICS_WAVEFORM_VENDOR_ID ((USAGE) 0x27) +#define HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME ((USAGE) 0x28) +#define HID_USAGE_HAPTICS_WAVEFORM_BEGIN ((USAGE) 0x1000) +/* Differs from https://usb.org/sites/default/files/hut1_22.pdf */ +/* Waveform None */ +#define HID_USAGE_HAPTICS_WAVEFORM_STOP ((USAGE) 0x1001) +/* Waveform Stop */ +#define HID_USAGE_HAPTICS_WAVEFORM_NULL ((USAGE) 0x1002) +#define HID_USAGE_HAPTICS_WAVEFORM_CLICK ((USAGE) 0x1003) +#define HID_USAGE_HAPTICS_WAVEFORM_BUZZ ((USAGE) 0x1004) +#define HID_USAGE_HAPTICS_WAVEFORM_RUMBLE ((USAGE) 0x1005) +#define HID_USAGE_HAPTICS_WAVEFORM_PRESS ((USAGE) 0x1006) +#define HID_USAGE_HAPTICS_WAVEFORM_RELEASE ((USAGE) 0x1007) +#define HID_USAGE_HAPTICS_WAVEFORM_END ((USAGE) 0x1FFF) +#define HID_USAGE_HAPTICS_WAVEFORM_VENDOR_BEGIN ((USAGE) 0x2000) +#define HID_USAGE_HAPTICS_WAVEFORM_VENDOR_END ((USAGE) 0x2FFF) + #define HID_USAGE_MS_BTH_HF_DIALNUMBER ((USAGE) 0x21) #define HID_USAGE_MS_BTH_HF_DIALMEMORY ((USAGE) 0x22) -- 2.31.0

1 0

[PATCH 3/3] msado15: Correct field reference value
by Alistair Leslie-Hughes June 7, 2021

June 7, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 9 +++++++++ dlls/msado15/tests/msado15.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 2b32dc6cf94..8d7619d9161 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -594,6 +594,7 @@ static HRESULT Field_create( const WCHAR *name, LONG index, struct recordset *re field->Field_iface.lpVtbl = &field_vtbl; field->ISupportErrorInfo_iface.lpVtbl = &field_supporterrorinfo_vtbl; field->Properties_iface.lpVtbl = &field_properties_vtbl; + field->refs = 1; if (!(field->name = strdupW( name ))) { heap_free( field ); @@ -998,6 +999,7 @@ static ULONG WINAPI recordset_AddRef( _Recordset *iface ) static void close_recordset( struct recordset *recordset ) { ULONG row, col, col_count; + ULONG i; if ( recordset->row_set ) IRowset_Release( recordset->row_set ); recordset->row_set = NULL; @@ -1005,6 +1007,13 @@ static void close_recordset( struct recordset *recordset ) if (!recordset->fields) return; col_count = get_column_count( recordset ); + for (i = 0; i < col_count; i++) + { + struct field *field = impl_from_Field( recordset->fields->field[i] ); + field->recordset = NULL; + Field_Release(&field->Field_iface); + } + recordset->fields->count = 0; Fields_Release( &recordset->fields->Fields_iface ); recordset->fields = NULL; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 16faefef550..97a578b0618 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -273,7 +273,7 @@ static void test_Recordset(void) count = -1; hr = Fields_get_Count( fields, &count ); - todo_wine ok( !count, "got %d\n", count ); + ok( !count, "got %d\n", count ); hr = Field_get_Name(field, &name); todo_wine ok( hr == MAKE_ADO_HRESULT( adErrObjectNotSet ), "got %08x\n", hr ); -- 2.30.2

2 1