- Wine-Commits - list.winehq.org

Henri Verbeet : vkd3d: Update the version information for release 1.7.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: master Commit: 7f90c9d7eb08891394f5d48448fd1a6cb5a67df9 URL: https://gitlab.winehq.org/wine/wine/-/commit/7f90c9d7eb08891394f5d48448fd1a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 20 21:18:04 2023 +0200 vkd3d: Update the version information for release 1.7. --- libs/vkd3d/config.h | 4 ++-- libs/vkd3d/include/private/vkd3d_version.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/config.h b/libs/vkd3d/config.h index 914d34288f8..6d2eeba235a 100644 --- a/libs/vkd3d/config.h +++ b/libs/vkd3d/config.h @@ -1,5 +1,5 @@ #define PACKAGE_NAME "vkd3d" -#define PACKAGE_STRING "vkd3d 1.6" -#define PACKAGE_VERSION "1.6" +#define PACKAGE_STRING "vkd3d 1.7" +#define PACKAGE_VERSION "1.7" #define PATH_MAX 1024 #define SONAME_LIBVULKAN "vulkan-1.dll" diff --git a/libs/vkd3d/include/private/vkd3d_version.h b/libs/vkd3d/include/private/vkd3d_version.h index fe0e9ce6b30..0edc4428022 100644 --- a/libs/vkd3d/include/private/vkd3d_version.h +++ b/libs/vkd3d/include/private/vkd3d_version.h @@ -1 +1 @@ -#define VKD3D_VCS_ID " (git 1eaf73147cd3)" +#define VKD3D_VCS_ID " (Wine bundled)"

1 0

Piotr Caban : wineps: Handle EMR_STRETCHDIBITS record in spool files.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: master Commit: 5ece770d3706f7e49c6fe0148d6b353670fd926b URL: https://gitlab.winehq.org/wine/wine/-/commit/5ece770d3706f7e49c6fe0148d6b35… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 20 14:47:01 2023 +0200 wineps: Handle EMR_STRETCHDIBITS record in spool files. --- dlls/wineps.drv/printproc.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 2715cb952fc..48f584e1a7e 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -888,6 +888,52 @@ static int set_di_bits_to_device(PHYSDEV dev, const EMRSETDIBITSTODEVICE *p) return 1; } +static int stretch_di_bits(PHYSDEV dev, const EMRSTRETCHDIBITS *p) +{ + char bi_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + const BYTE *bits = (BYTE *)p + p->offBitsSrc; + BITMAPINFO *bi = (BITMAPINFO *)bi_buffer; + EMRSTRETCHBLT blt; + + memcpy(bi, (BYTE *)p + p->offBmiSrc, p->cbBmiSrc); + memset(bi_buffer + p->cbBmiSrc, 0, sizeof(bi_buffer) - p->cbBmiSrc); + + if (p->iUsageSrc == DIB_PAL_COLORS && (bi->bmiHeader.biBitCount == 1 || + bi->bmiHeader.biBitCount == 4 || bi->bmiHeader.biBitCount == 8)) + { + PALETTEENTRY pal[256]; + HPALETTE hpal; + UINT i, size; + + hpal = GetCurrentObject(dev->hdc, OBJ_PAL); + size = GetPaletteEntries(hpal, 0, 1 << bi->bmiHeader.biBitCount, pal); + for (i = 0; i < size; i++) + { + bi->bmiColors[i].rgbBlue = pal[i].peBlue; + bi->bmiColors[i].rgbGreen = pal[i].peGreen; + bi->bmiColors[i].rgbRed = pal[i].peRed; + } + } + + memset(&blt, 0, sizeof(blt)); + blt.rclBounds = p->rclBounds; + blt.xDest = p->xDest; + blt.yDest = p->yDest; + blt.cxDest = p->cxDest; + blt.cyDest = p->cyDest; + blt.dwRop = p->dwRop; + blt.xSrc = p->xSrc; + blt.ySrc = abs(bi->bmiHeader.biHeight) - p->ySrc - p->cySrc; + blt.xformSrc.eM11 = 1; + blt.xformSrc.eM22 = 1; + blt.iUsageSrc = p->iUsageSrc; + blt.cbBmiSrc = sizeof(bi_buffer); + blt.cbBitsSrc = p->cbBitsSrc; + blt.cxSrc = p->cxSrc; + blt.cySrc = p->cySrc; + return stretch_blt(dev, &blt, bi, bits); +} + static int poly_draw(PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count) { POINT first, cur, pts[4]; @@ -2680,6 +2726,8 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, } case EMR_SETDIBITSTODEVICE: return set_di_bits_to_device(&data->pdev->dev, (const EMRSETDIBITSTODEVICE *)rec); + case EMR_STRETCHDIBITS: + return stretch_di_bits(&data->pdev->dev, (const EMRSTRETCHDIBITS *)rec); case EMR_EXTTEXTOUTW: { const EMREXTTEXTOUTW *p = (const EMREXTTEXTOUTW *)rec;

