- Wine-Commits - list.winehq.org

Rémi Bernon : dinput: Merge all acquired device lists together.
by Alexandre Julliard Feb. 15, 2023

Feb. 15, 2023

Module: wine Branch: master Commit: a75e0d062236db2dafad44f3de3f0d3ac2120834 URL: https://gitlab.winehq.org/wine/wine/-/commit/a75e0d062236db2dafad44f3de3f0d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Feb 12 00:38:54 2023 +0100 dinput: Merge all acquired device lists together. This is no longer needed as an optimization. --- dlls/dinput/dinput_main.c | 45 ++++++++++----------------------------------- 1 file changed, 10 insertions(+), 35 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index cf0d8841424..15ab2fe3dce 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -88,8 +88,6 @@ static CRITICAL_SECTION_DEBUG dinput_critsect_debug = }; static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0, 0 }; -static struct list acquired_mouse_list = LIST_INIT( acquired_mouse_list ); -static struct list acquired_keyboard_list = LIST_INIT( acquired_keyboard_list ); static struct list acquired_device_list = LIST_INIT( acquired_device_list ); void dinput_hooks_acquire_device( IDirectInputDevice8W *iface ) @@ -97,12 +95,7 @@ void dinput_hooks_acquire_device( IDirectInputDevice8W *iface ) struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); EnterCriticalSection( &dinput_hook_crit ); - if (IsEqualGUID( &impl->guid, &GUID_SysMouse )) - list_add_tail( &acquired_mouse_list, &impl->entry ); - else if (IsEqualGUID( &impl->guid, &GUID_SysKeyboard )) - list_add_tail( &acquired_keyboard_list, &impl->entry ); - else - list_add_tail( &acquired_device_list, &impl->entry ); + list_add_tail( &acquired_device_list, &impl->entry ); LeaveCriticalSection( &dinput_hook_crit ); SendMessageW( di_em_win, INPUT_THREAD_NOTIFY, NOTIFY_REFRESH_DEVICES, 0 ); @@ -177,18 +170,6 @@ static void dinput_unacquire_window_devices( HWND window ) TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl ); dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); } - LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_mouse_list, struct dinput_device, entry ) - { - if (window != impl->win) continue; - TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl ); - dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); - } - LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_keyboard_list, struct dinput_device, entry ) - { - if (window != impl->win) continue; - TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl ); - dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); - } LeaveCriticalSection( &dinput_hook_crit ); } @@ -201,10 +182,6 @@ static void dinput_unacquire_devices(void) LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_device_list, struct dinput_device, entry ) dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); - LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_mouse_list, struct dinput_device, entry ) - dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); - LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_keyboard_list, struct dinput_device, entry ) - dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); LeaveCriticalSection( &dinput_hook_crit ); } @@ -224,7 +201,7 @@ static LRESULT CALLBACK cbt_hook_proc( int code, WPARAM wparam, LPARAM lparam ) static void input_thread_update_device_list( struct input_thread_state *state ) { RAWINPUTDEVICE rawinput_mouse = {.usUsagePage = HID_USAGE_PAGE_GENERIC, .usUsage = HID_USAGE_GENERIC_MOUSE, .dwFlags = RIDEV_REMOVE}; - UINT count = 0, keyboard_count = 0, mouse_ll_count = 0, foreground_count = 0; + UINT count = 0, keyboard_ll_count = 0, mouse_ll_count = 0, foreground_count = 0; struct dinput_device *device; EnterCriticalSection( &dinput_hook_crit ); @@ -238,11 +215,11 @@ static void input_thread_update_device_list( struct input_thread_state *state ) } state->events_count = count; - LIST_FOR_EACH_ENTRY( device, &acquired_mouse_list, struct dinput_device, entry ) + LIST_FOR_EACH_ENTRY( device, &acquired_device_list, struct dinput_device, entry ) { RAWINPUTDEVICE *rawinput_device = NULL; - if (device->dwCoopLevel & DISCL_FOREGROUND) foreground_count++; + if (device->read_event && device->vtbl->read) continue; switch (GET_DIDEVICE_TYPE( device->instance.dwDevType )) { case DIDEVTYPE_MOUSE: @@ -251,6 +228,10 @@ static void input_thread_update_device_list( struct input_thread_state *state ) if (!device->use_raw_input) mouse_ll_count++; else rawinput_device = &rawinput_mouse; break; + case DIDEVTYPE_KEYBOARD: + case DI8DEVTYPE_KEYBOARD: + if (!device->use_raw_input) keyboard_ll_count++; + break; } if (rawinput_device) @@ -263,12 +244,6 @@ static void input_thread_update_device_list( struct input_thread_state *state ) if (count < INPUT_THREAD_MAX_DEVICES) dinput_device_internal_addref( (state->devices[count++] = device) ); } - LIST_FOR_EACH_ENTRY( device, &acquired_keyboard_list, struct dinput_device, entry ) - { - if (device->dwCoopLevel & DISCL_FOREGROUND) foreground_count++; - keyboard_count++; - if (count < INPUT_THREAD_MAX_DEVICES) dinput_device_internal_addref( (state->devices[count++] = device) ); - } state->devices_count = count; LeaveCriticalSection( &dinput_hook_crit ); @@ -280,9 +255,9 @@ static void input_thread_update_device_list( struct input_thread_state *state ) state->callwndproc_hook = NULL; } - if (keyboard_count && !state->keyboard_ll_hook) + if (keyboard_ll_count && !state->keyboard_ll_hook) state->keyboard_ll_hook = SetWindowsHookExW( WH_KEYBOARD_LL, input_thread_ll_hook_proc, DINPUT_instance, 0 ); - else if (!keyboard_count && state->keyboard_ll_hook) + else if (!keyboard_ll_count && state->keyboard_ll_hook) { UnhookWindowsHookEx( state->keyboard_ll_hook ); state->keyboard_ll_hook = NULL;

