June 2021 - Wine-Commits - list.winehq.org

Hugh McMaster : reg/tests: Test use of registry views with the 'query' operation.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: 76b30097525f755f572d835b0187d9496941d985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76b30097525f755f572d835b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 29 23:54:43 2021 +1000 reg/tests: Test use of registry views with the 'query' operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/query.c | 181 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index f5ba32f97e3..590d322c37c 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -132,6 +132,16 @@ static void test_command_syntax(void) run_reg_exe("reg query HKCU\\" KEY_BASE " /s /s", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* Test registry view */ + run_reg_exe("reg query HKCU\\" KEY_BASE " /reg:32 /reg:32", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /reg:32 /reg:64", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /reg:64 /reg:64", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } static void test_query(void) @@ -296,6 +306,165 @@ static void test_query(void) delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); } +static const char *test9a = "\r\n" + "HKEY_LOCAL_MACHINE\\" KEY_BASE "\r\n" + " Test1 REG_SZ Hello, World\r\n" + " Test2 REG_DWORD 0x123\r\n" + " Wine REG_SZ First instance\r\n\r\n" + "HKEY_LOCAL_MACHINE\\" KEY_BASE "\\subkey\r\n"; + +static const char *test9b = "\r\n" + "HKEY_LOCAL_MACHINE\\" KEY_BASE "\r\n" + " Test1 REG_SZ Hello, World\r\n" + " Test2 REG_DWORD 0x123\r\n" + " Wine REG_SZ First instance\r\n\r\n" + "HKEY_LOCAL_MACHINE\\" KEY_BASE "\\subkey\r\n" + " Test3 REG_SZ Some string data\r\n" + " Test4 REG_DWORD 0xabc\r\n" + " Wine REG_SZ Second instance\r\n\r\n"; + +static void create_test_key(REGSAM sam) +{ + HKEY hkey, subkey; + DWORD dword; + + add_key(HKEY_LOCAL_MACHINE, KEY_BASE, sam, &hkey); + add_value(hkey, "Test1", REG_SZ, "Hello, World", 13); + dword = 0x123; + add_value(hkey, "Test2", REG_DWORD, &dword, sizeof(dword)); + add_value(hkey, "Wine", REG_SZ, "First instance", 15); + + add_key(hkey, "subkey", sam, &subkey); + add_value(subkey, "Test3", REG_SZ, "Some string data", 16); + dword = 0xabc; + add_value(subkey, "Test4", REG_DWORD, &dword, sizeof(dword)); + add_value(subkey, "Wine", REG_SZ, "Second instance", 16); + + close_key(subkey); + close_key(hkey); +} + +static void test_registry_view_win32(void) +{ + BOOL is_wow64, is_win32; + DWORD r; + BYTE buf[512]; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + is_win32 = !is_wow64 && (sizeof(void *) == sizeof(int)); + + if (!is_win32) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try querying the 32-bit registry view (32-bit Windows) */ + create_test_key(KEY_WOW64_32KEY); + + read_reg_output("reg query HKLM\\" KEY_BASE " /reg:32", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9a, FALSE, 0); + + read_reg_output("reg query HKLM\\" KEY_BASE " /s /reg:32", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9b, FALSE, 0); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try querying the 64-bit registry view, which doesn't exist on 32-bit Windows */ + create_test_key(KEY_WOW64_64KEY); + + read_reg_output("reg query HKLM\\" KEY_BASE " /reg:64", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9a, FALSE, 0); + + read_reg_output("reg query HKLM\\" KEY_BASE " /s /reg:64", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9b, FALSE, 0); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + +static void test_registry_view_win64(void) +{ + BOOL is_wow64, is_win64; + DWORD r; + BYTE buf[512]; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + is_win64 = !is_wow64 && (sizeof(void *) > sizeof(int)); + + if (!is_win64) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try querying the 32-bit registry view (64-bit Windows) */ + create_test_key(KEY_WOW64_32KEY); + + read_reg_output("reg query HKLM\\" KEY_BASE " /reg:32", buf, sizeof(buf), &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9a, FALSE, TODO_REG_COMPARE); + + read_reg_output("reg query HKLM\\" KEY_BASE " /s /reg:32", buf, sizeof(buf), &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9b, FALSE, TODO_REG_COMPARE); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + /* Try querying the 64-bit registry view (64-bit Windows) */ + create_test_key(KEY_WOW64_64KEY); + + read_reg_output("reg query HKLM\\" KEY_BASE " /reg:64", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9a, FALSE, 0); + + read_reg_output("reg query HKLM\\" KEY_BASE " /s /reg:64", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9b, FALSE, 0); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + +static void test_registry_view_wow64(void) +{ + BOOL is_wow64; + DWORD r; + BYTE buf[512]; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + + if (!is_wow64) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try querying the 32-bit registry view (WOW64) */ + create_test_key(KEY_WOW64_32KEY); + + read_reg_output("reg query HKLM\\" KEY_BASE " /reg:32", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9a, FALSE, 0); + + read_reg_output("reg query HKLM\\" KEY_BASE " /s /reg:32", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9b, FALSE, 0); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + /* Try querying the 64-bit registry view (WOW64) */ + create_test_key(KEY_WOW64_64KEY); + + read_reg_output("reg query HKLM\\" KEY_BASE " /reg:64", buf, sizeof(buf), &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9a, FALSE, TODO_REG_COMPARE); + + read_reg_output("reg query HKLM\\" KEY_BASE " /s /reg:64", buf, sizeof(buf), &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9b, FALSE, TODO_REG_COMPARE); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + START_TEST(query) { DWORD r; @@ -307,4 +476,16 @@ START_TEST(query) test_command_syntax(); test_query(); + + /* Check if reg.exe is running with elevated privileges */ + if (!is_elevated_process()) + { + win_skip("reg.exe is not running with elevated privileges; " + "skipping registry view tests\n"); + return; + } + + test_registry_view_win32(); + test_registry_view_win64(); + test_registry_view_wow64(); }

1 0

Huw Davies : loader: Add tag ids to ensure nsiproxy.sys starts before ndis.sys.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: 87e43b8eaf287e4f4a6de591696b4394fbb277bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=87e43b8eaf287e4f4a6de591… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 29 08:04:20 2021 +0100 loader: Add tag ids to ensure nsiproxy.sys starts before ndis.sys. This will be needed as ndis.sys depends on iphlpapi which will in turn depend on nsi. Note that this isn't quite how the tags are supposed to work. The tags should be ordered according to the load group's order list. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index defaba008e2..426fe8b1595 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3775,6 +3775,7 @@ ErrorControl=1 LoadOrderGroup="System Bus Extender" [NDISService] +AddReg=NDISServiceKeys Description="NDIS service" DisplayName="NDIS" ServiceBinary="%12%\ndis.sys" @@ -3783,7 +3784,11 @@ StartType=2 ErrorControl=1 LoadOrderGroup="System Bus Extender" +[NDISServiceKeys] +HKR,,"Tag",0x10001,2 + [NsiProxyService] +AddReg=NsiProxyServiceKeys Description="NSI proxy service" DisplayName="NSI Proxy" ServiceBinary="%12%\nsiproxy.sys" @@ -3792,6 +3797,9 @@ StartType=2 ErrorControl=1 LoadOrderGroup="System Bus Extender" +[NsiProxyServiceKeys] +HKR,,"Tag",0x10001,1 + [RpcSsService] Description="RPC service" DisplayName="Remote Procedure Call (RPC)"

1 0

Zebediah Figura : wined3d: Create buffers with a format of WINED3DFMT_R8_UNORM.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: 447a748c512ea94034a03f58b6bb4f8ba7af845e URL: https://source.winehq.org/git/wine.git/?a=commit;h=447a748c512ea94034a03f58… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 28 11:39:01 2021 -0500 wined3d: Create buffers with a format of WINED3DFMT_R8_UNORM. Allow things like wined3d_format_copy_data() to work on them. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 00d219a49f2..0511f278144 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -849,7 +849,7 @@ static HRESULT buffer_resource_sub_resource_get_desc(struct wined3d_resource *re return E_INVALIDARG; } - desc->format = WINED3DFMT_UNKNOWN; + desc->format = WINED3DFMT_R8_UNORM; desc->multisample_type = WINED3D_MULTISAMPLE_NONE; desc->multisample_quality = 0; desc->usage = resource->usage; @@ -1156,7 +1156,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_buffer_ops *buffer_ops) { - const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, desc->bind_flags); + const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_R8_UNORM, desc->bind_flags); struct wined3d_resource *resource = &buffer->resource; HRESULT hr;

1 0

Francois Gouget : d3d10core/tests: Increase the tolerance in test_texture_compressed_3d().
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: 5e065c3c70ab5d3d4d8ea3631a1d6204f4130c37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e065c3c70ab5d3d4d8ea363… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 29 09:11:18 2021 +0200 d3d10core/tests: Increase the tolerance in test_texture_compressed_3d(). This fixes failures on Nvidia GeForce GTX 560 graphics cards. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51340 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 1eee482cc8f..2014e8edc94 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -19068,7 +19068,7 @@ static void test_texture_compressed_3d(void) } expected |= 0xff000000; colour = get_readback_color(&rb, (x * 640 + 128) / 256, (y * 480 + 128) / 256); - if (!(equal = compare_color(colour, expected, 2))) + if (!(equal = compare_color(colour, expected, 8))) break; } if (!equal)

