January 2021 - Wine-devel - list.winehq.org

Converting Paths from within Windows processes on top of Wine
by Sebastian M. Ernst 18 Jan '21

18 Jan '21

Hi all, I have been converting Windows to Unix paths and vice versa from within Windows processes on top of Wine by calling `wine_unix_to_nt_file_name` and `wine_nt_to_unix_file_name` in `nddll.dll`. The signatures of those functions changed from 5.12 to 5.13, which broke a couple of things. As I need to support multiple versions of Wine, at least down to 4.0, I need to find a generic (and preferably quick) way of converting paths. I am considering to simply call `wine_get_version` for deciding what signatures to use. Would this approach be advisable or is there a better, more stable, long-term way of achieving what I want? All of the mentioned functions are sort of "undocumented" API, as far as I understand. Best regards & thanks, Sebastian

4 4

[PATCH 1/4] winmm/tests: Expect TIME_BYTES format for TIME_MS request.
by Akihiro Sagawa 18 Jan '21

18 Jan '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/wave.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)

2 1

[PATCH 5/5] wined3d: Also trace memory types in adapter_vk_init_driver_info().
by Henri Verbeet 18 Jan '21

18 Jan '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 0404aa1877b..09180e7fdb6 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2025,6 +2025,7 @@ static bool adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk, const struct wined3d_gpu_description *gpu_description; struct wined3d_gpu_description description; UINT64 vram_bytes, sysmem_bytes; + const VkMemoryType *type; const VkMemoryHeap *heap; unsigned int i; @@ -2046,6 +2047,12 @@ static bool adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk, TRACE("Total device memory: 0x%s.\n", wine_dbgstr_longlong(vram_bytes)); TRACE("Total shared system memory: 0x%s.\n", wine_dbgstr_longlong(sysmem_bytes)); + for (i = 0; i < memory_properties->memoryTypeCount; ++i) + { + type = &memory_properties->memoryTypes[i]; + TRACE("Memory type [%u]: flags %#x, heap %u.\n", i, type->propertyFlags, type->heapIndex); + } + if (!(gpu_description = wined3d_get_user_override_gpu_description(properties->vendorID, properties->deviceID))) gpu_description = wined3d_get_gpu_description(properties->vendorID, properties->deviceID); -- 2.20.1

1 0

[PATCH 4/5] wined3d: Handle UNORM/SNORM as FLOAT in shader_glsl_sprintf_cast().
by Henri Verbeet 18 Jan '21

18 Jan '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 59c73ad4257..1fea6f92be0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3124,6 +3124,11 @@ static void shader_glsl_get_swizzle(const struct wined3d_shader_src_param *param static void shader_glsl_sprintf_cast(struct wined3d_string_buffer *dst_param, const char *src_param, enum wined3d_data_type dst_data_type, enum wined3d_data_type src_data_type, unsigned int size) { + if (dst_data_type == WINED3D_DATA_UNORM || dst_data_type == WINED3D_DATA_SNORM) + dst_data_type = WINED3D_DATA_FLOAT; + if (src_data_type == WINED3D_DATA_UNORM || src_data_type == WINED3D_DATA_SNORM) + src_data_type = WINED3D_DATA_FLOAT; + if (dst_data_type == src_data_type) { string_buffer_sprintf(dst_param, "%s", src_param); -- 2.20.1

1 0

[PATCH 3/5] wined3d: Handle UNORM/SNORM as FLOAT in shader_glsl_append_dst_ext().
by Henri Verbeet 18 Jan '21

18 Jan '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7423b2003a6..59c73ad4257 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3271,6 +3271,8 @@ static DWORD shader_glsl_append_dst_ext(struct wined3d_string_buffer *buffer, switch (data_type) { case WINED3D_DATA_FLOAT: + case WINED3D_DATA_UNORM: + case WINED3D_DATA_SNORM: shader_addline(buffer, "%s%s = %s(", glsl_dst.reg_name, glsl_dst.mask_str, shift_glsl_tab[dst->shift]); break; -- 2.20.1

1 0

[PATCH 2/5] wined3d: Cleanup the staging bo on an error path in wined3d_texture_vk_upload_data().
by Henri Verbeet 18 Jan '21

18 Jan '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3f106bb2d9d..f6037a47c1c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4678,6 +4678,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) { ERR("Failed to get command buffer.\n"); + wined3d_context_vk_destroy_bo(context_vk, &staging_bo); return; } -- 2.20.1

1 0

[PATCH 1/5] wined3d: Get rid of the destination offset in wined3d_texture_vk_upload_data().
by Henri Verbeet 18 Jan '21

