wine-commits June 2021

wine-commits@winehq.org

1 participants
811 discussions

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in glsl_blitter_blit().
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: d5fa539749213fbc43f596ef483617c9084c854f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5fa539749213fbc43f596ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 25 15:01:30 2021 +0200 wined3d: Use wined3d_mask_from_size() in glsl_blitter_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ccfd5f3f28e..5d0e7b13bd4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13215,7 +13215,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli const struct wined3d_format *f = src_texture->resource.format; alpha_test_key.color_space_low_value = 0; - alpha_test_key.color_space_high_value = ~(((1u << f->alpha_size) - 1) << f->alpha_offset); + alpha_test_key.color_space_high_value = ~(wined3d_mask_from_size(f->alpha_size) << f->alpha_offset); colour_key = &alpha_test_key; } else if (op != WINED3D_BLIT_OP_COLOR_BLIT_CKEY)

1 0

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in arbfp_blitter_blit().
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 260b11a193b3f7b69722369ca26d2f7268c1f2c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=260b11a193b3f7b69722369c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 25 15:01:29 2021 +0200 wined3d: Use wined3d_mask_from_size() in arbfp_blitter_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e297c724412..1b533107f64 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7922,7 +7922,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl { const struct wined3d_format *fmt = src_texture->resource.format; alpha_test_key.color_space_low_value = 0; - alpha_test_key.color_space_high_value = ~(((1u << fmt->alpha_size) - 1) << fmt->alpha_offset); + alpha_test_key.color_space_high_value = ~(wined3d_mask_from_size(fmt->alpha_size) << fmt->alpha_offset); color_key = &alpha_test_key; }

1 0

Henri Verbeet : wined3d: Only invalidate valid state IDs in wined3d_cs_exec_reset_state().
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 0170bb0e548d33e4fa014b73cd2c75ce7ea0dc82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0170bb0e548d33e4fa014b73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 25 15:01:28 2021 +0200 wined3d: Only invalidate valid state IDs in wined3d_cs_exec_reset_state(). Not every state ID between 0 and STATE_HIGHEST is valid; for example, there are holes in the renderstate IDs. While invalidating these works fine, attempting to subsequently apply them in e.g. context_apply_draw_state() ends up calling state_undefined() and printing an ERR. This is especially visible when running the d2d1 tests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ad393c203c4..4adfa18f5f7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2214,15 +2214,21 @@ static void wined3d_cs_mt_push_constants(struct wined3d_device_context *context, static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) { + const struct wined3d_device *device = cs->c.device; const struct wined3d_cs_reset_state *op = data; + const struct wined3d_state_entry *state_table; unsigned int state; state_cleanup(&cs->state); - wined3d_state_reset(&cs->state, &cs->c.device->adapter->d3d_info); + wined3d_state_reset(&cs->state, &device->adapter->d3d_info); if (op->invalidate) { + state_table = device->state_table; for (state = 0; state <= STATE_HIGHEST; ++state) - device_invalidate_state(cs->c.device, state); + { + if (state_table[state].representative) + device_invalidate_state(device, state); + } } }

1 0

Hugh McMaster : reg/tests: Test deletion of keys and values using registry views.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 556121b1cafc2182edaeb7354caf46375205bef7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=556121b1cafc2182edaeb735… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 25 22:58:12 2021 +1000 reg/tests: Test deletion of keys and values using registry views. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/delete.c | 275 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 275 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=556121b1cafc2182edae…

1 0

Hugh McMaster : reg/tests: Remove duplicate test from test_registry_view_wow64().
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 8ad9c21b056d9f3119c363e0f7e56198985d5b08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ad9c21b056d9f3119c363e0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 25 22:58:11 2021 +1000 reg/tests: Remove duplicate test from test_registry_view_wow64(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index bb72c4a3737..36fa634796d 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -961,10 +961,6 @@ static void test_registry_view_wow64(void) run_reg_exe("reg add HKLM\\" KEY_BASE " /v Wine64 /d Test /f /reg:64", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); - verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); - close_key(hkey); - open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); close_key(hkey);

1 0

Hugh McMaster : reg/tests: Modify delete_tree() to support the use of registry views.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: d790c593490bfb363cf34ab2d00dddbaf04ddd15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d790c593490bfb363cf34ab2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 25 22:58:10 2021 +1000 reg/tests: Modify delete_tree() to support the use of registry views. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 17 ++++++++++------- programs/reg/tests/copy.c | 36 ++++++++++++++++++------------------ programs/reg/tests/delete.c | 4 ++-- programs/reg/tests/export.c | 8 ++++---- programs/reg/tests/import.c | 12 ++++++------ programs/reg/tests/query.c | 6 +++--- programs/reg/tests/reg_test.h | 2 +- 7 files changed, 44 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d790c593490bfb363cf3…

1 0

Akihiro Sagawa : ntdll: Fix null pointer dereference in RtlDosPathNameToNtPathName_U_WithStatus.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: c94ac2e0619ab31bc3138f17786e7cac00a95bcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c94ac2e0619ab31bc3138f17… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jun 25 18:47:00 2021 +0900 ntdll: Fix null pointer dereference in RtlDosPathNameToNtPathName_U_WithStatus. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index cacb95853ad..58983aca194 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -231,7 +231,7 @@ NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, U goto out; } - if (*file_part) *file_part = NULL; + if (file_part) *file_part = NULL; sz = LOWORD(dosdev);

1 0

