March 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : dxerr8: Use wide character string literals.
by Alexandre Julliard 09 Mar '20

09 Mar '20

Module: wine Branch: master Commit: 92ba0d3a91907bb8d8367c0ab20b0f4e00156fd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92ba0d3a91907bb8d8367c0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 09:53:46 2020 +0100 dxerr8: Use wide character string literals. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxerr8/dxerr8.c | 460 ++++++++++++- dlls/dxerr8/errors.awk | 80 --- dlls/dxerr8/errors.dat | 425 ------------ dlls/dxerr8/errors.h | 1705 ----------------------------------------------- dlls/dxerr8/make_errors | 2 - 5 files changed, 437 insertions(+), 2235 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=92ba0d3a91907bb8d836…

1 0

Alexandre Julliard : dxerr9: Use wide character string literals.
by Alexandre Julliard 09 Mar '20

09 Mar '20

Module: wine Branch: master Commit: 5825cb01204dc0733dbebb8c8abd2b8212c5fbb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5825cb01204dc0733dbebb8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 09:54:15 2020 +0100 dxerr9: Use wide character string literals. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxerr9/dxerr9.c | 589 ++++++++++++- dlls/dxerr9/errors.awk | 80 -- dlls/dxerr9/errors.dat | 552 ------------ dlls/dxerr9/errors.h | 2213 ----------------------------------------------- dlls/dxerr9/make_errors | 2 - 5 files changed, 565 insertions(+), 2871 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5825cb01204dc0733dbe…

1 0

Roman Pišl : wineconsole: Allow maximization.
by Alexandre Julliard 09 Mar '20

09 Mar '20

Module: wine Branch: master Commit: da395975b0af96b9a523ad9d563c66e0ae44d4a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da395975b0af96b9a523ad9d… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Fri Mar 6 15:22:55 2020 +0100 wineconsole: Allow maximization. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48706 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 5cc405d5b7..212c65cee4 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1437,7 +1437,7 @@ enum init_return WCUSER_InitBackend(struct inner_data* data) RegisterClassW(&wndclass); data->hWnd = CreateWindowW(wndclass.lpszClassName, NULL, - WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_HSCROLL|WS_VSCROLL, + WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_HSCROLL|WS_VSCROLL, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, 0, 0, wndclass.hInstance, data); if (!data->hWnd) return init_not_supported;

1 0

Ziqing Hui : comctl32/tests: Change create_test_bitmap() to give it the ability to create more kinds of bitmaps.
by Alexandre Julliard 09 Mar '20

09 Mar '20

