Skip to content

W
wine-cw
Commit 24bb3b69 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

oleacc: Enable compilation with long types.

Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent aebd8cd5
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 52 deletions
dlls/oleacc/Makefile.in
View file @ 24bb3b69
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = oleacc.dll
IMPORTLIB = oleacc
IMPORTS = uuid oleaut32 ole32 user32 rpcrt4
......
dlls/oleacc/client.c
View file @ 24bb3b69
......@@ -129,7 +129,7 @@ static ULONG WINAPI Client_AddRef(IAccessible *iface)
Client *This = impl_from_Client(iface);
ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref = %u\n", This, ref);
TRACE("(%p) ref = %lu\n", This, ref);
return ref;
}
......@@ -138,7 +138,7 @@ static ULONG WINAPI Client_Release(IAccessible *iface)
Client *This = impl_from_Client(iface);
ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref = %u\n", This, ref);
TRACE("(%p) ref = %lu\n", This, ref);
if(!ref)
heap_free(This);
......@@ -156,7 +156,7 @@ static HRESULT WINAPI Client_GetTypeInfo(IAccessible *iface,
UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo)
{
Client *This = impl_from_Client(iface);
FIXME("(%p)->(%u %x %p)\n", This, iTInfo, lcid, ppTInfo);
FIXME("(%p)->(%u %lx %p)\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
......@@ -164,7 +164,7 @@ static HRESULT WINAPI Client_GetIDsOfNames(IAccessible *iface, REFIID riid,
LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId)
{
Client *This = impl_from_Client(iface);
FIXME("(%p)->(%s %p %u %x %p)\n", This, debugstr_guid(riid),
FIXME("(%p)->(%s %p %u %lx %p)\n", This, debugstr_guid(riid),
rgszNames, cNames, lcid, rgDispId);
return E_NOTIMPL;
}
......@@ -174,7 +174,7 @@ static HRESULT WINAPI Client_Invoke(IAccessible *iface, DISPID dispIdMember,
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
Client *This = impl_from_Client(iface);
FIXME("(%p)->(%x %s %x %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
FIXME("(%p)->(%lx %s %lx %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_NOTIMPL;
}
......@@ -405,7 +405,7 @@ static HRESULT WINAPI Client_get_accDefaultAction(IAccessible *iface,
static HRESULT WINAPI Client_accSelect(IAccessible *iface, LONG flagsSelect, VARIANT varID)
{
Client *This = impl_from_Client(iface);
FIXME("(%p)->(%x %s)\n", This, flagsSelect, debugstr_variant(&varID));
FIXME("(%p)->(%lx %s)\n", This, flagsSelect, debugstr_variant(&varID));
return E_NOTIMPL;
}
......@@ -444,7 +444,7 @@ static HRESULT WINAPI Client_accNavigate(IAccessible *iface,
LONG navDir, VARIANT varStart, VARIANT *pvarEnd)
{
Client *This = impl_from_Client(iface);
FIXME("(%p)->(%d %s %p)\n", This, navDir, debugstr_variant(&varStart), pvarEnd);
FIXME("(%p)->(%ld %s %p)\n", This, navDir, debugstr_variant(&varStart), pvarEnd);
return E_NOTIMPL;
}
......@@ -455,7 +455,7 @@ static HRESULT WINAPI Client_accHitTest(IAccessible *iface,
HWND child;
POINT pt;
TRACE("(%p)->(%d %d %p)\n", This, xLeft, yTop, pvarID);
TRACE("(%p)->(%ld %ld %p)\n", This, xLeft, yTop, pvarID);
V_VT(pvarID) = VT_I4;
V_I4(pvarID) = 0;
......@@ -612,7 +612,7 @@ static HRESULT WINAPI Client_EnumVARIANT_Next(IEnumVARIANT *iface,
ULONG fetched = 0;
HRESULT hr;
TRACE("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched);
TRACE("(%p)->(%lu %p %p)\n", This, celt, rgVar, pCeltFetched);
if(!celt) {
if(pCeltFetched)
......@@ -659,7 +659,7 @@ static HRESULT WINAPI Client_EnumVARIANT_Skip(IEnumVARIANT *iface, ULONG celt)
Client *This = impl_from_Client_EnumVARIANT(iface);
HWND next;
TRACE("(%p)->(%u)\n", This, celt);
TRACE("(%p)->(%lu)\n", This, celt);
while(celt) {
if(!This->enum_pos)
......
dlls/oleacc/main.c
View file @ 24bb3b69
......@@ -84,7 +84,7 @@ const struct win_class_data* find_class_data(HWND hwnd, const struct win_class_d
HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject,
REFIID riidInterface, void** ppvObject )
{
TRACE("%p %d %s %p\n", hwnd, idObject,
TRACE("%p %ld %s %p\n", hwnd, idObject,
debugstr_guid( riidInterface ), ppvObject );
switch(idObject) {
......@@ -93,7 +93,7 @@ HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject,
case OBJID_WINDOW:
return create_window_object(hwnd, riidInterface, ppvObject);
default:
FIXME("unhandled object id: %d\n", idObject);
FIXME("unhandled object id: %ld\n", idObject);
return E_NOTIMPL;
}
}
......@@ -109,10 +109,10 @@ HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, vo
HRESULT hr;
WCHAR *p;
TRACE("%ld %s %ld %p\n", result, debugstr_guid(riid), wParam, ppObject );
TRACE("%Id %s %Id %p\n", result, debugstr_guid(riid), wParam, ppObject );
if(wParam)
FIXME("unsupported wParam = %lx\n", wParam);
FIXME("unsupported wParam = %Ix\n", wParam);
if(!ppObject)
return E_INVALIDARG;
......@@ -182,10 +182,10 @@ LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc )
ATOM atom;
void *view;
TRACE("%s %ld %p\n", debugstr_guid(riid), wParam, pAcc);
TRACE("%s %Id %p\n", debugstr_guid(riid), wParam, pAcc);
if(wParam)
FIXME("unsupported wParam = %lx\n", wParam);
FIXME("unsupported wParam = %Ix\n", wParam);
if(!pAcc)
return E_INVALIDARG;
......@@ -276,7 +276,7 @@ HRESULT WINAPI AccessibleObjectFromPoint( POINT point, IAccessible** acc, VARIAN
VARIANT v;
HWND hwnd;
TRACE("{%d,%d} %p %p\n", point.x, point.y, acc, child_id);
TRACE("{%ld,%ld} %p %p\n", point.x, point.y, acc, child_id);
if (!acc || !child_id)
return E_INVALIDARG;
......@@ -342,7 +342,7 @@ HRESULT WINAPI AccessibleObjectFromEvent( HWND hwnd, DWORD object_id, DWORD chil
IDispatch *child = NULL;
HRESULT hr;
TRACE("%p %d %d %p %p\n", hwnd, object_id, child_id, acc_out, child_id_out);
TRACE("%p %ld %ld %p %p\n", hwnd, object_id, child_id, acc_out, child_id_out);
if (!acc_out)
return E_INVALIDARG;
......@@ -356,7 +356,7 @@ HRESULT WINAPI AccessibleObjectFromEvent( HWND hwnd, DWORD object_id, DWORD chil
variant_init_i4(&child_id_variant, child_id);
hr = IAccessible_get_accChild(acc, child_id_variant, &child);
if (FAILED(hr))
TRACE("get_accChild failed with %#x!\n", hr);
TRACE("get_accChild failed with %#lx!\n", hr);
if (SUCCEEDED(hr) && child)
{
......@@ -378,7 +378,7 @@ HRESULT WINAPI AccessibleObjectFromEvent( HWND hwnd, DWORD object_id, DWORD chil
HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID,
REFIID riid, void** ppvObject )
{
TRACE("%p %d %s %p\n", hwnd, dwObjectID,
TRACE("%p %ld %s %p\n", hwnd, dwObjectID,
debugstr_guid( riid ), ppvObject );
if(!ppvObject)
......@@ -435,7 +435,7 @@ HRESULT WINAPI WindowFromAccessibleObject(IAccessible *acc, HWND *phwnd)
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
LPVOID lpvReserved)
{
TRACE("%p, %d, %p\n", hinstDLL, fdwReason, lpvReserved);
TRACE("%p, %ld, %p\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason)
{
......@@ -497,7 +497,7 @@ UINT WINAPI GetRoleTextW(DWORD role, LPWSTR lpRole, UINT rolemax)
INT ret;
WCHAR *resptr;
TRACE("%u %p %u\n", role, lpRole, rolemax);
TRACE("%lu %p %u\n", role, lpRole, rolemax);
/* return role text length */
if(!lpRole)
......@@ -517,7 +517,7 @@ UINT WINAPI GetRoleTextA(DWORD role, LPSTR lpRole, UINT rolemax)
UINT length;
WCHAR *roletextW;
TRACE("%u %p %u\n", role, lpRole, rolemax);
TRACE("%lu %p %u\n", role, lpRole, rolemax);
if(lpRole && !rolemax)
return 0;
......@@ -564,7 +564,7 @@ UINT WINAPI GetStateTextW(DWORD state_bit, WCHAR *state_str, UINT state_str_len)
{
DWORD state_id;
TRACE("%x %p %u\n", state_bit, state_str, state_str_len);
TRACE("%lx %p %u\n", state_bit, state_str, state_str_len);
if(state_bit & ~(STATE_SYSTEM_VALID | STATE_SYSTEM_HASPOPUP)) {
if(state_str && state_str_len)
......@@ -594,7 +594,7 @@ UINT WINAPI GetStateTextA(DWORD state_bit, CHAR *state_str, UINT state_str_len)
{
DWORD state_id;
TRACE("%x %p %u\n", state_bit, state_str, state_str_len);
TRACE("%lx %p %u\n", state_bit, state_str, state_str_len);
if(state_str && !state_str_len)
return 0;
......@@ -629,7 +629,7 @@ HRESULT WINAPI AccessibleChildren(IAccessible *container,
LONG i, child_no;
HRESULT hr;
TRACE("%p %d %d %p %p\n", container, start, count, children, children_cnt);
TRACE("%p %ld %ld %p %p\n", container, start, count, children, children_cnt);
if(!container || !children || !children_cnt)
return E_INVALIDARG;
......
dlls/oleacc/propservice.c
View file @ 24bb3b69
......@@ -57,105 +57,105 @@ static ULONG WINAPI AccPropServices_Release(IAccPropServices *iface)
static HRESULT WINAPI AccPropServices_SetPropValue(IAccPropServices *iface, const BYTE *pIDString,
DWORD dwIDStringLen, MSAAPROPID idProp, VARIANT var)
{
FIXME("(%p %u %s %s)\n", pIDString, dwIDStringLen, debugstr_guid(&idProp), debugstr_variant(&var));
FIXME("(%p %lu %s %s)\n", pIDString, dwIDStringLen, debugstr_guid(&idProp), debugstr_variant(&var));
return E_NOTIMPL;
}
static HRESULT WINAPI AccPropServices_SetPropServer(IAccPropServices *iface, const BYTE *pIDString,
DWORD dwIDStringLen, const MSAAPROPID *paProps, int cProps, IAccPropServer *pServer, AnnoScope AnnoScope)
{
FIXME("(%p %u %p %d %p %u)\n", pIDString, dwIDStringLen, paProps, cProps, pServer, AnnoScope);
FIXME("(%p %lu %p %d %p %u)\n", pIDString, dwIDStringLen, paProps, cProps, pServer, AnnoScope);
return E_NOTIMPL;
}
static HRESULT WINAPI AccPropServices_ClearProps(IAccPropServices *iface, const BYTE *pIDString,
DWORD dwIDStringLen, const MSAAPROPID *paProps, int cProps)
{
FIXME("(%p %u %p %d)\n", pIDString, dwIDStringLen, paProps, cProps);
FIXME("(%p %lu %p %d)\n", pIDString, dwIDStringLen, paProps, cProps);
return E_NOTIMPL;
}
static HRESULT WINAPI AccPropServices_SetHwndProp(IAccPropServices *iface, HWND hwnd, DWORD idObject,
DWORD idChild, MSAAPROPID idProp, VARIANT var)
{
FIXME("(%p %u %u %s %s)\n", hwnd, idObject, idChild, debugstr_guid(&idProp), debugstr_variant(&var));
FIXME("(%p %lu %lu %s %s)\n", hwnd, idObject, idChild, debugstr_guid(&idProp), debugstr_variant(&var));
return E_NOTIMPL;
}
static HRESULT WINAPI AccPropServices_SetHwndPropStr(IAccPropServices *iface, HWND hwnd, DWORD idObject,
DWORD idChild, MSAAPROPID idProp, LPWSTR str)
{
FIXME("(%p %u %u %s %s)\n", hwnd, idObject, idChild, debugstr_guid(&idProp), debugstr_w(str));
FIXME("(%p %lu %lu %s %s)\n", hwnd, idObject, idChild, debugstr_guid(&idProp), debugstr_w(str));
return E_NOTIMPL;
}
static HRESULT WINAPI AccPropServices_SetHwndPropServer(IAccPropServices *iface, HWND hwnd, DWORD idObject,
DWORD idChild, const MSAAPROPID *paProps, int cProps, IAccPropServer *pServer, AnnoScope AnnoScope)
{
FIXME("(%p %u %u %p %d %p %u)\n", hwnd, idObject, idChild, paProps, cProps, pServer, AnnoScope);
FIXME("(%p %lu %lu %p %d %p %u)\n", hwnd, idObject, idChild, paProps, cProps, pServer, AnnoScope);
return E_NOTIMPL;
}
static HRESULT WINAPI AccPropServices_ClearHwndProps(IAccPropServices *iface, HWND hwnd, DWORD idObject,
DWORD idChild, const MSAAPROPID *paProps, int cProps)
{
FIXME("(%p %u %u %p %d)\n", hwnd, idObject, idChild, paProps, cProps);
FIXME("(%p %lu %lu %p %d)\n", hwnd, idObject, idChild, paProps, cProps);
return E_NOTIMPL;
}
static HRESULT WINAPI AccPropServices_ComposeHwndIdentityString(IAccPropServices *iface, HWND hwnd,
DWORD idObject, DWORD idChild, BYTE **ppIDString, DWORD *pdwIDStringLen)
{
FIXME("(%p %u %u %p %p)\n", hwnd, idObject, idChild, ppIDString, pdwIDStringLen);
FIXME("(%p %lu %lu %p %p)\n", hwnd, idObject, idChild, ppIDString, pdwIDStringLen);
return E_NOTIMPL;
}
static HRESULT WINAPI AccPropServices_DecomposeHwndIdentityString(IAccPropServices *iface, const BYTE *pIDString,
DWORD dwIDStringLen, HWND *phwnd, DWORD *pidObject, DWORD *pidChild)
{
FIXME("(%p %u %p %p %p)\n", pIDString, dwIDStringLen, phwnd, pidObject, pidChild);
FIXME("(%p %lu %p %p %p)\n", pIDString, dwIDStringLen, phwnd, pidObject, pidChild);
return E_NOTIMPL;
}
static HRESULT WINAPI AccPropServices_SetHmenuProp(IAccPropServices *iface, HMENU hmenu, DWORD idChild,
MSAAPROPID idProp, VARIANT var)
{
FIXME("(%p %u %s %s)\n", hmenu, idChild, debugstr_guid(&idProp), debugstr_variant(&var));
FIXME("(%p %lu %s %s)\n", hmenu, idChild, debugstr_guid(&idProp), debugstr_variant(&var));
return E_NOTIMPL;
}
static HRESULT WINAPI AccPropServices_SetHmenuPropStr(IAccPropServices *iface, HMENU hmenu, DWORD idChild,
MSAAPROPID idProp, LPWSTR str)
{
FIXME("(%p %u %s %s)\n", hmenu, idChild, debugstr_guid(&idProp), debugstr_w(str));
FIXME("(%p %lu %s %s)\n", hmenu, idChild, debugstr_guid(&idProp), debugstr_w(str));
return E_NOTIMPL;
}
static HRESULT WINAPI AccPropServices_SetHmenuPropServer(IAccPropServices *iface, HMENU hmenu, DWORD idChild,
const MSAAPROPID *paProps, int cProps, IAccPropServer *pServer, AnnoScope AnnoScope)
{
FIXME("(%p %u %p %d %p %u)\n", hmenu, idChild, paProps, cProps, pServer, AnnoScope);
FIXME("(%p %lu %p %d %p %u)\n", hmenu, idChild, paProps, cProps, pServer, AnnoScope);
return E_NOTIMPL;
}
static HRESULT WINAPI AccPropServices_ClearHmenuProps(IAccPropServices *iface, HMENU hmenu, DWORD idChild,
const MSAAPROPID *paProps, int cProps)
{
FIXME("(%p %u %p %d)\n", hmenu, idChild, paProps, cProps);
FIXME("(%p %lu %p %d)\n", hmenu, idChild, paProps, cProps);
return E_NOTIMPL;
}
static HRESULT WINAPI AccPropServices_ComposeHmenuIdentityString(IAccPropServices *iface, HMENU hmenu, DWORD idChild,
BYTE **ppIDString, DWORD *pdwIDStringLen)
{
FIXME("(%p %u %p %p)\n", hmenu, idChild, ppIDString, pdwIDStringLen);
FIXME("(%p %lu %p %p)\n", hmenu, idChild, ppIDString, pdwIDStringLen);
return E_NOTIMPL;
}
static HRESULT WINAPI AccPropServices_DecomposeHmenuIdentityString(IAccPropServices *iface, const BYTE *pIDString,
DWORD dwIDStringLen, HMENU *phmenu, DWORD *pidChild)
{
FIXME("(%p %u %p %p\n", pIDString, dwIDStringLen, phmenu, pidChild);
FIXME("(%p %lu %p %p\n", pIDString, dwIDStringLen, phmenu, pidChild);
return E_NOTIMPL;
}
......
dlls/oleacc/window.c
View file @ 24bb3b69
......@@ -70,7 +70,7 @@ static ULONG WINAPI Window_AddRef(IAccessible *iface)
Window *This = impl_from_Window(iface);
ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref = %u\n", This, ref);
TRACE("(%p) ref = %lu\n", This, ref);
return ref;
}
......@@ -79,7 +79,7 @@ static ULONG WINAPI Window_Release(IAccessible *iface)
Window *This = impl_from_Window(iface);
ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref = %u\n", This, ref);
TRACE("(%p) ref = %lu\n", This, ref);
if(!ref)
heap_free(This);
......@@ -97,7 +97,7 @@ static HRESULT WINAPI Window_GetTypeInfo(IAccessible *iface,
UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo)
{
Window *This = impl_from_Window(iface);
FIXME("(%p)->(%u %x %p)\n", This, iTInfo, lcid, ppTInfo);
FIXME("(%p)->(%u %lx %p)\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
......@@ -105,7 +105,7 @@ static HRESULT WINAPI Window_GetIDsOfNames(IAccessible *iface, REFIID riid,
LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId)
{
Window *This = impl_from_Window(iface);
FIXME("(%p)->(%s %p %u %x %p)\n", This, debugstr_guid(riid),
FIXME("(%p)->(%s %p %u %lx %p)\n", This, debugstr_guid(riid),
rgszNames, cNames, lcid, rgDispId);
return E_NOTIMPL;
}
......@@ -115,7 +115,7 @@ static HRESULT WINAPI Window_Invoke(IAccessible *iface, DISPID dispIdMember,
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
Window *This = impl_from_Window(iface);
FIXME("(%p)->(%x %s %x %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
FIXME("(%p)->(%lx %s %lx %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_NOTIMPL;
}
......@@ -226,7 +226,7 @@ static HRESULT WINAPI Window_get_accDefaultAction(IAccessible *iface,
static HRESULT WINAPI Window_accSelect(IAccessible *iface, LONG flagsSelect, VARIANT varID)
{
Window *This = impl_from_Window(iface);
FIXME("(%p)->(%x %s)\n", This, flagsSelect, debugstr_variant(&varID));
FIXME("(%p)->(%lx %s)\n", This, flagsSelect, debugstr_variant(&varID));
return E_NOTIMPL;
}
......@@ -243,7 +243,7 @@ static HRESULT WINAPI Window_accNavigate(IAccessible *iface,
LONG navDir, VARIANT varStart, VARIANT *pvarEnd)
{
Window *This = impl_from_Window(iface);
FIXME("(%p)->(%d %s %p)\n", This, navDir, debugstr_variant(&varStart), pvarEnd);
FIXME("(%p)->(%ld %s %p)\n", This, navDir, debugstr_variant(&varStart), pvarEnd);
return E_NOTIMPL;
}
......@@ -255,7 +255,7 @@ static HRESULT WINAPI Window_accHitTest(IAccessible *iface, LONG x, LONG y, VARI
HRESULT hr;
RECT rect;
TRACE("(%p)->(%d %d %p)\n", This, x, y, v);
TRACE("(%p)->(%ld %ld %p)\n", This, x, y, v);
V_VT(v) = VT_EMPTY;
if (!GetClientRect(This->hwnd, &rect))
......@@ -409,14 +409,14 @@ static HRESULT WINAPI Window_EnumVARIANT_Next(IEnumVARIANT *iface,
ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched)
{
Window *This = impl_from_Window_EnumVARIANT(iface);
FIXME("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched);
FIXME("(%p)->(%lu %p %p)\n", This, celt, rgVar, pCeltFetched);
return E_NOTIMPL;
}
static HRESULT WINAPI Window_EnumVARIANT_Skip(IEnumVARIANT *iface, ULONG celt)
{
Window *This = impl_from_Window_EnumVARIANT(iface);
FIXME("(%p)->(%u)\n", This, celt);
FIXME("(%p)->(%lu)\n", This, celt);
return E_NOTIMPL;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment