February 2023 - Wine-Commits

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

Connor McAdams : uiautomationcore: Add UiaRaiseChangesEvent stub.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: 23c10c928b68918515b6ec195d90b09ef5936451 URL: https://gitlab.winehq.org/wine/wine/-/commit/23c10c928b68918515b6ec195d90b0… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Feb 2 12:59:41 2023 -0500 uiautomationcore: Add UiaRaiseChangesEvent 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 ca27ae927d4..00798bd9985 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -358,6 +358,16 @@ HRESULT WINAPI UiaRaiseNotificationEvent(IRawElementProviderSimple *provider, en return S_OK; } +/*********************************************************************** + * UiaRaiseChangesEvent (uiautomationcore.@) + */ +HRESULT WINAPI UiaRaiseChangesEvent(IRawElementProviderSimple *provider, int event_id_count, + struct UiaChangeInfo *uia_changes) +{ + FIXME("(%p, %d, %p): stub\n", provider, event_id_count, uia_changes); + 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 7ae363bb93b..4b7a69ca25c 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -87,7 +87,7 @@ @ stdcall UiaRaiseAsyncContentLoadedEvent(ptr long double) @ stdcall UiaRaiseAutomationEvent(ptr long) @ stdcall UiaRaiseAutomationPropertyChangedEvent(ptr long int128 int128) -#@ stub UiaRaiseChangesEvent +@ stdcall UiaRaiseChangesEvent(ptr long ptr) @ stdcall UiaRaiseNotificationEvent(ptr long long wstr wstr) @ stdcall UiaRaiseStructureChangedEvent(ptr long ptr long) @ stdcall UiaRaiseTextEditTextChangedEvent(ptr long ptr) diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 5ee79bcd1e9..6f0bfaf4ecd 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -480,6 +480,8 @@ HRESULT WINAPI UiaRaiseAsyncContentLoadedEvent(IRawElementProviderSimple *provid 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 UiaRaiseChangesEvent(IRawElementProviderSimple *provider, int event_id_count, + struct UiaChangeInfo *uia_changes); HRESULT WINAPI UiaRaiseNotificationEvent(IRawElementProviderSimple *provider, enum NotificationKind notification_kind, enum NotificationProcessing notification_processing, BSTR display_str, BSTR activity_id); HRESULT WINAPI UiaRaiseStructureChangedEvent(IRawElementProviderSimple *provider, enum StructureChangeType struct_change_type,

1 0

Connor McAdams : uiautomationcore: Add UiaRaiseNotificationEvent stub.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: e84b95ef6f64a2a267f54e337ed2c5ca37bd3485 URL: https://gitlab.winehq.org/wine/wine/-/commit/e84b95ef6f64a2a267f54e337ed2c5… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Feb 2 12:57:48 2023 -0500 uiautomationcore: Add UiaRaiseNotificationEvent stub. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_main.c | 11 +++++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 7d8dca82b83..ca27ae927d4 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -347,6 +347,17 @@ HRESULT WINAPI UiaRaiseTextEditTextChangedEvent(IRawElementProviderSimple *provi return S_OK; } +/*********************************************************************** + * UiaRaiseNotificationEvent (uiautomationcore.@) + */ +HRESULT WINAPI UiaRaiseNotificationEvent(IRawElementProviderSimple *provider, enum NotificationKind notification_kind, + enum NotificationProcessing notification_processing, BSTR display_str, BSTR activity_id) +{ + FIXME("(%p, %d, %d, %s, %s): stub\n", provider, notification_kind, notification_processing, + debugstr_w(display_str), debugstr_w(activity_id)); + 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 9469d39c8bc..7ae363bb93b 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -88,7 +88,7 @@ @ stdcall UiaRaiseAutomationEvent(ptr long) @ stdcall UiaRaiseAutomationPropertyChangedEvent(ptr long int128 int128) #@ stub UiaRaiseChangesEvent -#@ stub UiaRaiseNotificationEvent +@ stdcall UiaRaiseNotificationEvent(ptr long long wstr wstr) @ stdcall UiaRaiseStructureChangedEvent(ptr long ptr long) @ stdcall UiaRaiseTextEditTextChangedEvent(ptr long ptr) @ stdcall UiaRegisterProviderCallback(ptr) diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 0c06f374ed5..5ee79bcd1e9 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -480,6 +480,8 @@ HRESULT WINAPI UiaRaiseAsyncContentLoadedEvent(IRawElementProviderSimple *provid 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 UiaRaiseNotificationEvent(IRawElementProviderSimple *provider, enum NotificationKind notification_kind, + enum NotificationProcessing notification_processing, BSTR display_str, BSTR activity_id); 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,

1 0

Connor McAdams : uiautomationcore: Add UiaRaiseTextEditTextChangedEvent stub.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

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

Connor McAdams : uiautomationcore: Add UiaRaiseStructureChangedEvent stub.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

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