Module: wine Branch: master Commit: d6268b9e88b01795be7af414e6434eb115a5d958 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6268b9e88b01795be7af414… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Mar 6 17:56:50 2020 +0800 comctl32/tests: Change create_test_bitmap() to give it the ability to create more kinds of bitmaps. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index d4da38b151..806cec7bd9 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1363,12 +1363,12 @@ static void test_shell_imagelist(void) FreeLibrary(hShell32); } -static HBITMAP create_test_bitmap(HDC hdc, int bpp, UINT32 pixel1, UINT32 pixel2) +static HBITMAP create_test_bitmap(HDC hdc, UINT width, UINT height, WORD bpp, const UINT32 *bits) { HBITMAP hBitmap; UINT32 *buffer = NULL; - BITMAPINFO bitmapInfo = {{sizeof(BITMAPINFOHEADER), 2, 1, 1, bpp, BI_RGB, - 0, 0, 0, 0, 0}}; + UINT stride = ((width * bpp + 31) >> 3) & ~3; + BITMAPINFO bitmapInfo = { { sizeof(BITMAPINFOHEADER), width, - height, 1, bpp, BI_RGB, 0, 0, 0, 0, 0 } }; hBitmap = CreateDIBSection(hdc, &bitmapInfo, DIB_RGB_COLORS, (void**)&buffer, NULL, 0); ok(hBitmap != NULL && buffer != NULL, "CreateDIBSection failed.\n"); @@ -1379,8 +1379,7 @@ static HBITMAP create_test_bitmap(HDC hdc, int bpp, UINT32 pixel1, UINT32 pixel2 return NULL; } - buffer[0] = pixel1; - buffer[1] = pixel2; + memcpy(buffer, bits, stride * height); return hBitmap; } @@ -1447,6 +1446,10 @@ static void check_ImageList_DrawIndirect_broken(HDC hdc, HIMAGELIST himl, UINT32 static void test_ImageList_DrawIndirect(void) { + const UINT32 bits_image[] = { 0x00ABCDEF, 0x00ABCDEF }; + const UINT32 bits_alpha[] = { 0x89ABCDEF, 0x89ABCDEF }; + const UINT32 bits_transparent[] = { 0x00ABCDEF, 0x89ABCDEF }; + HIMAGELIST himl = NULL; int ret; HDC hdcDst = NULL; @@ -1480,7 +1483,7 @@ static void test_ImageList_DrawIndirect(void) if(!himl) goto cleanup; /* Add a no-alpha image */ - hbmImage = create_test_bitmap(hdcDst, 32, 0x00ABCDEF, 0x00ABCDEF); + hbmImage = create_test_bitmap(hdcDst, 2, 1, 32, bits_image); if(!hbmImage) goto cleanup; iImage = pImageList_Add(himl, hbmImage, hbmMask); @@ -1488,7 +1491,7 @@ static void test_ImageList_DrawIndirect(void) if(iImage == -1) goto cleanup; /* Add an alpha image */ - hbmAlphaImage = create_test_bitmap(hdcDst, 32, 0x89ABCDEF, 0x89ABCDEF); + hbmAlphaImage = create_test_bitmap(hdcDst, 2, 1, 32, bits_alpha); if(!hbmAlphaImage) goto cleanup; iAlphaImage = pImageList_Add(himl, hbmAlphaImage, hbmMask); @@ -1496,7 +1499,7 @@ static void test_ImageList_DrawIndirect(void) if(iAlphaImage == -1) goto cleanup; /* Add a transparent alpha image */ - hbmTransparentImage = create_test_bitmap(hdcDst, 32, 0x00ABCDEF, 0x89ABCDEF); + hbmTransparentImage = create_test_bitmap(hdcDst, 2, 1, 32, bits_transparent); if(!hbmTransparentImage) goto cleanup; iTransparentImage = pImageList_Add(himl, hbmTransparentImage, hbmMask); @@ -2310,7 +2313,7 @@ static void test_alpha(void) for (i = 0; i < ARRAY_SIZE(test_bitmaps); i += 2) { - hbm_test = create_test_bitmap(hdc, 32, test_bitmaps[i], test_bitmaps[i + 1]); + hbm_test = create_test_bitmap(hdc, 2, 1, 32, test_bitmaps + i); ret = pImageList_AddMasked(himl, hbm_test, CLR_NONE); ok(ret == i / 2, "ImageList_AddMasked returned %d, expected %d\n", ret, i / 2); DeleteObject(hbm_test);

1 0

Ziqing Hui : comctl32/tests: Add tests for grayscale.
by Alexandre Julliard 09 Mar '20

09 Mar '20

Module: wine Branch: master Commit: e8c2e505a8b12b2f4ec5eb98ef25a7ce416a7535 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8c2e505a8b12b2f4ec5eb98… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Mar 6 17:57:28 2020 +0800 comctl32/tests: Add tests for grayscale. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 42 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 806cec7bd9..24b33f54d7 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1444,6 +1444,43 @@ static void check_ImageList_DrawIndirect_broken(HDC hdc, HIMAGELIST himl, UINT32 bits[0] & 0x00FFFFFF, expected, line); } +static void check_ImageList_DrawIndirect_grayscale(HDC hdc, HIMAGELIST himl, UINT32 *dst_bits, const UINT32 *bitmap_bits, + int index, UINT width, UINT height, int line) +{ + int i; + BOOL has_alpha = FALSE; + IMAGELISTDRAWPARAMS ildp = { sizeof(IMAGELISTDRAWPARAMS), himl, index, hdc, + 0, 0, 0, 0, 0, 0, CLR_NONE, CLR_NONE, ILD_NORMAL, 0, ILS_SATURATE, 0, 0x00000000 }; + memset(dst_bits, 0, width * height * sizeof(*dst_bits)); + pImageList_DrawIndirect(&ildp); + + for (i = 0; i < width * height; i++) + if ((has_alpha = ((bitmap_bits[i] & 0xFF000000) != 0))) break; + + for (i = 0; i < width * height; i++) + { + UINT32 expected, expected_winxp; + UINT32 red = (bitmap_bits[i] & 0x00FF0000) >> 16; + UINT32 green = (bitmap_bits[i] & 0x0000FF00) >> 8; + UINT32 blue = (bitmap_bits[i] & 0x000000FF) >> 0; + UINT32 gray = (red * 299 + green * 587 + blue * 114 + 500) / 1000; + UINT32 gray_winxp = (red + green + blue) / 3; + if (has_alpha) + { + UINT32 alpha = (bitmap_bits[i] & 0xFF000000) >> 24; + gray = gray * alpha / 0xff * alpha / 0xff; + gray_winxp = gray_winxp * alpha / 0xff * 0x96 / 0xff; + } + expected = (gray << 16) | (gray << 8) | gray; + expected_winxp = (gray_winxp << 16) | (gray_winxp << 8) | gray_winxp; + + todo_wine_if(expected != 0 && expected != 0x00FFFFFF) + ok(colour_match(dst_bits[i], expected) || broken(colour_match(dst_bits[i], expected_winxp)), + "ImageList_DrawIndirect: got Pixel(%d,%d) %08X, Expected a close match to %08X from line %d\n", + i % width, i / width, dst_bits[i] & 0x00FFFFFF, expected, line); + } +} + static void test_ImageList_DrawIndirect(void) { const UINT32 bits_image[] = { 0x00ABCDEF, 0x00ABCDEF }; @@ -1546,8 +1583,9 @@ static void test_ImageList_DrawIndirect(void) check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iAlphaImage, SRCCOPY, 0x00D3E5F7, __LINE__); check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iAlphaImage, SRCINVERT, 0x00D3E5F7, __LINE__); - todo_wine check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_SATURATE, 0, 0x00CCCCCC, __LINE__); - todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, ILS_SATURATE, 0, 0x00AFAFAF, 0x00F0F0F0, __LINE__); + check_ImageList_DrawIndirect_grayscale(hdcDst, himl, bits, bits_image, iImage, 2, 1, __LINE__); + check_ImageList_DrawIndirect_grayscale(hdcDst, himl, bits, bits_alpha, iAlphaImage, 2, 1, __LINE__); + check_ImageList_DrawIndirect_grayscale(hdcDst, himl, bits, bits_transparent, iTransparentImage, 2, 1, __LINE__); check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_GLOW, 0, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_SHADOW, 0, 0x00ABCDEF, __LINE__);

