ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oledb32: Use correct 32/64-bit typedefs. 

Paul Vriens did the hard stuff of figuring out that the typedefs in
oledb.idl were not correct.
This commit is contained in:
Greg Geldorp 2010-12-31 01:14:39 +01:00 committed by Alexandre Julliard
parent 65892b5be4
commit f8e71a346c
8 changed files with 264 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dlls/msdaps/row_server.c
View File

@ -167,7 +167,7 @@ static HRESULT WINAPI server_GetColumns(IWineRowServer* iface, DBORDINAL num_col
DBCOLUMNACCESS *cols; DBCOLUMNACCESS *cols;
IRow *row; IRow *row;
TRACE("(%p)->(%d, %p, %p)\n", This, num_cols, in_data, out_data); TRACE("(%p)->(%ld, %p, %p)\n", This, num_cols, in_data, out_data);
hr = IUnknown_QueryInterface(This->inner_unk, &IID_IRow, (void**)&row); hr = IUnknown_QueryInterface(This->inner_unk, &IID_IRow, (void**)&row);
if(FAILED(hr)) return hr; if(FAILED(hr)) return hr;
@ -176,7 +176,7 @@ static HRESULT WINAPI server_GetColumns(IWineRowServer* iface, DBORDINAL num_col
for(i = 0; i < num_cols; i++) for(i = 0; i < num_cols; i++)
{ {
TRACE("%d:\tmax_len %d type %04x\n", i, in_data[i].max_len, in_data[i].type); TRACE("%ld:\tmax_len %ld type %04x\n", i, in_data[i].max_len, in_data[i].type);
cols[i].pData = CoTaskMemAlloc(db_type_size(in_data[i].type, in_data[i].max_len)); cols[i].pData = CoTaskMemAlloc(db_type_size(in_data[i].type, in_data[i].max_len));
cols[i].columnid = in_data[i].columnid; cols[i].columnid = in_data[i].columnid;
cols[i].cbMaxLen = in_data[i].max_len; cols[i].cbMaxLen = in_data[i].max_len;
@ -275,7 +275,7 @@ static HRESULT WINAPI server_SetColumns(IWineRowServer* iface, DBORDINAL num_col
DBCOLUMNACCESS *cols; DBCOLUMNACCESS *cols;
IRowChange *row_change; IRowChange *row_change;
TRACE("(%p)->(%d, %p, %p)\n", This, num_cols, in_data, status); TRACE("(%p)->(%ld, %p, %p)\n", This, num_cols, in_data, status);
hr = IUnknown_QueryInterface(This->inner_unk, &IID_IRowChange, (void**)&row_change); hr = IUnknown_QueryInterface(This->inner_unk, &IID_IRowChange, (void**)&row_change);
if(FAILED(hr)) return hr; if(FAILED(hr)) return hr;
@ -283,7 +283,7 @@ static HRESULT WINAPI server_SetColumns(IWineRowServer* iface, DBORDINAL num_col
for(i = 0; i < num_cols; i++) for(i = 0; i < num_cols; i++)
{ {
TRACE("%d:\ttype %04x\n", i, in_data[i].type); TRACE("%ld:\ttype %04x\n", i, in_data[i].type);
cols[i].pData = CoTaskMemAlloc(db_type_size(in_data[i].type, in_data[i].max_len)); cols[i].pData = CoTaskMemAlloc(db_type_size(in_data[i].type, in_data[i].max_len));
memcpy(cols[i].pData, &V_I1(&in_data[i].v), db_type_size(in_data[i].type, in_data[i].max_len)); memcpy(cols[i].pData, &V_I1(&in_data[i].v), db_type_size(in_data[i].type, in_data[i].max_len));
cols[i].columnid = in_data[i].columnid; cols[i].columnid = in_data[i].columnid;
@ -317,7 +317,7 @@ static HRESULT WINAPI server_AddRefRows(IWineRowServer* iface, DBCOUNTITEM cRows
IRowset *rowset; IRowset *rowset;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%d, %p, %p, %p)\n", This, cRows, rghRows, rgRefCounts, rgRowStatus); TRACE("(%p)->(%ld, %p, %p, %p)\n", This, cRows, rghRows, rgRefCounts, rgRowStatus);
hr = IUnknown_QueryInterface(This->inner_unk, &IID_IRowset, (void**)&rowset); hr = IUnknown_QueryInterface(This->inner_unk, &IID_IRowset, (void**)&rowset);
if(FAILED(hr)) return hr; if(FAILED(hr)) return hr;
@ -355,7 +355,7 @@ static HRESULT WINAPI server_GetNextRows(IWineRowServer* iface, HCHAPTER hReserv
IRowset *rowset; IRowset *rowset;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%08lx, %d, %d, %p, %p)\n", This, hReserved, lRowsOffset, cRows, pcRowObtained, prghRows); TRACE("(%p)->(%08lx, %ld, %ld, %p, %p)\n", This, hReserved, lRowsOffset, cRows, pcRowObtained, prghRows);
hr = IUnknown_QueryInterface(This->inner_unk, &IID_IRowset, (void**)&rowset); hr = IUnknown_QueryInterface(This->inner_unk, &IID_IRowset, (void**)&rowset);
if(FAILED(hr)) return hr; if(FAILED(hr)) return hr;
@ -364,7 +364,7 @@ static HRESULT WINAPI server_GetNextRows(IWineRowServer* iface, HCHAPTER hReserv
hr = IRowset_GetNextRows(rowset, hReserved, lRowsOffset, cRows, pcRowObtained, prghRows); hr = IRowset_GetNextRows(rowset, hReserved, lRowsOffset, cRows, pcRowObtained, prghRows);
IRowset_Release(rowset); IRowset_Release(rowset);
TRACE("returning %08x, got %d rows\n", hr, *pcRowObtained); TRACE("returning %08x, got %ld rows\n", hr, *pcRowObtained);
return hr; return hr;
} }
@ -375,7 +375,7 @@ static HRESULT WINAPI server_ReleaseRows(IWineRowServer* iface, DBCOUNTITEM cRow
IRowset *rowset; IRowset *rowset;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%d, %p, %p, %p, %p)\n", This, cRows, rghRows, rgRowOptions, rgRefCounts, rgRowStatus); TRACE("(%p)->(%ld, %p, %p, %p, %p)\n", This, cRows, rghRows, rgRowOptions, rgRefCounts, rgRowStatus);
hr = IUnknown_QueryInterface(This->inner_unk, &IID_IRowset, (void**)&rowset); hr = IUnknown_QueryInterface(This->inner_unk, &IID_IRowset, (void**)&rowset);
if(FAILED(hr)) return hr; if(FAILED(hr)) return hr;
@ -411,7 +411,7 @@ static HRESULT WINAPI server_GetRowsAt(IWineRowServer *iface, HWATCHREGION hRese
IRowsetLocate *rowsetlocate; IRowsetLocate *rowsetlocate;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%08lx, %08lx, %d, %p, %d, %d, %p, %p\n", This, hReserved1, hReserved2, cbBookmark, pBookmark, lRowsOffset, cRows, TRACE("(%p)->(%08lx, %08lx, %ld, %p, %ld, %ld, %p, %p\n", This, hReserved1, hReserved2, cbBookmark, pBookmark, lRowsOffset, cRows,
pcRowsObtained, prghRows); pcRowsObtained, prghRows);
*prghRows = NULL; *prghRows = NULL;
@ -497,7 +497,7 @@ static HRESULT WINAPI server_CreateAccessor(IWineRowServer* iface, DBACCESSORFLA
HRESULT hr; HRESULT hr;
IAccessor *accessor; IAccessor *accessor;
TRACE("(%p)->(%08x, %d, %p, %d, %p, %p)\n", This, dwAccessorFlags, cBindings, rgBindings, cbRowSize, phAccessor, rgStatus); TRACE("(%p)->(%08x, %ld, %p, %ld, %p, %p)\n", This, dwAccessorFlags, cBindings, rgBindings, cbRowSize, phAccessor, rgStatus);
hr = IUnknown_QueryInterface(This->inner_unk, &IID_IAccessor, (void**)&accessor); hr = IUnknown_QueryInterface(This->inner_unk, &IID_IAccessor, (void**)&accessor);
if(FAILED(hr)) return hr; if(FAILED(hr)) return hr;
@ -688,14 +688,14 @@ static HRESULT WINAPI row_GetColumns(IRow* iface, DBORDINAL cColumns, DBCOLUMNAC
wine_getcolumns_out *out_data; wine_getcolumns_out *out_data;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%d, %p)\n", This, cColumns, rgColumns); TRACE("(%p)->(%ld, %p)\n", This, cColumns, rgColumns);
in_data = CoTaskMemAlloc(cColumns * sizeof(in_data[0])); in_data = CoTaskMemAlloc(cColumns * sizeof(in_data[0]));
out_data = CoTaskMemAlloc(cColumns * sizeof(out_data[0])); out_data = CoTaskMemAlloc(cColumns * sizeof(out_data[0]));
for(i = 0; i < cColumns; i++) for(i = 0; i < cColumns; i++)
{ {
TRACE("%d:\tdata %p data_len %d status %08x max_len %d type %04x\n", i, rgColumns[i].pData, TRACE("%ld:\tdata %p data_len %ld status %08x max_len %ld type %04x\n", i, rgColumns[i].pData,
rgColumns[i].cbDataLen, rgColumns[i].dwStatus, rgColumns[i].cbMaxLen, rgColumns[i].wType); rgColumns[i].cbDataLen, rgColumns[i].dwStatus, rgColumns[i].cbMaxLen, rgColumns[i].wType);
in_data[i].columnid = rgColumns[i].columnid; in_data[i].columnid = rgColumns[i].columnid;
in_data[i].max_len = rgColumns[i].cbMaxLen; in_data[i].max_len = rgColumns[i].cbMaxLen;
@ -783,14 +783,14 @@ static HRESULT WINAPI row_change_SetColumns(IRowChange *iface, DBORDINAL cColumn
DBSTATUS *status; DBSTATUS *status;
DBORDINAL i; DBORDINAL i;
TRACE("(%p)->(%d, %p)\n", This, cColumns, rgColumns); TRACE("(%p)->(%ld, %p)\n", This, cColumns, rgColumns);
in_data = CoTaskMemAlloc(cColumns * sizeof(in_data[0])); in_data = CoTaskMemAlloc(cColumns * sizeof(in_data[0]));
status = CoTaskMemAlloc(cColumns * sizeof(status[0])); status = CoTaskMemAlloc(cColumns * sizeof(status[0]));
for(i = 0; i < cColumns; i++) for(i = 0; i < cColumns; i++)
{ {
TRACE("%d: wtype %04x max %08x len %08x\n", i, rgColumns[i].wType, rgColumns[i].cbMaxLen, rgColumns[i].cbDataLen); TRACE("%ld: wtype %04x max %08lx len %08lx\n", i, rgColumns[i].wType, rgColumns[i].cbMaxLen, rgColumns[i].cbDataLen);
V_VT(&in_data[i].v) = rgColumns[i].wType; V_VT(&in_data[i].v) = rgColumns[i].wType;
memcpy(&V_I1(&in_data[i].v), rgColumns[i].pData, db_type_size(rgColumns[i].wType, rgColumns[i].cbDataLen)); memcpy(&V_I1(&in_data[i].v), rgColumns[i].pData, db_type_size(rgColumns[i].wType, rgColumns[i].cbDataLen));
in_data[i].columnid = rgColumns[i].columnid; in_data[i].columnid = rgColumns[i].columnid;
@ -932,7 +932,7 @@ static HRESULT WINAPI rowsetlocate_AddRefRows(IRowsetLocate *iface, DBCOUNTITEM
DBREFCOUNT *refs = rgRefCounts; DBREFCOUNT *refs = rgRefCounts;
DBSTATUS *stats = rgRowStatus; DBSTATUS *stats = rgRowStatus;
TRACE("(%p)->(%d, %p, %p, %p)\n", This, cRows, rghRows, rgRefCounts, rgRowStatus); TRACE("(%p)->(%ld, %p, %p, %p)\n", This, cRows, rghRows, rgRefCounts, rgRowStatus);
if(!refs) refs = CoTaskMemAlloc(cRows * sizeof(refs[0])); if(!refs) refs = CoTaskMemAlloc(cRows * sizeof(refs[0]));
if(!stats) stats = CoTaskMemAlloc(cRows * sizeof(stats[0])); if(!stats) stats = CoTaskMemAlloc(cRows * sizeof(stats[0]));
@ -964,10 +964,10 @@ static HRESULT WINAPI rowsetlocate_GetData(IRowsetLocate *iface, HROW hRow, HACC
IAccessor_Release(accessor); IAccessor_Release(accessor);
if(FAILED(hr)) return hr; if(FAILED(hr)) return hr;
TRACE("got %d bindings\n", count); TRACE("got %ld bindings\n", count);
for(i = 0; i < count; i++) for(i = 0; i < count; i++)
{ {
TRACE("%d\tord %d offs: val %d len %d stat %d, part %x, max len %d type %04x\n", TRACE("%ld\tord %ld offs: val %ld len %ld stat %ld, part %x, max len %ld type %04x\n",
i, bindings[i].iOrdinal, bindings[i].obValue, bindings[i].obLength, bindings[i].obStatus, i, bindings[i].iOrdinal, bindings[i].obValue, bindings[i].obLength, bindings[i].obStatus,
bindings[i].dwPart, bindings[i].cbMaxLen, bindings[i].wType); bindings[i].dwPart, bindings[i].cbMaxLen, bindings[i].wType);
if(bindings[i].dwPart & DBPART_LENGTH && bindings[i].obLength >= max_len) if(bindings[i].dwPart & DBPART_LENGTH && bindings[i].obLength >= max_len)
@ -994,7 +994,7 @@ static HRESULT WINAPI rowsetlocate_GetNextRows(IRowsetLocate *iface, HCHAPTER hR
HRESULT hr; HRESULT hr;
HROW *rows = NULL; HROW *rows = NULL;
TRACE("(%p)->(%08lx, %d, %d, %p, %p)\n", This, hReserved, lRowsOffset, cRows, pcRowObtained, prghRows); TRACE("(%p)->(%08lx, %ld, %ld, %p, %p)\n", This, hReserved, lRowsOffset, cRows, pcRowObtained, prghRows);
hr = IWineRowServer_GetNextRows(This->server, hReserved, lRowsOffset, cRows, pcRowObtained, &rows); hr = IWineRowServer_GetNextRows(This->server, hReserved, lRowsOffset, cRows, pcRowObtained, &rows);
if(*prghRows) if(*prghRows)
@ -1017,7 +1017,7 @@ static HRESULT WINAPI rowsetlocate_ReleaseRows(IRowsetLocate *iface, DBCOUNTITEM
DBREFCOUNT *refs = rgRefCounts; DBREFCOUNT *refs = rgRefCounts;
DBROWSTATUS *status = rgRowStatus; DBROWSTATUS *status = rgRowStatus;
TRACE("(%p)->(%d, %p, %p, %p, %p)\n", This, cRows, rghRows, rgRowOptions, rgRefCounts, rgRowStatus); TRACE("(%p)->(%ld, %p, %p, %p, %p)\n", This, cRows, rghRows, rgRowOptions, rgRefCounts, rgRowStatus);
if(!options) if(!options)
{ {
@ -1061,7 +1061,7 @@ static HRESULT WINAPI rowsetlocate_GetRowsAt(IRowsetLocate *iface, HWATCHREGION
HRESULT hr; HRESULT hr;
HROW *rows = NULL; HROW *rows = NULL;
TRACE("(%p)->(%08lx, %08lx, %d, %p, %d, %d, %p, %p\n", This, hReserved1, hReserved2, cbBookmark, pBookmark, lRowsOffset, cRows, TRACE("(%p)->(%08lx, %08lx, %ld, %p, %ld, %ld, %p, %p\n", This, hReserved1, hReserved2, cbBookmark, pBookmark, lRowsOffset, cRows,
pcRowsObtained, prghRows); pcRowsObtained, prghRows);
hr = IWineRowServer_GetRowsAt(This->server, hReserved1, hReserved2, cbBookmark, pBookmark, lRowsOffset, cRows, pcRowsObtained, &rows); hr = IWineRowServer_GetRowsAt(This->server, hReserved1, hReserved2, cbBookmark, pBookmark, lRowsOffset, cRows, pcRowsObtained, &rows);
@ -1199,7 +1199,7 @@ static HRESULT WINAPI accessor_CreateAccessor(IAccessor *iface, DBACCESSORFLAGS
HRESULT hr; HRESULT hr;
DBBINDSTATUS *status; DBBINDSTATUS *status;
TRACE("(%p)->(%08x, %d, %p, %d, %p, %p)\n", This, dwAccessorFlags, cBindings, rgBindings, cbRowSize, phAccessor, rgStatus); TRACE("(%p)->(%08x, %ld, %p, %ld, %p, %p)\n", This, dwAccessorFlags, cBindings, rgBindings, cbRowSize, phAccessor, rgStatus);
if(!rgStatus) status = CoTaskMemAlloc(cBindings * sizeof(status[0])); if(!rgStatus) status = CoTaskMemAlloc(cBindings * sizeof(status[0]));
else status = rgStatus; else status = rgStatus;

56
dlls/msdaps/row_server.idl
View File

@ -51,8 +51,8 @@ typedef struct
} wine_getcolumns_out; } wine_getcolumns_out;
HRESULT GetColumns([in] DBORDINAL num_cols, HRESULT GetColumns([in] DBORDINAL num_cols,
[in, size_is(num_cols)] wine_getcolumns_in *in_data, [in, size_is((ULONG)num_cols)] wine_getcolumns_in *in_data,
[out, size_is(num_cols)] wine_getcolumns_out *out_cols); [out, size_is((ULONG)num_cols)] wine_getcolumns_out *out_cols);
HRESULT GetSourceRowset([in] REFIID riid, HRESULT GetSourceRowset([in] REFIID riid,
[out, iid_is(riid)] IUnknown **ppRowset, [out, iid_is(riid)] IUnknown **ppRowset,
@ -79,14 +79,14 @@ typedef struct
} wine_setcolumns_in; } wine_setcolumns_in;
HRESULT SetColumns([in] DBORDINAL num_cols, HRESULT SetColumns([in] DBORDINAL num_cols,
[in, size_is(num_cols)] wine_setcolumns_in *in_data, [in, size_is((ULONG)num_cols)] wine_setcolumns_in *in_data,
[out, size_is(num_cols)] DBSTATUS *status); [out, size_is((ULONG)num_cols)] DBSTATUS *status);
/* IRowset */ /* IRowset */
HRESULT AddRefRows([in] DBCOUNTITEM cRows, HRESULT AddRefRows([in] DBCOUNTITEM cRows,
[in, size_is(cRows)] const HROW rghRows[], [in, size_is((ULONG)cRows)] const HROW rghRows[],
[out, size_is(cRows)] DBREFCOUNT rgRefCounts[], [out, size_is((ULONG)cRows)] DBREFCOUNT rgRefCounts[],
[out, size_is(cRows)] DBROWSTATUS rgRowStatus[]); [out, size_is((ULONG)cRows)] DBROWSTATUS rgRowStatus[]);
HRESULT GetData([in] HROW hRow, HRESULT GetData([in] HROW hRow,
[in] HACCESSOR hAccessor, [in] HACCESSOR hAccessor,
@ -97,13 +97,13 @@ typedef struct
[in] DBROWOFFSET lRowsOffset, [in] DBROWOFFSET lRowsOffset,
[in] DBROWCOUNT cRows, [in] DBROWCOUNT cRows,
[out] DBCOUNTITEM *pcRowObtained, [out] DBCOUNTITEM *pcRowObtained,
[out, size_is(,cRows)] HROW **prghRows); [out, size_is(,(ULONG)cRows)] HROW **prghRows);
HRESULT ReleaseRows([in] DBCOUNTITEM cRows, HRESULT ReleaseRows([in] DBCOUNTITEM cRows,
[in, size_is(cRows)] const HROW rghRows[], [in, size_is((ULONG)cRows)] const HROW rghRows[],
[in, size_is(cRows)] DBROWOPTIONS rgRowOptions[], [in, size_is((ULONG)cRows)] DBROWOPTIONS rgRowOptions[],
[out, size_is(cRows)] DBREFCOUNT rgRefCounts[], [out, size_is((ULONG)cRows)] DBREFCOUNT rgRefCounts[],
[out, size_is(cRows)] DBROWSTATUS rgRowStatus[]); [out, size_is((ULONG)cRows)] DBROWSTATUS rgRowStatus[]);
HRESULT RestartPosition([in] HCHAPTER hReserved); HRESULT RestartPosition([in] HCHAPTER hReserved);
@ -111,38 +111,38 @@ typedef struct
HRESULT Compare([in] HCHAPTER hReserved, HRESULT Compare([in] HCHAPTER hReserved,
[in] DBBKMARK cbBookmark1, [in] DBBKMARK cbBookmark1,
[in, size_is(cbBookmark1)] const BYTE *pBookmark1, [in, size_is((ULONG)cbBookmark1)] const BYTE *pBookmark1,
[in] DBBKMARK cbBookmark2, [in] DBBKMARK cbBookmark2,
[in, size_is(cbBookmark2)] const BYTE *pBookmark2, [in, size_is((ULONG)cbBookmark2)] const BYTE *pBookmark2,
[out] DBCOMPARE *pComparison); [out] DBCOMPARE *pComparison);
HRESULT GetRowsAt([in] HWATCHREGION hReserved1, HRESULT GetRowsAt([in] HWATCHREGION hReserved1,
[in] HCHAPTER hReserved2, [in] HCHAPTER hReserved2,
[in] DBBKMARK cbBookmark, [in] DBBKMARK cbBookmark,
[in, size_is(cbBookmark)] const BYTE *pBookmark, [in, size_is((ULONG)cbBookmark)] const BYTE *pBookmark,
[in] DBROWOFFSET lRowsOffset, [in] DBROWOFFSET lRowsOffset,
[in] DBROWCOUNT cRows, [in] DBROWCOUNT cRows,
[out] DBCOUNTITEM *pcRowsObtained, [out] DBCOUNTITEM *pcRowsObtained,
[out, size_is(,cRows)] HROW **prghRows); [out, size_is(,(ULONG)cRows)] HROW **prghRows);
HRESULT GetRowsByBookmark([in] HCHAPTER hReserved, HRESULT GetRowsByBookmark([in] HCHAPTER hReserved,
[in] DBCOUNTITEM cRows, [in] DBCOUNTITEM cRows,
[in, size_is(cRows)] const DBBKMARK rgcbBookmarks[], [in, size_is((ULONG)cRows)] const DBBKMARK rgcbBookmarks[],
[in, size_is(cRows)] const BYTE *rgpBookmarks[], [in, size_is((ULONG)cRows)] const BYTE *rgpBookmarks[],
[out, size_is(cRows)] HROW rghRows[], [out, size_is((ULONG)cRows)] HROW rghRows[],
[out, size_is(cRows)] DBROWSTATUS rgRowStatus[]); [out, size_is((ULONG)cRows)] DBROWSTATUS rgRowStatus[]);
HRESULT Hash([in] HCHAPTER hReserved, HRESULT Hash([in] HCHAPTER hReserved,
[in] DBBKMARK cBookmarks, [in] DBBKMARK cBookmarks,
[in, size_is(cBookmarks)] const DBBKMARK rgcbBookmarks[], [in, size_is((ULONG)cBookmarks)] const DBBKMARK rgcbBookmarks[],
[in, size_is(cBookmarks)] const BYTE *rgpBookmarks[], [in, size_is((ULONG)cBookmarks)] const BYTE *rgpBookmarks[],
[out, size_is(cBookmarks)] DBHASHVALUE rgHashedValues[], [out, size_is((ULONG)cBookmarks)] DBHASHVALUE rgHashedValues[],
[out, size_is(cBookmarks)] DBROWSTATUS rgBookmarkStatus[]); [out, size_is((ULONG)cBookmarks)] DBROWSTATUS rgBookmarkStatus[]);
/* IRowsetInfo */ /* IRowsetInfo */
HRESULT GetProperties([in] ULONG cPropertyIDSets, HRESULT GetProperties([in] ULONG cPropertyIDSets,
[in, unique, size_is(cPropertyIDSets)] const DBPROPIDSET *rgPropertyIDSets, [in, unique, size_is((ULONG)cPropertyIDSets)] const DBPROPIDSET *rgPropertyIDSets,
[in, out] ULONG *pcPropertySets, [in, out] ULONG *pcPropertySets,
[out, size_is(,*pcPropertySets)] DBPROPSET **prgPropertySets); [out, size_is(,*pcPropertySets)] DBPROPSET **prgPropertySets);
@ -160,15 +160,15 @@ typedef struct
HRESULT CreateAccessor([in] DBACCESSORFLAGS dwAccessorFlags, HRESULT CreateAccessor([in] DBACCESSORFLAGS dwAccessorFlags,
[in] DBCOUNTITEM cBindings, [in] DBCOUNTITEM cBindings,
[in, unique, size_is(cBindings)] const DBBINDING *rgBindings, [in, unique, size_is((ULONG)cBindings)] const DBBINDING *rgBindings,
[in] DBLENGTH cbRowSize, [in] DBLENGTH cbRowSize,
[out] HACCESSOR *phAccessor, [out] HACCESSOR *phAccessor,
[in, out, unique, size_is(cBindings)] DBBINDSTATUS *rgStatus); [in, out, unique, size_is((ULONG)cBindings)] DBBINDSTATUS *rgStatus);
HRESULT GetBindings([in] HACCESSOR hAccessor, HRESULT GetBindings([in] HACCESSOR hAccessor,
[out] DBACCESSORFLAGS *pdwAccessorFlags, [out] DBACCESSORFLAGS *pdwAccessorFlags,
[in, out] DBCOUNTITEM *pcBindings, [in, out] DBCOUNTITEM *pcBindings,
[out, size_is(,*pcBindings)] DBBINDING **prgBindings); [out, size_is(,(ULONG)*pcBindings)] DBBINDING **prgBindings);
HRESULT ReleaseAccessor([in] HACCESSOR hAccessor, HRESULT ReleaseAccessor([in] HACCESSOR hAccessor,
[in, out, unique] DBREFCOUNT *pcRefCount); [in, out, unique] DBREFCOUNT *pcRefCount);

22
dlls/msdaps/usrmarshal.c
View File

@ -597,12 +597,12 @@ HRESULT CALLBACK IAccessor_CreateAccessor_Proxy(IAccessor* This, DBACCESSORFLAGS
IErrorInfo *error; IErrorInfo *error;
DBCOUNTITEM i; DBCOUNTITEM i;
TRACE("(%p)->(%08x, %d, %p, %d, %p, %p)\n", This, dwAccessorFlags, cBindings, rgBindings, TRACE("(%p)->(%08x, %ld, %p, %ld, %p, %p)\n", This, dwAccessorFlags, cBindings, rgBindings,
cbRowSize, phAccessor, rgStatus); cbRowSize, phAccessor, rgStatus);
for(i = 0; i < cBindings; i++) for(i = 0; i < cBindings; i++)
{ {
TRACE("%d: ord %d val off %d len off %d stat off %d part %04x mem_owner %d max_len %d type %04x\n", TRACE("%ld: ord %ld val off %ld len off %ld stat off %ld part %04x mem_owner %d max_len %ld type %04x\n",
i, rgBindings[i].iOrdinal, rgBindings[i].obValue, rgBindings[i].obLength, rgBindings[i].obStatus, i, rgBindings[i].iOrdinal, rgBindings[i].obValue, rgBindings[i].obLength, rgBindings[i].obStatus,
rgBindings[i].dwPart, rgBindings[i].dwMemOwner, rgBindings[i].cbMaxLen, rgBindings[i].wType); rgBindings[i].dwPart, rgBindings[i].dwMemOwner, rgBindings[i].cbMaxLen, rgBindings[i].wType);
} }
@ -625,7 +625,7 @@ HRESULT __RPC_STUB IAccessor_CreateAccessor_Stub(IAccessor* This, DBACCESSORFLAG
{ {
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%08x, %d, %p, %d, %p, %p, %p)\n", This, dwAccessorFlags, cBindings, rgBindings, TRACE("(%p)->(%08x, %ld, %p, %ld, %p, %p, %p)\n", This, dwAccessorFlags, cBindings, rgBindings,
cbRowSize, phAccessor, rgStatus, ppErrorInfoRem); cbRowSize, phAccessor, rgStatus, ppErrorInfoRem);
*ppErrorInfoRem = NULL; *ppErrorInfoRem = NULL;
@ -728,14 +728,14 @@ HRESULT __RPC_STUB IRowsetInfo_GetProperties_Stub(IRowsetInfo* This, ULONG cProp
HRESULT CALLBACK IRowsetInfo_GetReferencedRowset_Proxy(IRowsetInfo* This, DBORDINAL iOrdinal, REFIID riid, IUnknown **ppReferencedRowset) HRESULT CALLBACK IRowsetInfo_GetReferencedRowset_Proxy(IRowsetInfo* This, DBORDINAL iOrdinal, REFIID riid, IUnknown **ppReferencedRowset)
{ {
FIXME("(%p)->(%d, %s, %p): stub\n", This, iOrdinal, debugstr_guid(riid), ppReferencedRowset); FIXME("(%p)->(%ld, %s, %p): stub\n", This, iOrdinal, debugstr_guid(riid), ppReferencedRowset);
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT __RPC_STUB IRowsetInfo_GetReferencedRowset_Stub(IRowsetInfo* This, DBORDINAL iOrdinal, REFIID riid, IUnknown **ppReferencedRowset, HRESULT __RPC_STUB IRowsetInfo_GetReferencedRowset_Stub(IRowsetInfo* This, DBORDINAL iOrdinal, REFIID riid, IUnknown **ppReferencedRowset,
IErrorInfo **ppErrorInfoRem) IErrorInfo **ppErrorInfoRem)
{ {
FIXME("(%p)->(%d, %s, %p, %p): stub\n", This, iOrdinal, debugstr_guid(riid), ppReferencedRowset, ppErrorInfoRem); FIXME("(%p)->(%ld, %s, %p, %p): stub\n", This, iOrdinal, debugstr_guid(riid), ppReferencedRowset, ppErrorInfoRem);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -776,7 +776,7 @@ HRESULT CALLBACK ICommand_Execute_Proxy(ICommand* This, IUnknown *pUnkOuter, REF
if(pParams) if(pParams)
{ {
FIXME("Unhandled params {%p, %d, %08lx}\n", pParams->pData, pParams->cParamSets, pParams->hAccessor); FIXME("Unhandled params {%p, %ld, %08lx}\n", pParams->pData, pParams->cParamSets, pParams->hAccessor);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -806,7 +806,7 @@ HRESULT __RPC_STUB ICommand_Execute_Stub(ICommand* This, IUnknown *pUnkOuter, RE
IUnknown *obj = NULL; IUnknown *obj = NULL;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%p, %s, %08lx, %d, %p, %d, %p, %p, %d, %p, %p, %p, %p): stub\n", This, pUnkOuter, debugstr_guid(riid), TRACE("(%p)->(%p, %s, %08lx, %ld, %p, %d, %p, %p, %ld, %p, %p, %p, %p): stub\n", This, pUnkOuter, debugstr_guid(riid),
hAccessor, cParamSets, pGuid, ulGuidOffset, pInputParams, pOutputParams, cBindings, rgBindings, rgStatus, hAccessor, cParamSets, pGuid, ulGuidOffset, pInputParams, pOutputParams, cBindings, rgBindings, rgStatus,
pcRowsAffected, ppRowset); pcRowsAffected, ppRowset);
@ -892,13 +892,13 @@ HRESULT __RPC_STUB ICommandText_SetCommandText_Stub(ICommandText* This, REFGUID
HRESULT CALLBACK IDBAsynchNotify_OnLowResource_Proxy(IDBAsynchNotify* This, DB_DWRESERVE dwReserved) HRESULT CALLBACK IDBAsynchNotify_OnLowResource_Proxy(IDBAsynchNotify* This, DB_DWRESERVE dwReserved)
{ {
FIXME("(%p)->(%08x): stub\n", This, dwReserved); FIXME("(%p)->(%08lx): stub\n", This, dwReserved);
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT __RPC_STUB IDBAsynchNotify_OnLowResource_Stub(IDBAsynchNotify* This, DB_DWRESERVE dwReserved) HRESULT __RPC_STUB IDBAsynchNotify_OnLowResource_Stub(IDBAsynchNotify* This, DB_DWRESERVE dwReserved)
{ {
FIXME("(%p)->(%08x): stub\n", This, dwReserved); FIXME("(%p)->(%08lx): stub\n", This, dwReserved);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -906,7 +906,7 @@ HRESULT CALLBACK IDBAsynchNotify_OnProgress_Proxy(IDBAsynchNotify* This, HCHAPTE
DBCOUNTITEM ulProgress, DBCOUNTITEM ulProgressMax, DBASYNCHPHASE eAsynchPhase, DBCOUNTITEM ulProgress, DBCOUNTITEM ulProgressMax, DBASYNCHPHASE eAsynchPhase,
LPOLESTR pwszStatusText) LPOLESTR pwszStatusText)
{ {
TRACE("(%p)->(%lx, %d, %d, %d, %d, %s)\n", This, hChapter, eOperation, ulProgress, ulProgressMax, TRACE("(%p)->(%lx, %d, %ld, %ld, %d, %s)\n", This, hChapter, eOperation, ulProgress, ulProgressMax,
eAsynchPhase, debugstr_w(pwszStatusText)); eAsynchPhase, debugstr_w(pwszStatusText));
return IDBAsynchNotify_RemoteOnProgress_Proxy(This, hChapter, eOperation, ulProgress, ulProgressMax, eAsynchPhase, return IDBAsynchNotify_RemoteOnProgress_Proxy(This, hChapter, eOperation, ulProgress, ulProgressMax, eAsynchPhase,
@ -917,7 +917,7 @@ HRESULT __RPC_STUB IDBAsynchNotify_OnProgress_Stub(IDBAsynchNotify* This, HCHAPT
DBCOUNTITEM ulProgress, DBCOUNTITEM ulProgressMax, DBASYNCHPHASE eAsynchPhase, DBCOUNTITEM ulProgress, DBCOUNTITEM ulProgressMax, DBASYNCHPHASE eAsynchPhase,
LPOLESTR pwszStatusText) LPOLESTR pwszStatusText)
{ {
TRACE("(%p)->(%lx, %d, %d, %d, %d, %s)\n", This, hChapter, eOperation, ulProgress, ulProgressMax, TRACE("(%p)->(%lx, %d, %ld, %ld, %d, %s)\n", This, hChapter, eOperation, ulProgress, ulProgressMax,
eAsynchPhase, debugstr_w(pwszStatusText)); eAsynchPhase, debugstr_w(pwszStatusText));
return IDBAsynchNotify_OnProgress(This, hChapter, eOperation, ulProgress, ulProgressMax, eAsynchPhase, return IDBAsynchNotify_OnProgress(This, hChapter, eOperation, ulProgress, ulProgressMax, eAsynchPhase,
pwszStatusText); pwszStatusText);

2
dlls/oledb32/convert.c
View File

@ -163,7 +163,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
convert *This = impl_from_IDataConvert(iface); convert *This = impl_from_IDataConvert(iface);
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%d, %d, %d, %p, %p, %p, %d, %d, %p, %d, %d, %x)\n", This, TRACE("(%p)->(%d, %d, %ld, %p, %p, %p, %ld, %d, %p, %d, %d, %x)\n", This,
src_type, dst_type, src_len, dst_len, src, dst, dst_max_len, src_type, dst_type, src_len, dst_len, src, dst, dst_max_len,
src_status, dst_status, precision, scale, flags); src_status, dst_status, precision, scale, flags);

372
dlls/oledb32/tests/convert.c
View File

File diff suppressed because it is too large Load Diff

6
include/access.idl
View File

@ -48,10 +48,10 @@ interface IAccessor : IUnknown
[call_as(CreateAccessor)] [call_as(CreateAccessor)]
HRESULT RemoteCreateAccessor([in] DBACCESSORFLAGS dwAccessorFlags, HRESULT RemoteCreateAccessor([in] DBACCESSORFLAGS dwAccessorFlags,
[in] DBCOUNTITEM cBindings, [in] DBCOUNTITEM cBindings,
[in, unique, size_is(cBindings)] DBBINDING *rgBindings, [in, unique, size_is((ULONG)cBindings)] DBBINDING *rgBindings,
[in] DBLENGTH cbRowSize, [in] DBLENGTH cbRowSize,
[out] HACCESSOR *phAccessor, [out] HACCESSOR *phAccessor,
[in, out, unique, size_is(cBindings)] DBBINDSTATUS *rgStatus, [in, out, unique, size_is((ULONG)cBindings)] DBBINDSTATUS *rgStatus,
[out] IErrorInfo **ppErrorInfoRem); [out] IErrorInfo **ppErrorInfoRem);
[local] [local]
@ -64,7 +64,7 @@ interface IAccessor : IUnknown
HRESULT RemoteGetBindings([in] HACCESSOR hAccessor, HRESULT RemoteGetBindings([in] HACCESSOR hAccessor,
[out] DBACCESSORFLAGS *pdwAccessorFlags, [out] DBACCESSORFLAGS *pdwAccessorFlags,
[in, out] DBCOUNTITEM *pcBindings, [in, out] DBCOUNTITEM *pcBindings,
[out, size_is(,*pcBindings)] DBBINDING **prgBindings, [out, size_is(,(ULONG)*pcBindings)] DBBINDING **prgBindings,
[out] IErrorInfo **ppErrorInfoRem); [out] IErrorInfo **ppErrorInfoRem);
[local] [local]

4
include/cmdbas.idl
View File

@ -46,8 +46,8 @@ interface ICommand : IUnknown
[in, unique] RMTPACK *pInputParams, [in, unique] RMTPACK *pInputParams,
[in, out, unique] RMTPACK *pOutputParams, [in, out, unique] RMTPACK *pOutputParams,
[in] DBCOUNTITEM cBindings, [in] DBCOUNTITEM cBindings,
[in, unique, size_is(cBindings)] DBBINDING *rgBindings, [in, unique, size_is((ULONG)cBindings)] DBBINDING *rgBindings,
[in, out, unique, size_is(cBindings)] DBSTATUS *rgStatus, [in, out, unique, size_is((ULONG)cBindings)] DBSTATUS *rgStatus,
[in, out, unique] DBROWCOUNT *pcRowsAffected, [in, out, unique] DBROWCOUNT *pcRowsAffected,
[in, out, unique, iid_is(riid)] IUnknown **ppRowset); [in, out, unique, iid_is(riid)] IUnknown **ppRowset);

24
include/oledb.idl
View File

@ -28,18 +28,18 @@ import "ocidl.idl";
import "propidl.idl"; import "propidl.idl";
import "urlmon.idl"; import "urlmon.idl";
typedef ULONG DBBYTEOFFSET; typedef ULONG_PTR DBBYTEOFFSET;
typedef LONG DBROWOFFSET; typedef LONG_PTR DBROWOFFSET;
typedef LONG DBROWCOUNT; typedef LONG_PTR DBROWCOUNT;
typedef ULONG DBCOUNTITEM; typedef ULONG_PTR DBCOUNTITEM;
typedef ULONG DBLENGTH; typedef ULONG_PTR DBLENGTH;
typedef ULONG DBORDINAL; typedef ULONG_PTR DBORDINAL;
typedef ULONG DBBKMARK; typedef ULONG_PTR DBBKMARK;
typedef DWORD DB_DWRESERVE; typedef DWORD_PTR DB_DWRESERVE;
typedef ULONG DBREFCOUNT; typedef ULONG_PTR DBREFCOUNT;
typedef ULONG DB_UPARAMS; typedef ULONG_PTR DB_UPARAMS;
typedef LONG DB_LPARAMS; typedef LONG_PTR DB_LPARAMS;
typedef DWORD DBHASHVALUE; typedef DWORD_PTR DBHASHVALUE;
typedef struct { typedef struct {
SHORT year; SHORT year;
USHORT month; USHORT month;