1 0

Francois Gouget : kernel32/tests: Fix the ScrollConsoleScreenBuffer() tests on Windows 10 1909.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: master Commit: 4d3eb56e7cd53f8f6df7717e2b1274691f0ebd70 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d3eb56e7cd53f8f6df7717e2b1274… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 20 14:24:39 2023 +0200 kernel32/tests: Fix the ScrollConsoleScreenBuffer() tests on Windows 10 1909. On Windows 10 1909 ScrollConsoleScreenBufferA() returns an error if the destination is not within the clip rectangle but still modifies the console buffer as expected! So mark this behavior as very_broken(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54871 --- dlls/kernel32/tests/console.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index c2a8e99458f..5adce2d3f37 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -683,6 +683,20 @@ static void testScroll(HANDLE hCon, COORD sbSize) "Expected ERROR_NOT_ENOUGH_MEMORY, got %lu\n", GetLastError()); } + /* no clipping, src & dst rect do overlap */ + scroll.Left = 0; + scroll.Right = W - 1; + scroll.Top = 0; + scroll.Bottom = H - 1; + dst.X = W / 2 - 3; + dst.Y = H / 2 - 3; + ci.Char.UnicodeChar = '#'; + ci.Attributes = TEST_ATTRIB; + + ret = ScrollConsoleScreenBufferA(hCon, &scroll, NULL, dst, &ci); + ok(ret, "ScrollConsoleScreenBufferA failed: %lu\n", GetLastError()); + /* no win10 1909 error here, only check the result of the clipped case */ + /* clipping, src & dst rect do overlap */ resetContent(hCon, sbSize, TRUE); @@ -700,8 +714,14 @@ static void testScroll(HANDLE hCon, COORD sbSize) clip.Top = H / 2; clip.Bottom = min(H + H / 2, sbSize.Y - 1); + /* Windows 10 1909 fails if the destination is not in the clip rect + * but the result is still ok! + */ + SetLastError(0xdeadbeef); ret = ScrollConsoleScreenBufferA(hCon, &scroll, &clip, dst, &ci); - ok(ret, "ScrollConsoleScreenBufferA failed: %lu\n", GetLastError()); + ok((ret && GetLastError() == 0xdeadbeef) || + broken(!ret && GetLastError() == ERROR_INVALID_PARAMETER), + "ScrollConsoleScreenBufferA failed: %lu\n", GetLastError()); for (c.Y = 0; c.Y < sbSize.Y; c.Y++) {

1 0

Piotr Caban : wineps: Handle EMR_CREATEPALETTE record in spool files.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: master Commit: 40fdf388cfeeae5c1507c0dce3613be47206c3a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/40fdf388cfeeae5c1507c0dce3613b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 20 14:44:57 2023 +0200 wineps: Handle EMR_CREATEPALETTE record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 0a1f36c82d8..1b5095bd109 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2839,6 +2839,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_MODIFYWORLDTRANSFORM: case EMR_CREATEPEN: case EMR_CREATEBRUSHINDIRECT: + case EMR_CREATEPALETTE: case EMR_SETARCDIRECTION: case EMR_CLOSEFIGURE: case EMR_FLATTENPATH:

1 0

Piotr Caban : wineps: Handle EMR_SELECTPALETTE record in spool files.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: master Commit: 40c5790c55a4e048034285a6988d723079eaa5ec URL: https://gitlab.winehq.org/wine/wine/-/commit/40c5790c55a4e048034285a6988d72… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 20 14:45:20 2023 +0200 wineps: Handle EMR_SELECTPALETTE record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 1b5095bd109..3c54cfd7036 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2839,6 +2839,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_MODIFYWORLDTRANSFORM: case EMR_CREATEPEN: case EMR_CREATEBRUSHINDIRECT: + case EMR_SELECTPALETTE: case EMR_CREATEPALETTE: case EMR_SETARCDIRECTION: case EMR_CLOSEFIGURE:

1 0

Piotr Caban : wineps: Handle EMR_SETDIBITSTODEVICE record in spool files.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: master Commit: a3d1985ca8378d123e9d7559ef31ca3350eb6328 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3d1985ca8378d123e9d7559ef31ca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 20 14:46:43 2023 +0200 wineps: Handle EMR_SETDIBITSTODEVICE record in spool files. --- dlls/wineps.drv/printproc.c | 88 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 3c54cfd7036..2715cb952fc 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -802,6 +802,92 @@ static int plg_blt(PHYSDEV dev, const EMRPLGBLT *p) return TRUE; } +static inline int get_dib_stride( int width, int bpp ) +{ + return ((width * bpp + 31) >> 3) & ~3; +} + +static inline int get_dib_image_size( const BITMAPINFO *info ) +{ + return get_dib_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ) + * abs( info->bmiHeader.biHeight ); +} + +static int set_di_bits_to_device(PHYSDEV dev, const EMRSETDIBITSTODEVICE *p) +{ + const BITMAPINFO *info = (const BITMAPINFO *)((BYTE *)p + p->offBmiSrc); + char bi_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *bi = (BITMAPINFO *)bi_buffer; + HBITMAP bitmap, old_bitmap; + int width, height, ret; + BYTE *bits; + + width = min(p->cxSrc, info->bmiHeader.biWidth); + height = min(p->cySrc, abs(info->bmiHeader.biHeight)); + + memset(bi_buffer, 0, sizeof(bi_buffer)); + bi->bmiHeader.biSize = sizeof(bi->bmiHeader); + bi->bmiHeader.biWidth = width; + bi->bmiHeader.biHeight = height; + bi->bmiHeader.biPlanes = 1; + if (p->iUsageSrc == DIB_PAL_COLORS && (info->bmiHeader.biBitCount == 1 || + info->bmiHeader.biBitCount == 4 || info->bmiHeader.biBitCount == 8)) + { + PALETTEENTRY pal[256]; + HPALETTE hpal; + UINT i, size; + + bi->bmiHeader.biBitCount = info->bmiHeader.biBitCount; + bi->bmiHeader.biClrUsed = 1 << info->bmiHeader.biBitCount; + bi->bmiHeader.biClrImportant = bi->bmiHeader.biClrUsed; + + hpal = GetCurrentObject(dev->hdc, OBJ_PAL); + size = GetPaletteEntries(hpal, 0, bi->bmiHeader.biClrUsed, pal); + for (i = 0; i < size; i++) + { + bi->bmiColors[i].rgbBlue = pal[i].peBlue; + bi->bmiColors[i].rgbGreen = pal[i].peGreen; + bi->bmiColors[i].rgbRed = pal[i].peRed; + } + } + else + { + bi->bmiHeader.biBitCount = 24; + } + bi->bmiHeader.biCompression = BI_RGB; + bitmap = CreateDIBSection(dev->hdc, bi, DIB_RGB_COLORS, (void **)&bits, NULL, 0); + if (!bitmap) + return 1; + old_bitmap = SelectObject(dev->hdc, bitmap); + + ret = SetDIBitsToDevice(dev->hdc, 0, 0, width, height, p->xSrc, p->ySrc, + p->iStartScan, p->cScans, (const BYTE*)p + p->offBitsSrc, info, p->iUsageSrc); + SelectObject(dev->hdc, old_bitmap); + if (ret) + { + EMRSTRETCHBLT blt; + + memset(&blt, 0, sizeof(blt)); + blt.rclBounds = p->rclBounds; + blt.xDest = p->xDest; + blt.yDest = p->yDest + p->cySrc - height; + blt.cxDest = width; + blt.cyDest = ret; + blt.dwRop = SRCCOPY; + blt.xformSrc.eM11 = 1; + blt.xformSrc.eM22 = 1; + blt.iUsageSrc = DIB_RGB_COLORS; + blt.cbBmiSrc = sizeof(bi_buffer); + blt.cbBitsSrc = get_dib_image_size(bi); + blt.cxSrc = blt.cxDest; + blt.cySrc = blt.cyDest; + stretch_blt(dev, &blt, bi, bits); + } + + DeleteObject(bitmap); + return 1; +} + static int poly_draw(PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count) { POINT first, cur, pts[4]; @@ -2592,6 +2678,8 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return plg_blt(&data->pdev->dev, p); } + case EMR_SETDIBITSTODEVICE: + return set_di_bits_to_device(&data->pdev->dev, (const EMRSETDIBITSTODEVICE *)rec); case EMR_EXTTEXTOUTW: { const EMREXTTEXTOUTW *p = (const EMREXTTEXTOUTW *)rec;

1 0

Piotr Caban : wineps: Clip visible rectangle to bitmap size in get_vis_rectangles.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: master Commit: 08386cd984a6ebd116aa97c32bd8fcf14ed9de3e URL: https://gitlab.winehq.org/wine/wine/-/commit/08386cd984a6ebd116aa97c32bd8fc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 20 14:44:12 2023 +0200 wineps: Clip visible rectangle to bitmap size in get_vis_rectangles. --- dlls/wineps.drv/printproc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index b40f7a7962c..0a1f36c82d8 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -378,6 +378,10 @@ static void get_vis_rectangles(HDC hdc, struct bitblt_coords *dst, src->width = rect.right - rect.left; src->height = rect.bottom - rect.top; get_bounding_rect(&rect, src->x, src->y, src->width, src->height); + if (rect.left < 0) rect.left = 0; + if (rect.top < 0) rect.top = 0; + if (rect.right > width) rect.right = width; + if (rect.bottom > height) rect.bottom = height; src->visrect = rect; intersect_vis_rectangles(dst, src); @@ -413,7 +417,7 @@ static int stretch_blt(PHYSDEV dev, const EMRSTRETCHBLT *blt, src.layout = 0; get_vis_rectangles(dev->hdc, &dst, &blt->xformSrc, - bi->bmiHeader.biWidth, bi->bmiHeader.biHeight, &src); + bi->bmiHeader.biWidth, abs(bi->bmiHeader.biHeight), &src); memcpy(dst_info, bi, blt->cbBmiSrc); memset(&bits, 0, sizeof(bits));

1 0

Francois Gouget : wininet/tests: Add more proxy tests.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: master Commit: c441ad6a4eb54204a45ca2c52310dc08372d8e8b URL: https://gitlab.winehq.org/wine/wine/-/commit/c441ad6a4eb54204a45ca2c52310dc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 13 16:42:19 2023 +0200 wininet/tests: Add more proxy tests. --- dlls/wininet/tests/internet.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index fde1b65f5d2..7cd21efcd36 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -49,6 +49,11 @@ static BOOL (WINAPI *pInternetGetCookieExW)(LPCWSTR,LPCWSTR,LPWSTR,LPDWORD,DWORD static BOOL (WINAPI *pInternetGetConnectedStateExA)(LPDWORD,LPSTR,DWORD,DWORD); static BOOL (WINAPI *pInternetGetConnectedStateExW)(LPDWORD,LPWSTR,DWORD,DWORD); +#ifndef ERROR_WINHTTP_AUTODETECTION_FAILED +#define ERROR_WINHTTP_AUTODETECTION_FAILED 12180 +#endif + + /* ############################### */ static void test_InternetCanonicalizeUrlA(void) @@ -163,11 +168,27 @@ static void test_InternetQueryOptionA(void) { HINTERNET hinet,hurl; DWORD len, val; + INTERNET_PROXY_INFOA *pi; DWORD err; static const char useragent[] = {"Wininet Test"}; + char proxy[256]; char *buffer; - int retval; - BOOL res; + BOOL retval, res; + + SetLastError(0xdeadfeed); + memset(proxy, 0, sizeof(proxy)); + res = DetectAutoProxyUrl(proxy, sizeof(proxy), PROXY_AUTO_DETECT_TYPE_DHCP); + todo_wine ok((res && proxy[0]) || + (!res && GetLastError() == ERROR_WINHTTP_AUTODETECTION_FAILED && !proxy[0]), + "unexpected DHCP proxy result: %d gle %lu proxy %s\n", res, GetLastError(), proxy); + + SetLastError(0xdeadfeed); + memset(proxy, 0, sizeof(proxy)); + res = DetectAutoProxyUrl(proxy, sizeof(proxy), PROXY_AUTO_DETECT_TYPE_DNS_A); + todo_wine ok((res && proxy[0]) || + (!res && GetLastError() == ERROR_WINHTTP_AUTODETECTION_FAILED && !proxy[0]) || + broken(!res && GetLastError() == ERROR_NOT_FOUND && !proxy[0]), + "unexpected DNS proxy result: %d gle %lu proxy %s\n", res, GetLastError(), proxy); SetLastError(0xdeadbeef); len = 0xdeadbeef; @@ -175,6 +196,12 @@ static void test_InternetQueryOptionA(void) ok(!retval && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got wrong error %x(%lu)\n", retval, GetLastError()); ok(len >= sizeof(INTERNET_PROXY_INFOA) && len != 0xdeadbeef,"len = %lu\n", len); + pi = HeapAlloc(GetProcessHeap(), 0, len); + retval = InternetQueryOptionA(NULL, INTERNET_OPTION_PROXY, pi, &len); + ok(retval, "Failed (%lu)\n", GetLastError()); + ok(len >= sizeof(INTERNET_PROXY_INFOA) && len != 0xdeadbeef, "len = %lu\n", len); + HeapFree(GetProcessHeap(), 0, pi); + hinet = InternetOpenA(useragent,INTERNET_OPEN_TYPE_DIRECT,NULL,NULL, 0); ok((hinet != 0x0),"InternetOpen Failed\n");

1 0

Francois Gouget : wininet: Add constants for DetectAutoProxyUrl().
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: master Commit: e6ac3499a53e94366ccf3436526e55c68410161f URL: https://gitlab.winehq.org/wine/wine/-/commit/e6ac3499a53e94366ccf3436526e55… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 13 10:53:24 2023 +0200 wininet: Add constants for DetectAutoProxyUrl(). --- include/wininet.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/wininet.h b/include/wininet.h index f1c4e312281..158b005d36c 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1776,6 +1776,9 @@ typedef BOOL (CALLBACK *pfnInternetGetProxyInfo)(LPCSTR, DWORD, LPSTR, DWORD, LP typedef BOOL (CALLBACK *pfnInternetInitializeAutoProxyDll)(DWORD, LPSTR, LPSTR, AutoProxyHelperFunctions *, LPAUTO_PROXY_SCRIPT_BUFFER); +#define PROXY_AUTO_DETECT_TYPE_DHCP 1 +#define PROXY_AUTO_DETECT_TYPE_DNS_A 2 + BOOL WINAPI InternetInitializeAutoProxyDll(DWORD); BOOL WINAPI DetectAutoProxyUrl(LPSTR, DWORD, DWORD);

1 0

Conor McCarthy : vkd3d: Do not skip all viewports if one is invalid.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: vkd3d Branch: master Commit: 5d724abc9660f13fa77522fc018ebb35836f0dfb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5d724abc9660f13fa77522fc018eb… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 20 17:40:00 2023 +1000 vkd3d: Do not skip all viewports if one is invalid. Fixes blank screen in Assassin's Creed: Valhalla. --- libs/vkd3d/command.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2662ec04..228429ec 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3963,10 +3963,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_RSSetViewports(ID3D12GraphicsCo vk_viewports[i].minDepth = viewports[i].MinDepth; vk_viewports[i].maxDepth = viewports[i].MaxDepth; - if (!vk_viewports[i].width || !vk_viewports[i].height) + if (!vk_viewports[i].width) { - FIXME_ONCE("Invalid viewport %u, ignoring RSSetViewports().\n", i); - return; + /* Vulkan does not support width <= 0 */ + FIXME_ONCE("Setting invalid viewport %u to zero height.\n", i); + vk_viewports[i].width = 1.0f; + vk_viewports[i].height = 0.0f; } }

1 0