1 0

Rémi Bernon : dinput: Introduce keyboard_handle_key_event helper.
by Alexandre Julliard Feb. 15, 2023

Feb. 15, 2023

Module: wine Branch: master Commit: 2d6776e82e3597a87cd41074e7bea79f17492a9d URL: https://gitlab.winehq.org/wine/wine/-/commit/2d6776e82e3597a87cd41074e7bea7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 5 14:00:00 2022 +0100 dinput: Introduce keyboard_handle_key_event helper. --- dlls/dinput/keyboard.c | 47 +++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 873a2d98434..6c24ddcf24b 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -83,22 +83,13 @@ static BYTE map_dik_code(DWORD scanCode, DWORD vkCode, DWORD subType, DWORD vers return (BYTE)scanCode; } -int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam ) +static void keyboard_handle_event( struct keyboard *impl, DWORD vkey, DWORD scan_code, BOOL up ) { - struct keyboard *impl = impl_from_IDirectInputDevice8W( iface ); BYTE new_diks, subtype = GET_DIDEVICE_SUBTYPE( impl->base.instance.dwDevType ); - int dik_code, ret = impl->base.dwCoopLevel & DISCL_EXCLUSIVE; - KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam; - DWORD scan_code; - - if (wparam != WM_KEYDOWN && wparam != WM_KEYUP && - wparam != WM_SYSKEYDOWN && wparam != WM_SYSKEYUP) - return 0; + IDirectInputDevice8W *iface = &impl->base.IDirectInputDevice8W_iface; + int dik_code; - TRACE( "iface %p, wparam %#Ix, lparam %#Ix, vkCode %#lx, scanCode %#lx.\n", iface, wparam, - lparam, hook->vkCode, hook->scanCode ); - - switch (hook->vkCode) + switch (vkey) { /* R-Shift is special - it is an extended key with separate scan code */ case VK_RSHIFT : dik_code = DIK_RSHIFT; break; @@ -106,25 +97,41 @@ int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lpa case VK_NUMLOCK : dik_code = DIK_NUMLOCK; break; case VK_SUBTRACT: dik_code = DIK_SUBTRACT; break; default: - scan_code = hook->scanCode & 0xff; - if (hook->flags & LLKHF_EXTENDED) scan_code |= 0x100; - dik_code = map_dik_code( scan_code, hook->vkCode, subtype, impl->base.dinput->dwVersion ); + dik_code = map_dik_code( scan_code, vkey, subtype, impl->base.dinput->dwVersion ); + break; } - new_diks = hook->flags & LLKHF_UP ? 0 : 0x80; + new_diks = (up ? 0 : 0x80); /* returns now if key event already known */ - if (new_diks == impl->base.device_state[dik_code]) return ret; + if (new_diks == impl->base.device_state[dik_code]) return; impl->base.device_state[dik_code] = new_diks; - TRACE( " setting key %02x to %02x\n", dik_code, impl->base.device_state[dik_code] ); + TRACE( "setting key %02x to %02x\n", dik_code, impl->base.device_state[dik_code] ); EnterCriticalSection( &impl->base.crit ); queue_event( iface, DIDFT_MAKEINSTANCE( dik_code ) | DIDFT_PSHBUTTON, new_diks, GetCurrentTime(), impl->base.dinput->evsequence++ ); if (impl->base.hEvent) SetEvent( impl->base.hEvent ); LeaveCriticalSection( &impl->base.crit ); +} + +int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam ) +{ + struct keyboard *impl = impl_from_IDirectInputDevice8W( iface ); + KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam; + DWORD scan_code; + + TRACE( "iface %p, wparam %#Ix, lparam %#Ix, vkCode %#lx, scanCode %#lx.\n", iface, wparam, + lparam, hook->vkCode, hook->scanCode ); + + if (wparam != WM_KEYDOWN && wparam != WM_KEYUP && wparam != WM_SYSKEYDOWN && wparam != WM_SYSKEYUP) + return 0; + + scan_code = hook->scanCode & 0xff; + if (hook->flags & LLKHF_EXTENDED) scan_code |= 0x100; + keyboard_handle_event( impl, hook->vkCode, scan_code, hook->flags & LLKHF_UP ); - return ret; + return impl->base.dwCoopLevel & DISCL_EXCLUSIVE; } static DWORD get_keyboard_subtype(void)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 break instructions.
by Alexandre Julliard Feb. 15, 2023

Feb. 15, 2023