1 0

Zebediah Figura : wined3d: Pass a wined3d_const_bo_address to wined3d_cs_exec_update_sub_resource().
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: f5a22e43109327fdecad21b04a0ad71405a2aa77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5a22e43109327fdecad21b0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 28 11:39:03 2021 -0500 wined3d: Pass a wined3d_const_bo_address to wined3d_cs_exec_update_sub_resource(). 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/cs.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 022c0acbd0a..47bc36d4cc0 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -489,7 +489,8 @@ struct wined3d_cs_update_sub_resource struct wined3d_resource *resource; unsigned int sub_resource_idx; struct wined3d_box box; - struct wined3d_sub_resource_data data; + struct wined3d_const_bo_address addr; + unsigned int row_pitch, slice_pitch; }; struct wined3d_cs_add_dirty_texture_region @@ -2606,21 +2607,17 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi struct wined3d_resource *resource = op->resource; const struct wined3d_box *box = &op->box; unsigned int width, height, depth, level; - struct wined3d_const_bo_address addr; struct wined3d_context *context; struct wined3d_texture *texture; struct wined3d_box src_box; context = context_acquire(cs->c.device, NULL, 0); - addr.buffer_object = 0; - addr.addr = op->data.data; - if (resource->type == WINED3D_RTYPE_BUFFER) { struct wined3d_buffer *buffer = buffer_from_resource(resource); - wined3d_buffer_copy_bo_address(buffer, context, box->left, &addr, box->right - box->left); + wined3d_buffer_copy_bo_address(buffer, context, box->left, &op->addr, box->right - box->left); goto done; } @@ -2639,8 +2636,8 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi wined3d_texture_load_location(texture, op->sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); wined3d_box_set(&src_box, 0, 0, box->right - box->left, box->bottom - box->top, 0, box->back - box->front); - texture->texture_ops->texture_upload_data(context, &addr, texture->resource.format, &src_box, - op->data.row_pitch, op->data.slice_pitch, texture, op->sub_resource_idx, + texture->texture_ops->texture_upload_data(context, &op->addr, texture->resource.format, &src_box, + op->row_pitch, op->slice_pitch, texture, op->sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, box->left, box->top, box->front); wined3d_texture_validate_location(texture, op->sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); @@ -2665,9 +2662,10 @@ static void wined3d_cs_update_sub_resource(struct wined3d_device_context *contex op->resource = resource; op->sub_resource_idx = sub_resource_idx; op->box = *box; - op->data.row_pitch = row_pitch; - op->data.slice_pitch = slice_pitch; - op->data.data = data; + op->addr.buffer_object = 0; + op->addr.addr = data; + op->row_pitch = row_pitch; + op->slice_pitch = slice_pitch; wined3d_device_context_acquire_resource(context, resource);

1 0

Zebediah Figura : wined3d: Use wined3d_buffer_copy_bo_address() in wined3d_cs_exec_update_sub_resource().
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: a260928b81b399dca10ace70c084b80208877c3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a260928b81b399dca10ace70… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 28 11:39:02 2021 -0500 wined3d: Use wined3d_buffer_copy_bo_address() in wined3d_cs_exec_update_sub_resource(). 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 | 15 ++++----------- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 4 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 0511f278144..9d22a909fb6 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1054,25 +1054,6 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off context_release(context); } -void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context, - const struct wined3d_box *box, const void *data) -{ - struct wined3d_range range; - - if (box) - { - range.offset = box->left; - range.size = box->right - box->left; - } - else - { - range.offset = 0; - range.size = buffer->resource.size; - } - - buffer->buffer_ops->buffer_upload_ranges(buffer, context, data, range.offset, 1, &range); -} - static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, struct wined3d_device *device, const struct wined3d_sub_resource_data *data) { diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 4adfa18f5f7..022c0acbd0a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2613,18 +2613,14 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi context = context_acquire(cs->c.device, NULL, 0); + addr.buffer_object = 0; + addr.addr = op->data.data; + if (resource->type == WINED3D_RTYPE_BUFFER) { struct wined3d_buffer *buffer = buffer_from_resource(resource); - if (!wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER)) - { - ERR("Failed to load buffer location.\n"); - goto done; - } - - wined3d_buffer_upload_data(buffer, context, box, op->data.data); - wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); + wined3d_buffer_copy_bo_address(buffer, context, box->left, &addr, box->right - box->left); goto done; } @@ -2635,9 +2631,6 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi height = wined3d_texture_get_level_height(texture, level); depth = wined3d_texture_get_level_depth(texture, level); - addr.buffer_object = 0; - addr.addr = op->data.data; - /* Only load the sub-resource for partial updates. */ if (!box->left && !box->top && !box->front && box->right == width && box->bottom == height && box->back == depth) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d97b43af5a8..c70b0f7c338 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4930,8 +4930,6 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, struct wined3d_context *context, unsigned int location) DECLSPEC_HIDDEN; -void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context, - const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_no3d_init(struct wined3d_buffer *buffer_no3d, struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data,

1 0

Jan Sikorski : wined3d: Avoid ending the renderpass when issuing a query.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: f165b911d8d14773f089b1449d664e026e99fdc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f165b911d8d14773f089b144… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Jun 28 17:52:41 2021 +0200 wined3d: Avoid ending the renderpass when issuing a query. Allocate a fresh query index that does not need to be reset. Reset query pools at creation and when the render pass is ended. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 19 +++++++++++++--- dlls/wined3d/query.c | 50 ++++++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 6 ++++- 3 files changed, 60 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f165b911d8d14773f089…

1 0

Bernhard Übelacker : ntdll: Allow 16-bit executables to be loaded from build directory.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: cbf7a101763790ca03307c72d32dd8969a381be6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbf7a101763790ca03307c72… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Mon Jun 28 10:39:58 2021 +0200 ntdll: Allow 16-bit executables to be loaded from build directory. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51214 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 14cc105b64d..cfec779dd59 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2675,6 +2675,7 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne if (!get_env_var( L"WINEBUILDDIR", 20 + 2 * wcslen(name), new_name )) { + len = new_name->Length; RtlAppendUnicodeToString( new_name, L"\\dlls\\" ); RtlAppendUnicodeToString( new_name, name ); if ((ext = wcsrchr( name, '.' )) && !wcscmp( ext, L".dll" )) new_name->Length -= 4 * sizeof(WCHAR); @@ -2685,6 +2686,17 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne RtlAppendUnicodeToString( new_name, L".fake" ); status = open_dll_file( new_name, pwm, mapping, image_info, id ); if (status != STATUS_DLL_NOT_FOUND) goto done; + + new_name->Length = len; + RtlAppendUnicodeToString( new_name, L"\\programs\\" ); + RtlAppendUnicodeToString( new_name, name ); + RtlAppendUnicodeToString( new_name, L"\\" ); + RtlAppendUnicodeToString( new_name, name ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status != STATUS_DLL_NOT_FOUND) goto done; + RtlAppendUnicodeToString( new_name, L".fake" ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status != STATUS_DLL_NOT_FOUND) goto done; RtlFreeUnicodeString( new_name ); }

1 0

Qian Hong : server: Forbid shrinking files which are mapped to memory.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: be55038f3d139964de0daf2e7b6086b5de11a136 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be55038f3d139964de0daf2e… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Jun 25 00:28:52 2021 -0500 server: Forbid shrinking files which are mapped to memory. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 18 +++++++++--------- server/fd.c | 26 ++++++++++++++++++-------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index c09438e09bd..ea0a32f258d 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -6052,11 +6052,11 @@ static void test_eof(void) SetLastError(0xdeadbeef); SetFilePointer(file, 6, NULL, SEEK_SET); ret = SetEndOfFile(file); - todo_wine ok(!ret, "expected failure\n"); - todo_wine ok(GetLastError() == ERROR_USER_MAPPED_FILE, "got error %u\n", GetLastError()); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_USER_MAPPED_FILE, "got error %u\n", GetLastError()); ret = GetFileSizeEx(file, &file_size); ok(ret, "failed to get size, error %u\n", GetLastError()); - todo_wine ok(file_size.QuadPart == 8, "got size %I64d\n", file_size.QuadPart); + ok(file_size.QuadPart == 8, "got size %I64d\n", file_size.QuadPart); SetFilePointer(file, 8192, NULL, SEEK_SET); ret = SetEndOfFile(file); @@ -6067,11 +6067,11 @@ static void test_eof(void) SetFilePointer(file, 8191, NULL, SEEK_SET); ret = SetEndOfFile(file); - todo_wine ok(!ret, "expected failure\n"); - todo_wine ok(GetLastError() == ERROR_USER_MAPPED_FILE, "got error %u\n", GetLastError()); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_USER_MAPPED_FILE, "got error %u\n", GetLastError()); ret = GetFileSizeEx(file, &file_size); ok(ret, "failed to get size, error %u\n", GetLastError()); - todo_wine ok(file_size.QuadPart == 8192, "got size %I64d\n", file_size.QuadPart); + ok(file_size.QuadPart == 8192, "got size %I64d\n", file_size.QuadPart); view = MapViewOfFile(mapping, map_tests[i].view_access, 0, 0, 4); ok(!!view, "failed to map view, error %u\n", GetLastError()); @@ -6087,11 +6087,11 @@ static void test_eof(void) SetFilePointer(file, 16383, NULL, SEEK_SET); ret = SetEndOfFile(file); - todo_wine ok(!ret, "expected failure\n"); - todo_wine ok(GetLastError() == ERROR_USER_MAPPED_FILE, "got error %u\n", GetLastError()); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_USER_MAPPED_FILE, "got error %u\n", GetLastError()); ret = GetFileSizeEx(file, &file_size); ok(ret, "failed to get size, error %u\n", GetLastError()); - todo_wine ok(file_size.QuadPart == 16384, "got size %I64d\n", file_size.QuadPart); + ok(file_size.QuadPart == 16384, "got size %I64d\n", file_size.QuadPart); ret = UnmapViewOfFile(view); ok(ret, "failed to unmap view, error %u\n", GetLastError()); diff --git a/server/fd.c b/server/fd.c index 7204a8c51ba..b953da2ab85 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2645,15 +2645,25 @@ static void set_fd_eof( struct fd *fd, file_pos_t eof ) set_error( fd->no_fd_status ); return; } - - /* first try normal truncate */ - if (ftruncate( fd->unix_fd, eof ) != -1) return; - - /* now check for the need to extend the file */ - if (fstat( fd->unix_fd, &st ) != -1 && eof > st.st_size) - grow_file( fd->unix_fd, eof ); - else + if (fstat( fd->unix_fd, &st) == -1) + { file_set_error(); + return; + } + if (eof < st.st_size) + { + struct fd *fd_ptr; + LIST_FOR_EACH_ENTRY( fd_ptr, &fd->inode->open, struct fd, inode_entry ) + { + if (fd_ptr->access & FILE_MAPPING_ACCESS) + { + set_error( STATUS_USER_MAPPED_FILE ); + return; + } + } + if (ftruncate( fd->unix_fd, eof ) == -1) file_set_error(); + } + else grow_file( fd->unix_fd, eof ); } struct completion *fd_get_completion( struct fd *fd, apc_param_t *p_key )

