December 2020 - Wine-Devel - list.winehq.org

Re: [PATCH v2 1/4] winegstreamer: Introduce audio conversion transform.

by Zebediah Figura (she/her)

On 12/2/20 11:26 AM, Derek Lesho wrote: > On 12/2/20 12:25 PM, Zebediah Figura (she/her) wrote: > >> On 12/2/20 11:15 AM, Derek Lesho wrote: >>> On 12/2/20 12:07 PM, Zebediah Figura (she/her) wrote: >>>> Performance isn't really the concern—it's more code, and you really >>>> should be handling allocation failure. >>>> >>>> Another solution could be to just use a fixed-size stack buffer. >>> Okay, I guess I'll do that. There's no limit to how many types you can >>> register for the MFT so I'll just make a max of 100 for both input and >>> output (so ~3.2kb of stack space). >> I think there's no need for that; just allocate as much stack space as >> you actually need. > That varies on a per MFT registration basis, some MFTs require more > registration structs than others, since they have more input/output > types. Unless you're suggesting I use a VLA? No, simply use the maximum array size that any individual transform needs.

Dec. 2, 2020

Re: [PATCH v2 1/4] winegstreamer: Introduce audio conversion transform.

by Derek Lesho

On 12/2/20 12:25 PM, Zebediah Figura (she/her) wrote: > On 12/2/20 11:15 AM, Derek Lesho wrote: >> On 12/2/20 12:07 PM, Zebediah Figura (she/her) wrote: >>> Performance isn't really the concern—it's more code, and you really >>> should be handling allocation failure. >>> >>> Another solution could be to just use a fixed-size stack buffer. >> Okay, I guess I'll do that. There's no limit to how many types you can >> register for the MFT so I'll just make a max of 100 for both input and >> output (so ~3.2kb of stack space). > I think there's no need for that; just allocate as much stack space as > you actually need. That varies on a per MFT registration basis, some MFTs require more registration structs than others, since they have more input/output types. Unless you're suggesting I use a VLA?

Dec. 2, 2020

Re: [PATCH v2 1/4] winegstreamer: Introduce audio conversion transform.

by Zebediah Figura (she/her)

On 12/2/20 11:15 AM, Derek Lesho wrote: > > On 12/2/20 12:07 PM, Zebediah Figura (she/her) wrote: >> Performance isn't really the concern—it's more code, and you really >> should be handling allocation failure. >> >> Another solution could be to just use a fixed-size stack buffer. > Okay, I guess I'll do that. There's no limit to how many types you can > register for the MFT so I'll just make a max of 100 for both input and > output (so ~3.2kb of stack space). I think there's no need for that; just allocate as much stack space as you actually need.

Dec. 2, 2020

[PATCH] conhost: Allow events with left alt pressed in edit_line_insert.

by Jacek Caban

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50197 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

Dec. 2, 2020

Re: [PATCH v2] conhost: Respect the StartupInfo's wShowWindow.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

Dec. 2, 2020

Re: [PATCH v2 1/4] winegstreamer: Introduce audio conversion transform.

by Derek Lesho

On 12/2/20 12:07 PM, Zebediah Figura (she/her) wrote: > Performance isn't really the concern—it's more code, and you really > should be handling allocation failure. > > Another solution could be to just use a fixed-size stack buffer. Okay, I guess I'll do that. There's no limit to how many types you can register for the MFT so I'll just make a max of 100 for both input and output (so ~3.2kb of stack space).

Dec. 2, 2020

Re: [PATCH v2 1/4] winegstreamer: Introduce audio conversion transform.

by Zebediah Figura (she/her)

