mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-03 01:12:51 +00:00
uiautomationcore: Fix some long/LONG mismatches.
This commit is contained in:
parent
6892434b22
commit
641623ffe8
|
@ -29,7 +29,7 @@
|
||||||
|
|
||||||
#include "wine/test.h"
|
#include "wine/test.h"
|
||||||
|
|
||||||
static HRESULT (WINAPI *pUiaProviderFromIAccessible)(IAccessible *, long, DWORD, IRawElementProviderSimple **);
|
static HRESULT (WINAPI *pUiaProviderFromIAccessible)(IAccessible *, LONG, DWORD, IRawElementProviderSimple **);
|
||||||
static HRESULT (WINAPI *pUiaDisconnectProvider)(IRawElementProviderSimple *);
|
static HRESULT (WINAPI *pUiaDisconnectProvider)(IRawElementProviderSimple *);
|
||||||
|
|
||||||
#define DEFINE_EXPECT(func) \
|
#define DEFINE_EXPECT(func) \
|
||||||
|
|
|
@ -539,7 +539,7 @@ static HRESULT WINAPI uia_node_get_hwnd(IWineUiaNode *iface, ULONG *out_hwnd)
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI uia_node_attach_event(IWineUiaNode *iface, long proc_id, long event_cookie,
|
static HRESULT WINAPI uia_node_attach_event(IWineUiaNode *iface, LONG proc_id, LONG event_cookie,
|
||||||
IWineUiaEvent **ret_event)
|
IWineUiaEvent **ret_event)
|
||||||
{
|
{
|
||||||
struct uia_node *node = impl_from_IWineUiaNode(iface);
|
struct uia_node *node = impl_from_IWineUiaNode(iface);
|
||||||
|
|
|
@ -562,7 +562,7 @@ static ULONG WINAPI uia_event_Release(IWineUiaEvent *iface)
|
||||||
return ref;
|
return ref;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI uia_event_advise_events(IWineUiaEvent *iface, BOOL advise_added, long adviser_start_idx)
|
static HRESULT WINAPI uia_event_advise_events(IWineUiaEvent *iface, BOOL advise_added, LONG adviser_start_idx)
|
||||||
{
|
{
|
||||||
struct uia_event *event = impl_from_IWineUiaEvent(iface);
|
struct uia_event *event = impl_from_IWineUiaEvent(iface);
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
|
@ -607,7 +607,7 @@ static HRESULT WINAPI uia_event_advise_events(IWineUiaEvent *iface, BOOL advise_
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI uia_event_set_event_data(IWineUiaEvent *iface, const GUID *event_guid, long scope,
|
static HRESULT WINAPI uia_event_set_event_data(IWineUiaEvent *iface, const GUID *event_guid, LONG scope,
|
||||||
VARIANT runtime_id, IWineUiaEvent *event_iface)
|
VARIANT runtime_id, IWineUiaEvent *event_iface)
|
||||||
{
|
{
|
||||||
struct uia_event *event = impl_from_IWineUiaEvent(iface);
|
struct uia_event *event = impl_from_IWineUiaEvent(iface);
|
||||||
|
@ -1042,7 +1042,7 @@ HRESULT uia_event_add_serverside_event_adviser(IWineUiaEvent *serverside_event,
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT uia_event_advise(struct uia_event *event, BOOL advise_added, long start_idx)
|
static HRESULT uia_event_advise(struct uia_event *event, BOOL advise_added, LONG start_idx)
|
||||||
{
|
{
|
||||||
IWineUiaEvent *event_iface;
|
IWineUiaEvent *event_iface;
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
|
|
|
@ -220,7 +220,7 @@ HRESULT create_base_hwnd_provider(HWND hwnd, IRawElementProviderSimple **elprov)
|
||||||
void uia_stop_provider_thread(void) DECLSPEC_HIDDEN;
|
void uia_stop_provider_thread(void) DECLSPEC_HIDDEN;
|
||||||
void uia_provider_thread_remove_node(HUIANODE node) DECLSPEC_HIDDEN;
|
void uia_provider_thread_remove_node(HUIANODE node) DECLSPEC_HIDDEN;
|
||||||
LRESULT uia_lresult_from_node(HUIANODE huianode) DECLSPEC_HIDDEN;
|
LRESULT uia_lresult_from_node(HUIANODE huianode) DECLSPEC_HIDDEN;
|
||||||
HRESULT create_msaa_provider(IAccessible *acc, long child_id, HWND hwnd, BOOL known_root_acc,
|
HRESULT create_msaa_provider(IAccessible *acc, LONG child_id, HWND hwnd, BOOL known_root_acc,
|
||||||
IRawElementProviderSimple **elprov) DECLSPEC_HIDDEN;
|
IRawElementProviderSimple **elprov) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
/* uia_utils.c */
|
/* uia_utils.c */
|
||||||
|
|
|
@ -1133,7 +1133,7 @@ static const ILegacyIAccessibleProviderVtbl msaa_acc_provider_vtbl = {
|
||||||
msaa_acc_provider_get_DefaultAction,
|
msaa_acc_provider_get_DefaultAction,
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT create_msaa_provider(IAccessible *acc, long child_id, HWND hwnd, BOOL known_root_acc,
|
HRESULT create_msaa_provider(IAccessible *acc, LONG child_id, HWND hwnd, BOOL known_root_acc,
|
||||||
IRawElementProviderSimple **elprov)
|
IRawElementProviderSimple **elprov)
|
||||||
{
|
{
|
||||||
struct msaa_provider *msaa_prov = heap_alloc_zero(sizeof(*msaa_prov));
|
struct msaa_provider *msaa_prov = heap_alloc_zero(sizeof(*msaa_prov));
|
||||||
|
@ -1172,7 +1172,7 @@ HRESULT create_msaa_provider(IAccessible *acc, long child_id, HWND hwnd, BOOL kn
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* UiaProviderFromIAccessible (uiautomationcore.@)
|
* UiaProviderFromIAccessible (uiautomationcore.@)
|
||||||
*/
|
*/
|
||||||
HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, long child_id, DWORD flags,
|
HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, LONG child_id, DWORD flags,
|
||||||
IRawElementProviderSimple **elprov)
|
IRawElementProviderSimple **elprov)
|
||||||
{
|
{
|
||||||
IServiceProvider *serv_prov;
|
IServiceProvider *serv_prov;
|
||||||
|
|
|
@ -537,7 +537,7 @@ void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback);
|
||||||
LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov);
|
LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov);
|
||||||
BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);
|
BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);
|
||||||
HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **elprov);
|
HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **elprov);
|
||||||
HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, long child_id, DWORD flags, IRawElementProviderSimple **elprov);
|
HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, LONG child_id, DWORD flags, IRawElementProviderSimple **elprov);
|
||||||
HRESULT WINAPI UiaGetPropertyValue(HUIANODE huianode, PROPERTYID prop_id, VARIANT *out_val);
|
HRESULT WINAPI UiaGetPropertyValue(HUIANODE huianode, PROPERTYID prop_id, VARIANT *out_val);
|
||||||
HRESULT WINAPI UiaNodeFromProvider(IRawElementProviderSimple *elprov, HUIANODE *huianode);
|
HRESULT WINAPI UiaNodeFromProvider(IRawElementProviderSimple *elprov, HUIANODE *huianode);
|
||||||
BOOL WINAPI UiaNodeRelease(HUIANODE huianode);
|
BOOL WINAPI UiaNodeRelease(HUIANODE huianode);
|
||||||
|
|
Loading…
Reference in a new issue