February 2023 - Wine-commits

Zebediah Figura : vkd3d-shader/hlsl: Inline function calls.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: vkd3d Branch: master Commit: 4b944517b721d4f3cee1100014cf4171e1fc84a9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4b944517b721d4f3cee1100014cf4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Sep 11 16:56:04 2021 -0500 vkd3d-shader/hlsl: Inline function calls. --- libs/vkd3d-shader/hlsl.c | 289 ++++++++++++++++++++++ libs/vkd3d-shader/hlsl.h | 2 + libs/vkd3d-shader/hlsl_codegen.c | 32 ++- libs/vkd3d-shader/hlsl_sm1.c | 3 +- libs/vkd3d-shader/hlsl_sm4.c | 3 +- tests/function-return.shader_test | 22 +- tests/hlsl-function.shader_test | 16 +- tests/hlsl-numthreads.shader_test | 2 +- tests/hlsl-return-implicit-conversion.shader_test | 60 ++--- tests/hlsl-static-initializer.shader_test | 6 +- tests/hlsl-storage-qualifiers.shader_test | 6 +- tests/uav-out-param.shader_test | 8 +- 12 files changed, 383 insertions(+), 66 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Handle early return after a CF block only if there was actually a return somewhere in the CF block.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: vkd3d Branch: master Commit: 38964214cd65cd429e7882b3f848e8f8966d56a9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/38964214cd65cd429e7882b3f848e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 13 23:48:38 2021 -0500 vkd3d-shader/hlsl: Handle early return after a CF block only if there was actually a return somewhere in the CF block. --- libs/vkd3d-shader/hlsl_codegen.c | 65 ++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 2e5feff1..80d52dfc 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -520,11 +520,12 @@ static void insert_early_return_break(struct hlsl_ctx *ctx, } /* Remove HLSL_IR_JUMP_RETURN calls by altering subsequent control flow. */ -static void lower_return(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *func, +static bool lower_return(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *func, struct hlsl_block *block, bool in_loop) { struct hlsl_ir_node *return_instr = NULL, *cf_instr = NULL; struct hlsl_ir_node *instr, *next; + bool has_early_return = false; /* SM1 has no function calls. SM4 does, but native d3dcompiler inlines * everything anyway. We are safest following suit. @@ -546,7 +547,7 @@ static void lower_return(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *fun * return into a break, which offers the right semantics—except that it * won't break out of nested loops. * - * - A CF block which might contain a return statement. After calling + * - A CF block which contains a return statement. After calling * lower_return() on the CF block body, we stop, pull out everything after * the CF instruction, shove it into an if block, and then lower that if * block. @@ -559,6 +560,9 @@ static void lower_return(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *fun * already turned any returns into breaks. If the block we just processed * was conditional, then "break" did our work for us. If it was a loop, * we need to propagate that break to the outer loop. + * + * We return true if there was an early return anywhere in the block we just + * processed (including CF contained inside that block). */ LIST_FOR_EACH_ENTRY_SAFE(instr, next, &block->instrs, struct hlsl_ir_node, entry) @@ -573,32 +577,38 @@ static void lower_return(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *fun { struct hlsl_ir_if *iff = hlsl_ir_if(instr); - lower_return(ctx, func, &iff->then_instrs, in_loop); - lower_return(ctx, func, &iff->else_instrs, in_loop); + has_early_return |= lower_return(ctx, func, &iff->then_instrs, in_loop); + has_early_return |= lower_return(ctx, func, &iff->else_instrs, in_loop); - /* If we're in a loop, we don't need to do anything here. We - * turned the return into a break, and that will already skip - * anything that comes after this "if" block. */ - if (!in_loop) + if (has_early_return) { - cf_instr = instr; - break; + /* If we're in a loop, we don't need to do anything here. We + * turned the return into a break, and that will already skip + * anything that comes after this "if" block. */ + if (!in_loop) + { + cf_instr = instr; + break; + } } } else if (instr->type == HLSL_IR_LOOP) { - lower_return(ctx, func, &hlsl_ir_loop(instr)->body, true); + has_early_return |= lower_return(ctx, func, &hlsl_ir_loop(instr)->body, true); - if (in_loop) - { - /* "instr" is a nested loop. "return" breaks out of all - * loops, so break out of this one too now. */ - insert_early_return_break(ctx, func, instr); - } - else + if (has_early_return) { - cf_instr = instr; - break; + if (in_loop) + { + /* "instr" is a nested loop. "return" breaks out of all + * loops, so break out of this one too now. */ + insert_early_return_break(ctx, func, instr); + } + else + { + cf_instr = instr; + break; + } } } else if (instr->type == HLSL_IR_JUMP) @@ -610,13 +620,14 @@ static void lower_return(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *fun if (jump->type == HLSL_IR_JUMP_RETURN) { if (!(constant = hlsl_new_bool_constant(ctx, true, &jump->node.loc))) - return; + return false; list_add_before(&jump->node.entry, &constant->node.entry); if (!(store = hlsl_new_simple_store(ctx, func->early_return_var, &constant->node))) - return; + return false; list_add_after(&constant->node.entry, &store->node.entry); + has_early_return = true; if (in_loop) { jump->type = HLSL_IR_JUMP_BREAK; @@ -658,24 +669,26 @@ static void lower_return(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *fun assert(!in_loop); if (tail == &cf_instr->entry) - return; + return has_early_return; if (!(load = hlsl_new_var_load(ctx, func->early_return_var, cf_instr->loc))) - return; + return false; list_add_tail(&block->instrs, &load->node.entry); if (!(not = hlsl_new_unary_expr(ctx, HLSL_OP1_LOGIC_NOT, &load->node, cf_instr->loc))) - return; + return false; list_add_tail(&block->instrs, &not->entry); if (!(iff = hlsl_new_if(ctx, not, cf_instr->loc))) - return; + return false; list_add_tail(&block->instrs, &iff->node.entry); list_move_slice_tail(&iff->then_instrs.instrs, list_next(&block->instrs, &cf_instr->entry), tail); lower_return(ctx, func, &iff->then_instrs, in_loop); } + + return has_early_return; } /* Remove HLSL_IR_CALL instructions by inlining them. */

1 0

Zebediah Figura : vkd3d-shader/hlsl: Allow the final expression in a for loop initializer to be omitted.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: vkd3d Branch: master Commit: 58445da64bb894cd092be4aa142a620842dd26b1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/58445da64bb894cd092be4aa142a6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 13 22:40:09 2021 -0500 vkd3d-shader/hlsl: Allow the final expression in a for loop initializer to be omitted. --- libs/vkd3d-shader/hlsl.y | 14 +++++++++----- tests/return.shader_test | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d5e2b2a9..3bad2acc 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3647,6 +3647,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <list> declaration_statement %type <list> equality_expr %type <list> expr +%type <list> expr_optional %type <list> expr_statement %type <list> initializer_expr %type <list> jump_statement @@ -4875,24 +4876,27 @@ loop_statement: { $$ = create_loop(ctx, LOOP_DO_WHILE, NULL, $5, NULL, $2, @1); } - | KW_FOR '(' scope_start expr_statement expr_statement expr ')' statement + | KW_FOR '(' scope_start expr_statement expr_statement expr_optional ')' statement { $$ = create_loop(ctx, LOOP_FOR, $4, $5, $6, $8, @1); hlsl_pop_scope(ctx); } - | KW_FOR '(' scope_start declaration expr_statement expr ')' statement + | KW_FOR '(' scope_start declaration expr_statement expr_optional ')' statement { $$ = create_loop(ctx, LOOP_FOR, $4, $5, $6, $8, @1); hlsl_pop_scope(ctx); } -expr_statement: - ';' +expr_optional: + %empty { if (!($$ = make_empty_list(ctx))) YYABORT; } - | expr ';' + | expr + +expr_statement: + expr_optional ';' { $$ = $1; } diff --git a/tests/return.shader_test b/tests/return.shader_test index a66d8756..2660c6dd 100644 --- a/tests/return.shader_test +++ b/tests/return.shader_test @@ -215,7 +215,7 @@ todo draw quad todo probe all rgba (0.2, 0.2, 0.2, 0.2) uniform 0 float 0.8 todo draw quad -todo probe all rgba (0.5, 0.5, 0.5, 0.5) +probe all rgba (0.5, 0.5, 0.5, 0.5) [pixel shader todo]

1 0

Alex Henrie : mountmgr: Avoid calling RtlInitUnicodeString on a static constant.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 3549ae75dd3761cea63bdf843b632ef60599890f URL: https://gitlab.winehq.org/wine/wine/-/commit/3549ae75dd3761cea63bdf843b632e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Feb 11 12:47:54 2023 -0700 mountmgr: Avoid calling RtlInitUnicodeString on a static constant. --- dlls/mountmgr.sys/mountmgr.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 9f72eedb33b..ec22a8eb9bc 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -618,7 +618,11 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) #ifdef _WIN64 HKEY wow64_ports_key = NULL; #endif - UNICODE_STRING nameW, linkW; + UNICODE_STRING device_mount_point_manager = RTL_CONSTANT_STRING( L"\\Device\\MountPointManager" ); + UNICODE_STRING object_mount_point_manager = RTL_CONSTANT_STRING( L"\\??\\MountPointManager" ); + UNICODE_STRING driver_harddisk = RTL_CONSTANT_STRING( L"\\Driver\\Harddisk" ); + UNICODE_STRING driver_serial = RTL_CONSTANT_STRING( L"\\Driver\\Serial" ); + UNICODE_STRING driver_parallel = RTL_CONSTANT_STRING( L"\\Driver\\Parallel" ); DEVICE_OBJECT *device; HKEY devicemap_key; NTSTATUS status; @@ -631,10 +635,8 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = mountmgr_ioctl; - RtlInitUnicodeString( &nameW, L"\\Device\\MountPointManager" ); - RtlInitUnicodeString( &linkW, L"\\??\\MountPointManager" ); - if (!(status = IoCreateDevice( driver, 0, &nameW, 0, 0, FALSE, &device ))) - status = IoCreateSymbolicLink( &linkW, &nameW ); + if (!(status = IoCreateDevice( driver, 0, &device_mount_point_manager, 0, 0, FALSE, &device ))) + status = IoCreateSymbolicLink( &object_mount_point_manager, &device_mount_point_manager ); if (status) { FIXME( "failed to create device error %lx\n", status ); @@ -648,8 +650,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) KEY_ALL_ACCESS, NULL, &devicemap_key, NULL )) RegCloseKey( devicemap_key ); - RtlInitUnicodeString( &nameW, L"\\Driver\\Harddisk" ); - status = IoCreateDriver( &nameW, harddisk_driver_entry ); + status = IoCreateDriver( &driver_harddisk, harddisk_driver_entry ); thread = CreateThread( NULL, 0, device_op_thread, NULL, 0, NULL ); CloseHandle( CreateThread( NULL, 0, run_loop_thread, thread, 0, NULL )); @@ -664,11 +665,8 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) RegCloseKey( wow64_ports_key ); #endif - RtlInitUnicodeString( &nameW, L"\\Driver\\Serial" ); - IoCreateDriver( &nameW, serial_driver_entry ); - - RtlInitUnicodeString( &nameW, L"\\Driver\\Parallel" ); - IoCreateDriver( &nameW, parallel_driver_entry ); + IoCreateDriver( &driver_serial, serial_driver_entry ); + IoCreateDriver( &driver_parallel, parallel_driver_entry ); return status; }

1 0

Alex Henrie : win32u: Avoid calling RtlInitUnicodeString on a static constant.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 33ddf019f7cb13f05aaeec984f3b9f3ca3411da9 URL: https://gitlab.winehq.org/wine/wine/-/commit/33ddf019f7cb13f05aaeec984f3b9f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Feb 11 12:52:28 2023 -0700 win32u: Avoid calling RtlInitUnicodeString on a static constant. --- dlls/win32u/imm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/imm.c b/dlls/win32u/imm.c index 54e1ef3662a..513f116f80f 100644 --- a/dlls/win32u/imm.c +++ b/dlls/win32u/imm.c @@ -277,12 +277,11 @@ BOOL register_imm_window( HWND hwnd ) /* Create default IME window */ if (!thread_data->window_cnt++) { - UNICODE_STRING class_name, name; static const WCHAR imeW[] = {'I','M','E',0}; static const WCHAR default_imeW[] = {'D','e','f','a','u','l','t',' ','I','M','E',0}; + UNICODE_STRING class_name = RTL_CONSTANT_STRING( imeW ); + UNICODE_STRING name = RTL_CONSTANT_STRING( default_imeW ); - RtlInitUnicodeString( &class_name, imeW ); - RtlInitUnicodeString( &name, default_imeW ); thread_data->default_hwnd = NtUserCreateWindowEx( 0, &class_name, &class_name, &name, WS_POPUP | WS_DISABLED | WS_CLIPSIBLINGS, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, FALSE );

1 0

Alex Henrie : wineboot: Avoid calling RtlInitUnicodeString on a static constant.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: fae940df23a8905b8852be9c10019cbe0e89f1c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/fae940df23a8905b8852be9c10019c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Feb 11 12:53:15 2023 -0700 wineboot: Avoid calling RtlInitUnicodeString on a static constant. --- programs/wineboot/wineboot.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 4de20705224..117fd4caf9b 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -257,11 +257,10 @@ static void create_user_shared_data(void) SYSTEM_BASIC_INFORMATION sbi; BOOLEAN *features; OBJECT_ATTRIBUTES attr = {sizeof(attr)}; - UNICODE_STRING name; + UNICODE_STRING name = RTL_CONSTANT_STRING( L"\\KernelObjects\\__wine_user_shared_data" ); NTSTATUS status; HANDLE handle; - RtlInitUnicodeString( &name, L"\\KernelObjects\\__wine_user_shared_data" ); InitializeObjectAttributes( &attr, &name, OBJ_OPENIF, NULL, NULL ); if ((status = NtOpenSection( &handle, SECTION_ALL_ACCESS, &attr ))) { @@ -1609,7 +1608,7 @@ int __cdecl main( int argc, char *argv[] ) BOOL end_session, force, init, kill, restart, shutdown, update; HANDLE event; OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; + UNICODE_STRING nameW = RTL_CONSTANT_STRING( L"\\KernelObjects\\__wineboot_event" ); BOOL is_wow64; end_session = force = init = kill = restart = shutdown = update = FALSE; @@ -1690,7 +1689,6 @@ int __cdecl main( int argc, char *argv[] ) /* create event to be inherited by services.exe */ InitializeObjectAttributes( &attr, &nameW, OBJ_OPENIF | OBJ_INHERIT, 0, NULL ); - RtlInitUnicodeString( &nameW, L"\\KernelObjects\\__wineboot_event" ); NtCreateEvent( &event, EVENT_ALL_ACCESS, &attr, NotificationEvent, 0 ); ResetEvent( event ); /* in case this is a restart */

1 0

Alex Henrie : ws2_32: Avoid calling RtlInitUnicodeString on a static constant.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 8630a0c84d7d74a433685538f91c299d2125c765 URL: https://gitlab.winehq.org/wine/wine/-/commit/8630a0c84d7d74a433685538f91c29… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Feb 11 12:54:07 2023 -0700 ws2_32: Avoid calling RtlInitUnicodeString on a static constant. --- dlls/ws2_32/socket.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2a8fcf01ed8..5eb926a408b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3823,7 +3823,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, { struct afd_create_params create_params; OBJECT_ATTRIBUTES attr; - UNICODE_STRING string; + UNICODE_STRING string = RTL_CONSTANT_STRING(L"\\Device\\Afd"); IO_STATUS_BLOCK io; NTSTATUS status; HANDLE handle; @@ -3901,7 +3901,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, } } - RtlInitUnicodeString(&string, L"\\Device\\Afd"); InitializeObjectAttributes(&attr, &string, (flags & WSA_FLAG_NO_HANDLE_INHERIT) ? 0 : OBJ_INHERIT, NULL, NULL); if ((status = NtOpenFile(&handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, 0, (flags & WSA_FLAG_OVERLAPPED) ? 0 : FILE_SYNCHRONOUS_IO_NONALERT)))

1 0

Alex Henrie : ntdll: Use RTL_CONSTANT_STRING instead of reimplementing it.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 94208fcee505b9ac61c9ef4b63d45795cb33e484 URL: https://gitlab.winehq.org/wine/wine/-/commit/94208fcee505b9ac61c9ef4b63d457… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jan 24 23:47:44 2023 -0700 ntdll: Use RTL_CONSTANT_STRING instead of reimplementing it. --- dlls/ntdll/env.c | 7 ++----- dlls/ntdll/unix/registry.c | 2 +- dlls/ntdll/unix/virtual.c | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 6db6cee17cd..ab54a9ec563 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -54,12 +54,9 @@ static inline SIZE_T get_env_length( const WCHAR *env ) */ static void set_wow64_environment( WCHAR **env ) { - static WCHAR archW[] = L"PROCESSOR_ARCHITECTURE"; - static WCHAR arch6432W[] = L"PROCESSOR_ARCHITEW6432"; - WCHAR buf[256]; - UNICODE_STRING arch_strW = { sizeof(archW) - sizeof(WCHAR), sizeof(archW), archW }; - UNICODE_STRING arch6432_strW = { sizeof(arch6432W) - sizeof(WCHAR), sizeof(arch6432W), arch6432W }; + UNICODE_STRING arch_strW = RTL_CONSTANT_STRING( L"PROCESSOR_ARCHITECTURE" ); + UNICODE_STRING arch6432_strW = RTL_CONSTANT_STRING( L"PROCESSOR_ARCHITEW6432" ); UNICODE_STRING valW = { 0, sizeof(buf), buf }; UNICODE_STRING nameW; diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index d183474b53f..a24d6e7c267 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -826,7 +826,7 @@ NTSTATUS WINAPI NtQueryLicenseValue( const UNICODE_STRING *name, ULONG *type, 'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','L','i','c','e','n','s','e', 'I','n','f','o','r','m','a','t','i','o','n',0}; - UNICODE_STRING keyW = { sizeof(nameW) - sizeof(WCHAR), sizeof(nameW), (WCHAR *)nameW }; + UNICODE_STRING keyW = RTL_CONSTANT_STRING( nameW ); KEY_VALUE_PARTIAL_INFORMATION *info; NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; DWORD info_length, count; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 0f66429fc9d..f6e8793396c 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3192,7 +3192,7 @@ void virtual_map_user_shared_data(void) { static const WCHAR nameW[] = {'\\','K','e','r','n','e','l','O','b','j','e','c','t','s', '\\','_','_','w','i','n','e','_','u','s','e','r','_','s','h','a','r','e','d','_','d','a','t','a',0}; - UNICODE_STRING name_str = { sizeof(nameW) - sizeof(WCHAR), sizeof(nameW), (WCHAR *)nameW }; + UNICODE_STRING name_str = RTL_CONSTANT_STRING( nameW ); OBJECT_ATTRIBUTES attr = { sizeof(attr), 0, &name_str }; unsigned int status; HANDLE section;

1 0

Alex Henrie : ntdll: Avoid calling RtlInit(Ansi|Unicode)String on a static constant.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: dfe047ee4cfe28a8e371b261b8f2ba777a41eab1 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfe047ee4cfe28a8e371b261b8f2ba… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Feb 10 23:39:04 2023 -0700 ntdll: Avoid calling RtlInit(Ansi|Unicode)String on a static constant. --- dlls/ntdll/loader.c | 33 +++++++++++++++------------------ dlls/ntdll/relay.c | 3 +-- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 01a30742678..7661227e951 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2195,10 +2195,9 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, */ static void build_ntdll_module( HMODULE module ) { - UNICODE_STRING nt_name; + UNICODE_STRING nt_name = RTL_CONSTANT_STRING( L"\\??\\C:\\windows\\system32\\ntdll.dll" ); WINE_MODREF *wm; - RtlInitUnicodeString( &nt_name, L"\\??\\C:\\windows\\system32\\ntdll.dll" ); wm = alloc_module( module, &nt_name, TRUE ); assert( wm ); wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; @@ -2370,7 +2369,7 @@ static inline WCHAR *append_path( WCHAR *p, const WCHAR *str, int len ) static NTSTATUS get_dll_load_path( LPCWSTR module, LPCWSTR dll_dir, ULONG safe_mode, WCHAR **path ) { const WCHAR *mod_end = module; - UNICODE_STRING name, value; + UNICODE_STRING name = RTL_CONSTANT_STRING( L"PATH" ), value; WCHAR *p, *ret; int len = ARRAY_SIZE(system_path) + 1, path_len = 0; @@ -2380,7 +2379,6 @@ static NTSTATUS get_dll_load_path( LPCWSTR module, LPCWSTR dll_dir, ULONG safe_m len += (mod_end - module) + 1; } - RtlInitUnicodeString( &name, L"PATH" ); value.Length = 0; value.MaximumLength = 0; value.Buffer = NULL; @@ -3951,20 +3949,22 @@ static void process_breakpoint(void) static void load_global_options(void) { OBJECT_ATTRIBUTES attr; - UNICODE_STRING name_str, val_str; + UNICODE_STRING bootstrap_mode_str = RTL_CONSTANT_STRING( L"WINEBOOTSTRAPMODE" ); + UNICODE_STRING session_manager_str = + RTL_CONSTANT_STRING( L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Session Manager" ); + UNICODE_STRING val_str; HANDLE hkey; - RtlInitUnicodeString( &name_str, L"WINEBOOTSTRAPMODE" ); val_str.MaximumLength = 0; - is_prefix_bootstrap = RtlQueryEnvironmentVariable_U( NULL, &name_str, &val_str ) != STATUS_VARIABLE_NOT_FOUND; + is_prefix_bootstrap = + RtlQueryEnvironmentVariable_U( NULL, &bootstrap_mode_str, &val_str ) != STATUS_VARIABLE_NOT_FOUND; attr.Length = sizeof(attr); attr.RootDirectory = 0; - attr.ObjectName = &name_str; + attr.ObjectName = &session_manager_str; attr.Attributes = OBJ_CASE_INSENSITIVE; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &name_str, L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Session Manager" ); if (!NtOpenKey( &hkey, KEY_QUERY_VALUE, &attr )) { @@ -4019,12 +4019,11 @@ static void map_wow64cpu(void) { SIZE_T size = 0; OBJECT_ATTRIBUTES attr; - UNICODE_STRING string; + UNICODE_STRING string = RTL_CONSTANT_STRING( L"\\??\\C:\\windows\\sysnative\\wow64cpu.dll" ); HANDLE file, section; IO_STATUS_BLOCK io; NTSTATUS status; - RtlInitUnicodeString( &string, L"\\??\\C:\\windows\\sysnative\\wow64cpu.dll" ); InitializeObjectAttributes( &attr, &string, 0, NULL, NULL ); if ((status = NtOpenFile( &file, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE ))) @@ -4114,7 +4113,8 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR if (!imports_fixup_done) { MEMORY_BASIC_INFORMATION meminfo; - ANSI_STRING func_name; + ANSI_STRING base_thread_init_thunk = RTL_CONSTANT_STRING( "BaseThreadInitThunk" ); + ANSI_STRING ctrl_routine = RTL_CONSTANT_STRING( "CtrlRoutine" ); WINE_MODREF *kernel32; PEB *peb = NtCurrentTeb()->Peb; @@ -4154,15 +4154,13 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR NtTerminateProcess( GetCurrentProcess(), status ); } node_kernel32 = kernel32->ldr.DdagNode; - RtlInitAnsiString( &func_name, "BaseThreadInitThunk" ); - if ((status = LdrGetProcedureAddress( kernel32->ldr.DllBase, &func_name, + if ((status = LdrGetProcedureAddress( kernel32->ldr.DllBase, &base_thread_init_thunk, 0, (void **)&pBaseThreadInitThunk )) != STATUS_SUCCESS) { MESSAGE( "wine: could not find BaseThreadInitThunk in kernel32.dll, status %lx\n", status ); NtTerminateProcess( GetCurrentProcess(), status ); } - RtlInitAnsiString( &func_name, "CtrlRoutine" ); - LdrGetProcedureAddress( kernel32->ldr.DllBase, &func_name, 0, (void **)&pCtrlRoutine ); + LdrGetProcedureAddress( kernel32->ldr.DllBase, &ctrl_routine, 0, (void **)&pCtrlRoutine ); actctx_init(); locale_init(); @@ -4532,9 +4530,8 @@ NTSTATUS WINAPI RtlGetExePath( PCWSTR name, PWSTR *path ) /* same check as NeedCurrentDirectoryForExePathW */ if (!wcschr( name, '\\' )) { - UNICODE_STRING name, value = { 0 }; + UNICODE_STRING name = RTL_CONSTANT_STRING( L"NoDefaultCurrentDirectoryInExePath" ), value = { 0 }; - RtlInitUnicodeString( &name, L"NoDefaultCurrentDirectoryInExePath" ); if (RtlQueryEnvironmentVariable_U( NULL, &name, &value ) != STATUS_VARIABLE_NOT_FOUND) dlldir = L""; } diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 7dbff3c0727..afa4085fb33 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -165,7 +165,7 @@ static const WCHAR **load_list( HKEY hkey, const WCHAR *value ) static DWORD WINAPI init_debug_lists( RTL_RUN_ONCE *once, void *param, void **context ) { OBJECT_ATTRIBUTES attr; - UNICODE_STRING name; + UNICODE_STRING name = RTL_CONSTANT_STRING( L"Software\\Wine\\Debug" ); HANDLE root, hkey; RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); @@ -175,7 +175,6 @@ static DWORD WINAPI init_debug_lists( RTL_RUN_ONCE *once, void *param, void **co attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &name, L"Software\\Wine\\Debug" ); /* @@ Wine registry key: HKCU\Software\Wine\Debug */ if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) hkey = 0;

1 0

Connor McAdams : include: Fully define uiautomationclient interfaces.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: f02ee34d3ae09be8fa12cf6a04d4200d65bf032d URL: https://gitlab.winehq.org/wine/wine/-/commit/f02ee34d3ae09be8fa12cf6a04d420… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Dec 13 12:59:48 2022 -0500 include: Fully define uiautomationclient interfaces. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/uiautomationclient.idl | 730 ++++++++++++++++++++++++++++++++++++++--- include/uiautomationcore.idl | 92 ++++++ 2 files changed, 782 insertions(+), 40 deletions(-)

1 0