February 2021 - Wine-Commits

Zebediah Figura : vkd3d-shader: Use a table to initialize predefined effect types.
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

Module: vkd3d Branch: master Commit: af47cc5b5371fbcebff8740b79e73585533d9382 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=af47cc5b5371fbcebff8740… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 4 16:33:51 2021 -0600 vkd3d-shader: Use a table to initialize predefined effect types. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index e3d1110..43072c2 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1378,8 +1378,9 @@ static int compare_function_rb(const void *key, const struct rb_entry *entry) static void declare_predefined_types(struct hlsl_scope *scope) { + unsigned int x, y, bt, i; struct hlsl_type *type; - unsigned int x, y, bt; + static const char * const names[] = { "float", @@ -1400,6 +1401,25 @@ static void declare_predefined_types(struct hlsl_scope *scope) "samplerCUBE" }; + static const struct + { + char name[13]; + enum hlsl_type_class class; + enum hlsl_base_type base_type; + unsigned int dimx, dimy; + } + effect_types[] = + { + {"DWORD", HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1}, + {"FLOAT", HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1}, + {"VECTOR", HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1}, + {"MATRIX", HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4}, + {"STRING", HLSL_CLASS_OBJECT, HLSL_TYPE_STRING, 1, 1}, + {"TEXTURE", HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1}, + {"PIXELSHADER", HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1}, + {"VERTEXSHADER", HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1}, + }; + for (bt = 0; bt <= HLSL_TYPE_LAST_SCALAR; ++bt) { for (y = 1; y <= 4; ++y) @@ -1438,23 +1458,12 @@ static void declare_predefined_types(struct hlsl_scope *scope) hlsl_ctx.builtin_types.Void = hlsl_new_type(vkd3d_strdup("void"), HLSL_CLASS_OBJECT, HLSL_TYPE_VOID, 1, 1); - /* DX8 effects predefined types */ - type = hlsl_new_type(vkd3d_strdup("DWORD"), HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1); - hlsl_scope_add_type(scope, type); - type = hlsl_new_type(vkd3d_strdup("FLOAT"), HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1); - hlsl_scope_add_type(scope, type); - type = hlsl_new_type(vkd3d_strdup("VECTOR"), HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1); - hlsl_scope_add_type(scope, type); - type = hlsl_new_type(vkd3d_strdup("MATRIX"), HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4); - hlsl_scope_add_type(scope, type); - type = hlsl_new_type(vkd3d_strdup("STRING"), HLSL_CLASS_OBJECT, HLSL_TYPE_STRING, 1, 1); - hlsl_scope_add_type(scope, type); - type = hlsl_new_type(vkd3d_strdup("TEXTURE"), HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1); - hlsl_scope_add_type(scope, type); - type = hlsl_new_type(vkd3d_strdup("PIXELSHADER"), HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1); - hlsl_scope_add_type(scope, type); - type = hlsl_new_type(vkd3d_strdup("VERTEXSHADER"), HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1); - hlsl_scope_add_type(scope, type); + for (i = 0; i < ARRAY_SIZE(effect_types); ++i) + { + type = hlsl_new_type(vkd3d_strdup(effect_types[i].name), effect_types[i].class, + effect_types[i].base_type, effect_types[i].dimx, effect_types[i].dimy); + hlsl_scope_add_type(scope, type); + } } static bool hlsl_ctx_init(struct hlsl_parse_ctx *ctx, struct vkd3d_shader_message_context *message_context)

1 0

Francois Gouget : testbot/LogUtils: Add support for winedbg's unhandled exception lines.
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

Module: tools Branch: master Commit: 5e7c5603ba0227e6a6f7421ca09989f14d5bd810 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5e7c5603ba0227e6a6f7421… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 10 02:16:01 2021 +0100 testbot/LogUtils: Add support for winedbg's unhandled exception lines. They replace the test framework's "unhandled exception" lines we get on Windows but specify neither the test unit nor the process pid. So just assign them to the current test unit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50538 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 69299da..9164b47 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -631,6 +631,13 @@ sub ParseWineTestReport($$$) _CheckUnit($LogInfo, $Cur, $Unit, "unhandled exception"); $Cur->{LineFailures}++; } + elsif ($Line =~ /Unhandled exception: .* in .* code /) + { + # This also replaces a test summary line. The pid is unknown so use 0. + $Cur->{Pids}->{0} = 1; + $Cur->{SummaryFailures}++; + $Cur->{LineFailures}++; + } elsif (($Cur->{Unit} ne "" and $Line =~ /($Cur->{UnitsRE}):\d+: unhandled exception [0-9a-fA-F]{8} in child process /) or $Line =~ /^([_.a-z0-9]+):\d+: unhandled exception [0-9a-fA-F]{8} in child process /)

1 0

Francois Gouget : testbot/web: Fix the $Task->TestFailures check.
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

Module: tools Branch: master Commit: 694e6f4e9812b5df1ec9193be32b6d7fcb835db9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=694e6f4e9812b5df1ec9193… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 10 16:36:17 2021 +0100 testbot/web: Fix the $Task->TestFailures check. If it has not been set to a numeric value, $Task->TestFailures is undefined so comparing it to an empty string makes no sense. Fortunately undef ne "" is false (as well as undef eq "") so the code was doing the right thing and was not generating a warning since warnings are not turned on. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 088aea1..2486229 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -131,7 +131,7 @@ sub GenerateDataCell($$$$) foreach my $Task (@{$Step->Tasks->GetItems()}) { my $TaskFailures = $Task->TestFailures; - if ($TaskFailures ne "") + if (defined $TaskFailures) { $HasTestResult = 1; $Failures += $TaskFailures;

1 0

Francois Gouget : winetest/dissect: Add support for winedbg's unhandled exception lines.
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

Module: tools Branch: master Commit: 93b9a7e085713d815c5a26b756ef1ff7e7d2201f URL: https://source.winehq.org/git/tools.git/?a=commit;h=93b9a7e085713d815c5a26b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 10 02:15:58 2021 +0100 winetest/dissect: Add support for winedbg's unhandled exception lines. They replace the test framework's "unhandled exception" lines we get on Windows but specify neither the test unit nor the process pid. So just assign them to the current test unit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50538 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/winetest/dissect b/winetest/dissect index 12a939d..c20dab6 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -685,6 +685,14 @@ while ($line = <IN>) { check_unit($l_unit, "unhandled exception"); $failures++; } + elsif ($line =~ /Unhandled exception: .* in .* code /) + { + # This also replaces a test summary line. The pid is unknown so use 0. + $pids{0} = 1; + $s_failures++; + $failures++; + add_test_line("failed", escapeHTML($line)); + } elsif (($unit ne "" and $line =~ /([0-9a-f]+):($unit): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) or $line =~ /^([0-9a-f]+):([_a-z0-9]+): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./)

1 0

Francois Gouget : testbot/reporttest: Add a test for winedbg's unhandled exception lines.
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

Module: tools Branch: master Commit: 4edf020d007fc4806911983300bc3ec5baa58d1b URL: https://source.winehq.org/git/tools.git/?a=commit;h=4edf020d007fc4806911983… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 10 02:15:00 2021 +0100 testbot/reporttest: Add a test for winedbg's unhandled exception lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 9 +++++++-- testbot/src/reporttest/report.testwtbs | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 14d2cf6..8ff6e14 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -314,7 +314,7 @@ advpack:files:0880 done (3) in 0s advpack:install start dlls/advpack/tests/install.c - ----- WTBS Simple test crash ------ A test unit with a crash +----- 1/2: A test unit with a wine/test.h "unhandled exception" line ----- Expected assessement: Crash 07b0:install: unhandled exception c0000005 at 0040167C advpack:install:07b0 done (-1073741819) in 0s @@ -515,7 +515,12 @@ Do not cut 07b0:syslink: 2251 tests executed (1 marked as todo, 2 failures), 1 s me off comctl32:syslink:07b0 done (2) in 0s -stub comctl32:tab +comctl32:tab start dlls/comctl32/tests/tab.c - +----- WTBS Simple test crash +----- 2/2: A test unit with a winedbg "unhandled exception" line +----- Expected assessement: Crash +Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x0054376d). +comctl32:tab:07b0 done (-1073741819) in 0s stub comctl32:taskdialog diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index 49ef2c0..b444b69 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -13,7 +13,7 @@ with: ----- TestWTBS ----- -p tests.TestFailures 40 +p tests.TestFailures 41 p build.HasTask 0 a wine.log.GrepV ^Applying patch @@ -41,6 +41,7 @@ n 0 1234:rebar: unhandled exception c0000005 at 0040167C n 0 1234:subclass: unhandled exception c0000005 at 0040167C n 0 Do not cut syslink.c:40: Test failed: Something wrong n 0 Do not cut syslink.c:41: Test succeeded inside todo block: Something right! +n 0 Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x0054376d). n 0 driver.c:40: Test failed: Something wrong n 0 driver.c:41: Test succeeded inside todo block: Something right!

1 0

Paul Gofman : vcomp120: Share the source with vcomp.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

Module: wine Branch: master Commit: 90d1fec2625af2a781c9d5484a414987c09bff19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90d1fec2625af2a781c9d548… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 9 02:44:13 2021 +0300 vcomp120: Share the source with vcomp. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp120/Makefile.in | 7 ++ dlls/vcomp120/vcomp120.spec | 202 ++++++++++++++++++++++---------------------- 2 files changed, 108 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=90d1fec2625af2a781c9…

1 0

Paul Gofman : vcomp140: Share the source with vcomp.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

Module: wine Branch: master Commit: d73df9e4e1e8ca59d7b517369f4ef608ba9a8962 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d73df9e4e1e8ca59d7b51736… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 9 02:44:14 2021 +0300 vcomp140: Share the source with vcomp. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp140/Makefile.in | 7 ++ dlls/vcomp140/vcomp140.spec | 202 ++++++++++++++++++++++---------------------- 2 files changed, 108 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d73df9e4e1e8ca59d7b5…

1 0

Paul Gofman : vcomp110: Share the source with vcomp.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

Module: wine Branch: master Commit: 411afe8223b8aad8e55a4aa039f69b0fcd169d14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=411afe8223b8aad8e55a4aa0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 9 02:44:12 2021 +0300 vcomp110: Share the source with vcomp. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp110/Makefile.in | 7 ++ dlls/vcomp110/vcomp110.spec | 202 ++++++++++++++++++++++---------------------- 2 files changed, 108 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=411afe8223b8aad8e55a…

1 0

Alexandre Julliard : server: Return the NT name for the list_processes request.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

Module: wine Branch: master Commit: 146ed693d60d2eee98b1afef5b4c6a3f7652c455 URL: https://source.winehq.org/git/wine.git/?a=commit;h=146ed693d60d2eee98b1afef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 16:25:26 2021 +0100 server: Return the NT name for the list_processes request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 21 +++++++++------------ server/process.h | 6 ------ 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/server/process.c b/server/process.c index f49cfe99a82..229c8b44e95 100644 --- a/server/process.c +++ b/server/process.c @@ -1822,6 +1822,7 @@ DECL_HANDLER(list_processes) { struct process *process; struct thread *thread; + struct unicode_str nt_name; unsigned int pos = 0; char *buffer; @@ -1830,10 +1831,10 @@ DECL_HANDLER(list_processes) LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) { - struct process_dll *exe = get_process_exe_module( process ); + struct memory_view *view = get_exe_view( process ); + if (!view || !get_view_nt_name( view, &nt_name )) nt_name.len = 0; reply->info_size = (reply->info_size + 7) & ~7; - reply->info_size += sizeof(struct process_info); - if (exe) reply->info_size += exe->namelen; + reply->info_size += sizeof(struct process_info) + nt_name.len; reply->info_size = (reply->info_size + 7) & ~7; reply->info_size += process->running_threads * sizeof(struct thread_info); reply->process_count++; @@ -1851,12 +1852,13 @@ DECL_HANDLER(list_processes) LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) { struct process_info *process_info; - struct process_dll *exe = get_process_exe_module( process ); + struct memory_view *view = get_exe_view( process ); pos = (pos + 7) & ~7; + if (!view || !get_view_nt_name( view, &nt_name )) nt_name.len = 0; process_info = (struct process_info *)(buffer + pos); process_info->start_time = process->start_time; - process_info->name_len = exe ? exe->namelen : 0; + process_info->name_len = nt_name.len; process_info->thread_count = process->running_threads; process_info->priority = process->priority; process_info->pid = process->id; @@ -1864,13 +1866,8 @@ DECL_HANDLER(list_processes) process_info->handle_count = get_handle_table_count(process); process_info->unix_pid = process->unix_pid; pos += sizeof(*process_info); - - if (exe) - { - memcpy( buffer + pos, exe->filename, exe->namelen ); - pos += exe->namelen; - } - + memcpy( buffer + pos, nt_name.str, nt_name.len ); + pos += nt_name.len; pos = (pos + 7) & ~7; LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) { diff --git a/server/process.h b/server/process.h index caab869c8a0..0c69ede9a46 100644 --- a/server/process.h +++ b/server/process.h @@ -153,10 +153,4 @@ static inline int is_process_init_done( struct process *process ) return process->startup_state == STARTUP_DONE; } -static inline struct process_dll *get_process_exe_module( struct process *process ) -{ - struct list *ptr = list_head( &process->dlls ); - return ptr ? LIST_ENTRY( ptr, struct process_dll, entry ) : NULL; -} - #endif /* __WINE_SERVER_PROCESS_H */

1 0

Alexandre Julliard : ntdll: Pass the NT name in the set_fd_name_info request.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

Module: wine Branch: master Commit: 9e255ba4e05be3e316fe13f8c7eeec12de8d39ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e255ba4e05be3e316fe13f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 13:31:26 2021 +0100 ntdll: Pass the NT name in the set_fd_name_info request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 4 ++++ include/wine/server_protocol.h | 5 +++-- server/fd.c | 9 ++++++++- server/protocol.def | 2 ++ server/request.h | 5 +++-- server/trace.c | 2 ++ 6 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 84342ba469f..6337433ed80 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4387,8 +4387,10 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); + req->namelen = nt_name.Length; req->link = FALSE; req->replace = info->ReplaceIfExists; + wine_server_add_data( req, nt_name.Buffer, nt_name.Length ); wine_server_add_data( req, unix_name, strlen(unix_name) ); io->u.Status = wine_server_call( req ); } @@ -4425,8 +4427,10 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); + req->namelen = nt_name.Length; req->link = TRUE; req->replace = info->ReplaceIfExists; + wine_server_add_data( req, nt_name.Buffer, nt_name.Length ); wine_server_add_data( req, unix_name, strlen(unix_name) ); io->u.Status = wine_server_call( req ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index c848b71423c..a515ab2aa86 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5130,10 +5130,11 @@ struct set_fd_name_info_request struct request_header __header; obj_handle_t handle; obj_handle_t rootdir; + data_size_t namelen; int link; int replace; + /* VARARG(name,unicode_str,namelen); */ /* VARARG(filename,string); */ - char __pad_28[4]; }; struct set_fd_name_info_reply { @@ -6279,7 +6280,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 670 +#define SERVER_PROTOCOL_VERSION 671 /* ### protocol_version end ### */ diff --git a/server/fd.c b/server/fd.c index 848203f31ec..079508c2d95 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2825,6 +2825,12 @@ DECL_HANDLER(set_fd_name_info) { struct fd *fd, *root_fd = NULL; + if (req->namelen > get_req_data_size()) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + if (req->rootdir) { struct dir *root; @@ -2837,7 +2843,8 @@ DECL_HANDLER(set_fd_name_info) if ((fd = get_handle_fd_obj( current->process, req->handle, 0 ))) { - set_fd_name( fd, root_fd, get_req_data(), get_req_data_size(), req->link, req->replace ); + set_fd_name( fd, root_fd, (const char *)get_req_data() + req->namelen, + get_req_data_size() - req->namelen, req->link, req->replace ); release_object( fd ); } if (root_fd) release_object( root_fd ); diff --git a/server/protocol.def b/server/protocol.def index 9fbe02f2f99..49a0566d09e 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3542,8 +3542,10 @@ struct handle_info @REQ(set_fd_name_info) obj_handle_t handle; /* handle to a file or directory */ obj_handle_t rootdir; /* root directory */ + data_size_t namelen; /* length of NT name in bytes */ int link; /* link instead of renaming */ int replace; /* replace an existing file? */ + VARARG(name,unicode_str,namelen); /* NT name */ VARARG(filename,string); /* new file name */ @END diff --git a/server/request.h b/server/request.h index 39ba4377fd1..094a6d2e6fb 100644 --- a/server/request.h +++ b/server/request.h @@ -2173,8 +2173,9 @@ C_ASSERT( FIELD_OFFSET(struct set_fd_disp_info_request, unlink) == 16 ); C_ASSERT( sizeof(struct set_fd_disp_info_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, rootdir) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, link) == 20 ); -C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, replace) == 24 ); +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 get_window_layered_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_window_layered_info_request) == 16 ); diff --git a/server/trace.c b/server/trace.c index e8636013b0e..1d495e4fb42 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4292,8 +4292,10 @@ static void dump_set_fd_name_info_request( const struct set_fd_name_info_request { fprintf( stderr, " handle=%04x", req->handle ); fprintf( stderr, ", rootdir=%04x", req->rootdir ); + fprintf( stderr, ", namelen=%u", req->namelen ); fprintf( stderr, ", link=%d", req->link ); fprintf( stderr, ", replace=%d", req->replace ); + dump_varargs_unicode_str( ", name=", min(cur_size,req->namelen) ); dump_varargs_string( ", filename=", cur_size ); }

1 0