February 2023 - Wine-commits

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

15 Feb '23

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

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

15 Feb '23

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 15 Feb '23

15 Feb '23

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

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

15 Feb '23

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 15 Feb '23

15 Feb '23

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 15 Feb '23

15 Feb '23

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

Max Figura : wined3d: Move the WINED3D_RS_MONOENABLE stub to wined3d_device_apply_stateblock.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 0dfc9461052fedc9f287d1777e2cfab913b7e5be URL: https://gitlab.winehq.org/wine/wine/-/commit/0dfc9461052fedc9f287d1777e2cfa… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 13:15:55 2022 -0600 wined3d: Move the WINED3D_RS_MONOENABLE stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 5 +++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 8 +------- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 6cf8f50f2c2..cdf71270d8c 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -97,7 +97,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_VIEWPORT, {STATE_VIEWPORT, state_nop}}, {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, - {STATE_RENDER(WINED3D_RS_MONOENABLE), {STATE_RENDER(WINED3D_RS_MONOENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_ROP2), {STATE_RENDER(WINED3D_RS_ROP2), state_nop}}, {STATE_RENDER(WINED3D_RS_PLANEMASK), {STATE_RENDER(WINED3D_RS_PLANEMASK), state_nop}}, {STATE_RENDER(WINED3D_RS_LASTPIXEL), {STATE_RENDER(WINED3D_RS_LASTPIXEL), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b7d312aac65..477a6e9af34 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4057,6 +4057,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_WRAPV not implemented yet.\n"); break; + case WINED3D_RS_MONOENABLE: + if (state->rs[WINED3D_RS_MONOENABLE]) + FIXME("Render state WINED3D_RS_MONOENABLE not implemented yet.\n"); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3f8aeef017a..75b2a90d20a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2809,7 +2809,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_VIEWPORT, {STATE_VDECL}}, {STATE_INDEXBUFFER, {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_MONOENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ROP2), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_PLANEMASK), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LASTPIXEL), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 288cd40f3fc..a570bbb11b8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2072,12 +2072,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]); } -static void state_monoenable(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_MONOENABLE]) - FIXME("Render state WINED3D_RS_MONOENABLE not implemented yet.\n"); -} - static void state_rop2(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (state->render_states[WINED3D_RS_ROP2]) @@ -4770,7 +4764,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_MONOENABLE), { STATE_RENDER(WINED3D_RS_MONOENABLE), state_monoenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ROP2), { STATE_RENDER(WINED3D_RS_ROP2), state_rop2 }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_PLANEMASK), { STATE_RENDER(WINED3D_RS_PLANEMASK), state_planemask }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LASTPIXEL), { STATE_RENDER(WINED3D_RS_LASTPIXEL), state_lastpixel }, WINED3D_GL_EXT_NONE }, @@ -5572,6 +5565,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) rs_holes[] = { { 1, 8}, + { 11, 11}, { 14, 14}, { 17, 23}, { 27, 27},

1 0

