May 2022 - Wine-Devel - list.winehq.org

Re: [PATCH 5/9] wined3d: Add 16 bit per channel UNORM formats to wined3d_format_convert_from_float.

by Henri Verbeet

On Sun, 1 May 2022 at 20:39, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -6015,24 +6015,27 @@ void wined3d_format_convert_from_float(const struct wined3d_format *format, cons > } > float_conv[] = > { > - {WINED3DFMT_B8G8R8A8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, > - {WINED3DFMT_B8G8R8X8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, > - {WINED3DFMT_B8G8R8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, > - {WINED3DFMT_B5G6R5_UNORM, { 31.0f, 63.0f, 31.0f, 0.0f}, {11, 5, 0, 0}}, > - {WINED3DFMT_B5G5R5A1_UNORM, { 31.0f, 31.0f, 31.0f, 1.0f}, {10, 5, 0, 15}}, > - {WINED3DFMT_B5G5R5X1_UNORM, { 31.0f, 31.0f, 31.0f, 1.0f}, {10, 5, 0, 15}}, > - {WINED3DFMT_R8_UNORM, { 255.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, > - {WINED3DFMT_A8_UNORM, { 0.0f, 0.0f, 0.0f, 255.0f}, { 0, 0, 0, 0}}, > - {WINED3DFMT_B4G4R4A4_UNORM, { 15.0f, 15.0f, 15.0f, 15.0f}, { 8, 4, 0, 12}}, > - {WINED3DFMT_B4G4R4X4_UNORM, { 15.0f, 15.0f, 15.0f, 15.0f}, { 8, 4, 0, 12}}, > - {WINED3DFMT_B2G3R3_UNORM, { 7.0f, 7.0f, 3.0f, 0.0f}, { 5, 2, 0, 0}}, > - {WINED3DFMT_R8G8B8A8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, { 0, 8, 16, 24}}, > - {WINED3DFMT_R8G8B8X8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, { 0, 8, 16, 24}}, > - {WINED3DFMT_B10G10R10A2_UNORM, { 1023.0f, 1023.0f, 1023.0f, 3.0f}, {20, 10, 0, 30}}, > - {WINED3DFMT_R10G10B10A2_UNORM, { 1023.0f, 1023.0f, 1023.0f, 3.0f}, { 0, 10, 20, 30}}, > - {WINED3DFMT_P8_UINT, { 0.0f, 0.0f, 0.0f, 255.0f}, { 0, 0, 0, 0}}, > - {WINED3DFMT_S1_UINT_D15_UNORM, { 32767.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, > - {WINED3DFMT_D16_UNORM, { 65535.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, > + {WINED3DFMT_B8G8R8A8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, > + {WINED3DFMT_B8G8R8X8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, > + {WINED3DFMT_B8G8R8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, > + {WINED3DFMT_B5G6R5_UNORM, { 31.0f, 63.0f, 31.0f, 0.0f}, {11, 5, 0, 0}}, > + {WINED3DFMT_B5G5R5A1_UNORM, { 31.0f, 31.0f, 31.0f, 1.0f}, {10, 5, 0, 15}}, > + {WINED3DFMT_B5G5R5X1_UNORM, { 31.0f, 31.0f, 31.0f, 1.0f}, {10, 5, 0, 15}}, > + {WINED3DFMT_R8_UNORM, { 255.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, > + {WINED3DFMT_A8_UNORM, { 0.0f, 0.0f, 0.0f, 255.0f}, { 0, 0, 0, 0}}, > + {WINED3DFMT_B4G4R4A4_UNORM, { 15.0f, 15.0f, 15.0f, 15.0f}, { 8, 4, 0, 12}}, > + {WINED3DFMT_B4G4R4X4_UNORM, { 15.0f, 15.0f, 15.0f, 15.0f}, { 8, 4, 0, 12}}, > + {WINED3DFMT_B2G3R3_UNORM, { 7.0f, 7.0f, 3.0f, 0.0f}, { 5, 2, 0, 0}}, > + {WINED3DFMT_R8G8B8A8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, { 0, 8, 16, 24}}, > + {WINED3DFMT_R8G8B8X8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, { 0, 8, 16, 24}}, > + {WINED3DFMT_B10G10R10A2_UNORM, { 1023.0f, 1023.0f, 1023.0f, 3.0f}, {20, 10, 0, 30}}, > + {WINED3DFMT_R10G10B10A2_UNORM, { 1023.0f, 1023.0f, 1023.0f, 3.0f}, { 0, 10, 20, 30}}, > + {WINED3DFMT_R16_UNORM, { 65535.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, > + {WINED3DFMT_R16G16_UNORM, { 65535.0f, 65535.0f, 0.0f, 0.0f}, { 0, 16, 0, 0}}, > + {WINED3DFMT_R16G16B16A16_UNORM,{ 65535.0f, 65535.0f, 65535.0f,65535.0f}, { 0, 16, 32, 48}}, > + {WINED3DFMT_P8_UINT, { 0.0f, 0.0f, 0.0f, 255.0f}, { 0, 0, 0, 0}}, > + {WINED3DFMT_S1_UINT_D15_UNORM, { 32767.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, > + {WINED3DFMT_D16_UNORM, { 65535.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, > }; I think this is fine, although it's perhaps also worth pointing out that between WINED3DFMT_FLAG_NORMALISED, and the component sizes and offsets in struct wined3d_format, we actually already have the required information for most of these. The main exception would be odd formats like WINED3DFMT_P8_UINT.

May 2, 2022

Re: [PATCH 4/9] wined3d: Support CPU clear of float16 formats.

by Henri Verbeet

On Sun, 1 May 2022 at 20:39, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + for (i = 0; i < ARRAY_SIZE(float16_conv); ++i) > + { > + if (format_id != float16_conv[i]) > + continue; > + > + switch(format->byte_count) > + { > + case 8: > + ((short *)ret)[3] = float_32_to_16(&color->a); > + ((short *)ret)[2] = float_32_to_16(&color->b); > + /* fall through */ > + case 4: > + ((short *)ret)[1] = float_32_to_16(&color->g); > + /* fall through */ > + case 2: > + ((short *)ret)[0] = float_32_to_16(&color->r); > + break; > + > + default: > + ERR("Unexpected byte count %u: Format %s\n", format->byte_count, debug_d3dformat(format_id)); > + break; > + } > + > + return; > + } Like 3/9, it seems preferable to check for WINED3DFMT_FLAG_FLOAT and component sizes. There's a missing space after "switch" here as well.

May 2, 2022

Re: [PATCH 3/9] wined3d: Add support for sysmem-clearing float32 formats.

by Henri Verbeet

On Sun, 1 May 2022 at 20:39, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -6113,6 +6121,27 @@ void wined3d_format_convert_from_float(const struct wined3d_format *format, cons > return; > } > > + for (i = 0; i < ARRAY_SIZE(float32_copy); ++i) > + { > + if (format_id != float32_copy[i]) > + continue; > + > + switch(format->byte_count) Missing space after "switch". Could we just check for WINED3DFMT_FLAG_FLOAT and the component sizes instead of listing individual formats?

May 2, 2022

Re: [PATCH 2/9] wined3d: Prepare wined3d_format_convert_from_float for > 32bpp formats.

by Henri Verbeet

On Sun, 1 May 2022 at 20:39, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -3689,7 +3690,8 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO > diffuse_colour = material_diffuse; > } > wined3d_color_clamp(&diffuse_colour, &diffuse_colour, 0.0f, 1.0f); > - *((DWORD *)dest_ptr) = wined3d_format_convert_from_float(output_colour_format, &diffuse_colour); > + wined3d_format_convert_from_float(output_colour_format, &diffuse_colour, argb_color); > + *((DWORD *)dest_ptr) = argb_color[0]; > dest_ptr += sizeof(DWORD); > } Why not "wined3d_format_convert_from_float(output_colour_format, &diffuse_colour, (uint32_t *)dest_ptr);"? This patch always writes 4 uint32_t's in wined3d_format_convert_from_float(), but that could easily be avoided. And arguably, if we're going to write to an output pointer in wined3d_format_convert_from_float(), that doesn't need to be a pointer to a 32-bit value either. (I.e., compare the upload/download/decompress operations from struct wined3d_format.)

May 2, 2022

Re: [PATCH 1/9] wined3d: Separate mapping from data writing in surface_cpu_blt_colour_fill.

by Henri Verbeet

On Sun, 1 May 2022 at 20:39, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > +void wined3d_resource_memory_colour_fill(struct wined3d_resource *resource, > + unsigned int level, const struct wined3d_map_desc *map, > + const struct wined3d_color *colour, const struct wined3d_box *box) > +{ > + const struct wined3d_format *format = resource->format; > + unsigned int w, h, d, x, y, z, bpp; > + struct wined3d_box level_box; > + uint8_t *dst, *dst2; > + DWORD c; > + > + if (resource->type == WINED3D_RTYPE_BUFFER) > + { > + level_box.left = 0; level_box.top = 0; level_box.front = 0; > + level_box.right = resource->width; level_box.bottom = 1; level_box.back = 1; > + } > + else > + { > + wined3d_texture_get_level_box(texture_from_resource(resource), level, &level_box); > + } > + > + w = min(box->right, level_box.right) - min(box->left, level_box.right); > + h = min(box->bottom, level_box.bottom) - min(box->top, level_box.bottom); > + if (resource->type != WINED3D_RTYPE_TEXTURE_3D) > + d = 1; > + else > + d = min(box->back, level_box.back) - min(box->front, level_box.back); > + This (i.e., clipping the supplied box against the resource dimensions) doesn't belong here; the caller should simply supply the correct box. Arguably it doesn't belong in surface_cpu_blt_colour_fill() either; the most appropriate place would be cpu_blitter_clear(). > + dst = (BYTE *)map->data > + + (box->front * map->slice_pitch) > + + ((box->top / format->block_height) * map->row_pitch) > + + ((box->left / format->block_width) * format->block_byte_count); We might as well cast to "uint8_t *". (And use uint16_t and uint32_t further below.) > + c = wined3d_format_convert_from_float(format, colour); > + bpp = format->byte_count; > + > + switch (bpp) > + { > + case 1: > + for (x = 0; x < w; ++x) > + { > + dst[x] = c; > + } > + break; > + > + case 2: > + for (x = 0; x < w; ++x) > + { > + ((WORD *)dst)[x] = c; > + } > + break; > + > + case 3: > + { > + dst2 = dst; > + for (x = 0; x < w; ++x, dst += 3) > + { > + dst2[0] = (c ) & 0xff; > + dst2[1] = (c >> 8) & 0xff; > + dst2[2] = (c >> 16) & 0xff; > + } > + break; > + } Does that do the right thing? We update "dst", but not "dst2".

May 2, 2022

Re: [PATCH] wined3d: Do not use vkCmdClearColorImage() to clear compressed images.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

May 2, 2022

[PATCH 1/1] include/msvcrt: redefine tolower & toupper with wint_t parameters

by Eric Pouech

From: Eric Pouech <eric.pouech(a)gmail.com> it conflicts in C++ compilation with MINGW builtin definitions Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/msvcrt/corecrt_wctype.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/msvcrt/corecrt_wctype.h b/include/msvcrt/corecrt_wctype.h index 33f91db9719..be2722bf8c8 100644 --- a/include/msvcrt/corecrt_wctype.h +++ b/include/msvcrt/corecrt_wctype.h @@ -36,8 +36,8 @@ _ACRTIMP int __cdecl _iswprint_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswpunct_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswspace_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswupper_l(wint_t,_locale_t); -_ACRTIMP wchar_t __cdecl _towlower_l(wchar_t,_locale_t); -_ACRTIMP wchar_t __cdecl _towupper_l(wchar_t,_locale_t); +_ACRTIMP wint_t __cdecl _towlower_l(wint_t,_locale_t); +_ACRTIMP wint_t __cdecl _towupper_l(wint_t,_locale_t); _ACRTIMP int __cdecl is_wctype(wint_t,wctype_t); _ACRTIMP int __cdecl isleadbyte(int); _ACRTIMP int __cdecl iswalnum(wint_t); @@ -54,8 +54,8 @@ _ACRTIMP int __cdecl iswpunct(wint_t); _ACRTIMP int __cdecl iswspace(wint_t); _ACRTIMP int __cdecl iswupper(wint_t); _ACRTIMP int __cdecl iswxdigit(wint_t); -_ACRTIMP wchar_t __cdecl towlower(wchar_t); -_ACRTIMP wchar_t __cdecl towupper(wchar_t); +_ACRTIMP wint_t __cdecl towlower(wint_t); +_ACRTIMP wint_t __cdecl towupper(wint_t); #ifdef __cplusplus } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/20

May 2, 2022

[PATCH 0/1] MR20: include/msvcrt: redefine tolower & toupper with wint_t parameters

by eric pouech (＠epo)

it conflicts in C++ compilation with MINGW builtin definitions Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/20

May 2, 2022

[PATCH v2 2/2] programs/cmd: skip too long paths

by Eric Pouech

From: Eric Pouech <eric.pouech(a)gmail.com> v2: protect against overflow in trace with debugstr_w Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/cmd/builtins.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index dd3ebf76d50..dd3ae5b509b 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1355,6 +1355,13 @@ static BOOL WCMD_delete_one (const WCHAR *thisArg) { DIRECTORY_STACK *nextDir; WCHAR subParm[MAX_PATH]; + if (wcslen(thisDir) + wcslen(fd.cFileName) + 1 + wcslen(fname) + wcslen(ext) >= MAX_PATH) + { + WINE_TRACE("Skipping path too long %s%s\\%s%s\n", + debugstr_w(thisDir), debugstr_w(fd.cFileName), + debugstr_w(fname), debugstr_w(ext)); + continue; + } /* Work out search parameter in sub dir */ lstrcpyW (subParm, thisDir); lstrcatW (subParm, fd.cFileName); @@ -1761,7 +1768,14 @@ static void WCMD_add_dirstowalk(DIRECTORY_STACK *dirsToWalk) { (lstrcmpW(fd.cFileName, L"..") != 0) && (lstrcmpW(fd.cFileName, L".") != 0)) { /* Allocate memory, add to list */ - DIRECTORY_STACK *toWalk = heap_xalloc(sizeof(DIRECTORY_STACK)); + DIRECTORY_STACK *toWalk; + if (wcslen(dirsToWalk->dirName) + 1 + wcslen(fd.cFileName) >= MAX_PATH) + { + WINE_TRACE("Skipping too long path %s\\%s\n", + debugstr_w(dirsToWalk->dirName), debugstr_w(fd.cFileName)); + continue; + } + toWalk = heap_xalloc(sizeof(DIRECTORY_STACK)); WINE_TRACE("(%p->%p)\n", remainingDirs, remainingDirs->next); toWalk->next = remainingDirs->next; remainingDirs->next = toWalk; @@ -2321,6 +2335,12 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WINE_TRACE("Processing FOR filename %s\n", wine_dbgstr_w(fd.cFileName)); if (doRecurse) { + if (wcslen(dirsToWalk->dirName) + 1 + wcslen(fd.cFileName) >= MAX_PATH) + { + WINE_TRACE("Skipping too long path %s\\%s\n", + debugstr_w(dirsToWalk->dirName), debugstr_w(fd.cFileName)); + continue; + } lstrcpyW(fullitem, dirsToWalk->dirName); lstrcatW(fullitem, L"\\"); lstrcatW(fullitem, fd.cFileName); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/17

May 2, 2022

[PATCH v2 1/2] programs/cmd: test that read is successful before using its result

by Eric Pouech

From: Eric Pouech <eric.pouech(a)gmail.com> There are cases where the read can fail (not attached to a console, input stream mapped to /dev/null...) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/cmd/builtins.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 963a9eaf361..dd3ebf76d50 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -193,7 +193,8 @@ static BOOL WCMD_ask_confirm (const WCHAR *message, BOOL showSureText, if (showSureText) WCMD_output_asis (confirm); WCMD_output_asis (options); - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, ARRAY_SIZE(answer), &count); + if (!WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, ARRAY_SIZE(answer), &count)) + return FALSE; answer[0] = towupper(answer[0]); if (answer[0] == Ybuffer[0]) return TRUE; @@ -383,7 +384,12 @@ void WCMD_choice (const WCHAR * args) { /* FIXME: Add support for option /T */ answer[1] = 0; /* terminate single character string */ - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, 1, &count); + if (!WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, 1, &count)) + { + heap_free(my_command); + errorlevel = 0; + return; + } if (!opt_s) answer[0] = towupper(answer[0]); @@ -3506,8 +3512,8 @@ void WCMD_setshow_date (void) { WCMD_output (WCMD_LoadMessage(WCMD_CURRENTDATE), curdate); if (wcsstr(quals, L"/T") == NULL) { WCMD_output (WCMD_LoadMessage(WCMD_NEWDATE)); - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, ARRAY_SIZE(buffer), &count); - if (count > 2) { + if (WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, ARRAY_SIZE(buffer), &count) && + count > 2) { WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); } } @@ -4142,8 +4148,7 @@ void WCMD_setshow_env (WCHAR *s) { if (*p) WCMD_output_asis(p); /* Read the reply */ - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count); - if (count > 1) { + if (WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count) && count > 1) { string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ WINE_TRACE("set /p: Setting var '%s' to '%s'\n", wine_dbgstr_w(s), @@ -4295,8 +4300,8 @@ void WCMD_setshow_time (void) { WCMD_output (WCMD_LoadMessage(WCMD_CURRENTTIME), curtime); if (wcsstr(quals, L"/T") == NULL) { WCMD_output (WCMD_LoadMessage(WCMD_NEWTIME)); - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, ARRAY_SIZE(buffer), &count); - if (count > 2) { + if (WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, ARRAY_SIZE(buffer), &count) && + count > 2) { WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); } } @@ -4717,8 +4722,8 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) HIWORD(serial), LOWORD(serial)); if (set_label) { WCMD_output (WCMD_LoadMessage(WCMD_VOLUMEPROMPT)); - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count); - if (count > 1) { + if (WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count) && + count > 1) { string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/17

May 2, 2022