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

Piotr Caban : wineps: Handle EMR_SELECTPALETTE record in spool files.
by Alexandre Julliard 20 Apr '23

20 Apr '23

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 20 Apr '23

20 Apr '23

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: Handle EMR_STRETCHDIBITS record in spool files.
by Alexandre Julliard 20 Apr '23

20 Apr '23

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

Henri Verbeet : vkd3d: Update the version information for release 1.7.
by Alexandre Julliard 20 Apr '23

20 Apr '23

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

Francois Gouget : wininet: Add constants for DetectAutoProxyUrl().
by Alexandre Julliard 20 Apr '23

20 Apr '23

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

Francois Gouget : wininet/tests: Add more proxy tests.
by Alexandre Julliard 20 Apr '23

20 Apr '23

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

Conor McCarthy : vkd3d: Do not skip all viewports if one is invalid.
by Alexandre Julliard 20 Apr '23

20 Apr '23

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

Conor McCarthy : vkd3d: Treat negative viewport widths as invalid.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: vkd3d Branch: master Commit: a4a95aa950be7cc305b8c150904f944b80fc5d45 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a4a95aa950be7cc305b8c150904f9… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 20 17:40:24 2023 +1000 vkd3d: Treat negative viewport widths as invalid. Negative widths are not supported in Vulkan. --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 228429ec..8b857695 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3963,7 +3963,7 @@ 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) + if (vk_viewports[i].width <= 0.0f) { /* Vulkan does not support width <= 0 */ FIXME_ONCE("Setting invalid viewport %u to zero height.\n", i);

1 0

Alexandre Julliard : Wine release 8.0.1
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: website Branch: master Commit: d5a7e7440947a97d8bc2a828100617a9bb088120 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/d5a7e7440947a97d8bc2a82810… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 20 13:38:14 2023 +0200 Wine release 8.0.1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023042001.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2023042001.xml b/news/en/2023042001.xml new file mode 100644 index 00000000..961b43f2 --- /dev/null +++ b/news/en/2023042001.xml @@ -0,0 +1,15 @@ +<news> +<date>April 20, 2023</date> +<title>Wine 8.0.1 Released</title> +<body> + The Wine stable release 8.0.1 is now available. + <a href="{$root}/announce/8.0.1">What's new</a> in this release: +<ul> + <li>Fixes for macOS Ventura 13.3 on Apple Silicon</li> + <li>Tamil and Turkish translation updates</li> + <li>Various bug fixes</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.0/wine-8.0.1.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-8.0.1 : Alexandre Julliard : Release 8.0.1
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: refs/tags/wine-8.0.1 Tag: 4d44366eec52147d2b5868c48accc2ed613ea242 URL: https://gitlab.winehq.org/wine/wine/-/tags/4d44366eec52147d2b5868c48accc2ed… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 20 13:36:15 2023 +0200 Release 8.0.1

1 0