Connor McAdams : uiautomationcore: Add UiaRaiseStructureChangedEvent stub.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 8f70e20fbddda976eec8e1d2dd7b718ae66b99b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f70e20fbddda976eec8e1d2dd7b71… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Aug 23 10:24:29 2021 -0400 uiautomationcore: Add UiaRaiseStructureChangedEvent stub. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_main.c | 10 ++++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 2c741398c82..383c0b3d989 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -317,6 +317,16 @@ HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple return S_OK; } +/*********************************************************************** + * UiaRaiseStructureChangedEvent (uiautomationcore.@) + */ +HRESULT WINAPI UiaRaiseStructureChangedEvent(IRawElementProviderSimple *provider, enum StructureChangeType struct_change_type, + int *runtime_id, int runtime_id_len) +{ + FIXME("(%p, %d, %p, %d): stub\n", provider, struct_change_type, runtime_id, runtime_id_len); + return S_OK; +} + HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **provider) { struct hwnd_host_provider *host_prov; diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 11ca7be7f97..5c577dbfe07 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -89,7 +89,7 @@ @ stdcall UiaRaiseAutomationPropertyChangedEvent(ptr long int128 int128) #@ stub UiaRaiseChangesEvent #@ stub UiaRaiseNotificationEvent -@ stub UiaRaiseStructureChangedEvent +@ stdcall UiaRaiseStructureChangedEvent(ptr long ptr long) #@ stub UiaRaiseTextEditTextChangedEvent @ stdcall UiaRegisterProviderCallback(ptr) @ stdcall UiaRemoveEvent(ptr) diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index ccffb1cc23b..ef8e760ed4c 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -478,6 +478,8 @@ int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *, PROPERTYID, VARIANT, VARIANT); +HRESULT WINAPI UiaRaiseStructureChangedEvent(IRawElementProviderSimple *provider, enum StructureChangeType struct_change_type, + int *runtime_id, int runtime_id_len); void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);

1 0

Connor McAdams : uiautomationcore: Add UiaRaiseAsyncContentLoadedEvent stub.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: c928ae56e42e9cccfaeb0228c272a9326c9f1910 URL: https://gitlab.winehq.org/wine/wine/-/commit/c928ae56e42e9cccfaeb0228c272a9… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Feb 2 12:35:20 2023 -0500 uiautomationcore: Add UiaRaiseAsyncContentLoadedEvent stub. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_main.c | 10 ++++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 383c0b3d989..e0f9f71ce34 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -327,6 +327,16 @@ HRESULT WINAPI UiaRaiseStructureChangedEvent(IRawElementProviderSimple *provider return S_OK; } +/*********************************************************************** + * UiaRaiseAsyncContentLoadedEvent (uiautomationcore.@) + */ +HRESULT WINAPI UiaRaiseAsyncContentLoadedEvent(IRawElementProviderSimple *provider, + enum AsyncContentLoadedState async_content_loaded_state, double percent_complete) +{ + FIXME("(%p, %d, %f): stub\n", provider, async_content_loaded_state, percent_complete); + return S_OK; +} + HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **provider) { struct hwnd_host_provider *host_prov; diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 5c577dbfe07..5841523852a 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -84,7 +84,7 @@ @ stub UiaPatternRelease #@ stub UiaProviderForNonClient @ stdcall UiaProviderFromIAccessible(ptr long long ptr) -@ stub UiaRaiseAsyncContentLoadedEvent +@ stdcall UiaRaiseAsyncContentLoadedEvent(ptr long double) @ stdcall UiaRaiseAutomationEvent(ptr long) @ stdcall UiaRaiseAutomationPropertyChangedEvent(ptr long int128 int128) #@ stub UiaRaiseChangesEvent diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index ef8e760ed4c..91944064ae5 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -476,6 +476,8 @@ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value); HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); +HRESULT WINAPI UiaRaiseAsyncContentLoadedEvent(IRawElementProviderSimple *provider, + enum AsyncContentLoadedState async_content_loaded_state, double percent_complete); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *, PROPERTYID, VARIANT, VARIANT); HRESULT WINAPI UiaRaiseStructureChangedEvent(IRawElementProviderSimple *provider, enum StructureChangeType struct_change_type,

1 0

Connor McAdams : uiautomationcore: Add UiaRaiseTextEditTextChangedEvent stub.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 5e7356c8dbce777ff76af91ab899c0ba0e38cc2b URL: https://gitlab.winehq.org/wine/wine/-/commit/5e7356c8dbce777ff76af91ab899c0… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Feb 2 12:53:56 2023 -0500 uiautomationcore: Add UiaRaiseTextEditTextChangedEvent stub. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_main.c | 10 ++++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index e0f9f71ce34..7d8dca82b83 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -337,6 +337,16 @@ HRESULT WINAPI UiaRaiseAsyncContentLoadedEvent(IRawElementProviderSimple *provid return S_OK; } +/*********************************************************************** + * UiaRaiseTextEditTextChangedEvent (uiautomationcore.@) + */ +HRESULT WINAPI UiaRaiseTextEditTextChangedEvent(IRawElementProviderSimple *provider, + enum TextEditChangeType text_edit_change_type, SAFEARRAY *changed_data) +{ + FIXME("(%p, %d, %p): stub\n", provider, text_edit_change_type, changed_data); + return S_OK; +} + HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **provider) { struct hwnd_host_provider *host_prov; diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 5841523852a..9469d39c8bc 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -90,7 +90,7 @@ #@ stub UiaRaiseChangesEvent #@ stub UiaRaiseNotificationEvent @ stdcall UiaRaiseStructureChangedEvent(ptr long ptr long) -#@ stub UiaRaiseTextEditTextChangedEvent +@ stdcall UiaRaiseTextEditTextChangedEvent(ptr long ptr) @ stdcall UiaRegisterProviderCallback(ptr) @ stdcall UiaRemoveEvent(ptr) @ stdcall UiaReturnRawElementProvider(long long long ptr) diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 91944064ae5..0c06f374ed5 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -482,6 +482,8 @@ HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVEN HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *, PROPERTYID, VARIANT, VARIANT); HRESULT WINAPI UiaRaiseStructureChangedEvent(IRawElementProviderSimple *provider, enum StructureChangeType struct_change_type, int *runtime_id, int runtime_id_len); +HRESULT WINAPI UiaRaiseTextEditTextChangedEvent(IRawElementProviderSimple *provider, enum TextEditChangeType text_edit_change_type, + SAFEARRAY *changed_data); void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);

1 0