18 Jan '21

The idea was once to use permanent bo's for textures, similar to how texture PBOs work in the OpenGL backend. In that case we would have needed to copy to the correct position in the bo, in order not to modify other parts of the bo. With the current scheme, the destination offset serves no purpose. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b630f0dcfc5..3f106bb2d9d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4592,9 +4592,9 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, VkCommandBuffer vk_command_buffer; struct wined3d_bo_vk staging_bo; VkImageAspectFlags aspect_mask; - size_t src_offset, dst_offset; struct wined3d_range range; VkBufferImageCopy region; + size_t src_offset; void *map_ptr; TRACE("context %p, src_bo_addr %s, src_format %s, src_box %s, src_row_pitch %u, src_slice_pitch %u, " @@ -4649,9 +4649,6 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, src_offset = src_box->front * src_slice_pitch + (src_box->top / src_format->block_height) * src_row_pitch + (src_box->left / src_format->block_width) * src_format->block_byte_count; - dst_offset = dst_z * src_slice_pitch - + (dst_y / src_format->block_height) * src_row_pitch - + (dst_x / src_format->block_width) * src_format->block_byte_count; if (!wined3d_context_vk_create_bo(context_vk, sub_resource->size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo)) @@ -4670,8 +4667,8 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, return; } - wined3d_format_copy_data(src_format, src_bo_addr->addr + src_offset, src_row_pitch, src_slice_pitch, - (uint8_t *)map_ptr + dst_offset, dst_row_pitch, dst_slice_pitch, src_box->right - src_box->left, + wined3d_format_copy_data(src_format, src_bo_addr->addr + src_offset, src_row_pitch, + src_slice_pitch, map_ptr, dst_row_pitch, dst_slice_pitch, src_box->right - src_box->left, src_box->bottom - src_box->top, src_box->back - src_box->front); range.offset = 0; @@ -4691,7 +4688,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, dst_texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, dst_texture_vk->vk_image, aspect_mask); - region.bufferOffset = staging_bo.buffer_offset + dst_offset; + region.bufferOffset = staging_bo.buffer_offset; region.bufferRowLength = (dst_row_pitch / src_format->block_byte_count) * src_format->block_width; if (dst_row_pitch) region.bufferImageHeight = (dst_slice_pitch / dst_row_pitch) * src_format->block_height; -- 2.20.1

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Implement __LINE__.
by Zebediah Figura 18 Jan '21

18 Jan '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/preproc.l | 20 ++++++++++++++++++++ tests/hlsl_d3d12.c | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 388b77f6..c5c49251 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -471,6 +471,26 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) } continue; } + + if (!strcmp(text, "__LINE__")) + { + const struct preproc_file *file = preproc_get_top_file(ctx); + + /* Not the current line number, but rather the line + * number before invoking any macros. */ + + if (ctx->current_directive) + { + char string[13]; + + sprintf(string, "%d", file->buffer.location.line); + return return_token(T_INTEGER, lval, string); + } + + if (preproc_is_writing(ctx)) + vkd3d_string_buffer_printf(&ctx->buffer, "%d ", file->buffer.location.line); + continue; + } } if (ctx->current_directive) diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 9d8d16d9..03169716 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -350,7 +350,7 @@ static void test_preprocess(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { vkd3d_test_set_context("Source \"%s\"", tests[i].source); - todo_if (i == 9 || (i >= 12 && i <= 14)) + todo_if (i == 9) check_preprocess(tests[i].source, NULL, NULL, tests[i].present, tests[i].absent); } vkd3d_test_set_context(NULL); -- 2.30.0

3 14

[PATCH] winemac.drv: Include depth32+stencil pixel formats in enumeration.
by Jan Sikorski 18 Jan '21

18 Jan '21

This is especially important for M1 GPUs as they don't support the 24/8 format. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/winemac.drv/opengl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index b66af0f1c47..9f02e93d376 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -741,7 +741,8 @@ static void enum_renderer_pixel_formats(renderer_properties renderer, CFMutableA if (!(renderer.stencil_modes & depth_stencil_modes[stencil_mode].mode)) continue; - if (accelerated && depth_stencil_modes[depth_mode].bits != 24 && stencil_mode > 0) + if (accelerated && depth_stencil_modes[depth_mode].bits != 24 && + depth_stencil_modes[depth_mode].bits != 32 && stencil_mode > 0) continue; attribs[n++] = kCGLPFAStencilSize; -- 2.29.2

1 0

[PATCH] dwrite: Add check for pass parameters of create_trimmingsign() to prevent crash.
by Haoyang Chen 18 Jan '21

18 Jan '21

2 1