1 0

Ziqing Hui : comctl32/tests: Add a 4x4 bitmap for ImageList_DrawIndirect tests.
by Alexandre Julliard 09 Mar '20

09 Mar '20

Module: wine Branch: master Commit: 7a1727004ba1aebf4af9fd975ed326c1a7e6b3cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a1727004ba1aebf4af9fd97… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Mar 6 17:57:43 2020 +0800 comctl32/tests: Add a 4x4 bitmap for ImageList_DrawIndirect tests. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 24b33f54d7..106ae92ffd 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -77,6 +77,7 @@ static void (WINAPI *pImageList_EndDrag)(void); static INT (WINAPI *pImageList_GetImageCount)(HIMAGELIST); static BOOL (WINAPI *pImageList_SetDragCursorImage)(HIMAGELIST, int, int, int); static BOOL (WINAPI *pImageList_GetIconSize)(HIMAGELIST, int *, int *); +static BOOL (WINAPI *pImageList_SetIconSize)(HIMAGELIST, INT, INT); static BOOL (WINAPI *pImageList_Remove)(HIMAGELIST, int); static INT (WINAPI *pImageList_ReplaceIcon)(HIMAGELIST, int, HICON); static BOOL (WINAPI *pImageList_Replace)(HIMAGELIST, int, HBITMAP, HBITMAP); @@ -1487,12 +1488,17 @@ static void test_ImageList_DrawIndirect(void) const UINT32 bits_alpha[] = { 0x89ABCDEF, 0x89ABCDEF }; const UINT32 bits_transparent[] = { 0x00ABCDEF, 0x89ABCDEF }; + const UINT32 bits_4x4[] = { 0x00ABCDEF, 0x89ABCDEF, 0xFFABCDEF, 0xFEDCBA98, + 0x00345678, 0x12345678, 0xFF345678, 0x87654321, + 0x00987654, 0xBA987654, 0xFF987654, 0x456789AB, + 0x00000000, 0xFF000000, 0xFFFFFFFF, 0x00FFFFFF }; + HIMAGELIST himl = NULL; int ret; HDC hdcDst = NULL; HBITMAP hbmOld = NULL, hbmDst = NULL; HBITMAP hbmMask = NULL, hbmInverseMask = NULL; - HBITMAP hbmImage = NULL, hbmAlphaImage = NULL, hbmTransparentImage = NULL; + HBITMAP hbmImage = NULL, hbmAlphaImage = NULL, hbmTransparentImage = NULL, hbm4x4 = NULL; int iImage = -1, iAlphaImage = -1, iTransparentImage = -1; UINT32 *bits = 0; UINT32 maskBits = 0x00000000, inverseMaskBits = 0xFFFFFFFF; @@ -1594,6 +1600,29 @@ static void test_ImageList_DrawIndirect(void) check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, ILS_ALPHA, 127, 0x00E9F2FB, 0x00AEB7C0, __LINE__); todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, ILS_NORMAL, 127, 0x00E9F2FB, 0x00D3E5F7, __LINE__); + /* 4x4 bitmap tests */ + SelectObject(hdcDst, hbmOld); + DeleteObject(hbmDst); + bitmapInfo.bmiHeader.biWidth = 4; + bitmapInfo.bmiHeader.biHeight = -4; + hbmDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok (hbmDst && bits, "CreateDIBSection failed to return a valid bitmap and buffer\n"); + if (!hbmDst || !bits) goto cleanup; + SelectObject(hdcDst, hbmDst); + + hbm4x4 = create_test_bitmap(hdcDst, 4, 4, 32, bits_4x4); + if (!hbm4x4) goto cleanup; + + ret = pImageList_SetIconSize(himl, 4, 4); + ok(ret, "ImageList_SetIconSize failed\n"); + if (!ret) goto cleanup; + + ret = pImageList_Add(himl, hbm4x4, NULL); + ok(ret != -1, "ImageList_Add failed\n"); + if(ret == -1) goto cleanup; + + check_ImageList_DrawIndirect_grayscale(hdcDst, himl, bits, bits_4x4, 0, 4, 4, __LINE__); + cleanup: if(hbmOld) @@ -1614,6 +1643,8 @@ cleanup: DeleteObject(hbmAlphaImage); if(hbmTransparentImage) DeleteObject(hbmTransparentImage); + if(hbm4x4) + DeleteObject(hbm4x4); if(himl) { @@ -2509,6 +2540,7 @@ static void init_functions(void) X(ImageList_GetImageCount); X(ImageList_SetDragCursorImage); X(ImageList_GetIconSize); + X(ImageList_SetIconSize); X(ImageList_Remove); X(ImageList_ReplaceIcon); X(ImageList_Replace);

1 0

Ziqing Hui : comctl32/imagelist: Support flag ILS_SATURATE for ImageList_DrawIndirect().
by Alexandre Julliard 09 Mar '20

09 Mar '20

Module: wine Branch: master Commit: d6305e1bdb3bf0c0918d717c8567fee8b9673522 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6305e1bdb3bf0c0918d717c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Mar 6 18:00:39 2020 +0800 comctl32/imagelist: Support flag ILS_SATURATE for ImageList_DrawIndirect(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 24 ++++++++++++++++++------ dlls/comctl32/tests/imagelist.c | 1 - 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 3cf7cc8c7f..14a17c2717 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1242,7 +1242,7 @@ ImageList_DrawEx (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y, static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, int src_x, int src_y, int cx, int cy, BLENDFUNCTION func, - UINT style, COLORREF blend_col, BOOL has_alpha ) + UINT style, COLORREF blend_col, BOOL has_alpha, BOOL grayscale ) { BOOL ret = FALSE; HDC hdc; @@ -1293,6 +1293,18 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des } } + if (grayscale) + { + for (i = 0, ptr = bits; i < cx * cy; i++, ptr++) + { + DWORD gray = (((*ptr & 0x00ff0000) >> 16) * 299 + + ((*ptr & 0x0000ff00) >> 8) * 587 + + ((*ptr & 0x000000ff) >> 0) * 114 + 500) / 1000; + if (has_alpha) gray = gray * (*ptr >> 24) / 255; + *ptr = (*ptr & 0xff000000)| (gray << 16) | (gray << 8) | gray; + } + } + if (has_alpha) /* we already have an alpha channel in this case */ { /* pre-multiply by the alpha channel */ @@ -1422,7 +1434,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) oldImageBk = SetBkColor( hImageDC, RGB( 0xff, 0xff, 0xff ) ); has_alpha = (himl->has_alpha && himl->has_alpha[pimldp->i]); - if (!bMask && (has_alpha || (fState & ILS_ALPHA))) + if (!bMask && (has_alpha || (fState & ILS_ALPHA) || (fState & ILS_SATURATE))) { COLORREF colour, blend_col = CLR_NONE; BLENDFUNCTION func; @@ -1441,8 +1453,8 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) if (bIsTransparent) { - bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, - pt.x, pt.y, cx, cy, func, fStyle, blend_col, has_alpha ); + bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, pt.x, pt.y, cx, cy, + func, fStyle, blend_col, has_alpha, fState & ILS_SATURATE ); goto end; } colour = pimldp->rgbBk; @@ -1451,7 +1463,8 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) hOldBrush = SelectObject (hImageDC, CreateSolidBrush (colour)); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); - alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func, fStyle, blend_col, has_alpha ); + alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func, + fStyle, blend_col, has_alpha, fState & ILS_SATURATE ); DeleteObject (SelectObject (hImageDC, hOldBrush)); bResult = BitBlt( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, hImageDC, 0, 0, SRCCOPY ); goto end; @@ -1545,7 +1558,6 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) } } - if (fState & ILS_SATURATE) FIXME("ILS_SATURATE: unimplemented!\n"); if (fState & ILS_GLOW) FIXME("ILS_GLOW: unimplemented!\n"); if (fState & ILS_SHADOW) FIXME("ILS_SHADOW: unimplemented!\n"); diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 106ae92ffd..984ca053c8 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1475,7 +1475,6 @@ static void check_ImageList_DrawIndirect_grayscale(HDC hdc, HIMAGELIST himl, UIN expected = (gray << 16) | (gray << 8) | gray; expected_winxp = (gray_winxp << 16) | (gray_winxp << 8) | gray_winxp; - todo_wine_if(expected != 0 && expected != 0x00FFFFFF) ok(colour_match(dst_bits[i], expected) || broken(colour_match(dst_bits[i], expected_winxp)), "ImageList_DrawIndirect: got Pixel(%d,%d) %08X, Expected a close match to %08X from line %d\n", i % width, i / width, dst_bits[i] & 0x00FFFFFF, expected, line);

1 0

Zebediah Figura : qedit: Register the sample grabber and null renderer.
by Alexandre Julliard 09 Mar '20

09 Mar '20

Module: wine Branch: master Commit: cf376c96e8d7ac8308f37217400de251d13299cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf376c96e8d7ac8308f37217… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 8 14:05:07 2020 -0500 qedit: Register the sample grabber and null renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/main.c | 77 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/qedit/qedit_private.h | 3 +- dlls/quartz/regsvr.c | 12 -------- 3 files changed, 77 insertions(+), 15 deletions(-) diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index a271f9adb7..3797d96dcf 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -192,12 +192,71 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return S_OK; } +static const REGPINTYPES reg_null_mt = {&GUID_NULL, &GUID_NULL}; + +static const REGFILTERPINS2 reg_sample_grabber_pins[2] = +{ + { + .cInstances = 1, + .nMediaTypes = 1, + .lpMediaType = &reg_null_mt, + }, + { + .dwFlags = REG_PINFLAG_B_OUTPUT, + .cInstances = 1, + .nMediaTypes = 1, + .lpMediaType = &reg_null_mt, + }, +}; + +static const REGFILTER2 reg_sample_grabber = +{ + .dwVersion = 2, + .dwMerit = MERIT_DO_NOT_USE, + .u.s2.cPins2 = 2, + .u.s2.rgPins2 = reg_sample_grabber_pins, +}; + +static const REGFILTERPINS2 reg_null_renderer_pins[1] = +{ + { + .dwFlags = REG_PINFLAG_B_OUTPUT, + .cInstances = 1, + .nMediaTypes = 1, + .lpMediaType = &reg_null_mt, + }, +}; + +static const REGFILTER2 reg_null_renderer = +{ + .dwVersion = 2, + .dwMerit = MERIT_DO_NOT_USE, + .u.s2.cPins2 = 1, + .u.s2.rgPins2 = reg_null_renderer_pins, +}; + /*********************************************************************** * DllRegisterServer (QEDIT.@) */ HRESULT WINAPI DllRegisterServer(void) { - return __wine_register_resources( instance ); + IFilterMapper2 *mapper; + HRESULT hr; + + if (FAILED(hr = __wine_register_resources( instance ))) + return hr; + + if (FAILED(hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterMapper2, (void **)&mapper))) + return hr; + + IFilterMapper2_RegisterFilter(mapper, &CLSID_SampleGrabber, L"SampleGrabber", + NULL, NULL, NULL, &reg_sample_grabber); + IFilterMapper2_RegisterFilter(mapper, &CLSID_NullRenderer, L"Null Renderer", + NULL, NULL, NULL, &reg_null_renderer); + + IFilterMapper2_Release(mapper); + return S_OK; } /*********************************************************************** @@ -205,5 +264,19 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - return __wine_unregister_resources( instance ); + IFilterMapper2 *mapper; + HRESULT hr; + + if (FAILED(hr = __wine_unregister_resources( instance ))) + return hr; + + if (FAILED(hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterMapper2, (void **)&mapper))) + return hr; + + IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_SampleGrabber); + IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_NullRenderer); + + IFilterMapper2_Release(mapper); + return S_OK; } diff --git a/dlls/qedit/qedit_private.h b/dlls/qedit/qedit_private.h index 344656d7d8..96f21bcb3b 100644 --- a/dlls/qedit/qedit_private.h +++ b/dlls/qedit/qedit_private.h @@ -23,7 +23,8 @@ #include <stdarg.h> #define COBJMACROS - +#define NONAMELESSSTRUCT +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "wtypes.h" diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index ff5db662f0..7196f79a54 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -174,18 +174,6 @@ static HRESULT unregister_filters(struct regsvr_filter const *list) */ static struct regsvr_filter const filter_list[] = { - { &CLSID_NullRenderer, - &CLSID_LegacyAmFilterCategory, - L"Null Renderer", - 0x200000, - { { REG_PINFLAG_B_RENDERER, - { { &MEDIATYPE_NULL, &GUID_NULL }, - { NULL } - }, - }, - { 0xFFFFFFFF }, - } - }, { &CLSID_VideoRenderer, &CLSID_LegacyAmFilterCategory, L"Video Renderer",

1 0

Zebediah Figura : qcap: Reimplement COM registration and vending locally.
by Alexandre Julliard 09 Mar '20

09 Mar '20

Module: wine Branch: master Commit: 7bcb8e74ce4b3428ac25db624349949caef69dda URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bcb8e74ce4b3428ac25db62… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 8 14:05:08 2020 -0500 qcap: Reimplement COM registration and vending locally. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/Makefile.in | 4 +- dlls/qcap/audiorecord.c | 24 ++-- dlls/qcap/avico.c | 25 ++-- dlls/qcap/avimux.c | 17 +-- dlls/qcap/capturegraph.c | 40 +++--- dlls/qcap/qcap_classes.idl | 70 ++++++++++ dlls/qcap/qcap_main.c | 321 +++++++++++++++++++++++++++++---------------- dlls/qcap/qcap_main.h | 19 +-- dlls/qcap/smartteefilter.c | 16 +-- dlls/qcap/vfwcapture.c | 11 +- 10 files changed, 340 insertions(+), 207 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7bcb8e74ce4b3428ac25…

1 0

Nikolay Sivov : mfplat: Remove extra critical section from presentation descriptor.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: ca2e20906ec636718c335f0904104492f849a4e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca2e20906ec636718c335f09… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 6 18:32:26 2020 +0300 mfplat: Remove extra critical section from presentation descriptor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 382f066327..c52255723c 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -58,7 +58,6 @@ struct presentation_desc IMFPresentationDescriptor IMFPresentationDescriptor_iface; struct presentation_desc_entry *descriptors; unsigned int count; - CRITICAL_SECTION cs; }; static HRESULT presentation_descriptor_init(struct presentation_desc *object, DWORD count); @@ -1239,7 +1238,6 @@ static ULONG WINAPI presentation_descriptor_Release(IMFPresentationDescriptor *i IMFStreamDescriptor_Release(presentation_desc->descriptors[i].descriptor); } clear_attributes_object(&presentation_desc->attributes); - DeleteCriticalSection(&presentation_desc->cs); heap_free(presentation_desc->descriptors); heap_free(presentation_desc); } @@ -1553,9 +1551,9 @@ static HRESULT WINAPI presentation_descriptor_GetStreamDescriptorByIndex(IMFPres if (index >= presentation_desc->count) return E_INVALIDARG; - EnterCriticalSection(&presentation_desc->cs); + EnterCriticalSection(&presentation_desc->attributes.cs); *selected = presentation_desc->descriptors[index].selected; - LeaveCriticalSection(&presentation_desc->cs); + LeaveCriticalSection(&presentation_desc->attributes.cs); *descriptor = presentation_desc->descriptors[index].descriptor; IMFStreamDescriptor_AddRef(*descriptor); @@ -1572,9 +1570,9 @@ static HRESULT WINAPI presentation_descriptor_SelectStream(IMFPresentationDescri if (index >= presentation_desc->count) return E_INVALIDARG; - EnterCriticalSection(&presentation_desc->cs); + EnterCriticalSection(&presentation_desc->attributes.cs); presentation_desc->descriptors[index].selected = TRUE; - LeaveCriticalSection(&presentation_desc->cs); + LeaveCriticalSection(&presentation_desc->attributes.cs); return S_OK; } @@ -1588,9 +1586,9 @@ static HRESULT WINAPI presentation_descriptor_DeselectStream(IMFPresentationDesc if (index >= presentation_desc->count) return E_INVALIDARG; - EnterCriticalSection(&presentation_desc->cs); + EnterCriticalSection(&presentation_desc->attributes.cs); presentation_desc->descriptors[index].selected = FALSE; - LeaveCriticalSection(&presentation_desc->cs); + LeaveCriticalSection(&presentation_desc->attributes.cs); return S_OK; } @@ -1610,7 +1608,7 @@ static HRESULT WINAPI presentation_descriptor_Clone(IMFPresentationDescriptor *i presentation_descriptor_init(object, presentation_desc->count); - EnterCriticalSection(&presentation_desc->cs); + EnterCriticalSection(&presentation_desc->attributes.cs); for (i = 0; i < presentation_desc->count; ++i) { @@ -1620,7 +1618,7 @@ static HRESULT WINAPI presentation_descriptor_Clone(IMFPresentationDescriptor *i attributes_CopyAllItems(&presentation_desc->attributes, (IMFAttributes *)&object->IMFPresentationDescriptor_iface); - LeaveCriticalSection(&presentation_desc->cs); + LeaveCriticalSection(&presentation_desc->attributes.cs); *descriptor = &object->IMFPresentationDescriptor_iface; @@ -1677,7 +1675,6 @@ static HRESULT presentation_descriptor_init(struct presentation_desc *object, DW return hr; object->IMFPresentationDescriptor_iface.lpVtbl = &presentationdescriptorvtbl; object->descriptors = heap_alloc_zero(count * sizeof(*object->descriptors)); - InitializeCriticalSection(&object->cs); if (!object->descriptors) { IMFPresentationDescriptor_Release(&object->IMFPresentationDescriptor_iface);

1 0