[PATCH 18/21] dlls/oledb32: enable compilation with long types
Eric Pouech
eric.pouech at gmail.com
Wed Feb 16 01:12:28 CST 2022
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
---
dlls/oledb32/Makefile.in | 1 -
dlls/oledb32/convert.c | 10 +++++-----
dlls/oledb32/datainit.c | 22 +++++++++++-----------
dlls/oledb32/dslocator.c | 30 +++++++++++++++---------------
dlls/oledb32/errorinfo.c | 16 ++++++++--------
dlls/oledb32/rowpos.c | 8 ++++----
6 files changed, 43 insertions(+), 44 deletions(-)
diff --git a/dlls/oledb32/Makefile.in b/dlls/oledb32/Makefile.in
index ec07aa6d656..58e8f7b519d 100644
--- a/dlls/oledb32/Makefile.in
+++ b/dlls/oledb32/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = oledb32.dll
IMPORTS = uuid oleaut32 ole32 comctl32 user32 advapi32
diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index 9bd93b6ca66..b8db8f06d8b 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -170,7 +170,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
VARIANT tmp;
HRESULT hr;
- TRACE("(%p)->(%d, %d, %ld, %p, %p, %p, %ld, %d, %p, %d, %d, %x)\n", This,
+ TRACE("(%p)->(%d, %d, %Id, %p, %p, %p, %Id, %ld, %p, %d, %d, %lx)\n", This,
src_type, dst_type, src_len, dst_len, src, dst, dst_max_len,
src_status, dst_status, precision, scale, flags);
@@ -1113,7 +1113,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
hr = SafeArrayAccessData(V_ARRAY((VARIANT*)src), (VOID**)&data);
if(FAILED(hr))
{
- ERR("SafeArrayAccessData Failed = 0x%08x\n", hr);
+ ERR("SafeArrayAccessData Failed = 0x%08lx\n", hr);
return hr;
}
@@ -1613,7 +1613,7 @@ static HRESULT WINAPI dcinfo_GetInfo(IDCInfo *iface, ULONG num, DCINFOTYPE types
ULONG i;
DCINFO *infos;
- TRACE("(%p)->(%d, %p, %p)\n", This, num, types, info_ptr);
+ TRACE("(%p)->(%ld, %p, %p)\n", This, num, types, info_ptr);
*info_ptr = infos = CoTaskMemAlloc(num * sizeof(*infos));
if(!infos) return E_OUTOFMEMORY;
@@ -1641,7 +1641,7 @@ static HRESULT WINAPI dcinfo_SetInfo(IDCInfo* iface, ULONG num, DCINFO info[])
ULONG i;
HRESULT hr = S_OK;
- TRACE("(%p)->(%d, %p)\n", This, num, info);
+ TRACE("(%p)->(%ld, %p)\n", This, num, info);
for(i = 0; i < num; i++)
{
@@ -1658,7 +1658,7 @@ static HRESULT WINAPI dcinfo_SetInfo(IDCInfo* iface, ULONG num, DCINFO info[])
break;
default:
- FIXME("Unhandled info type %d (vt %x)\n", info[i].eInfoType, V_VT(&info[i].vData));
+ FIXME("Unhandled info type %ld (vt %x)\n", info[i].eInfoType, V_VT(&info[i].vData));
}
}
return hr;
diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c
index 08bc60bce92..0438375202b 100644
--- a/dlls/oledb32/datainit.c
+++ b/dlls/oledb32/datainit.c
@@ -111,7 +111,7 @@ static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropert
{
dbinit *This = impl_from_IDBProperties(iface);
- FIXME("(%p)->(%d %p %p %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets);
+ FIXME("(%p)->(%ld %p %p %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets);
return E_NOTIMPL;
}
@@ -122,7 +122,7 @@ static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPrope
{
dbinit *This = impl_from_IDBProperties(iface);
- FIXME("(%p)->(%d %p %p %p %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets,
+ FIXME("(%p)->(%ld %p %p %p %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets,
prgPropertyInfoSets, ppDescBuffer);
return E_NOTIMPL;
@@ -133,7 +133,7 @@ static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropert
{
dbinit *This = impl_from_IDBProperties(iface);
- FIXME("(%p)->(%d %p)\n", This, cPropertySets, rgPropertySets);
+ FIXME("(%p)->(%ld %p)\n", This, cPropertySets, rgPropertySets);
return E_NOTIMPL;
}
@@ -343,7 +343,7 @@ static HRESULT convert_dbproperty_mode(const WCHAR *src, VARIANT *dest)
{
V_VT(dest) = VT_I4;
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;
}
@@ -698,7 +698,7 @@ HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID
IDBProperties_Release(dbprops);
if (FAILED(hr))
{
- WARN("GetProperties failed for datasource, 0x%08x\n", hr);
+ WARN("GetProperties failed for datasource, 0x%08lx\n", hr);
return hr;
}
@@ -754,7 +754,7 @@ HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID
free_dbpropset(1, propset);
if (FAILED(hr))
{
- ERR("SetProperties failed, 0x%08x\n", hr);
+ ERR("SetProperties failed, 0x%08lx\n", hr);
datasource_release(datasource_created, datasource);
return hr;
}
@@ -768,7 +768,7 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o
{
datainit *This = impl_from_IDataInitialize(iface);
- TRACE("(%p)->(%p 0x%x %s %s %p)\n", This, outer, clsctx, debugstr_w(initstring), debugstr_guid(riid), datasource);
+ TRACE("(%p)->(%p 0x%lx %s %s %p)\n", This, outer, clsctx, debugstr_w(initstring), debugstr_guid(riid), datasource);
return get_data_source(outer, clsctx, initstring, riid, datasource);
}
@@ -889,7 +889,7 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I
hr = IDBProperties_GetProperties(props, 1, &propidset, &count, &propset);
if (FAILED(hr))
{
- WARN("failed to get data source properties, 0x%08x\n", hr);
+ WARN("failed to get data source properties, 0x%08lx\n", hr);
CoTaskMemFree(progid);
return hr;
}
@@ -956,7 +956,7 @@ static HRESULT WINAPI datainit_CreateDBInstance(IDataInitialize *iface, REFCLSID
{
datainit *This = impl_from_IDataInitialize(iface);
- TRACE("(%p)->(%s %p 0x%08x %s %s %p)\n", This, debugstr_guid(provider), outer, clsctx, debugstr_w(reserved),
+ TRACE("(%p)->(%s %p 0x%08lx %s %s %p)\n", This, debugstr_guid(provider), outer, clsctx, debugstr_w(reserved),
debugstr_guid(riid), datasource);
return CoCreateInstance(provider, outer, clsctx, riid, (void**)datasource);
@@ -967,7 +967,7 @@ static HRESULT WINAPI datainit_CreateDBInstanceEx(IDataInitialize *iface, REFCLS
{
datainit *This = impl_from_IDataInitialize(iface);
- FIXME("(%p)->(%s %p %#x %s %p %u %p)\n", This, debugstr_guid(provider), outer, clsctx,
+ FIXME("(%p)->(%s %p %#lx %s %p %lu %p)\n", This, debugstr_guid(provider), outer, clsctx,
debugstr_w(reserved), server_info, cmq, results);
return E_NOTIMPL;
@@ -988,7 +988,7 @@ static HRESULT WINAPI datainit_WriteStringToStorage(IDataInitialize *iface, LPWS
{
datainit *This = impl_from_IDataInitialize(iface);
- FIXME("(%p)->(%s %s %d)\n", This, debugstr_w(pwszFileName), debugstr_w(pwszInitializationString), dwCreationDisposition);
+ FIXME("(%p)->(%s %s %ld)\n", This, debugstr_w(pwszFileName), debugstr_w(pwszInitializationString), dwCreationDisposition);
return E_NOTIMPL;
}
diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c
index d35e1eb116f..722032bc18b 100644
--- a/dlls/oledb32/dslocator.c
+++ b/dlls/oledb32/dslocator.c
@@ -89,7 +89,7 @@ static BOOL initialize_datasource(struct datasource *data)
hr = CoCreateInstance(&data->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDBProperties, (void**)&data->provider);
if (FAILED(hr))
{
- WARN("Datasource cannot be created (0x%08x)\n", hr);
+ WARN("Datasource cannot be created (0x%08lx)\n", hr);
return FALSE;
}
@@ -100,7 +100,7 @@ static BOOL initialize_datasource(struct datasource *data)
hr = IDBProperties_GetPropertyInfo(data->provider, 1, &propidset, &infocount, &data->propinfoset, &data->description);
if (FAILED(hr))
{
- WARN("Failed to get DB Properties (0x%08x)\n", hr);
+ WARN("Failed to get DB Properties (0x%08lx)\n", hr);
IDBProperties_Release(data->provider);
data->provider = NULL;
@@ -180,7 +180,7 @@ static HRESULT WINAPI dslocator_QueryInterface(IDataSourceLocator *iface, REFIID
static ULONG WINAPI dslocator_AddRef(IDataSourceLocator *iface)
{
DSLocatorImpl *This = impl_from_IDataSourceLocator(iface);
- TRACE("(%p)->%u\n",This,This->ref);
+ TRACE("(%p)->%lu\n",This,This->ref);
return InterlockedIncrement(&This->ref);
}
@@ -189,7 +189,7 @@ static ULONG WINAPI dslocator_Release(IDataSourceLocator *iface)
DSLocatorImpl *This = impl_from_IDataSourceLocator(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->%u\n",This,ref+1);
+ TRACE("(%p)->%lu\n",This,ref+1);
if (!ref)
{
@@ -212,7 +212,7 @@ static HRESULT WINAPI dslocator_GetTypeInfo(IDataSourceLocator *iface, UINT iTIn
{
DSLocatorImpl *This = impl_from_IDataSourceLocator(iface);
- FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+ FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
@@ -222,7 +222,7 @@ static HRESULT WINAPI dslocator_GetIDsOfNames(IDataSourceLocator *iface, REFIID
{
DSLocatorImpl *This = impl_from_IDataSourceLocator(iface);
- FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
+ FIXME("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
return E_NOTIMPL;
}
@@ -232,7 +232,7 @@ static HRESULT WINAPI dslocator_Invoke(IDataSourceLocator *iface, DISPID dispIdM
{
DSLocatorImpl *This = impl_from_IDataSourceLocator(iface);
- FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ FIXME("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_NOTIMPL;
@@ -331,7 +331,7 @@ static void add_connections_providers(HWND lv)
static INT_PTR CALLBACK data_link_properties_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
{
- TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp);
+ TRACE("(%p, %08x, %08Ix, %08Ix)\n", hwnd, msg, wp, lp);
switch (msg)
{
@@ -479,7 +479,7 @@ static void connection_toggle_controls(HWND parent)
static INT_PTR CALLBACK data_link_connection_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
{
- TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp);
+ TRACE("(%p, %08x, %08Ix, %08Ix)\n", hwnd, msg, wp, lp);
switch (msg)
{
@@ -551,7 +551,7 @@ static void advanced_fill_permission_list(HWND parent)
static INT_PTR CALLBACK data_link_advanced_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
{
- TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp);
+ TRACE("(%p, %08x, %08Ix, %08Ix)\n", hwnd, msg, wp, lp);
switch (msg)
{
@@ -595,7 +595,7 @@ static void create_page_all_columns(HWND lv)
static INT_PTR CALLBACK data_link_all_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
{
- TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp);
+ TRACE("(%p, %08x, %08Ix, %08Ix)\n", hwnd, msg, wp, lp);
switch (msg)
{
@@ -712,7 +712,7 @@ static ULONG WINAPI datainitialize_Release(IDataInitialize *iface)
static HRESULT WINAPI datainitialize_GetDataSource(IDataInitialize *iface,
IUnknown *outer, DWORD context, LPWSTR initstring, REFIID riid, IUnknown **datasource)
{
- TRACE("(%p)->(%p %#x %s %s %p)\n", iface, outer, context, debugstr_w(initstring), debugstr_guid(riid),
+ TRACE("(%p)->(%p %#lx %s %s %p)\n", iface, outer, context, debugstr_w(initstring), debugstr_guid(riid),
datasource);
return get_data_source(outer, context, initstring, riid, datasource);
@@ -728,7 +728,7 @@ static HRESULT WINAPI datainitialize_GetInitializationString(IDataInitialize *if
static HRESULT WINAPI datainitialize_CreateDBInstance(IDataInitialize *iface, REFCLSID prov, IUnknown *outer,
DWORD clsctx, LPWSTR reserved, REFIID riid, IUnknown **datasource)
{
- FIXME("(%p)->(%s %p %#x %p %s %p): stub\n", iface, debugstr_guid(prov), outer, clsctx, reserved,
+ FIXME("(%p)->(%s %p %#lx %p %s %p): stub\n", iface, debugstr_guid(prov), outer, clsctx, reserved,
debugstr_guid(riid), datasource);
return E_NOTIMPL;
}
@@ -736,7 +736,7 @@ static HRESULT WINAPI datainitialize_CreateDBInstance(IDataInitialize *iface, RE
static HRESULT WINAPI datainitialize_CreateDBInstanceEx(IDataInitialize *iface, REFCLSID prov, IUnknown *outer,
DWORD clsctx, LPWSTR reserved, COSERVERINFO *server_info, DWORD cmq, MULTI_QI *results)
{
- FIXME("(%p)->(%s %p %#x %p %p %u %p): stub\n", iface, debugstr_guid(prov), outer, clsctx, reserved,
+ FIXME("(%p)->(%s %p %#lx %p %p %lu %p): stub\n", iface, debugstr_guid(prov), outer, clsctx, reserved,
server_info, cmq, results);
return E_NOTIMPL;
}
@@ -750,7 +750,7 @@ static HRESULT WINAPI datainitialize_LoadStringFromStorage(IDataInitialize *ifac
static HRESULT WINAPI datainitialize_WriteStringToStorage(IDataInitialize *iface, LPWSTR filename, LPWSTR initstring,
DWORD disposition)
{
- FIXME("(%p)->(%s %s %#x): stub\n", iface, debugstr_w(filename), debugstr_w(initstring), disposition);
+ FIXME("(%p)->(%s %s %#lx): stub\n", iface, debugstr_w(filename), debugstr_w(initstring), disposition);
return E_NOTIMPL;
}
diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c
index 9987b2113bf..b6e0d10e8e0 100644
--- a/dlls/oledb32/errorinfo.c
+++ b/dlls/oledb32/errorinfo.c
@@ -96,7 +96,7 @@ static HRESULT WINAPI errorrecords_QueryInterface(IErrorInfo* iface, REFIID riid
static ULONG WINAPI errorrecords_AddRef(IErrorInfo* iface)
{
errorrecords *This = impl_from_IErrorInfo(iface);
- TRACE("(%p)->%u\n",This,This->ref);
+ TRACE("(%p)->%lu\n",This,This->ref);
return InterlockedIncrement(&This->ref);
}
@@ -105,7 +105,7 @@ static ULONG WINAPI errorrecords_Release(IErrorInfo* iface)
errorrecords *This = impl_from_IErrorInfo(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->%u\n",This,ref+1);
+ TRACE("(%p)->%lu\n",This,ref+1);
if (!ref)
{
@@ -268,7 +268,7 @@ static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *p
struct ErrorEntry *entry;
HRESULT hr;
- TRACE("(%p)->(%p %d %p %p %d)\n", This, pErrorInfo, dwLookupID, pdispparams, punkCustomError, dwDynamicErrorID);
+ TRACE("(%p)->(%p %ld %p %p %ld)\n", This, pErrorInfo, dwLookupID, pdispparams, punkCustomError, dwDynamicErrorID);
if(!pErrorInfo)
return E_INVALIDARG;
@@ -313,7 +313,7 @@ static HRESULT WINAPI errorrec_GetBasicErrorInfo(IErrorRecords *iface, ULONG ind
{
errorrecords *This = impl_from_IErrorRecords(iface);
- TRACE("(%p)->(%u %p)\n", This, index, info);
+ TRACE("(%p)->(%lu %p)\n", This, index, info);
if (!info)
return E_INVALIDARG;
@@ -331,7 +331,7 @@ static HRESULT WINAPI errorrec_GetCustomErrorObject(IErrorRecords *iface, ULONG
{
errorrecords *This = impl_from_IErrorRecords(iface);
- TRACE("(%p)->(%u %s %p)\n", This, index, debugstr_guid(riid), object);
+ TRACE("(%p)->(%lu %s %p)\n", This, index, debugstr_guid(riid), object);
if (!object)
return E_INVALIDARG;
@@ -353,7 +353,7 @@ static HRESULT WINAPI errorrec_GetErrorInfo(IErrorRecords *iface, ULONG index,
{
errorrecords *This = impl_from_IErrorRecords(iface);
- FIXME("(%p)->(%u %d, %p)\n", This, index, lcid, ppErrorInfo);
+ FIXME("(%p)->(%lu %ld, %p)\n", This, index, lcid, ppErrorInfo);
if (!ppErrorInfo)
return E_INVALIDARG;
@@ -368,7 +368,7 @@ static HRESULT WINAPI errorrec_GetErrorParameters(IErrorRecords *iface, ULONG in
{
errorrecords *This = impl_from_IErrorRecords(iface);
- TRACE("(%p)->(%u %p)\n", This, index, pdispparams);
+ TRACE("(%p)->(%lu %p)\n", This, index, pdispparams);
if (!pdispparams)
return E_INVALIDARG;
@@ -391,7 +391,7 @@ static HRESULT WINAPI errorrec_GetRecordCount(IErrorRecords *iface, ULONG *count
*count = This->count;
- TRACE("<--(%u)\n", *count);
+ TRACE("<--(%lu)\n", *count);
return S_OK;
}
diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c
index c922f93f908..bc42f33f851 100644
--- a/dlls/oledb32/rowpos.c
+++ b/dlls/oledb32/rowpos.c
@@ -136,7 +136,7 @@ static ULONG WINAPI rowpos_AddRef(IRowPosition* iface)
{
rowpos *This = impl_from_IRowPosition(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("(%p)->(%ld)\n", This, ref);
return ref;
}
@@ -145,7 +145,7 @@ static ULONG WINAPI rowpos_Release(IRowPosition* iface)
rowpos *This = impl_from_IRowPosition(iface);
LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("(%p)->(%ld)\n", This, ref);
if (ref == 0)
{
@@ -230,7 +230,7 @@ static HRESULT WINAPI rowpos_SetRowPosition(IRowPosition *iface, HCHAPTER chapte
DBREASON reason;
HRESULT hr;
- TRACE("(%p)->(%lx %lx %d)\n", This, chapter, row, flags);
+ TRACE("(%p)->(%Ix %Ix %ld)\n", This, chapter, row, flags);
if (!This->cleared) return E_UNEXPECTED;
@@ -425,7 +425,7 @@ static HRESULT WINAPI rowpos_cp_Unadvise(IConnectionPoint *iface, DWORD cookie)
{
rowpos_cp *This = impl_from_IConnectionPoint(iface);
- TRACE("(%p)->(%d)\n", This, cookie);
+ TRACE("(%p)->(%ld)\n", This, cookie);
if (!cookie || cookie > This->sinks_size || !This->sinks[cookie-1])
return CONNECT_E_NOCONNECTION;
More information about the wine-devel
mailing list