Commit 1bf3ebdf authored by Alexandre Julliard's avatar Alexandre Julliard

msado15: Fix some LONG/LONG_PTR mismatches.

parent 0adcd7d1
...@@ -234,10 +234,10 @@ static HRESULT WINAPI command_Execute( _Command *iface, VARIANT *affected, VARIA ...@@ -234,10 +234,10 @@ static HRESULT WINAPI command_Execute( _Command *iface, VARIANT *affected, VARIA
} }
static HRESULT WINAPI command_CreateParameter( _Command *iface, BSTR name, DataTypeEnum type, static HRESULT WINAPI command_CreateParameter( _Command *iface, BSTR name, DataTypeEnum type,
ParameterDirectionEnum direction, LONG size, VARIANT value, ParameterDirectionEnum direction, ADO_LONGPTR size, VARIANT value,
_Parameter **parameter ) _Parameter **parameter )
{ {
FIXME( "%p, %s, %d, %d, %d, %p\n", iface, debugstr_w(name), type, direction, size, parameter ); FIXME( "%p, %s, %d, %d, %ld, %p\n", iface, debugstr_w(name), type, direction, size, parameter );
return E_NOTIMPL; return E_NOTIMPL;
} }
......
...@@ -336,8 +336,10 @@ static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARI ...@@ -336,8 +336,10 @@ static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARI
if (records_affected) if (records_affected)
{ {
ADO_LONGPTR count;
_Recordset_get_RecordCount(recordset, &count);
V_VT(records_affected) = VT_I4; V_VT(records_affected) = VT_I4;
_Recordset_get_RecordCount(recordset, &V_I4(records_affected)); V_I4(records_affected) = count;
} }
*record_set = recordset; *record_set = recordset;
......
...@@ -195,7 +195,7 @@ static HRESULT WINAPI field_get_Properties( Field *iface, Properties **obj ) ...@@ -195,7 +195,7 @@ static HRESULT WINAPI field_get_Properties( Field *iface, Properties **obj )
return S_OK; return S_OK;
} }
static HRESULT WINAPI field_get_ActualSize( Field *iface, LONG *size ) static HRESULT WINAPI field_get_ActualSize( Field *iface, ADO_LONGPTR *size )
{ {
FIXME( "%p, %p\n", iface, size ); FIXME( "%p, %p\n", iface, size );
return E_NOTIMPL; return E_NOTIMPL;
...@@ -211,7 +211,7 @@ static HRESULT WINAPI field_get_Attributes( Field *iface, LONG *attrs ) ...@@ -211,7 +211,7 @@ static HRESULT WINAPI field_get_Attributes( Field *iface, LONG *attrs )
return S_OK; return S_OK;
} }
static HRESULT WINAPI field_get_DefinedSize( Field *iface, LONG *size ) static HRESULT WINAPI field_get_DefinedSize( Field *iface, ADO_LONGPTR *size )
{ {
struct field *field = impl_from_Field( iface ); struct field *field = impl_from_Field( iface );
...@@ -360,11 +360,11 @@ static HRESULT WINAPI field_put_Type( Field *iface, DataTypeEnum type ) ...@@ -360,11 +360,11 @@ static HRESULT WINAPI field_put_Type( Field *iface, DataTypeEnum type )
return S_OK; return S_OK;
} }
static HRESULT WINAPI field_put_DefinedSize( Field *iface, LONG size ) static HRESULT WINAPI field_put_DefinedSize( Field *iface, ADO_LONGPTR size )
{ {
struct field *field = impl_from_Field( iface ); struct field *field = impl_from_Field( iface );
TRACE( "%p, %d\n", field, size ); TRACE( "%p, %ld\n", field, size );
field->defined_size = size; field->defined_size = size;
return S_OK; return S_OK;
...@@ -829,11 +829,11 @@ static HRESULT append_field( struct fields *fields, BSTR name, DataTypeEnum type ...@@ -829,11 +829,11 @@ static HRESULT append_field( struct fields *fields, BSTR name, DataTypeEnum type
return S_OK; return S_OK;
} }
static HRESULT WINAPI fields__Append( Fields *iface, BSTR name, DataTypeEnum type, LONG size, FieldAttributeEnum attr ) static HRESULT WINAPI fields__Append( Fields *iface, BSTR name, DataTypeEnum type, ADO_LONGPTR size, FieldAttributeEnum attr )
{ {
struct fields *fields = impl_from_Fields( iface ); struct fields *fields = impl_from_Fields( iface );
TRACE( "%p, %s, %u, %d, %d\n", fields, debugstr_w(name), type, size, attr ); TRACE( "%p, %s, %u, %ld, %d\n", fields, debugstr_w(name), type, size, attr );
return append_field( fields, name, type, size, attr, NULL ); return append_field( fields, name, type, size, attr, NULL );
} }
...@@ -844,12 +844,12 @@ static HRESULT WINAPI fields_Delete( Fields *iface, VARIANT index ) ...@@ -844,12 +844,12 @@ static HRESULT WINAPI fields_Delete( Fields *iface, VARIANT index )
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI fields_Append( Fields *iface, BSTR name, DataTypeEnum type, LONG size, FieldAttributeEnum attr, static HRESULT WINAPI fields_Append( Fields *iface, BSTR name, DataTypeEnum type, ADO_LONGPTR size, FieldAttributeEnum attr,
VARIANT value ) VARIANT value )
{ {
struct fields *fields = impl_from_Fields( iface ); struct fields *fields = impl_from_Fields( iface );
TRACE( "%p, %s, %u, %d, %d, %s\n", fields, debugstr_w(name), type, size, attr, debugstr_variant(&value) ); TRACE( "%p, %s, %u, %ld, %d, %s\n", fields, debugstr_w(name), type, size, attr, debugstr_variant(&value) );
return append_field( fields, name, type, size, attr, &value ); return append_field( fields, name, type, size, attr, &value );
} }
...@@ -1156,7 +1156,7 @@ static HRESULT WINAPI recordset_get_AbsolutePosition( _Recordset *iface, Positio ...@@ -1156,7 +1156,7 @@ static HRESULT WINAPI recordset_get_AbsolutePosition( _Recordset *iface, Positio
static HRESULT WINAPI recordset_put_AbsolutePosition( _Recordset *iface, PositionEnum_Param pos ) static HRESULT WINAPI recordset_put_AbsolutePosition( _Recordset *iface, PositionEnum_Param pos )
{ {
FIXME( "%p, %d\n", iface, pos ); FIXME( "%p, %ld\n", iface, pos );
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1290,19 +1290,19 @@ static HRESULT WINAPI recordset_put_LockType( _Recordset *iface, LockTypeEnum lo ...@@ -1290,19 +1290,19 @@ static HRESULT WINAPI recordset_put_LockType( _Recordset *iface, LockTypeEnum lo
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI recordset_get_MaxRecords( _Recordset *iface, LONG *max_records ) static HRESULT WINAPI recordset_get_MaxRecords( _Recordset *iface, ADO_LONGPTR *max_records )
{ {
FIXME( "%p, %p\n", iface, max_records ); FIXME( "%p, %p\n", iface, max_records );
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI recordset_put_MaxRecords( _Recordset *iface, LONG max_records ) static HRESULT WINAPI recordset_put_MaxRecords( _Recordset *iface, ADO_LONGPTR max_records )
{ {
FIXME( "%p, %d\n", iface, max_records ); FIXME( "%p, %ld\n", iface, max_records );
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI recordset_get_RecordCount( _Recordset *iface, LONG *count ) static HRESULT WINAPI recordset_get_RecordCount( _Recordset *iface, ADO_LONGPTR *count )
{ {
struct recordset *recordset = impl_from_Recordset( iface ); struct recordset *recordset = impl_from_Recordset( iface );
...@@ -1392,9 +1392,9 @@ static HRESULT WINAPI recordset_GetRows( _Recordset *iface, LONG rows, VARIANT s ...@@ -1392,9 +1392,9 @@ static HRESULT WINAPI recordset_GetRows( _Recordset *iface, LONG rows, VARIANT s
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI recordset_Move( _Recordset *iface, LONG num_records, VARIANT start ) static HRESULT WINAPI recordset_Move( _Recordset *iface, ADO_LONGPTR num_records, VARIANT start )
{ {
FIXME( "%p, %d, %s\n", iface, num_records, debugstr_variant(&start) ); FIXME( "%p, %ld, %s\n", iface, num_records, debugstr_variant(&start) );
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1569,7 +1569,7 @@ static HRESULT WINAPI recordset_get_AbsolutePage( _Recordset *iface, PositionEnu ...@@ -1569,7 +1569,7 @@ static HRESULT WINAPI recordset_get_AbsolutePage( _Recordset *iface, PositionEnu
static HRESULT WINAPI recordset_put_AbsolutePage( _Recordset *iface, PositionEnum_Param pos ) static HRESULT WINAPI recordset_put_AbsolutePage( _Recordset *iface, PositionEnum_Param pos )
{ {
FIXME( "%p, %d\n", iface, pos ); FIXME( "%p, %ld\n", iface, pos );
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1591,7 +1591,7 @@ static HRESULT WINAPI recordset_put_Filter( _Recordset *iface, VARIANT criteria ...@@ -1591,7 +1591,7 @@ static HRESULT WINAPI recordset_put_Filter( _Recordset *iface, VARIANT criteria
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI recordset_get_PageCount( _Recordset *iface, LONG *count ) static HRESULT WINAPI recordset_get_PageCount( _Recordset *iface, ADO_LONGPTR *count )
{ {
FIXME( "%p, %p\n", iface, count ); FIXME( "%p, %p\n", iface, count );
return E_NOTIMPL; return E_NOTIMPL;
...@@ -2061,17 +2061,17 @@ static HRESULT WINAPI rsconstruction_put_Rowset(ADORecordsetConstruction *iface, ...@@ -2061,17 +2061,17 @@ static HRESULT WINAPI rsconstruction_put_Rowset(ADORecordsetConstruction *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI rsconstruction_get_Chapter(ADORecordsetConstruction *iface, LONG *chapter) static HRESULT WINAPI rsconstruction_get_Chapter(ADORecordsetConstruction *iface, ADO_LONGPTR *chapter)
{ {
struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); struct recordset *recordset = impl_from_ADORecordsetConstruction( iface );
FIXME( "%p, %p\n", recordset, chapter ); FIXME( "%p, %p\n", recordset, chapter );
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI rsconstruction_put_Chapter(ADORecordsetConstruction *iface, LONG chapter) static HRESULT WINAPI rsconstruction_put_Chapter(ADORecordsetConstruction *iface, ADO_LONGPTR chapter)
{ {
struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); struct recordset *recordset = impl_from_ADORecordsetConstruction( iface );
FIXME( "%p, %d\n", recordset, chapter ); FIXME( "%p, %ld\n", recordset, chapter );
return E_NOTIMPL; return E_NOTIMPL;
} }
......
...@@ -144,7 +144,7 @@ static HRESULT WINAPI stream_Invoke( _Stream *iface, DISPID member, REFIID riid, ...@@ -144,7 +144,7 @@ static HRESULT WINAPI stream_Invoke( _Stream *iface, DISPID member, REFIID riid,
return hr; return hr;
} }
static HRESULT WINAPI stream_get_Size( _Stream *iface, LONG *size ) static HRESULT WINAPI stream_get_Size( _Stream *iface, ADO_LONGPTR *size )
{ {
struct stream *stream = impl_from_Stream( iface ); struct stream *stream = impl_from_Stream( iface );
TRACE( "%p, %p\n", stream, size ); TRACE( "%p, %p\n", stream, size );
...@@ -166,7 +166,7 @@ static HRESULT WINAPI stream_get_EOS( _Stream *iface, VARIANT_BOOL *eos ) ...@@ -166,7 +166,7 @@ static HRESULT WINAPI stream_get_EOS( _Stream *iface, VARIANT_BOOL *eos )
return S_OK; return S_OK;
} }
static HRESULT WINAPI stream_get_Position( _Stream *iface, LONG *pos ) static HRESULT WINAPI stream_get_Position( _Stream *iface, ADO_LONGPTR *pos )
{ {
struct stream *stream = impl_from_Stream( iface ); struct stream *stream = impl_from_Stream( iface );
TRACE( "%p, %p\n", stream, pos ); TRACE( "%p, %p\n", stream, pos );
...@@ -191,12 +191,12 @@ static HRESULT resize_buffer( struct stream *stream, LONG size ) ...@@ -191,12 +191,12 @@ static HRESULT resize_buffer( struct stream *stream, LONG size )
return S_OK; return S_OK;
} }
static HRESULT WINAPI stream_put_Position( _Stream *iface, LONG pos ) static HRESULT WINAPI stream_put_Position( _Stream *iface, ADO_LONGPTR pos )
{ {
struct stream *stream = impl_from_Stream( iface ); struct stream *stream = impl_from_Stream( iface );
HRESULT hr; HRESULT hr;
TRACE( "%p, %d\n", stream, pos ); TRACE( "%p, %ld\n", stream, pos );
if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed );
if (pos < 0) return MAKE_ADO_HRESULT( adErrInvalidArgument ); if (pos < 0) return MAKE_ADO_HRESULT( adErrInvalidArgument );
...@@ -406,9 +406,9 @@ static HRESULT WINAPI stream_SetEOS( _Stream *iface ) ...@@ -406,9 +406,9 @@ static HRESULT WINAPI stream_SetEOS( _Stream *iface )
return resize_buffer( stream, stream->pos ); return resize_buffer( stream, stream->pos );
} }
static HRESULT WINAPI stream_CopyTo( _Stream *iface, _Stream *dst, LONG size ) static HRESULT WINAPI stream_CopyTo( _Stream *iface, _Stream *dst, ADO_LONGPTR size )
{ {
FIXME( "%p, %p, %d\n", iface, dst, size ); FIXME( "%p, %p, %ld\n", iface, dst, size );
return E_NOTIMPL; return E_NOTIMPL;
} }
......
...@@ -53,6 +53,7 @@ static void test_Recordset(void) ...@@ -53,6 +53,7 @@ static void test_Recordset(void)
Properties *props; Properties *props;
Property *prop; Property *prop;
LONG count, state; LONG count, state;
ADO_LONGPTR rec_count;
VARIANT missing, val, index; VARIANT missing, val, index;
CursorLocationEnum location; CursorLocationEnum location;
CursorTypeEnum cursor; CursorTypeEnum cursor;
...@@ -212,20 +213,20 @@ static void test_Recordset(void) ...@@ -212,20 +213,20 @@ static void test_Recordset(void)
hr = _Recordset_put_Bookmark( recordset, bookmark ); hr = _Recordset_put_Bookmark( recordset, bookmark );
ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr ); ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr );
count = -1; rec_count = -1;
hr = _Recordset_get_RecordCount( recordset, &count ); hr = _Recordset_get_RecordCount( recordset, &rec_count );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
ok( !count, "got %d\n", count ); ok( !rec_count, "got %ld\n", rec_count );
hr = _Recordset_AddNew( recordset, missing, missing ); hr = _Recordset_AddNew( recordset, missing, missing );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
ok( !is_eof( recordset ), "eof\n" ); ok( !is_eof( recordset ), "eof\n" );
ok( !is_bof( recordset ), "bof\n" ); ok( !is_bof( recordset ), "bof\n" );
count = -1; rec_count = -1;
hr = _Recordset_get_RecordCount( recordset, &count ); hr = _Recordset_get_RecordCount( recordset, &rec_count );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
ok( count == 1, "got %d\n", count ); ok( rec_count == 1, "got %ld\n", rec_count );
/* get_Fields still returns the same object */ /* get_Fields still returns the same object */
hr = _Recordset_get_Fields( recordset, &fields2 ); hr = _Recordset_get_Fields( recordset, &fields2 );
...@@ -631,7 +632,7 @@ static void test_ADORecordsetConstruction(void) ...@@ -631,7 +632,7 @@ static void test_ADORecordsetConstruction(void)
if (count > 0) if (count > 0)
{ {
VARIANT index; VARIANT index;
LONG size; ADO_LONGPTR size;
DataTypeEnum type; DataTypeEnum type;
V_VT( &index ) = VT_BSTR; V_VT( &index ) = VT_BSTR;
...@@ -646,7 +647,7 @@ static void test_ADORecordsetConstruction(void) ...@@ -646,7 +647,7 @@ static void test_ADORecordsetConstruction(void)
size = -1; size = -1;
hr = Field_get_DefinedSize( field, &size ); hr = Field_get_DefinedSize( field, &size );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
ok( size == 5, "got %d\n", size ); ok( size == 5, "got %ld\n", size );
VariantClear(&index); VariantClear(&index);
...@@ -672,7 +673,8 @@ static void test_Fields(void) ...@@ -672,7 +673,8 @@ static void test_Fields(void)
Field *field, *field2; Field *field, *field2;
VARIANT val, index; VARIANT val, index;
BSTR name; BSTR name;
LONG count, size; LONG count;
ADO_LONGPTR size;
DataTypeEnum type; DataTypeEnum type;
FieldAttributeEnum attrs; FieldAttributeEnum attrs;
HRESULT hr; HRESULT hr;
...@@ -747,7 +749,7 @@ static void test_Fields(void) ...@@ -747,7 +749,7 @@ static void test_Fields(void)
size = -1; size = -1;
hr = Field_get_DefinedSize( field, &size ); hr = Field_get_DefinedSize( field, &size );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
ok( size == 4, "got %d\n", size ); ok( size == 4, "got %ld\n", size );
attrs = 0xdead; attrs = 0xdead;
hr = Field_get_Attributes( field, &attrs ); hr = Field_get_Attributes( field, &attrs );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
...@@ -785,7 +787,8 @@ static void test_Stream(void) ...@@ -785,7 +787,8 @@ static void test_Stream(void)
VARIANT_BOOL eos; VARIANT_BOOL eos;
StreamTypeEnum type; StreamTypeEnum type;
LineSeparatorEnum sep; LineSeparatorEnum sep;
LONG refs, size, pos; LONG refs;
ADO_LONGPTR size, pos;
ObjectStateEnum state; ObjectStateEnum state;
ConnectModeEnum mode; ConnectModeEnum mode;
BSTR charset, str; BSTR charset, str;
...@@ -875,7 +878,7 @@ static void test_Stream(void) ...@@ -875,7 +878,7 @@ static void test_Stream(void)
size = -1; size = -1;
hr = _Stream_get_Size( stream, &size ); hr = _Stream_get_Size( stream, &size );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
ok( !size, "got %d\n", size ); ok( !size, "got %ld\n", size );
eos = VARIANT_FALSE; eos = VARIANT_FALSE;
hr = _Stream_get_EOS( stream, &eos ); hr = _Stream_get_EOS( stream, &eos );
...@@ -885,12 +888,12 @@ static void test_Stream(void) ...@@ -885,12 +888,12 @@ static void test_Stream(void)
pos = -1; pos = -1;
hr = _Stream_get_Position( stream, &pos ); hr = _Stream_get_Position( stream, &pos );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
ok( !pos, "got %d\n", pos ); ok( !pos, "got %ld\n", pos );
size = -1; size = -1;
hr = _Stream_get_Size( stream, &size ); hr = _Stream_get_Size( stream, &size );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
ok( !size, "got %d\n", size ); ok( !size, "got %ld\n", size );
hr = _Stream_Read( stream, 2, &val ); hr = _Stream_Read( stream, 2, &val );
ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr );
...@@ -903,7 +906,7 @@ static void test_Stream(void) ...@@ -903,7 +906,7 @@ static void test_Stream(void)
pos = -1; pos = -1;
hr = _Stream_get_Position( stream, &pos ); hr = _Stream_get_Position( stream, &pos );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
ok( !pos, "got %d\n", pos ); ok( !pos, "got %ld\n", pos );
str = SysAllocString( L"test" ); str = SysAllocString( L"test" );
hr = _Stream_WriteText( stream, str, adWriteChar ); hr = _Stream_WriteText( stream, str, adWriteChar );
...@@ -925,7 +928,7 @@ static void test_Stream(void) ...@@ -925,7 +928,7 @@ static void test_Stream(void)
pos = -1; pos = -1;
hr = _Stream_get_Position( stream, &pos ); hr = _Stream_get_Position( stream, &pos );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
ok( pos == 10, "got %d\n", pos ); ok( pos == 10, "got %ld\n", pos );
eos = VARIANT_FALSE; eos = VARIANT_FALSE;
hr = _Stream_get_EOS( stream, &eos ); hr = _Stream_get_EOS( stream, &eos );
...@@ -938,7 +941,7 @@ static void test_Stream(void) ...@@ -938,7 +941,7 @@ static void test_Stream(void)
size = -1; size = -1;
hr = _Stream_get_Size( stream, &size ); hr = _Stream_get_Size( stream, &size );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
ok( size == 10, "got %d\n", size ); ok( size == 10, "got %ld\n", size );
hr = _Stream_put_Position( stream, 2 ); hr = _Stream_put_Position( stream, 2 );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
...@@ -949,12 +952,12 @@ static void test_Stream(void) ...@@ -949,12 +952,12 @@ static void test_Stream(void)
pos = -1; pos = -1;
hr = _Stream_get_Position( stream, &pos ); hr = _Stream_get_Position( stream, &pos );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
ok( pos == 2, "got %d\n", pos ); ok( pos == 2, "got %ld\n", pos );
size = -1; size = -1;
hr = _Stream_get_Size( stream, &size ); hr = _Stream_get_Size( stream, &size );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
ok( size == 2, "got %d\n", size ); ok( size == 2, "got %ld\n", size );
hr = _Stream_Close( stream ); hr = _Stream_Close( stream );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
...@@ -1006,7 +1009,7 @@ static void test_Stream(void) ...@@ -1006,7 +1009,7 @@ static void test_Stream(void)
pos = -1; pos = -1;
hr = _Stream_get_Position( stream, &pos ); hr = _Stream_get_Position( stream, &pos );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
ok( pos == 4, "got %d\n", pos ); ok( pos == 4, "got %ld\n", pos );
hr = _Stream_put_Position( stream, 0 ); hr = _Stream_put_Position( stream, 0 );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
...@@ -1020,7 +1023,7 @@ static void test_Stream(void) ...@@ -1020,7 +1023,7 @@ static void test_Stream(void)
pos = -1; pos = -1;
hr = _Stream_get_Position( stream, &pos ); hr = _Stream_get_Position( stream, &pos );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
ok( pos == 4, "got %d\n", pos ); ok( pos == 4, "got %ld\n", pos );
refs = _Stream_Release( stream ); refs = _Stream_Release( stream );
ok( !refs, "got %d\n", refs ); ok( !refs, "got %d\n", refs );
...@@ -1187,7 +1190,7 @@ if (0) /* Crashes on windows */ ...@@ -1187,7 +1190,7 @@ if (0) /* Crashes on windows */
todo_wine ok(!wcscmp(str3, str2) || broken(!wcscmp(str, str2)) /* XP */, "wrong string %s\n", wine_dbgstr_w(str2)); todo_wine ok(!wcscmp(str3, str2) || broken(!wcscmp(str, str2)) /* XP */, "wrong string %s\n", wine_dbgstr_w(str2));
hr = _Connection_Open(connection, str, NULL, NULL, adConnectUnspecified); hr = _Connection_Open(connection, str, NULL, NULL, adConnectUnspecified);
todo_wine ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr);
SysFreeString(str); SysFreeString(str);
str2 = NULL; str2 = NULL;
......
...@@ -51,6 +51,8 @@ interface ConnectionEventsVt; ...@@ -51,6 +51,8 @@ interface ConnectionEventsVt;
dispinterface ConnectionEvents; dispinterface ConnectionEvents;
dispinterface RecordsetEvents; dispinterface RecordsetEvents;
typedef [uuid(54D8B4B9-663B-4a9c-95F6-0E749ABD70F1)] LONG_PTR ADO_LONGPTR;
typedef [uuid(0000052A-0000-0010-8000-00AA006D2EA4)] enum ErrorValueEnum typedef [uuid(0000052A-0000-0010-8000-00AA006D2EA4)] enum ErrorValueEnum
{ {
adErrInvalidArgument = 3001, adErrInvalidArgument = 3001,
...@@ -125,7 +127,7 @@ typedef [uuid(00000528-0000-0010-8000-00aa006d2ea4)] enum PositionEnum ...@@ -125,7 +127,7 @@ typedef [uuid(00000528-0000-0010-8000-00aa006d2ea4)] enum PositionEnum
adPosEOF = -3 adPosEOF = -3
} PositionEnum; } PositionEnum;
typedef [uuid(a56187c5-d690-4037-ae32-a00edc376ac3), public] PositionEnum PositionEnum_Param; typedef [uuid(a56187c5-d690-4037-ae32-a00edc376ac3), public] ADO_LONGPTR PositionEnum_Param;
typedef [uuid(0000051f-0000-0010-8000-00aa006d2ea4)] enum DataTypeEnum typedef [uuid(0000051f-0000-0010-8000-00aa006d2ea4)] enum DataTypeEnum
{ {
...@@ -626,7 +628,7 @@ interface Field20 : _ADO ...@@ -626,7 +628,7 @@ interface Field20 : _ADO
{ {
[id(0x00000455), propget] [id(0x00000455), propget]
HRESULT ActualSize( HRESULT ActualSize(
[out, retval] LONG *size); [out, retval] ADO_LONGPTR *size);
[id(0x0000040c), propget] [id(0x0000040c), propget]
HRESULT Attributes( HRESULT Attributes(
...@@ -634,7 +636,7 @@ interface Field20 : _ADO ...@@ -634,7 +636,7 @@ interface Field20 : _ADO
[id(0x0000044f), propget] [id(0x0000044f), propget]
HRESULT DefinedSize( HRESULT DefinedSize(
[out, retval] LONG *size); [out, retval] ADO_LONGPTR *size);
[id(0x0000044c), propget] [id(0x0000044c), propget]
HRESULT Name( HRESULT Name(
...@@ -699,7 +701,7 @@ interface Field20 : _ADO ...@@ -699,7 +701,7 @@ interface Field20 : _ADO
[id(0x0000044f), propput] [id(0x0000044f), propput]
HRESULT DefinedSize( HRESULT DefinedSize(
[in] LONG size); [in] ADO_LONGPTR size);
[id(0x0000040c), propput] [id(0x0000040c), propput]
HRESULT Attributes( HRESULT Attributes(
...@@ -748,7 +750,7 @@ interface Fields20 : Fields15 ...@@ -748,7 +750,7 @@ interface Fields20 : Fields15
HRESULT _Append( HRESULT _Append(
[in] BSTR name, [in] BSTR name,
[in] DataTypeEnum type, [in] DataTypeEnum type,
[in, defaultvalue(0)] LONG size, [in, defaultvalue(0)] ADO_LONGPTR size,
[in, defaultvalue(adFldUnspecified)] FieldAttributeEnum attr); [in, defaultvalue(adFldUnspecified)] FieldAttributeEnum attr);
[id(0x60030002)] [id(0x60030002)]
...@@ -769,7 +771,7 @@ interface Fields : Fields20 ...@@ -769,7 +771,7 @@ interface Fields : Fields20
HRESULT Append( HRESULT Append(
[in] BSTR name, [in] BSTR name,
[in] DataTypeEnum type, [in] DataTypeEnum type,
[in, defaultvalue(0)] LONG size, [in, defaultvalue(0)] ADO_LONGPTR size,
[in, defaultvalue(adFldUnspecified)] FieldAttributeEnum attr, [in, defaultvalue(adFldUnspecified)] FieldAttributeEnum attr,
[in, optional] VARIANT value); [in, optional] VARIANT value);
...@@ -859,15 +861,15 @@ interface Recordset15 : _ADO ...@@ -859,15 +861,15 @@ interface Recordset15 : _ADO
[id(0x000003f1), propget] [id(0x000003f1), propget]
HRESULT MaxRecords( HRESULT MaxRecords(
[out, retval] LONG *max_records); [out, retval] ADO_LONGPTR *max_records);
[id(0x000003f1), propput] [id(0x000003f1), propput]
HRESULT MaxRecords( HRESULT MaxRecords(
[in] LONG max_records); [in] ADO_LONGPTR max_records);
[id(0x000003f2), propget] [id(0x000003f2), propget]
HRESULT RecordCount( HRESULT RecordCount(
[out, retval] LONG *count); [out, retval] ADO_LONGPTR *count);
[id(0x000003f3), propputref] [id(0x000003f3), propputref]
HRESULT Source( HRESULT Source(
...@@ -905,7 +907,7 @@ interface Recordset15 : _ADO ...@@ -905,7 +907,7 @@ interface Recordset15 : _ADO
[id(0x000003f9)] [id(0x000003f9)]
HRESULT Move( HRESULT Move(
[in] LONG num_records, [in] ADO_LONGPTR num_records,
[in, optional] VARIANT start); [in, optional] VARIANT start);
[id(0x000003fa)] [id(0x000003fa)]
...@@ -963,7 +965,7 @@ interface Recordset15 : _ADO ...@@ -963,7 +965,7 @@ interface Recordset15 : _ADO
[id(0x0000041a), propget] [id(0x0000041a), propget]
HRESULT PageCount( HRESULT PageCount(
[out, retval] LONG *count); [out, retval] ADO_LONGPTR *count);
[id(0x00000418), propget] [id(0x00000418), propget]
HRESULT PageSize( HRESULT PageSize(
...@@ -1408,11 +1410,11 @@ interface _Parameter : _ADO ...@@ -1408,11 +1410,11 @@ interface _Parameter : _ADO
[id(0x6003000c), propput] [id(0x6003000c), propput]
HRESULT Size( HRESULT Size(
[in] LONG size); [in] ADO_LONGPTR size);
[id(0x6003000c), propget] [id(0x6003000c), propget]
HRESULT Size( HRESULT Size(
[out, retval] LONG *size); [out, retval] ADO_LONGPTR *size);
[id(0x6003000e)] [id(0x6003000e)]
HRESULT AppendChunk( HRESULT AppendChunk(
...@@ -1517,7 +1519,7 @@ interface Command15 : _ADO ...@@ -1517,7 +1519,7 @@ interface Command15 : _ADO
[in, defaultvalue("")] BSTR name, [in, defaultvalue("")] BSTR name,
[in, defaultvalue(adEmpty)] DataTypeEnum type, [in, defaultvalue(adEmpty)] DataTypeEnum type,
[in, defaultvalue(adParamInput)] ParameterDirectionEnum direction, [in, defaultvalue(adParamInput)] ParameterDirectionEnum direction,
[in, defaultvalue(0)] LONG size, [in, defaultvalue(0)] ADO_LONGPTR size,
[in, optional] VARIANT value, [in, optional] VARIANT value,
[out, retval] _Parameter **parameter); [out, retval] _Parameter **parameter);
...@@ -1844,7 +1846,7 @@ interface _Stream : IDispatch ...@@ -1844,7 +1846,7 @@ interface _Stream : IDispatch
{ {
[id(1), propget] [id(1), propget]
HRESULT Size( HRESULT Size(
[out, retval] LONG *size); [out, retval] ADO_LONGPTR *size);
[id(2), propget] [id(2), propget]
HRESULT EOS( HRESULT EOS(
...@@ -1852,11 +1854,11 @@ interface _Stream : IDispatch ...@@ -1852,11 +1854,11 @@ interface _Stream : IDispatch
[id(3), propget] [id(3), propget]
HRESULT Position( HRESULT Position(
[out, retval] LONG *position); [out, retval] ADO_LONGPTR *position);
[id(3), propput] [id(3), propput]
HRESULT Position( HRESULT Position(
[in] LONG position); [in] ADO_LONGPTR position);
[id(4), propget] [id(4), propget]
HRESULT Type( HRESULT Type(
...@@ -1923,7 +1925,7 @@ interface _Stream : IDispatch ...@@ -1923,7 +1925,7 @@ interface _Stream : IDispatch
[id(15)] [id(15)]
HRESULT CopyTo( HRESULT CopyTo(
[in] _Stream *dest, [in] _Stream *dest,
[in, defaultvalue(-1)] LONG size); [in, defaultvalue(-1)] ADO_LONGPTR size);
[id(16)] [id(16)]
HRESULT Flush(void); HRESULT Flush(void);
...@@ -2111,11 +2113,11 @@ interface ADORecordsetConstruction : IDispatch ...@@ -2111,11 +2113,11 @@ interface ADORecordsetConstruction : IDispatch
[propget] [propget]
HRESULT Chapter( HRESULT Chapter(
[out, retval] LONG *chapter); [out, retval] ADO_LONGPTR *chapter);
[propput] [propput]
HRESULT Chapter( HRESULT Chapter(
[in] LONG chapter); [in] ADO_LONGPTR chapter);
[propget] [propget]
HRESULT RowPosition( HRESULT RowPosition(
......
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