On 12/1/20 3:57 PM, Derek Lesho wrote: > > On 12/1/20 3:00 PM, Zebediah Figura (she/her) wrote: >> >>> +HRESULT mfplat_DllRegisterServer(void) >>> +{ >>> + unsigned int i; >>> + HRESULT hr; >>> + >>> + for (i = 0; i < ARRAY_SIZE(mfts); i++) >>> + { >>> + const struct mft *cur = &mfts[i]; >>> + >>> + MFT_REGISTER_TYPE_INFO *input_types, *output_types; >>> + input_types = heap_alloc(cur->input_types_count * >>> sizeof(input_types[0])); >>> + output_types = heap_alloc(cur->output_types_count * >>> sizeof(output_types[0])); >> Separately, I think it'd be better just to use MFT_REGISTER_TYPE_INFO >> directly in your "struct mft", and avoid allocation. It'd have to be >> non-const (or duplicate GUID definitions), but I think that's less >> awkward on the whole. > I'm trying to implement this now, but I'm having trouble with it. > MFT_REGISTER_TYPE_INFO consists of GUID value fields, not GUID pointer > fields. I'm not sure if there's a clean way to fill GUID fields of a > struct in an initialization list, even when the array is not const. I > definitely don't want to duplicate the GUID definitions, that would be > ugly. Also, I'm not sure I necessarily I agree this solution is better > than just having some heap allocations in DllRegisterServer, it's not in > what I would call a hotpath. Performance isn't really the concern—it's more code, and you really should be handling allocation failure. Another solution could be to just use a fixed-size stack buffer.

Dec. 2, 2020

[PATCH 2/2] kernel32: Remove outdated comments.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 4 ---- 1 file changed, 4 deletions(-)

Dec. 2, 2020

[PATCH 1/2] kernel32: Remove no longer used variables.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/kernel_main.c | 1 - dlls/kernel32/kernel_private.h | 4 ---- dlls/kernel32/path.c | 8 +++++--- dlls/kernel32/process.c | 4 ---- 4 files changed, 5 insertions(+), 12 deletions(-)

Dec. 2, 2020

Re: [PATCH vkd3d v2] vkd3d-shader: Validate "compile_info" in vkd3d_shader_preprocess().

by Henri Verbeet

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

Dec. 2, 2020

[PATCH 5/5] wined3d: Reference the source/destination bo in wined3d_texture_copy_sysmem_location().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b84b68c592b..1e410930a8b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -636,6 +636,7 @@ static BOOL wined3d_texture_copy_sysmem_location(struct wined3d_texture *texture GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, dst_bo->id)); GL_EXTCALL(glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, size, src.addr)); GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + wined3d_context_gl_reference_bo(wined3d_context_gl(context), dst_bo); checkGLcall("PBO upload"); context_release(context); return TRUE; @@ -648,6 +649,7 @@ static BOOL wined3d_texture_copy_sysmem_location(struct wined3d_texture *texture GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, src_bo->id)); GL_EXTCALL(glGetBufferSubData(GL_PIXEL_PACK_BUFFER, 0, size, dst.addr)); GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + wined3d_context_gl_reference_bo(wined3d_context_gl(context), src_bo); checkGLcall("PBO download"); context_release(context); return TRUE; -- 2.20.1

Dec. 2, 2020

[PATCH 4/5] wined3d: Reference the bo (if any) in texture2d_read_from_framebuffer().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index af2ab36d273..d5d07d8c401 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -527,6 +527,7 @@ error: if (data.buffer_object) { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + wined3d_context_gl_reference_bo(context_gl, (struct wined3d_bo_gl *)data.buffer_object); checkGLcall("glBindBuffer"); } -- 2.20.1

Dec. 2, 2020

[PATCH 3/5] wined3d: Reference the constant buffer bo in context_gl_load_shader_resources().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index beb418ba960..83c61834f5a 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3703,8 +3703,12 @@ static void context_gl_load_shader_resources(struct wined3d_context_gl *context_ for (j = 0; j < WINED3D_MAX_CBS; ++j) { - if (state->cb[i][j]) - wined3d_buffer_load(state->cb[i][j], &context_gl->c, state); + if (!state->cb[i][j]) + continue; + + buffer_gl = wined3d_buffer_gl(state->cb[i][j]); + wined3d_buffer_load(&buffer_gl->b, &context_gl->c, state); + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); } for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) -- 2.20.1

Dec. 2, 2020

