Skip to content

W
wine-winehq
Commit 0b977672 authored by Alistair Leslie-Hughes's avatar Alistair Leslie-Hughes Committed by Alexandre Julliard
Browse files
Options

msdasql: Fix printf format warnings with long types.

Signed-off-by: 's avatarAlistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 14204de9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 52 deletions
dlls/msdasql/Makefile.in
View file @ 0b977672
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = msdasql.dll MODULE = msdasql.dll
IMPORTS = uuid ole32 oleaut32 odbc32 IMPORTS = uuid ole32 oleaut32 odbc32
......
dlls/msdasql/msdasql_main.c
View file @ 0b977672
...@@ -188,7 +188,7 @@ static HRESULT convert_dbproperty_mode(const WCHAR *src, VARIANT *dest) ...@@ -188,7 +188,7 @@ static HRESULT convert_dbproperty_mode(const WCHAR *src, VARIANT *dest)
{ {
V_VT(dest) = VT_I4; V_VT(dest) = VT_I4;
V_I4(dest) = prop->value; V_I4(dest) = prop->value;
TRACE("%s = %#x\n", debugstr_w(src), prop->value); TRACE("%s = %#lx\n", debugstr_w(src), prop->value);
return S_OK; return S_OK;
} }
...@@ -303,7 +303,7 @@ static ULONG WINAPI msdsql_AddRef(IUnknown *iface) ...@@ -303,7 +303,7 @@ static ULONG WINAPI msdsql_AddRef(IUnknown *iface)
struct msdasql *provider = impl_from_IUnknown(iface); struct msdasql *provider = impl_from_IUnknown(iface);
ULONG ref = InterlockedIncrement(&provider->ref); ULONG ref = InterlockedIncrement(&provider->ref);
TRACE("(%p) ref=%u\n", provider, ref); TRACE("(%p) ref=%lu\n", provider, ref);
return ref; return ref;
} }
...@@ -313,7 +313,7 @@ static ULONG WINAPI msdsql_Release(IUnknown *iface) ...@@ -313,7 +313,7 @@ static ULONG WINAPI msdsql_Release(IUnknown *iface)
struct msdasql *provider = impl_from_IUnknown(iface); struct msdasql *provider = impl_from_IUnknown(iface);
ULONG ref = InterlockedDecrement(&provider->ref); ULONG ref = InterlockedDecrement(&provider->ref);
TRACE("(%p) ref=%u\n", provider, ref); TRACE("(%p) ref=%lu\n", provider, ref);
if (!ref) if (!ref)
{ {
...@@ -362,7 +362,7 @@ static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropert ...@@ -362,7 +362,7 @@ static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropert
int i, j, k; int i, j, k;
DBPROPSET *propset; DBPROPSET *propset;
TRACE("(%p)->(%d %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); TRACE("(%p)->(%ld %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets);
*pcPropertySets = 1; *pcPropertySets = 1;
...@@ -397,7 +397,7 @@ static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropert ...@@ -397,7 +397,7 @@ static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropert
for (i=0; i < cPropertyIDSets; i++) for (i=0; i < cPropertyIDSets; i++)
{ {
TRACE("Property id %d (count %d, set %s)\n", i, rgPropertyIDSets[i].cPropertyIDs, TRACE("Property id %d (count %ld, set %s)\n", i, rgPropertyIDSets[i].cPropertyIDs,
debugstr_guid(&rgPropertyIDSets[i].guidPropertySet)); debugstr_guid(&rgPropertyIDSets[i].guidPropertySet));
propset->cProperties = rgPropertyIDSets[i].cPropertyIDs; propset->cProperties = rgPropertyIDSets[i].cPropertyIDs;
...@@ -434,7 +434,7 @@ static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPrope ...@@ -434,7 +434,7 @@ static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPrope
int size = 1; int size = 1;
OLECHAR *ptr; OLECHAR *ptr;
TRACE("(%p)->(%d %p %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, TRACE("(%p)->(%ld %p %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets,
prgPropertyInfoSets, ppDescBuffer); prgPropertyInfoSets, ppDescBuffer);
infoset = CoTaskMemAlloc(sizeof(DBPROPINFOSET)); infoset = CoTaskMemAlloc(sizeof(DBPROPINFOSET));
...@@ -474,7 +474,7 @@ static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropert ...@@ -474,7 +474,7 @@ static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropert
struct msdasql *provider = impl_from_IDBProperties(iface); struct msdasql *provider = impl_from_IDBProperties(iface);
int i, j, k; int i, j, k;
TRACE("(%p)->(%d %p)\n", provider, cPropertySets, rgPropertySets); TRACE("(%p)->(%ld %p)\n", provider, cPropertySets, rgPropertySets);
for (i=0; i < cPropertySets; i++) for (i=0; i < cPropertySets; i++)
{ {
...@@ -757,7 +757,7 @@ static ULONG WINAPI msdasql_enum_AddRef(ISourcesRowset *iface) ...@@ -757,7 +757,7 @@ static ULONG WINAPI msdasql_enum_AddRef(ISourcesRowset *iface)
struct msdasql_enum *enumerator = msdasql_enum_from_ISourcesRowset(iface); struct msdasql_enum *enumerator = msdasql_enum_from_ISourcesRowset(iface);
ULONG ref = InterlockedIncrement(&enumerator->ref); ULONG ref = InterlockedIncrement(&enumerator->ref);
TRACE("(%p) ref=%u\n", enumerator, ref); TRACE("(%p) ref=%lu\n", enumerator, ref);
return ref; return ref;
} }
...@@ -767,7 +767,7 @@ static ULONG WINAPI msdasql_enum_Release(ISourcesRowset *iface) ...@@ -767,7 +767,7 @@ static ULONG WINAPI msdasql_enum_Release(ISourcesRowset *iface)
struct msdasql_enum *enumerator = msdasql_enum_from_ISourcesRowset(iface); struct msdasql_enum *enumerator = msdasql_enum_from_ISourcesRowset(iface);
ULONG ref = InterlockedDecrement(&enumerator->ref); ULONG ref = InterlockedDecrement(&enumerator->ref);
TRACE("(%p) ref=%u\n", enumerator, ref); TRACE("(%p) ref=%lu\n", enumerator, ref);
if (!ref) if (!ref)
{ {
...@@ -825,7 +825,7 @@ static ULONG WINAPI enum_rowset_AddRef(IRowset *iface) ...@@ -825,7 +825,7 @@ static ULONG WINAPI enum_rowset_AddRef(IRowset *iface)
{ {
struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface );
LONG refs = InterlockedIncrement( &rowset->ref ); LONG refs = InterlockedIncrement( &rowset->ref );
TRACE( "%p new refcount %d\n", rowset, refs ); TRACE( "%p new refcount %ld\n", rowset, refs );
return refs; return refs;
} }
...@@ -833,7 +833,7 @@ static ULONG WINAPI enum_rowset_Release(IRowset *iface) ...@@ -833,7 +833,7 @@ static ULONG WINAPI enum_rowset_Release(IRowset *iface)
{ {
struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface );
LONG refs = InterlockedDecrement( &rowset->ref ); LONG refs = InterlockedDecrement( &rowset->ref );
TRACE( "%p new refcount %d\n", rowset, refs ); TRACE( "%p new refcount %ld\n", rowset, refs );
if (!refs) if (!refs)
{ {
TRACE( "destroying %p\n", rowset ); TRACE( "destroying %p\n", rowset );
...@@ -847,7 +847,7 @@ static HRESULT WINAPI enum_rowset_AddRefRows(IRowset *iface, DBCOUNTITEM count, ...@@ -847,7 +847,7 @@ static HRESULT WINAPI enum_rowset_AddRefRows(IRowset *iface, DBCOUNTITEM count,
{ {
struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface );
FIXME("%p, %ld, %p, %p, %p\n", rowset, count, rows, ref_counts, status); FIXME("%p, %Iu, %p, %p, %p\n", rowset, count, rows, ref_counts, status);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -856,7 +856,7 @@ static HRESULT WINAPI enum_rowset_GetData(IRowset *iface, HROW row, HACCESSOR ac ...@@ -856,7 +856,7 @@ static HRESULT WINAPI enum_rowset_GetData(IRowset *iface, HROW row, HACCESSOR ac
{ {
struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface );
FIXME("%p, %ld, %ld, %p\n", rowset, row, accessor, data); FIXME("%p, %Iu, %Iu, %p\n", rowset, row, accessor, data);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -866,7 +866,7 @@ static HRESULT WINAPI enum_rowset_GetNextRows(IRowset *iface, HCHAPTER reserved, ...@@ -866,7 +866,7 @@ static HRESULT WINAPI enum_rowset_GetNextRows(IRowset *iface, HCHAPTER reserved,
{ {
struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface );
FIXME("%p, %ld, %ld, %ld, %p, %p\n", rowset, reserved, offset, count, obtained, rows); FIXME("%p, %Iu, %Iu, %Iu, %p, %p\n", rowset, reserved, offset, count, obtained, rows);
if (!obtained || !rows) if (!obtained || !rows)
return E_INVALIDARG; return E_INVALIDARG;
...@@ -884,7 +884,7 @@ static HRESULT WINAPI enum_rowset_ReleaseRows(IRowset *iface, DBCOUNTITEM count, ...@@ -884,7 +884,7 @@ static HRESULT WINAPI enum_rowset_ReleaseRows(IRowset *iface, DBCOUNTITEM count,
{ {
struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface );
FIXME("%p, %ld, %p, %p, %p, %p\n", rowset, count, rows, options, ref_counts, status); FIXME("%p, %Iu, %p, %p, %p, %p\n", rowset, count, rows, options, ref_counts, status);
return S_OK; return S_OK;
} }
...@@ -893,7 +893,7 @@ static HRESULT WINAPI enum_rowset_RestartPosition(IRowset *iface, HCHAPTER reser ...@@ -893,7 +893,7 @@ static HRESULT WINAPI enum_rowset_RestartPosition(IRowset *iface, HCHAPTER reser
{ {
struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface );
FIXME("%p, %ld\n", rowset, reserved); FIXME("%p, %Iu\n", rowset, reserved);
return S_OK; return S_OK;
} }
...@@ -931,7 +931,7 @@ static ULONG WINAPI enum_rs_accessor_Release(IAccessor *iface) ...@@ -931,7 +931,7 @@ static ULONG WINAPI enum_rs_accessor_Release(IAccessor *iface)
static HRESULT WINAPI enum_rs_accessor_AddRefAccessor(IAccessor *iface, HACCESSOR accessor, DBREFCOUNT *count) static HRESULT WINAPI enum_rs_accessor_AddRefAccessor(IAccessor *iface, HACCESSOR accessor, DBREFCOUNT *count)
{ {
struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface );
FIXME("%p, %lu, %p\n", rowset, accessor, count); FIXME("%p, %Iu, %p\n", rowset, accessor, count);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -941,7 +941,7 @@ static HRESULT WINAPI enum_rs_accessor_CreateAccessor(IAccessor *iface, DBACCESS ...@@ -941,7 +941,7 @@ static HRESULT WINAPI enum_rs_accessor_CreateAccessor(IAccessor *iface, DBACCESS
{ {
struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface );
FIXME("%p 0x%08x, %lu, %p, %lu, %p, %p\n", rowset, flags, count, bindings, row_size, accessor, status); FIXME("%p 0x%08lx, %Iu, %p, %Iu, %p, %p\n", rowset, flags, count, bindings, row_size, accessor, status);
if (accessor) if (accessor)
*accessor = 0xdeadbeef; *accessor = 0xdeadbeef;
...@@ -953,7 +953,7 @@ static HRESULT WINAPI enum_rs_accessor_GetBindings(IAccessor *iface, HACCESSOR a ...@@ -953,7 +953,7 @@ static HRESULT WINAPI enum_rs_accessor_GetBindings(IAccessor *iface, HACCESSOR a
DBACCESSORFLAGS *flags, DBCOUNTITEM *count, DBBINDING **bindings) DBACCESSORFLAGS *flags, DBCOUNTITEM *count, DBBINDING **bindings)
{ {
struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface );
FIXME("%p %lu, %p, %p, %p\n", rowset, accessor, flags, count, bindings); FIXME("%p, %Iu, %p, %p, %p\n", rowset, accessor, flags, count, bindings);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -961,7 +961,7 @@ static HRESULT WINAPI enum_rs_accessor_ReleaseAccessor(IAccessor *iface, HACCESS ...@@ -961,7 +961,7 @@ static HRESULT WINAPI enum_rs_accessor_ReleaseAccessor(IAccessor *iface, HACCESS
{ {
struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface );
FIXME("%p, %lu, %p\n", rowset, accessor, count); FIXME("%p, %Iu, %p\n", rowset, accessor, count);
if (count) if (count)
*count = 0; *count = 0;
...@@ -987,7 +987,7 @@ static HRESULT WINAPI msdasql_enum_GetSourcesRowset(ISourcesRowset *iface, IUnkn ...@@ -987,7 +987,7 @@ static HRESULT WINAPI msdasql_enum_GetSourcesRowset(ISourcesRowset *iface, IUnkn
struct msdasql_enum_rowset *enum_rs; struct msdasql_enum_rowset *enum_rs;
HRESULT hr; HRESULT hr;
TRACE("(%p) %p, %s, %d, %p, %p\n", enumerator, outer, debugstr_guid(riid), sets, properties, rowset); TRACE("(%p) %p, %s, %lu, %p, %p\n", enumerator, outer, debugstr_guid(riid), sets, properties, rowset);
enum_rs = malloc(sizeof(*enum_rs)); enum_rs = malloc(sizeof(*enum_rs));
enum_rs->IRowset_iface.lpVtbl = &enum_rowset_vtbl; enum_rs->IRowset_iface.lpVtbl = &enum_rowset_vtbl;
......
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