Module: vkd3d Branch: master Commit: 7c3dadce6b6430f82860e35001608eb8fc7ae46a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7c3dadce6b6430f82860e35001608… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Sep 10 08:53:17 2021 +0200 vkd3d-shader/hlsl: Write SM4 break instructions. --- libs/vkd3d-shader/hlsl.c | 14 ++++++++++++++ libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl_sm4.c | 26 ++++++++++++++++++++++++++ tests/function-return.shader_test | 16 ++++++++-------- tests/return.shader_test | 30 +++++++++++++++--------------- 5 files changed, 65 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 97713343..5dbdaf7e 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1861,6 +1861,20 @@ const char *hlsl_node_type_to_string(enum hlsl_ir_node_type type) return names[type]; } +const char *hlsl_jump_type_to_string(enum hlsl_ir_jump_type type) +{ + static const char * const names[] = + { + "HLSL_IR_JUMP_BREAK", + "HLSL_IR_JUMP_CONTINUE", + "HLSL_IR_JUMP_DISCARD", + "HLSL_IR_JUMP_RETURN", + }; + + assert(type < ARRAY_SIZE(names)); + return names[type]; +} + static void dump_instr(struct hlsl_ctx *ctx, struct vkd3d_string_buffer *buffer, const struct hlsl_ir_node *instr); static void dump_instr_list(struct hlsl_ctx *ctx, struct vkd3d_string_buffer *buffer, const struct list *list) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 53b47e40..81b1a61d 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1003,6 +1003,8 @@ struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name); struct hlsl_type *hlsl_get_element_type_from_path_index(struct hlsl_ctx *ctx, const struct hlsl_type *type, struct hlsl_ir_node *idx); +const char *hlsl_jump_type_to_string(enum hlsl_ir_jump_type type); + struct hlsl_type *hlsl_new_array_type(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, unsigned int array_size); struct hlsl_ir_node *hlsl_new_binary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2); diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 2e7c101f..10bb1e3d 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -2118,6 +2118,28 @@ static void write_sm4_if(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf write_sm4_instruction(buffer, &instr); } +static void write_sm4_jump(struct hlsl_ctx *ctx, + struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_jump *jump) +{ + struct sm4_instruction instr = {0}; + + switch (jump->type) + { + case HLSL_IR_JUMP_BREAK: + instr.opcode = VKD3D_SM4_OP_BREAK; + break; + + case HLSL_IR_JUMP_RETURN: + vkd3d_unreachable(); + + default: + hlsl_fixme(ctx, &jump->node.loc, "Jump type %s.\n", hlsl_jump_type_to_string(jump->type)); + return; + } + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_load *load) { @@ -2375,6 +2397,10 @@ static void write_sm4_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * write_sm4_if(ctx, buffer, hlsl_ir_if(instr)); break; + case HLSL_IR_JUMP: + write_sm4_jump(ctx, buffer, hlsl_ir_jump(instr)); + break; + case HLSL_IR_LOAD: write_sm4_load(ctx, buffer, hlsl_ir_load(instr)); break; diff --git a/tests/function-return.shader_test b/tests/function-return.shader_test index 7d411998..cbd29749 100644 --- a/tests/function-return.shader_test +++ b/tests/function-return.shader_test @@ -145,7 +145,7 @@ uniform 0 float 0.9 draw quad probe all rgba (1.0, 0.9, 1.0, 0.6) 1 -[pixel shader todo] +[pixel shader] float func(out float o) { @@ -184,10 +184,10 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (0.4, 0.3, 0.3, 0.9) 1 -[pixel shader todo] +[pixel shader] uniform float f; @@ -239,23 +239,23 @@ float4 main() : sv_target [test] uniform 0 float 0.0 -todo draw quad +draw quad probe all rgba (0.3, 0.2, 0.3, 0.3) 1 uniform 0 float 0.1 -todo draw quad +draw quad probe all rgba (0.3, 0.3, 0.3, 0.3) 1 uniform 0 float 0.3 -todo draw quad +draw quad probe all rgba (0.3, 0.5, 0.3, 0.3) 1 uniform 0 float 0.7 -todo draw quad +draw quad probe all rgba (0.3, 0.9, 0.7, 0.6) 1 uniform 0 float 0.9 -todo draw quad +draw quad probe all rgba (0.4, 0.1, 0.7, 0.6) 1 [pixel shader todo] diff --git a/tests/return.shader_test b/tests/return.shader_test index 2660c6dd..3c9ea611 100644 --- a/tests/return.shader_test +++ b/tests/return.shader_test @@ -128,7 +128,7 @@ uniform 0 float 0.9 draw quad probe all rgba (0.4, 0.5, 0.6, 0.7) 1 -[pixel shader todo] +[pixel shader] void main(out float4 ret : sv_target) { @@ -143,10 +143,10 @@ void main(out float4 ret : sv_target) } [test] -todo draw quad -todo probe all rgba (0.2, 0.4, 0.6, 0.8) +draw quad +probe all rgba (0.2, 0.4, 0.6, 0.8) -[pixel shader todo] +[pixel shader] uniform float f; @@ -166,26 +166,26 @@ void main(out float4 ret : sv_target) [test] uniform 0 float 0.0 -todo draw quad -todo probe all rgba (0.1, 0.1, 0.1, 0.1) 1 +draw quad +probe all rgba (0.1, 0.1, 0.1, 0.1) 1 uniform 0 float 0.1 -todo draw quad -todo probe all rgba (0.2, 0.2, 0.2, 0.2) 1 +draw quad +probe all rgba (0.2, 0.2, 0.2, 0.2) 1 uniform 0 float 0.3 -todo draw quad +draw quad todo probe all rgba (0.4, 0.4, 0.4, 0.4) 1 uniform 0 float 0.7 -todo draw quad +draw quad todo probe all rgba (0.8, 0.8, 0.8, 0.8) 1 uniform 0 float 0.9 -todo draw quad +draw quad todo probe all rgba (0.9, 0.9, 0.9, 0.9) 1 -[pixel shader todo] +[pixel shader] uniform float f; @@ -211,10 +211,10 @@ void main(out float4 ret : sv_target) [test] uniform 0 float 0.2 -todo draw quad -todo probe all rgba (0.2, 0.2, 0.2, 0.2) +draw quad +probe all rgba (0.2, 0.2, 0.2, 0.2) uniform 0 float 0.8 -todo draw quad +draw quad probe all rgba (0.5, 0.5, 0.5, 0.5) [pixel shader todo]

1 0

Alex Henrie : kernelbase: Avoid calling RtlInitUnicodeString on a static constant.
by Alexandre Julliard Feb. 15, 2023

Feb. 15, 2023

Module: wine Branch: master Commit: 9cbbcb409c60215007547bb2f9201c00260170db URL: https://gitlab.winehq.org/wine/wine/-/commit/9cbbcb409c60215007547bb2f9201c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 14 19:15:26 2023 -0700 kernelbase: Avoid calling RtlInitUnicodeString on a static constant. --- dlls/kernelbase/console.c | 9 +++------ dlls/kernelbase/debug.c | 3 +-- dlls/kernelbase/file.c | 15 +++++++-------- dlls/kernelbase/registry.c | 7 ++----- dlls/kernelbase/volume.c | 7 ++----- 5 files changed, 15 insertions(+), 26 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 7cd87f53b3c..fa143857bc2 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -205,12 +205,11 @@ static COORD get_console_font_size( HANDLE handle, DWORD index ) static HANDLE create_console_server( void ) { OBJECT_ATTRIBUTES attr = {sizeof(attr)}; - UNICODE_STRING string; + UNICODE_STRING string = RTL_CONSTANT_STRING( L"\\Device\\ConDrv\\Server" ); IO_STATUS_BLOCK iosb; HANDLE handle; NTSTATUS status; - RtlInitUnicodeString( &string, L"\\Device\\ConDrv\\Server" ); attr.ObjectName = &string; attr.Attributes = OBJ_INHERIT; status = NtCreateFile( &handle, FILE_WRITE_PROPERTIES | FILE_READ_PROPERTIES | SYNCHRONIZE, @@ -222,12 +221,11 @@ static HANDLE create_console_server( void ) static HANDLE create_console_reference( HANDLE root ) { OBJECT_ATTRIBUTES attr = {sizeof(attr)}; - UNICODE_STRING string; + UNICODE_STRING string = RTL_CONSTANT_STRING( L"Reference" ); IO_STATUS_BLOCK iosb; HANDLE handle; NTSTATUS status; - RtlInitUnicodeString( &string, L"Reference" ); attr.RootDirectory = root; attr.ObjectName = &string; status = NtCreateFile( &handle, FILE_READ_DATA | FILE_WRITE_DATA | FILE_WRITE_PROPERTIES | @@ -466,7 +464,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateConsoleScreenBuffer( DWORD access, DWORD s { OBJECT_ATTRIBUTES attr = {sizeof(attr)}; IO_STATUS_BLOCK iosb; - UNICODE_STRING name; + UNICODE_STRING name = RTL_CONSTANT_STRING( L"\\Device\\ConDrv\\ScreenBuffer" ); HANDLE handle; NTSTATUS status; @@ -478,7 +476,6 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateConsoleScreenBuffer( DWORD access, DWORD s return INVALID_HANDLE_VALUE; } - RtlInitUnicodeString( &name, L"\\Device\\ConDrv\\ScreenBuffer" ); attr.ObjectName = &name; attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; if (sa && sa->bInheritHandle) attr.Attributes |= OBJ_INHERIT; diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 6d8b9ad4b2c..ebf1ed76023 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -398,7 +398,7 @@ static void format_exception_msg( const EXCEPTION_POINTERS *ptr, char *buffer, i static BOOL start_debugger( EXCEPTION_POINTERS *epointers, HANDLE event ) { OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; + UNICODE_STRING nameW = RTL_CONSTANT_STRING( L"\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug" ); WCHAR *cmdline, *env, *p, *format = NULL; HANDLE dbg_key; DWORD autostart = TRUE; @@ -416,7 +416,6 @@ static BOOL start_debugger( EXCEPTION_POINTERS *epointers, HANDLE event ) attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &nameW, L"\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug" ); if (!NtOpenKey( &dbg_key, KEY_READ, &attr )) { diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index ac04388acde..b676c50c416 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -148,7 +148,9 @@ static BOOL add_boot_rename_entry( LPCWSTR source, LPCWSTR dest, DWORD flags ) static const int info_size = FIELD_OFFSET( KEY_VALUE_PARTIAL_INFORMATION, Data ); OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW, source_name, dest_name; + UNICODE_STRING session_manager = RTL_CONSTANT_STRING( L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Session Manager" ); + UNICODE_STRING pending_file_rename_operations = RTL_CONSTANT_STRING( L"PendingFileRenameOperations" ); + UNICODE_STRING source_name, dest_name; KEY_VALUE_PARTIAL_INFORMATION *info; BOOL rc = FALSE; HANDLE key = 0; @@ -172,11 +174,10 @@ static BOOL add_boot_rename_entry( LPCWSTR source, LPCWSTR dest, DWORD flags ) attr.Length = sizeof(attr); attr.RootDirectory = 0; - attr.ObjectName = &nameW; + attr.ObjectName = &session_manager; attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &nameW, L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Session Manager" ); if (NtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS) { @@ -194,14 +195,12 @@ static BOOL add_boot_rename_entry( LPCWSTR source, LPCWSTR dest, DWORD flags ) } else len2 = sizeof(WCHAR); /* minimum is the 0 characters for the empty second string */ - RtlInitUnicodeString( &nameW, L"PendingFileRenameOperations" ); - /* First we check if the key exists and if so how many bytes it already contains. */ - if (NtQueryValueKey( key, &nameW, KeyValuePartialInformation, + if (NtQueryValueKey( key, &pending_file_rename_operations, KeyValuePartialInformation, NULL, 0, &size ) == STATUS_BUFFER_TOO_SMALL) { if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size + len1 + len2 + sizeof(WCHAR) ))) goto done; - if (NtQueryValueKey( key, &nameW, KeyValuePartialInformation, buffer, size, &size )) goto done; + if (NtQueryValueKey( key, &pending_file_rename_operations, KeyValuePartialInformation, buffer, size, &size )) goto done; info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; if (info->Type != REG_MULTI_SZ) goto done; if (size > sizeof(info)) size -= sizeof(WCHAR); /* remove terminating null (will be added back later) */ @@ -231,7 +230,7 @@ static BOOL add_boot_rename_entry( LPCWSTR source, LPCWSTR dest, DWORD flags ) p = (WCHAR *)(buffer + size); *p = 0; size += sizeof(WCHAR); - rc = !NtSetValueKey( key, &nameW, 0, REG_MULTI_SZ, buffer + info_size, size - info_size ); + rc = !NtSetValueKey( key, &pending_file_rename_operations, 0, REG_MULTI_SZ, buffer + info_size, size - info_size ); done: RtlFreeUnicodeString( &source_name ); diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index 91462d80e06..0137cbe6cad 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -107,7 +107,7 @@ static BOOL is_wow6432node( const UNICODE_STRING *name ) static HANDLE open_wow6432node( HANDLE key ) { OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; + UNICODE_STRING nameW = RTL_CONSTANT_STRING( L"Wow6432Node" ); HANDLE ret; attr.Length = sizeof(attr); @@ -116,7 +116,6 @@ static HANDLE open_wow6432node( HANDLE key ) attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &nameW, L"Wow6432Node" ); if (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 )) ret = 0; return ret; } @@ -2312,7 +2311,7 @@ LSTATUS WINAPI RegLoadKeyW( HKEY hkey, LPCWSTR subkey, LPCWSTR filename ) */ LSTATUS WINAPI RegLoadKeyA( HKEY hkey, LPCSTR subkey, LPCSTR filename ) { - UNICODE_STRING subkeyW, filenameW; + UNICODE_STRING subkeyW = { 0, 0, NULL }, filenameW = { 0, 0, NULL }; STRING subkeyA, filenameA; NTSTATUS status; LONG ret; @@ -2320,8 +2319,6 @@ LSTATUS WINAPI RegLoadKeyA( HKEY hkey, LPCSTR subkey, LPCSTR filename ) RtlInitAnsiString(&subkeyA, subkey); RtlInitAnsiString(&filenameA, filename); - RtlInitUnicodeString(&subkeyW, NULL); - RtlInitUnicodeString(&filenameW, NULL); if (!(status = RtlAnsiStringToUnicodeString(&subkeyW, &subkeyA, TRUE)) && !(status = RtlAnsiStringToUnicodeString(&filenameW, &filenameA, TRUE))) { diff --git a/dlls/kernelbase/volume.c b/dlls/kernelbase/volume.c index 39386867aa3..d39613175f9 100644 --- a/dlls/kernelbase/volume.c +++ b/dlls/kernelbase/volume.c @@ -433,7 +433,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH DefineDosDeviceW( DWORD flags, const WCHAR *device */ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) { - UNICODE_STRING nt_name; NTSTATUS status; if (!bufsize) @@ -471,12 +470,11 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) } else /* return a list of all devices */ { + UNICODE_STRING nt_name = RTL_CONSTANT_STRING( L"\\DosDevices" ); OBJECT_ATTRIBUTES attr; HANDLE handle; WCHAR *p = target; - RtlInitUnicodeString( &nt_name, L"\\DosDevices\\" ); - nt_name.Length -= sizeof(WCHAR); /* without trailing slash */ attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = &nt_name; @@ -517,12 +515,11 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) DWORD WINAPI DECLSPEC_HOTPATCH GetLogicalDrives(void) { OBJECT_ATTRIBUTES attr; - UNICODE_STRING nt_name; + UNICODE_STRING nt_name = RTL_CONSTANT_STRING( L"\\DosDevices\\" ); DWORD bitmask = 0; NTSTATUS status; HANDLE handle; - RtlInitUnicodeString( &nt_name, L"\\DosDevices\\" ); nt_name.Length -= sizeof(WCHAR); /* without trailing slash */ attr.Length = sizeof(attr); attr.RootDirectory = 0;

1 0

Alex Henrie : ntoskrnl: Avoid calling RtlInitUnicodeString on a static constant.
by Alexandre Julliard Feb. 15, 2023

Feb. 15, 2023

Module: wine Branch: master Commit: e60e8af0a9684b229ed9ee21543c0695ff754a6b URL: https://gitlab.winehq.org/wine/wine/-/commit/e60e8af0a9684b229ed9ee21543c06… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 14 19:54:25 2023 -0700 ntoskrnl: Avoid calling RtlInitUnicodeString on a static constant. --- dlls/ntoskrnl.exe/pnp.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 7c77a9a7145..25a52d7d219 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -720,8 +720,6 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\', 'D','e','v','i','c','e','C','l','a','s','s','e','s','\\',0}; - static const WCHAR controlW[] = {'C','o','n','t','r','o','l',0}; - static const WCHAR linkedW[] = {'L','i','n','k','e','d',0}; static const WCHAR slashW[] = {'\\',0}; static const WCHAR hashW[] = {'#',0}; @@ -732,6 +730,8 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable HANDLE iface_key, control_key; OBJECT_ATTRIBUTES attr = {0}; struct wine_rb_entry *entry; + UNICODE_STRING control = RTL_CONSTANT_STRING( L"Control" ); + UNICODE_STRING linked = RTL_CONSTANT_STRING( L"Linked" ); UNICODE_STRING string; DWORD data = enable; NTSTATUS ret; @@ -780,14 +780,14 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable return ret; attr.RootDirectory = iface_key; - RtlInitUnicodeString( &string, controlW ); + attr.ObjectName = &control; ret = NtCreateKey( &control_key, KEY_SET_VALUE, &attr, 0, NULL, REG_OPTION_VOLATILE, NULL ); NtClose( iface_key ); if (ret) return ret; - RtlInitUnicodeString( &string, linkedW ); - ret = NtSetValueKey( control_key, &string, 0, REG_DWORD, &data, sizeof(data) ); + attr.ObjectName = &linked; + ret = NtSetValueKey( control_key, &linked, 0, REG_DWORD, &data, sizeof(data) ); if (ret) { NtClose( control_key ); @@ -800,7 +800,7 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable ret = IoDeleteSymbolicLink( name ); if (ret) { - NtDeleteValueKey( control_key, &string ); + NtDeleteValueKey( control_key, &linked ); NtClose( control_key ); return ret; } @@ -1141,15 +1141,13 @@ static DWORD CALLBACK device_enum_thread_proc(void *arg) void pnp_manager_start(void) { - static const WCHAR driver_nameW[] = {'\\','D','r','i','v','e','r','\\','P','n','p','M','a','n','a','g','e','r',0}; WCHAR endpoint[] = L"\\pipe\\wine_plugplay"; WCHAR protseq[] = L"ncacn_np"; - UNICODE_STRING driver_nameU; + UNICODE_STRING driver_nameU = RTL_CONSTANT_STRING( L"\\Driver\\PnpManager" ); RPC_WSTR binding_str; NTSTATUS status; RPC_STATUS err; - RtlInitUnicodeString( &driver_nameU, driver_nameW ); if ((status = IoCreateDriver( &driver_nameU, pnp_manager_driver_entry ))) ERR("Failed to create PnP manager driver, status %#lx.\n", status);

1 0

Alex Henrie : krnl386: Avoid calling RtlInitUnicodeString on a static constant.
by Alexandre Julliard Feb. 15, 2023

Feb. 15, 2023

Module: wine Branch: master Commit: 956005d338f8270feeac2e36a4f0374b0f82b96a URL: https://gitlab.winehq.org/wine/wine/-/commit/956005d338f8270feeac2e36a4f037… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 14 19:51:30 2023 -0700 krnl386: Avoid calling RtlInitUnicodeString on a static constant. --- dlls/krnl386.exe16/relay.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/krnl386.exe16/relay.c b/dlls/krnl386.exe16/relay.c index 1532df52676..8b53f6bfd05 100644 --- a/dlls/krnl386.exe16/relay.c +++ b/dlls/krnl386.exe16/relay.c @@ -85,27 +85,23 @@ static const char **build_list( const WCHAR *buffer ) void RELAY16_InitDebugLists(void) { OBJECT_ATTRIBUTES attr; - UNICODE_STRING name; char buffer[1024]; HANDLE root, hkey; DWORD count; WCHAR *str; - static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\', - 'D','e','b','u','g',0}; - static const WCHAR RelayIncludeW[] = {'R','e','l','a','y','I','n','c','l','u','d','e',0}; - static const WCHAR RelayExcludeW[] = {'R','e','l','a','y','E','x','c','l','u','d','e',0}; - static const WCHAR SnoopIncludeW[] = {'S','n','o','o','p','I','n','c','l','u','d','e',0}; - static const WCHAR SnoopExcludeW[] = {'S','n','o','o','p','E','x','c','l','u','d','e',0}; + UNICODE_STRING config = RTL_CONSTANT_STRING( L"Software\\Wine\\Debug" ); + UNICODE_STRING relay_include = RTL_CONSTANT_STRING( L"RelayInclude" ); + UNICODE_STRING relay_exclude = RTL_CONSTANT_STRING( L"RelayExclude" ); + UNICODE_STRING snoop_include = RTL_CONSTANT_STRING( L"SnoopInclude" ); + UNICODE_STRING snoop_exclude = RTL_CONSTANT_STRING( L"SnoopExclude" ); RtlOpenCurrentUser( KEY_READ, &root ); attr.Length = sizeof(attr); attr.RootDirectory = root; - attr.ObjectName = &name; + attr.ObjectName = &config; attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &name, configW ); /* @@ Wine registry key: HKCU\Software\Wine\Debug */ if (NtOpenKey( &hkey, KEY_READ, &attr )) hkey = 0; @@ -113,26 +109,22 @@ void RELAY16_InitDebugLists(void) if (!hkey) return; str = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)buffer)->Data; - RtlInitUnicodeString( &name, RelayIncludeW ); - if (!NtQueryValueKey( hkey, &name, KeyValuePartialInformation, buffer, sizeof(buffer), &count )) + if (!NtQueryValueKey( hkey, &relay_include, KeyValuePartialInformation, buffer, sizeof(buffer), &count )) { debug_relay_includelist = build_list( str ); } - RtlInitUnicodeString( &name, RelayExcludeW ); - if (!NtQueryValueKey( hkey, &name, KeyValuePartialInformation, buffer, sizeof(buffer), &count )) + if (!NtQueryValueKey( hkey, &relay_exclude, KeyValuePartialInformation, buffer, sizeof(buffer), &count )) { debug_relay_excludelist = build_list( str ); } - RtlInitUnicodeString( &name, SnoopIncludeW ); - if (!NtQueryValueKey( hkey, &name, KeyValuePartialInformation, buffer, sizeof(buffer), &count )) + if (!NtQueryValueKey( hkey, &snoop_include, KeyValuePartialInformation, buffer, sizeof(buffer), &count )) { debug_snoop_includelist = build_list( str ); } - RtlInitUnicodeString( &name, SnoopExcludeW ); - if (!NtQueryValueKey( hkey, &name, KeyValuePartialInformation, buffer, sizeof(buffer), &count )) + if (!NtQueryValueKey( hkey, &snoop_exclude, KeyValuePartialInformation, buffer, sizeof(buffer), &count )) { debug_snoop_excludelist = build_list( str ); }

1 0

Alex Henrie : wow64: Avoid calling RtlInitUnicodeString on a static constant.
by Alexandre Julliard Feb. 15, 2023

Feb. 15, 2023

Module: wine Branch: master Commit: 1798bcd5406e36dca5cb924f256e61d499e5da3e URL: https://gitlab.winehq.org/wine/wine/-/commit/1798bcd5406e36dca5cb924f256e61… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 14 19:58:28 2023 -0700 wow64: Avoid calling RtlInitUnicodeString on a static constant. --- dlls/wow64/file.c | 8 ++++---- dlls/wow64/syscall.c | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wow64/file.c b/dlls/wow64/file.c index 3254d69d14a..d32ef0b5455 100644 --- a/dlls/wow64/file.c +++ b/dlls/wow64/file.c @@ -59,12 +59,12 @@ static inline ULONG starts_with_path( const WCHAR *name, ULONG name_len, const W void init_file_redirects(void) { OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; + UNICODE_STRING windows = RTL_CONSTANT_STRING( L"\\??\\C:\\windows" ); + UNICODE_STRING system32 = RTL_CONSTANT_STRING( L"\\??\\C:\\windows\\system32" ); IO_STATUS_BLOCK io; HANDLE handle; - InitializeObjectAttributes( &attr, &nameW, OBJ_CASE_INSENSITIVE, 0, NULL ); - RtlInitUnicodeString( &nameW, L"\\??\\C:\\windows" ); + InitializeObjectAttributes( &attr, &windows, OBJ_CASE_INSENSITIVE, 0, NULL ); if (!NtOpenFile( &handle, SYNCHRONIZE | FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT | FILE_DIRECTORY_FILE )) @@ -72,7 +72,7 @@ void init_file_redirects(void) get_file_id( handle, &windir_id ); NtClose( handle ); } - RtlInitUnicodeString( &nameW, L"\\??\\C:\\windows\\system32" ); + attr.ObjectName = &system32; if (!NtOpenFile( &handle, SYNCHRONIZE | FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT | FILE_DIRECTORY_FILE )) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 9323bae296e..8caf06ec013 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -696,7 +696,7 @@ static const WCHAR *get_cpu_dll_name(void) static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **context ) { HMODULE module; - UNICODE_STRING str; + UNICODE_STRING str = RTL_CONSTANT_STRING( L"ntdll.dll" ); SYSTEM_BASIC_INFORMATION info; RtlWow64GetProcessMachines( GetCurrentProcess(), &current_machine, &native_machine ); @@ -708,7 +708,6 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex #define GET_PTR(name) p ## name = RtlFindExportedRoutineByName( module, #name ) - RtlInitUnicodeString( &str, L"ntdll.dll" ); LdrGetDllHandle( NULL, 0, &str, &module ); GET_PTR( LdrSystemDllInitBlock );

1 0

Jacek Caban : oleaut32: Remove overflow check for VT_R4 and VT_R8 in VarAbs.
by Alexandre Julliard Feb. 15, 2023

Feb. 15, 2023

Module: wine Branch: master Commit: 23f0df42016011535f19ffff40f0a0393a8e6cd8 URL: https://gitlab.winehq.org/wine/wine/-/commit/23f0df42016011535f19ffff40f0a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 14 16:56:40 2023 +0100 oleaut32: Remove overflow check for VT_R4 and VT_R8 in VarAbs. --- dlls/oleaut32/tests/vartest.c | 2 ++ dlls/oleaut32/variant.c | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index cdbb836b041..4e9c892e37e 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -3121,6 +3121,8 @@ static void test_VarAbs(void) VARABS(R4,-1,R4,1); VARABS(R8,1,R8,1); VARABS(R8,-1,R8,1); + VARABS(R4,1.40129846432481707e-45,R4,1.40129846432481707e-45); + VARABS(R8,4.94065645841246544e-324,R8,4.94065645841246544e-324); VARABS(DATE,1,DATE,1); VARABS(DATE,-1,DATE,1); V_VT(&v) = VT_CY; diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 885082cc659..bbfc1b2d952 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -4369,7 +4369,9 @@ HRESULT WINAPI VarAbs(LPVARIANT pVarIn, LPVARIANT pVarOut) case VT_INT: ABS_CASE(I4,I4_MIN); ABS_CASE(I8,I8_MIN); - ABS_CASE(R4,R4_MIN); + case VT_R4: + if (V_R4(pVarOut) < 0.0) V_R4(pVarOut) = -V_R4(pVarOut); + break; case VT_BSTR: hRet = VarR8FromStr(V_BSTR(pVarIn), LOCALE_USER_DEFAULT, 0, &V_R8(&varIn)); if (FAILED(hRet)) @@ -4378,7 +4380,9 @@ HRESULT WINAPI VarAbs(LPVARIANT pVarIn, LPVARIANT pVarOut) pVarIn = &varIn; /* Fall through ... */ case VT_DATE: - ABS_CASE(R8,R8_MIN); + case VT_R8: + if (V_R8(pVarOut) < 0.0) V_R8(pVarOut) = -V_R8(pVarOut); + break; case VT_CY: hRet = VarCyAbs(V_CY(pVarIn), & V_CY(pVarOut)); break;

1 0

Jason Millard : oleaut32: Fix VarAbs function for BSTR with positive values.
by Alexandre Julliard Feb. 15, 2023

Feb. 15, 2023

Module: wine Branch: master Commit: 72b86f967e0282be60b3507194ba01a7e1cf66b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/72b86f967e0282be60b3507194ba01… Author: Jason Millard <jsm174(a)gmail.com> Date: Tue Feb 14 13:22:56 2023 -0500 oleaut32: Fix VarAbs function for BSTR with positive values. --- dlls/oleaut32/tests/vartest.c | 8 ++++++++ dlls/oleaut32/variant.c | 4 +--- dlls/vbscript/tests/api.vbs | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 4e9c892e37e..d31df67d084 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -3145,6 +3145,14 @@ static void test_VarAbs(void) hres = pVarAbs(&v,&vDst); ok(hres == S_OK && V_VT(&vDst) == VT_R8 && V_R8(&vDst) == 1.1, "VarAbs: expected 0x0,%d,%g, got 0x%lX,%d,%g\n", VT_R8, 1.1, hres, V_VT(&vDst), V_R8(&vDst)); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(L"30000"); + memset(&vDst,0,sizeof(vDst)); + hres = pVarAbs(&v,&vDst); + ok(hres == S_OK && V_VT(&vDst) == VT_R8 && V_R8(&vDst) == 30000.0, + "VarAbs: expected 0x0,%d,%g, got 0x%lX,%d,%g\n", VT_R8, 30000.0, hres, V_VT(&vDst), V_R8(&vDst)); + SysFreeString(V_BSTR(&v)); } static HRESULT (WINAPI *pVarNot)(LPVARIANT,LPVARIANT); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index bbfc1b2d952..8c2aa3b729d 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -4329,7 +4329,6 @@ VarOr_Exit: */ HRESULT WINAPI VarAbs(LPVARIANT pVarIn, LPVARIANT pVarOut) { - VARIANT varIn; HRESULT hRet = S_OK; VARIANT temp; @@ -4373,11 +4372,10 @@ HRESULT WINAPI VarAbs(LPVARIANT pVarIn, LPVARIANT pVarOut) if (V_R4(pVarOut) < 0.0) V_R4(pVarOut) = -V_R4(pVarOut); break; case VT_BSTR: - hRet = VarR8FromStr(V_BSTR(pVarIn), LOCALE_USER_DEFAULT, 0, &V_R8(&varIn)); + hRet = VarR8FromStr(V_BSTR(pVarIn), LOCALE_USER_DEFAULT, 0, &V_R8(pVarOut)); if (FAILED(hRet)) break; V_VT(pVarOut) = VT_R8; - pVarIn = &varIn; /* Fall through ... */ case VT_DATE: case VT_R8: diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index c0ac6c56cf5..842cce33f83 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1672,6 +1672,7 @@ Call ok(Abs(True) = 1, "Abs(True) = " & Abs(True)) Call ok(getVT(Abs(True)) = "VT_I2", "getVT(Abs(True)) = " & getVT(Abs(True))) Call ok(Abs(CByte(1)) = 1, "Abs(CByte(1)) = " & Abs(CByte(1))) Call ok(getVT(Abs(CByte(1))) = "VT_UI1", "getVT(Abs(CByte(1))) = " & getVT(Abs(CByte(1)))) +Call ok(Abs("30000") = 30000, "Abs(""30000"") = " & Abs("30000")) Sub testAbsError(strings, error_num1, error_num2) on error resume next

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Use mul only for two scalars for dot().
by Alexandre Julliard Feb. 15, 2023

Feb. 15, 2023

Module: vkd3d Branch: master Commit: 99acf5038eff44c697f3735b720a5bfb3bf17428 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/99acf5038eff44c697f3735b720a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 12 21:53:28 2023 +0100 vkd3d-shader/hlsl: Use mul only for two scalars for dot(). --- libs/vkd3d-shader/hlsl.y | 2 +- tests/hlsl-dot.shader_test | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 95c1c0fa..76b0eae7 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1638,7 +1638,7 @@ static struct hlsl_ir_node *add_binary_dot_expr(struct hlsl_ctx *ctx, struct lis if (arg1->data_type->type == HLSL_CLASS_SCALAR) dim = arg2->data_type->dimx; - else if (arg1->data_type->type == HLSL_CLASS_SCALAR) + else if (arg2->data_type->type == HLSL_CLASS_SCALAR) dim = arg1->data_type->dimx; else dim = min(arg1->data_type->dimx, arg2->data_type->dimx); diff --git a/tests/hlsl-dot.shader_test b/tests/hlsl-dot.shader_test index a83c2488..e51d7cb8 100644 --- a/tests/hlsl-dot.shader_test +++ b/tests/hlsl-dot.shader_test @@ -43,6 +43,21 @@ uniform 4 float4 10.0 11.0 12.0 13.0 draw quad probe all rgba (92.0, 92.0, 92.0, 92.0) +[pixel shader] +uniform float4 x; +uniform float y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[test] +uniform 0 float4 10.0 11.0 12.0 13.0 +uniform 4 float4 2.0 0.0 0.0 0.0 +draw quad +probe all rgba (92.0, 92.0, 92.0, 92.0) + [pixel shader] uniform float x; uniform float y;

1 0