[PATCH 2/5] wined3d: Reference the SRV bo in context_load_shader_resources().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 37 -------------------------- dlls/wined3d/context_gl.c | 48 ++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 46 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ddff9f1e014..118ac2aad8a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -383,40 +383,3 @@ void context_preload_textures(struct wined3d_context *context, const struct wine } } } - -void context_load_shader_resources(struct wined3d_context *context, - const struct wined3d_state *state, unsigned int shader_mask) -{ - struct wined3d_shader_sampler_map_entry *entry; - struct wined3d_shader_resource_view *view; - struct wined3d_shader *shader; - unsigned int i, j; - - for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) - { - if (!(shader_mask & (1u << i))) - continue; - - if (!(shader = state->shader[i])) - continue; - - for (j = 0; j < WINED3D_MAX_CBS; ++j) - { - if (state->cb[i][j]) - wined3d_buffer_load(state->cb[i][j], context, state); - } - - for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) - { - entry = &shader->reg_maps.sampler_map.entries[j]; - - if (!(view = state->shader_resource_view[i][entry->resource_idx])) - continue; - - if (view->resource->type == WINED3D_RTYPE_BUFFER) - wined3d_buffer_load(buffer_from_resource(view->resource), context, state); - else - wined3d_texture_load(texture_from_resource(view->resource), context, FALSE); - } - } -} diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 9faff43f003..beb418ba960 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3684,6 +3684,50 @@ static void wined3d_context_gl_bind_unordered_access_views(struct wined3d_contex checkGLcall("Bind unordered access views"); } +static void context_gl_load_shader_resources(struct wined3d_context_gl *context_gl, + const struct wined3d_state *state, unsigned int shader_mask) +{ + struct wined3d_shader_sampler_map_entry *entry; + struct wined3d_shader_resource_view *view; + struct wined3d_buffer_gl *buffer_gl; + struct wined3d_shader *shader; + unsigned int i, j; + + for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) + { + if (!(shader_mask & (1u << i))) + continue; + + if (!(shader = state->shader[i])) + continue; + + for (j = 0; j < WINED3D_MAX_CBS; ++j) + { + if (state->cb[i][j]) + wined3d_buffer_load(state->cb[i][j], &context_gl->c, state); + } + + for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) + { + entry = &shader->reg_maps.sampler_map.entries[j]; + + if (!(view = state->shader_resource_view[i][entry->resource_idx])) + continue; + + if (view->resource->type == WINED3D_RTYPE_BUFFER) + { + buffer_gl = wined3d_buffer_gl(buffer_from_resource(view->resource)); + wined3d_buffer_load(&buffer_gl->b, &context_gl->c, state); + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); + } + else + { + wined3d_texture_load(texture_from_resource(view->resource), &context_gl->c, FALSE); + } + } + } +} + static void context_gl_load_unordered_access_resources(struct wined3d_context_gl *context_gl, const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) { @@ -3768,7 +3812,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, * updating a resource location. */ wined3d_context_gl_update_tex_unit_map(context_gl, state); context_preload_textures(context, state); - context_load_shader_resources(context, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); + context_gl_load_shader_resources(context_gl, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); context_gl_load_unordered_access_resources(context_gl, state->shader[WINED3D_SHADER_TYPE_PIXEL], state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); context_gl_load_stream_output_buffers(context_gl, state); @@ -3873,7 +3917,7 @@ static void wined3d_context_gl_apply_compute_state(struct wined3d_context_gl *co const struct wined3d_gl_info *gl_info = context_gl->gl_info; unsigned int state_id, i; - context_load_shader_resources(&context_gl->c, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); + context_gl_load_shader_resources(context_gl, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); context_gl_load_unordered_access_resources(context_gl, state->shader[WINED3D_SHADER_TYPE_COMPUTE], state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 95abd2217a0..b756c80ad8a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2149,8 +2149,6 @@ struct wined3d_context void wined3d_context_cleanup(struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; -void context_load_shader_resources(struct wined3d_context *context, - const struct wined3d_state *state, unsigned int shader_mask) DECLSPEC_HIDDEN; void context_preload_textures(struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; void context_update_stream_info(struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; -- 2.20.1

Dec. 2, 2020

[PATCH 1/5] wined3d: Reference the UAV bo in context_load_unordered_access_resources().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 35 ----------------------------- dlls/wined3d/context_gl.c | 40 ++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 38 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2dd4780b8ad..ddff9f1e014 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -420,38 +420,3 @@ void context_load_shader_resources(struct wined3d_context *context, } } } - -void context_load_unordered_access_resources(struct wined3d_context *context, - const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) -{ - struct wined3d_unordered_access_view *view; - struct wined3d_texture *texture; - struct wined3d_buffer *buffer; - unsigned int i; - - context->uses_uavs = 0; - - if (!shader) - return; - - for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) - { - if (!(view = views[i])) - continue; - - if (view->resource->type == WINED3D_RTYPE_BUFFER) - { - buffer = buffer_from_resource(view->resource); - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); - wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); - } - else - { - texture = texture_from_resource(view->resource); - wined3d_texture_load(texture, context, FALSE); - wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_TEXTURE_RGB); - } - - context->uses_uavs = 1; - } -} diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 13e4fa69ea7..9faff43f003 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3684,6 +3684,42 @@ static void wined3d_context_gl_bind_unordered_access_views(struct wined3d_contex checkGLcall("Bind unordered access views"); } +static void context_gl_load_unordered_access_resources(struct wined3d_context_gl *context_gl, + const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) +{ + struct wined3d_unordered_access_view *view; + struct wined3d_buffer_gl *buffer_gl; + struct wined3d_texture *texture; + unsigned int i; + + context_gl->c.uses_uavs = 0; + + if (!shader) + return; + + for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) + { + if (!(view = views[i])) + continue; + + if (view->resource->type == WINED3D_RTYPE_BUFFER) + { + buffer_gl = wined3d_buffer_gl(buffer_from_resource(view->resource)); + wined3d_buffer_load_location(&buffer_gl->b, &context_gl->c, WINED3D_LOCATION_BUFFER); + wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); + } + else + { + texture = texture_from_resource(view->resource); + wined3d_texture_load(texture, &context_gl->c, FALSE); + wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_TEXTURE_RGB); + } + + context_gl->c.uses_uavs = 1; + } +} + static void context_gl_load_stream_output_buffers(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { @@ -3733,7 +3769,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, wined3d_context_gl_update_tex_unit_map(context_gl, state); context_preload_textures(context, state); context_load_shader_resources(context, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); - context_load_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_PIXEL], + context_gl_load_unordered_access_resources(context_gl, state->shader[WINED3D_SHADER_TYPE_PIXEL], state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); context_gl_load_stream_output_buffers(context_gl, state); /* TODO: Right now the dependency on the vertex shader is necessary @@ -3838,7 +3874,7 @@ static void wined3d_context_gl_apply_compute_state(struct wined3d_context_gl *co unsigned int state_id, i; context_load_shader_resources(&context_gl->c, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); - context_load_unordered_access_resources(&context_gl->c, state->shader[WINED3D_SHADER_TYPE_COMPUTE], + context_gl_load_unordered_access_resources(context_gl, state->shader[WINED3D_SHADER_TYPE_COMPUTE], state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); for (i = 0, state_id = STATE_COMPUTE_OFFSET; i < ARRAY_SIZE(context_gl->c.dirty_compute_states); ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f2dedf45a68..95abd2217a0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2151,8 +2151,6 @@ void wined3d_context_cleanup(struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void context_load_shader_resources(struct wined3d_context *context, const struct wined3d_state *state, unsigned int shader_mask) DECLSPEC_HIDDEN; -void context_load_unordered_access_resources(struct wined3d_context *context, - const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) DECLSPEC_HIDDEN; void context_preload_textures(struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; void context_update_stream_info(struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; -- 2.20.1

Dec. 2, 2020

Re: [PATCH 3/5] wined3d: Get rid of an unnecessary assignment.

by Henri Verbeet

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

Dec. 2, 2020

Re: [PATCH 4/5] d3d9/tests: Make a variable static const.

by Henri Verbeet

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

Dec. 2, 2020

Re: [PATCH 5/5] d3d11: Don't explicitly check for cube map support.

by Henri Verbeet

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

Dec. 2, 2020

[PATCH] wined3d: Add NVIDIA GeForce GTX 1060 Mobile.

by Andrey Gusev

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7164b81b8ee..412842469b3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -439,6 +439,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1050TI, "NVIDIA GeForce GTX 1050 Ti", DRIVER_NVIDIA_KEPLER, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060_3GB,"NVIDIA GeForce GTX 1060 3GB", DRIVER_NVIDIA_KEPLER, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_KEPLER, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060M, "NVIDIA GeForce GTX 1060M", DRIVER_NVIDIA_KEPLER, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080M, "NVIDIA GeForce GTX 1080M", DRIVER_NVIDIA_KEPLER, 8192}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f2dedf45a68..610f3a022c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3016,6 +3016,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1050TI = 0x1c82, CARD_NVIDIA_GEFORCE_GTX1060_3GB = 0x1c02, CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, + CARD_NVIDIA_GEFORCE_GTX1060M = 0x1c20, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, CARD_NVIDIA_GEFORCE_GTX1080M = 0x1be0, -- 2.28.0

Dec. 2, 2020

Re: [PATCH vkd3d 5/5] vkd3d-shader: Validate "compile_info" in vkd3d_shader_preprocess().

by Henri Verbeet

On Wed, 2 Dec 2020 at 19:00, Zebediah Figura (she/her) <zfigura(a)codeweavers.com> wrote: > On 12/2/20 8:32 AM, Henri Verbeet wrote: > > On Wed, 2 Dec 2020 at 06:21, Zebediah Figura <zfigura(a)codeweavers.com> wrote: > >> @@ -832,7 +836,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char > >> if (messages) > >> *messages = NULL; > >> > >> - if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) > >> + if ((ret = vkd3d_shader_validate_compile_info(compile_info, false)) < 0) > >> return ret; > >> > > This makes vkd3d_shader_scan() ignore the target type. Maybe that's > > ok, but it probably deserves a bit more thought than being a side > > effect of this patch, as well as some updates to the API > > documentation. > > > > I figured it was sensible enough to be obvious, but that's fair enough. I can certainly see the argument for ignoring it, but there's somewhat of an open question about whether the target type can influence what vkd3d_shader_scan() returns for a particular shader, or whether that purely depends on the source type and (potentially) chained output structures.

Dec. 2, 2020

Re: [PATCH] crypt32: Add support for CRYPT_STRING_HEX to CryptBinaryToStringW.

by Dmitry Timoshkov

Alex Henrie <alexhenrie24(a)gmail.com> wrote: > On Wed, Dec 2, 2020 at 6:56 AM Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > > > > +static BOOL BinaryToHexRawW(const BYTE *bin, DWORD nbin, DWORD flags, LPWSTR str, DWORD *nstr) > > { > > static const WCHAR hex[] = L"0123456789abcdef"; > > DWORD needed; > > @@ -506,6 +506,79 @@ static BOOL BinaryToHexW(const BYTE *bin, DWORD nbin, DWORD flags, LPWSTR str, D > > return TRUE; > > } > > > > +static BOOL binary_to_hexW(const BYTE *bin, DWORD nbin, DWORD flags, LPWSTR str, DWORD *nstr) > > +{ > > + static const WCHAR hex[] = {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'}; > > This can be an L-string now. In fact, you can just move the > declaration from BinaryToHexRawW outside of the function and use it in > both BinaryToHexRawW and binary_to_hexW. Thanks for the suggestion, I missed this during resend. However there must be something else that prevented this patch to be accepted, since conversion to using wine-char string literals happend after this patch was sent first time. If there are no other requests (Alexandre?) I'll resubmit with this change. -- Dmitry.

Dec. 2, 2020

Re: [PATCH vkd3d 5/5] vkd3d-shader: Validate "compile_info" in vkd3d_shader_preprocess().

by Zebediah Figura (she/her)

On 12/2/20 8:32 AM, Henri Verbeet wrote: > On Wed, 2 Dec 2020 at 06:21, Zebediah Figura <zfigura(a)codeweavers.com> wrote: >> @@ -832,7 +836,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char >> if (messages) >> *messages = NULL; >> >> - if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) >> + if ((ret = vkd3d_shader_validate_compile_info(compile_info, false)) < 0) >> return ret; >> > This makes vkd3d_shader_scan() ignore the target type. Maybe that's > ok, but it probably deserves a bit more thought than being a side > effect of this patch, as well as some updates to the API > documentation. > I figured it was sensible enough to be obvious, but that's fair enough.

Dec. 2, 2020

[PATCH vkd3d v2] vkd3d-shader: Validate "compile_info" in vkd3d_shader_preprocess().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 33 +++++++++++++++++---------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6289a185..1a029246 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -252,7 +252,8 @@ static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) free_shader_desc(&parser->shader_desc); } -static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info) +static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info, + bool validate_target_type) { const enum vkd3d_shader_source_type *source_types; const enum vkd3d_shader_target_type *target_types; @@ -276,16 +277,19 @@ static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_ return VKD3D_ERROR_INVALID_ARGUMENT; } - target_types = vkd3d_shader_get_supported_target_types(compile_info->source_type, &count); - for (i = 0; i < count; ++i) + if (validate_target_type) { - if (target_types[i] == compile_info->target_type) - break; - } - if (i == count) - { - WARN("Invalid shader target type %#x.\n", compile_info->target_type); - return VKD3D_ERROR_INVALID_ARGUMENT; + target_types = vkd3d_shader_get_supported_target_types(compile_info->source_type, &count); + for (i = 0; i < count; ++i) + { + if (target_types[i] == compile_info->target_type) + break; + } + if (i == count) + { + WARN("Invalid shader target type %#x.\n", compile_info->target_type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } } return VKD3D_OK; @@ -832,7 +836,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char if (messages) *messages = NULL; - if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) + if ((ret = vkd3d_shader_validate_compile_info(compile_info, true)) < 0) return ret; vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name); @@ -933,7 +937,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, if (messages) *messages = NULL; - if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) + if ((ret = vkd3d_shader_validate_compile_info(compile_info, true)) < 0) return ret; vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name); @@ -1150,10 +1154,15 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages) { + int ret; + TRACE("compile_info %p, out %p, messages %p.\n", compile_info, out, messages); if (messages) *messages = NULL; + if ((ret = vkd3d_shader_validate_compile_info(compile_info, false)) < 0) + return ret; + return VKD3D_ERROR_NOT_IMPLEMENTED; } -- 2.29.2

Dec. 2, 2020

Re: [PATCH] crypt32: Add support for CRYPT_STRING_HEX to CryptBinaryToStringW.

by Alex Henrie

On Wed, Dec 2, 2020 at 6:56 AM Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > > +static BOOL BinaryToHexRawW(const BYTE *bin, DWORD nbin, DWORD flags, LPWSTR str, DWORD *nstr) > { > static const WCHAR hex[] = L"0123456789abcdef"; > DWORD needed; > @@ -506,6 +506,79 @@ static BOOL BinaryToHexW(const BYTE *bin, DWORD nbin, DWORD flags, LPWSTR str, D > return TRUE; > } > > +static BOOL binary_to_hexW(const BYTE *bin, DWORD nbin, DWORD flags, LPWSTR str, DWORD *nstr) > +{ > + static const WCHAR hex[] = {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'}; This can be an L-string now. In fact, you can just move the declaration from BinaryToHexRawW outside of the function and use it in both BinaryToHexRawW and binary_to_hexW. -Alex

Dec. 2, 2020

Re: [PATCH 05/10] msvcrt: Remove MSVCRT_ prefix from exit.c functions.

by Alexandre Julliard

Piotr Caban <piotr(a)codeweavers.com> writes: > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > --- > dlls/crtdll/crtdll.spec | 16 +++++----- > dlls/msvcr100/msvcr100.spec | 22 +++++++------- > dlls/msvcr110/msvcr110.spec | 24 +++++++-------- > dlls/msvcr120/msvcr120.spec | 26 ++++++++-------- > dlls/msvcr70/msvcr70.spec | 18 +++++------ > dlls/msvcr71/msvcr71.spec | 18 +++++------ > dlls/msvcr80/msvcr80.spec | 22 +++++++------- > dlls/msvcr90/msvcr90.spec | 22 +++++++------- > dlls/msvcrt/cpp.c | 2 +- > dlls/msvcrt/errno.c | 2 +- > dlls/msvcrt/except.c | 6 ++-- > dlls/msvcrt/exit.c | 46 ++++++++++++++-------------- > dlls/msvcrt/locale.c | 10 +++---- > dlls/msvcrt/msvcrt.h | 2 -- > dlls/msvcrt/msvcrt.spec | 20 ++++++------- > dlls/msvcrt/process.c | 2 +- > dlls/msvcrtd/msvcrtd.spec | 18 +++++------ > dlls/ucrtbase/ucrtbase.spec | 60 ++++++++++++++++++------------------- > 18 files changed, 167 insertions(+), 169 deletions(-) I'll commit it, but I reverted the atexit() bit since it's causing trouble on Android: arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: error: dlls/crtdll/exit.o: multiple definition of 'atexit' arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: /home/julliard/android/android-ndk-r21/toolchains/llvm/prebuilt/linux-x86_64/bin/../sysroot/usr/lib/arm-linux-androideabi/29/crtbegin_so.o: previous definition here -- Alexandre Julliard julliard(a)winehq.org

Dec. 2, 2020