Skip to content

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

msado15: 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 3542152c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 26 deletions
dlls/msado15/Makefile.in
View file @ 2424f03a
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = msado15.dll
IMPORTS = oleaut32 ole32
......
dlls/msado15/command.c
View file @ 2424f03a
......@@ -100,7 +100,7 @@ static HRESULT WINAPI command_GetTypeInfoCount( _Command *iface, UINT *count )
static HRESULT WINAPI command_GetTypeInfo( _Command *iface, UINT index, LCID lcid, ITypeInfo **info )
{
struct command *command = impl_from_Command( iface );
TRACE( "%p, %u, %u, %p\n", command, index, lcid, info );
TRACE( "%p, %u, %lu, %p\n", command, index, lcid, info );
return get_typeinfo(Command_tid, info);
}
......@@ -111,7 +111,7 @@ static HRESULT WINAPI command_GetIDsOfNames( _Command *iface, REFIID riid, LPOLE
HRESULT hr;
ITypeInfo *typeinfo;
TRACE( "%p, %s, %p, %u, %u, %p\n", command, debugstr_guid(riid), names, count, lcid, dispid );
TRACE( "%p, %s, %p, %u, %lu, %p\n", command, debugstr_guid(riid), names, count, lcid, dispid );
hr = get_typeinfo(Command_tid, &typeinfo);
if(SUCCEEDED(hr))
......@@ -130,7 +130,7 @@ static HRESULT WINAPI command_Invoke( _Command *iface, DISPID member, REFIID rii
HRESULT hr;
ITypeInfo *typeinfo;
TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", command, member, debugstr_guid(riid), lcid, flags, params,
TRACE( "%p, %ld, %s, %ld, %d, %p, %p, %p, %p\n", command, member, debugstr_guid(riid), lcid, flags, params,
result, excep_info, arg_err );
hr = get_typeinfo(Command_tid, &typeinfo);
......@@ -210,7 +210,7 @@ static HRESULT WINAPI command_get_CommandTimeout( _Command *iface, LONG *timeout
static HRESULT WINAPI command_put_CommandTimeout( _Command *iface, LONG timeout )
{
FIXME( "%p, %d\n", iface, timeout );
FIXME( "%p, %ld\n", iface, timeout );
return E_NOTIMPL;
}
......@@ -229,7 +229,7 @@ static HRESULT WINAPI command_put_Prepared( _Command *iface, VARIANT_BOOL prepar
static HRESULT WINAPI command_Execute( _Command *iface, VARIANT *affected, VARIANT *parameters,
LONG options, _Recordset **recordset )
{
FIXME( "%p, %p, %p, %d, %p\n", iface, affected, parameters, options, recordset );
FIXME( "%p, %p, %p, %ld, %p\n", iface, affected, parameters, options, recordset );
return E_NOTIMPL;
}
......@@ -237,7 +237,7 @@ static HRESULT WINAPI command_CreateParameter( _Command *iface, BSTR name, DataT
ParameterDirectionEnum direction, ADO_LONGPTR size, VARIANT value,
_Parameter **parameter )
{
FIXME( "%p, %s, %d, %d, %ld, %p\n", iface, debugstr_w(name), type, direction, size, parameter );
FIXME( "%p, %s, %d, %d, %Id, %p\n", iface, debugstr_w(name), type, direction, size, parameter );
return E_NOTIMPL;
}
......
dlls/msado15/connection.c
View file @ 2424f03a
......@@ -165,7 +165,7 @@ static HRESULT WINAPI connection_GetTypeInfoCount( _Connection *iface, UINT *cou
static HRESULT WINAPI connection_GetTypeInfo( _Connection *iface, UINT index, LCID lcid, ITypeInfo **info )
{
struct connection *connection = impl_from_Connection( iface );
TRACE( "%p, %u, %u, %p\n", connection, index, lcid, info );
TRACE( "%p, %u, %lu, %p\n", connection, index, lcid, info );
return get_typeinfo(Connection_tid, info);
}
......@@ -176,7 +176,7 @@ static HRESULT WINAPI connection_GetIDsOfNames( _Connection *iface, REFIID riid,
HRESULT hr;
ITypeInfo *typeinfo;
TRACE( "%p, %s, %p, %u, %u, %p\n", connection, debugstr_guid(riid), names, count, lcid, dispid );
TRACE( "%p, %s, %p, %u, %lu, %p\n", connection, debugstr_guid(riid), names, count, lcid, dispid );
hr = get_typeinfo(Connection_tid, &typeinfo);
if(SUCCEEDED(hr))
......@@ -195,7 +195,7 @@ static HRESULT WINAPI connection_Invoke( _Connection *iface, DISPID member, REFI
HRESULT hr;
ITypeInfo *typeinfo;
TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", connection, member, debugstr_guid(riid), lcid, flags,
TRACE( "%p, %ld, %s, %ld, %d, %p, %p, %p, %p\n", connection, member, debugstr_guid(riid), lcid, flags,
params, result, excep_info, arg_err );
hr = get_typeinfo(Connection_tid, &typeinfo);
......@@ -251,7 +251,7 @@ static HRESULT WINAPI connection_get_CommandTimeout( _Connection *iface, LONG *t
static HRESULT WINAPI connection_put_CommandTimeout( _Connection *iface, LONG timeout )
{
struct connection *connection = impl_from_Connection( iface );
TRACE( "%p, %d\n", connection, timeout );
TRACE( "%p, %ld\n", connection, timeout );
connection->timeout = timeout;
return S_OK;
}
......@@ -264,7 +264,7 @@ static HRESULT WINAPI connection_get_ConnectionTimeout( _Connection *iface, LONG
static HRESULT WINAPI connection_put_ConnectionTimeout( _Connection *iface, LONG timeout )
{
FIXME( "%p, %d\n", iface, timeout );
FIXME( "%p, %ld\n", iface, timeout );
return E_NOTIMPL;
}
......@@ -301,7 +301,7 @@ static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARI
VARIANT source, active;
IDispatch *dispatch;
FIXME( "%p, %s, %p, 0x%08x, %p Semi-stub\n", iface, debugstr_w(command), records_affected, options, record_set );
FIXME( "%p, %s, %p, 0x%08lx, %p Semi-stub\n", iface, debugstr_w(command), records_affected, options, record_set );
if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed );
......@@ -375,7 +375,7 @@ static HRESULT WINAPI connection_Open( _Connection *iface, BSTR connect_str, BST
IDBCreateSession *session = NULL;
HRESULT hr;
TRACE( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), password, options );
TRACE( "%p, %s, %s, %p, %08lx\n", iface, debugstr_w(connect_str), debugstr_w(userid), password, options );
if (connection->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen );
if (!connect_str) return E_FAIL;
......@@ -411,7 +411,7 @@ done:
}
IDataInitialize_Release( datainit );
TRACE("ret 0x%08x\n", hr);
TRACE("ret 0x%08lx\n", hr);
return hr;
}
......@@ -453,7 +453,7 @@ static HRESULT WINAPI connection_get_Attributes( _Connection *iface, LONG *attr
static HRESULT WINAPI connection_put_Attributes( _Connection *iface, LONG attr )
{
FIXME( "%p, %d\n", iface, attr );
FIXME( "%p, %ld\n", iface, attr );
return E_NOTIMPL;
}
......@@ -772,7 +772,7 @@ static HRESULT WINAPI connpoint_Advise( IConnectionPoint *iface, IUnknown *unk_s
static HRESULT WINAPI connpoint_Unadvise( IConnectionPoint *iface, DWORD cookie )
{
struct connection_point *connpoint = impl_from_IConnectionPoint( iface );
TRACE( "%p, %u\n", connpoint, cookie );
TRACE( "%p, %lu\n", connpoint, cookie );
if (!cookie || cookie > connpoint->sinks_size || !connpoint->sinks || !connpoint->sinks[cookie - 1])
return E_FAIL;
......
dlls/msado15/main.c
View file @ 2424f03a
......@@ -161,7 +161,7 @@ static HRESULT load_typelib(void)
hres = LoadRegTypeLib(&LIBID_ADODB, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl);
if(FAILED(hres)) {
ERR("LoadRegTypeLib failed: %08x\n", hres);
ERR("LoadRegTypeLib failed: %08lx\n", hres);
return hres;
}
......@@ -182,7 +182,7 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo)
hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti);
if(FAILED(hres)) {
ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres);
ERR("GetTypeInfoOfGuid(%s) failed: %08lx\n", debugstr_guid(tid_ids[tid]), hres);
return hres;
}
......
dlls/msado15/stream.c
View file @ 2424f03a
......@@ -100,7 +100,7 @@ static HRESULT WINAPI stream_GetTypeInfoCount( _Stream *iface, UINT *count )
static HRESULT WINAPI stream_GetTypeInfo( _Stream *iface, UINT index, LCID lcid, ITypeInfo **info )
{
struct stream *stream = impl_from_Stream( iface );
TRACE( "%p, %u, %u, %p\n", stream, index, lcid, info );
TRACE( "%p, %u, %lu, %p\n", stream, index, lcid, info );
return get_typeinfo(Stream_tid, info);
}
......@@ -111,7 +111,7 @@ static HRESULT WINAPI stream_GetIDsOfNames( _Stream *iface, REFIID riid, LPOLEST
HRESULT hr;
ITypeInfo *typeinfo;
TRACE( "%p, %s, %p, %u, %u, %p\n", stream, debugstr_guid(riid), names, count, lcid, dispid );
TRACE( "%p, %s, %p, %u, %lu, %p\n", stream, debugstr_guid(riid), names, count, lcid, dispid );
hr = get_typeinfo(Stream_tid, &typeinfo);
if(SUCCEEDED(hr))
......@@ -130,7 +130,7 @@ static HRESULT WINAPI stream_Invoke( _Stream *iface, DISPID member, REFIID riid,
HRESULT hr;
ITypeInfo *typeinfo;
TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", stream, member, debugstr_guid(riid), lcid, flags, params,
TRACE( "%p, %ld, %s, %ld, %d, %p, %p, %p, %p\n", stream, member, debugstr_guid(riid), lcid, flags, params,
result, excep_info, arg_err );
hr = get_typeinfo(Stream_tid, &typeinfo);
......@@ -196,7 +196,7 @@ static HRESULT WINAPI stream_put_Position( _Stream *iface, ADO_LONGPTR pos )
struct stream *stream = impl_from_Stream( iface );
HRESULT hr;
TRACE( "%p, %ld\n", stream, pos );
TRACE( "%p, %Id\n", stream, pos );
if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed );
if (pos < 0) return MAKE_ADO_HRESULT( adErrInvalidArgument );
......@@ -326,7 +326,7 @@ static HRESULT WINAPI stream_Read( _Stream *iface, LONG size, VARIANT *val )
struct stream *stream = impl_from_Stream( iface );
HRESULT hr;
TRACE( "%p, %d, %p\n", stream, size, val );
TRACE( "%p, %ld, %p\n", stream, size, val );
if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed );
if (stream->type != adTypeBinary) return MAKE_ADO_HRESULT( adErrIllegalOperation );
......@@ -408,7 +408,7 @@ static HRESULT WINAPI stream_SetEOS( _Stream *iface )
static HRESULT WINAPI stream_CopyTo( _Stream *iface, _Stream *dst, ADO_LONGPTR size )
{
FIXME( "%p, %p, %ld\n", iface, dst, size );
FIXME( "%p, %p, %Id\n", iface, dst, size );
return E_NOTIMPL;
}
......@@ -435,7 +435,7 @@ static HRESULT WINAPI stream_ReadText( _Stream *iface, LONG len, BSTR *ret )
struct stream *stream = impl_from_Stream( iface );
BSTR str;
TRACE( "%p, %d, %p\n", stream, len, ret );
TRACE( "%p, %ld, %p\n", stream, len, ret );
if (len == adReadLine)
{
FIXME( "adReadLine not supported\n" );
......
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