Rename arguments to UiaRaiseAutomationPropertyChangedEvent to avoid conflicts with reserved words when included from C++ applications.
Signed-off-by: Philip Allison mangobrain@gmail.com --- dlls/uiautomationcore/uia_main.c | 4 ++-- include/uiautomationcoreapi.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 9f257684333..4b0fb545c51 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -328,9 +328,9 @@ HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVEN /*********************************************************************** * UiaRaiseAutomationPropertyChangedEvent (uiautomationcore.@) */ -HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new) +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue) { - FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&old), debugstr_variant(&new)); + FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&oldValue), debugstr_variant(&newValue)); return S_OK; }
diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 22b3888dc6e..cc44501e1a0 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -69,7 +69,7 @@ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); 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 *provider, PROPERTYID id, VARIANT old, VARIANT new); +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue); void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);
Apologies for the spam - these are all the same patch, just look at the start of the thread. This is the first time I've sent a patch, and initially I wasn't subscribed and got caught by the spam filter; I didn't expect the earlier attempts to then show up several hours later. Won't happen again!
Regards, Phil
On Fri, 13 May 2022 at 23:01, Philip Allison mangobrain@gmail.com wrote:
Rename arguments to UiaRaiseAutomationPropertyChangedEvent to avoid conflicts with reserved words when included from C++ applications.
Signed-off-by: Philip Allison mangobrain@gmail.com
dlls/uiautomationcore/uia_main.c | 4 ++-- include/uiautomationcoreapi.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 9f257684333..4b0fb545c51 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -328,9 +328,9 @@ HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVEN /***********************************************************************
UiaRaiseAutomationPropertyChangedEvent (uiautomationcore.@)*/ -HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new) +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue) {
- FIXME("(%p, %d, %s, %s): stub\n", provider, id,
debugstr_variant(&old), debugstr_variant(&new));
- FIXME("(%p, %d, %s, %s): stub\n", provider, id,
debugstr_variant(&oldValue), debugstr_variant(&newValue)); return S_OK; }
diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 22b3888dc6e..cc44501e1a0 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -69,7 +69,7 @@ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); 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 *provider, PROPERTYID id, VARIANT old, VARIANT new); +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue); void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj); -- 2.32.0
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=114708
Your paranoid android.
=== debian11 (build log) ===
Task: Patch failed to apply
=== debian11 (build log) ===
Task: Patch failed to apply
-
Marvin -
Philip Allison