1 0

Qian Hong : ntdll: Truncate files through the server.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: 4e84a553a8f0e14dd9c36ea280003d8d96e6a9cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e84a553a8f0e14dd9c36ea2… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Jun 25 00:28:51 2021 -0500 ntdll: Truncate files through the server. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 23 +++++------------------ include/wine/server_protocol.h | 18 +++++++++++++++++- server/fd.c | 37 +++++++++++++++++++++++++++++++++++++ server/file.h | 1 + server/mapping.c | 2 +- server/protocol.def | 7 +++++++ server/request.h | 5 +++++ server/trace.c | 9 +++++++++ 8 files changed, 82 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 21f5d10f3f8..1a57a112a59 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4360,28 +4360,15 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, case FileEndOfFileInformation: if (len >= sizeof(FILE_END_OF_FILE_INFORMATION)) { - struct stat st; const FILE_END_OF_FILE_INFORMATION *info = ptr; - if ((io->u.Status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) - return io->u.Status; - - /* first try normal truncate */ - if (ftruncate( fd, (off_t)info->EndOfFile.QuadPart ) != -1) break; - - /* now check for the need to extend the file */ - if (fstat( fd, &st ) != -1 && (off_t)info->EndOfFile.QuadPart > st.st_size) + SERVER_START_REQ( set_fd_eof_info ) { - static const char zero; - - /* extend the file one byte beyond the requested size and then truncate it */ - /* this should work around ftruncate implementations that can't extend files */ - if (pwrite( fd, &zero, 1, (off_t)info->EndOfFile.QuadPart ) != -1 && - ftruncate( fd, (off_t)info->EndOfFile.QuadPart ) != -1) break; + req->handle = wine_server_obj_handle( handle ); + req->eof = info->EndOfFile.QuadPart; + io->u.Status = wine_server_call( req ); } - io->u.Status = errno_to_status( errno ); - - if (needs_close) close( fd ); + SERVER_END_REQ; } else io->u.Status = STATUS_INVALID_PARAMETER_3; break; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 58310a4d9a2..51ee6ee4aa3 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5083,6 +5083,19 @@ struct set_fd_name_info_reply +struct set_fd_eof_info_request +{ + struct request_header __header; + obj_handle_t handle; + file_pos_t eof; +}; +struct set_fd_eof_info_reply +{ + struct reply_header __header; +}; + + + struct get_window_layered_info_request { struct request_header __header; @@ -5640,6 +5653,7 @@ enum request REQ_set_fd_completion_mode, REQ_set_fd_disp_info, REQ_set_fd_name_info, + REQ_set_fd_eof_info, REQ_get_window_layered_info, REQ_set_window_layered_info, REQ_alloc_user_handle, @@ -5919,6 +5933,7 @@ union generic_request struct set_fd_completion_mode_request set_fd_completion_mode_request; struct set_fd_disp_info_request set_fd_disp_info_request; struct set_fd_name_info_request set_fd_name_info_request; + struct set_fd_eof_info_request set_fd_eof_info_request; struct get_window_layered_info_request get_window_layered_info_request; struct set_window_layered_info_request set_window_layered_info_request; struct alloc_user_handle_request alloc_user_handle_request; @@ -6196,6 +6211,7 @@ union generic_reply struct set_fd_completion_mode_reply set_fd_completion_mode_reply; struct set_fd_disp_info_reply set_fd_disp_info_reply; struct set_fd_name_info_reply set_fd_name_info_reply; + struct set_fd_eof_info_reply set_fd_eof_info_reply; struct get_window_layered_info_reply get_window_layered_info_reply; struct set_window_layered_info_reply set_window_layered_info_reply; struct alloc_user_handle_reply alloc_user_handle_reply; @@ -6220,7 +6236,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 717 +#define SERVER_PROTOCOL_VERSION 718 /* ### protocol_version end ### */ diff --git a/server/fd.c b/server/fd.c index e326354d127..7204a8c51ba 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2630,6 +2630,32 @@ failed: free( name ); } +static void set_fd_eof( struct fd *fd, file_pos_t eof ) +{ + struct stat st; + + if (!fd->inode) + { + set_error( STATUS_OBJECT_TYPE_MISMATCH ); + return; + } + + if (fd->unix_fd == -1) + { + set_error( fd->no_fd_status ); + return; + } + + /* first try normal truncate */ + if (ftruncate( fd->unix_fd, eof ) != -1) return; + + /* now check for the need to extend the file */ + if (fstat( fd->unix_fd, &st ) != -1 && eof > st.st_size) + grow_file( fd->unix_fd, eof ); + else + file_set_error(); +} + struct completion *fd_get_completion( struct fd *fd, apc_param_t *p_key ) { *p_key = fd->comp_key; @@ -2922,3 +2948,14 @@ DECL_HANDLER(set_fd_name_info) } if (root_fd) release_object( root_fd ); } + +/* set fd eof information */ +DECL_HANDLER(set_fd_eof_info) +{ + struct fd *fd = get_handle_fd_obj( current->process, req->handle, 0 ); + if (fd) + { + set_fd_eof( fd, req->eof ); + release_object( fd ); + } +} diff --git a/server/file.h b/server/file.h index b8bc7645b19..10b5c0d0493 100644 --- a/server/file.h +++ b/server/file.h @@ -168,6 +168,7 @@ extern int is_file_executable( const char *name ); struct memory_view; +extern int grow_file( int unix_fd, file_pos_t new_size ); extern struct memory_view *find_mapped_view( struct process *process, client_ptr_t base ); extern struct memory_view *get_exe_view( struct process *process ); extern struct file *get_view_file( const struct memory_view *view, unsigned int access, unsigned int sharing ); diff --git a/server/mapping.c b/server/mapping.c index 529ce43bac9..2df337a172c 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -241,7 +241,7 @@ static void shared_map_destroy( struct object *obj ) } /* extend a file beyond the current end of file */ -static int grow_file( int unix_fd, file_pos_t new_size ) +int grow_file( int unix_fd, file_pos_t new_size ) { static const char zero; off_t size = new_size; diff --git a/server/protocol.def b/server/protocol.def index 5d165e7bfa4..557311e2b3f 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3535,6 +3535,13 @@ struct handle_info @END +/* set fd eof information */ +(a)REQ(set_fd_eof_info) + obj_handle_t handle; /* handle to a file or directory */ + file_pos_t eof; /* offset of eof of file */ +(a)END + + /* Retrieve layered info for a window */ @REQ(get_window_layered_info) user_handle_t handle; /* handle to the window */ diff --git a/server/request.h b/server/request.h index defb3a640fd..0221cbd33ae 100644 --- a/server/request.h +++ b/server/request.h @@ -371,6 +371,7 @@ DECL_HANDLER(add_fd_completion); DECL_HANDLER(set_fd_completion_mode); DECL_HANDLER(set_fd_disp_info); DECL_HANDLER(set_fd_name_info); +DECL_HANDLER(set_fd_eof_info); DECL_HANDLER(get_window_layered_info); DECL_HANDLER(set_window_layered_info); DECL_HANDLER(alloc_user_handle); @@ -649,6 +650,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_set_fd_completion_mode, (req_handler)req_set_fd_disp_info, (req_handler)req_set_fd_name_info, + (req_handler)req_set_fd_eof_info, (req_handler)req_get_window_layered_info, (req_handler)req_set_window_layered_info, (req_handler)req_alloc_user_handle, @@ -2141,6 +2143,9 @@ C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, namelen) == 20 ); C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, link) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, replace) == 28 ); C_ASSERT( sizeof(struct set_fd_name_info_request) == 32 ); +C_ASSERT( FIELD_OFFSET(struct set_fd_eof_info_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct set_fd_eof_info_request, eof) == 16 ); +C_ASSERT( sizeof(struct set_fd_eof_info_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_window_layered_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_window_layered_info_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_window_layered_info_reply, color_key) == 8 ); diff --git a/server/trace.c b/server/trace.c index 406be00008e..bbdf17feb1a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4355,6 +4355,12 @@ static void dump_set_fd_name_info_request( const struct set_fd_name_info_request dump_varargs_string( ", filename=", cur_size ); } +static void dump_set_fd_eof_info_request( const struct set_fd_eof_info_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); + dump_uint64( ", eof=", &req->eof ); +} + static void dump_get_window_layered_info_request( const struct get_window_layered_info_request *req ) { fprintf( stderr, " handle=%08x", req->handle ); @@ -4792,6 +4798,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_set_fd_completion_mode_request, (dump_func)dump_set_fd_disp_info_request, (dump_func)dump_set_fd_name_info_request, + (dump_func)dump_set_fd_eof_info_request, (dump_func)dump_get_window_layered_info_request, (dump_func)dump_set_window_layered_info_request, (dump_func)dump_alloc_user_handle_request, @@ -5067,6 +5074,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, NULL, NULL, + NULL, (dump_func)dump_get_window_layered_info_reply, NULL, (dump_func)dump_alloc_user_handle_reply, @@ -5342,6 +5350,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "set_fd_completion_mode", "set_fd_disp_info", "set_fd_name_info", + "set_fd_eof_info", "get_window_layered_info", "set_window_layered_info", "alloc_user_handle",

1 0