Brendan McGrath : kernelbase: Don't pass StdHandles with CREATE_NEW_CONSOLE.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 7539dd607b5a9840d13849a0668d9e8982e20c8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7539dd607b5a9840d13849a0… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Fri Jun 25 07:01:56 2021 +1000 kernelbase: Don't pass StdHandles with CREATE_NEW_CONSOLE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51264 Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 924fa733e5b..7296e085382 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -198,7 +198,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename params->hStdOutput = startup->hStdOutput; params->hStdError = startup->hStdError; } - else if (flags & DETACHED_PROCESS) + else if (flags & (DETACHED_PROCESS | CREATE_NEW_CONSOLE)) { params->hStdInput = INVALID_HANDLE_VALUE; params->hStdOutput = INVALID_HANDLE_VALUE;

1 0

Zebediah Figura : wined3d: Return the map pitch in wined3d_device_context_map().
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 61024aa12f7752014924f30657e2adb80148f312 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61024aa12f7752014924f306… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 15:29:06 2021 -0500 wined3d: Return the map pitch in wined3d_device_context_map(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 19 ++++++++++------ dlls/wined3d/cs.c | 18 +++++++-------- dlls/wined3d/device.c | 6 ++++- dlls/wined3d/texture.c | 50 +++++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 13 ++++++++--- 5 files changed, 65 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61024aa12f7752014924…

1 0

Zebediah Figura : wined3d: Always pass a non-NULL box to context->ops->map().
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 236afee0daab65ccbd8e744569667e128c04a439 URL: https://source.winehq.org/git/wine.git/?a=commit;h=236afee0daab65ccbd8e7445… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 15:29:05 2021 -0500 wined3d: Always pass a non-NULL box to context->ops->map(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 17 ++--------------- dlls/wined3d/device.c | 12 ++++++++++++ dlls/wined3d/texture.c | 39 ++++++++++++++------------------------- 3 files changed, 28 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 142cce0299f..20057b4127f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -875,21 +875,8 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc TRACE("resource %p, sub_resource_idx %u, map_desc %p, box %s, flags %#x.\n", resource, sub_resource_idx, map_desc, debug_box(box), flags); - if (sub_resource_idx) - { - WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); - return E_INVALIDARG; - } - - if (box) - { - offset = box->left; - size = box->right - box->left; - } - else - { - offset = size = 0; - } + offset = box->left; + size = box->right - box->left; map_desc->row_pitch = map_desc->slice_pitch = resource->size; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6d749269c18..55407516446 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4834,6 +4834,9 @@ HRESULT CDECL wined3d_device_context_map(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) { + struct wined3d_sub_resource_desc desc; + struct wined3d_box b; + TRACE("context %p, resource %p, sub_resource_idx %u, map_desc %p, box %s, flags %#x.\n", context, resource, sub_resource_idx, map_desc, debug_box(box), flags); @@ -4857,6 +4860,15 @@ HRESULT CDECL wined3d_device_context_map(struct wined3d_device_context *context, flags = sanitise_map_flags(resource, flags); + if (FAILED(wined3d_resource_get_sub_resource_desc(resource, sub_resource_idx, &desc))) + return E_INVALIDARG; + + if (!box) + { + wined3d_box_set(&b, 0, 0, desc.width, desc.height, 0, desc.depth); + box = &b; + } + return context->ops->map(context, resource, sub_resource_idx, map_desc, box, flags); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5f02bcfed8f..c09a9f619ac 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3532,11 +3532,10 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour resource, sub_resource_idx, map_desc, debug_box(box), flags); texture = texture_from_resource(resource); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) - return E_INVALIDARG; + sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx); texture_level = sub_resource_idx % texture->level_count; - if (box && FAILED(wined3d_texture_check_box_dimensions(texture, texture_level, box))) + if (FAILED(wined3d_texture_check_box_dimensions(texture, texture_level, box))) { WARN("Map box is invalid.\n"); if (((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && !(resource->access & WINED3D_RESOURCE_ACCESS_CPU)) @@ -3605,38 +3604,28 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour wined3d_texture_get_pitch(texture, texture_level, &map_desc->row_pitch, &map_desc->slice_pitch); } - if (!box) + if ((fmt_flags & (WINED3DFMT_FLAG_BLOCKS | WINED3DFMT_FLAG_BROKEN_PITCH)) == WINED3DFMT_FLAG_BLOCKS) { - map_desc->data = base_memory; + /* Compressed textures are block based, so calculate the offset of + * the block that contains the top-left pixel of the mapped box. */ + map_desc->data = base_memory + + (box->front * map_desc->slice_pitch) + + ((box->top / format->block_height) * map_desc->row_pitch) + + ((box->left / format->block_width) * format->block_byte_count); } else { - if ((fmt_flags & (WINED3DFMT_FLAG_BLOCKS | WINED3DFMT_FLAG_BROKEN_PITCH)) == WINED3DFMT_FLAG_BLOCKS) - { - /* Compressed textures are block based, so calculate the offset of - * the block that contains the top-left pixel of the mapped box. */ - map_desc->data = base_memory - + (box->front * map_desc->slice_pitch) - + ((box->top / format->block_height) * map_desc->row_pitch) - + ((box->left / format->block_width) * format->block_byte_count); - } - else - { - map_desc->data = base_memory - + (box->front * map_desc->slice_pitch) - + (box->top * map_desc->row_pitch) - + (box->left * format->byte_count); - } + map_desc->data = base_memory + + (box->front * map_desc->slice_pitch) + + (box->top * map_desc->row_pitch) + + (box->left * format->byte_count); } if (texture->swapchain && texture->swapchain->front_buffer == texture) { RECT *r = &texture->swapchain->front_buffer_update; - if (!box) - SetRect(r, 0, 0, resource->width, resource->height); - else - SetRect(r, box->left, box->top, box->right, box->bottom); + SetRect(r, box->left, box->top, box->right, box->bottom); TRACE("Mapped front buffer %s.\n", wine_dbgstr_rect(r)); }

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2021