Hans Leidekker : msado15: Implement _Stream_get_Size.
Alexandre Julliard
julliard at winehq.org
Mon Dec 9 16:57:38 CST 2019
Module: wine
Branch: master
Commit: 93a7a9037ad01ba6d029e22b3868ccc3ab624933
URL: https://source.winehq.org/git/wine.git/?a=commit;h=93a7a9037ad01ba6d029e22b3868ccc3ab624933
Author: Hans Leidekker <hans at codeweavers.com>
Date: Mon Dec 9 11:24:33 2019 +0100
msado15: Implement _Stream_get_Size.
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msado15/stream.c | 9 +++++++--
dlls/msado15/tests/msado15.c | 15 ++++++++++++++-
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c
index eb384fbf94..0c4d9ea425 100644
--- a/dlls/msado15/stream.c
+++ b/dlls/msado15/stream.c
@@ -113,8 +113,13 @@ static HRESULT WINAPI stream_Invoke( _Stream *iface, DISPID member, REFIID riid,
static HRESULT WINAPI stream_get_Size( _Stream *iface, LONG *size )
{
- FIXME( "%p, %p\n", iface, size );
- return E_NOTIMPL;
+ struct stream *stream = impl_from_Stream( iface );
+ TRACE( "%p, %p\n", stream, size );
+
+ if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed );
+
+ *size = stream->size;
+ return S_OK;
}
static HRESULT WINAPI stream_get_EOS( _Stream *iface, VARIANT_BOOL *eos )
diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c
index c7563228de..1755a7f3da 100644
--- a/dlls/msado15/tests/msado15.c
+++ b/dlls/msado15/tests/msado15.c
@@ -50,7 +50,7 @@ static void test_Stream(void)
{
_Stream *stream;
StreamTypeEnum type;
- LONG refs, pos;
+ LONG refs, size, pos;
ObjectStateEnum state;
VARIANT missing, val;
HRESULT hr;
@@ -58,6 +58,9 @@ static void test_Stream(void)
hr = CoCreateInstance( &CLSID_Stream, NULL, CLSCTX_INPROC_SERVER, &IID__Stream, (void **)&stream );
ok( hr == S_OK, "got %08x\n", hr );
+ hr = _Stream_get_Size( stream, &size );
+ ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr );
+
hr = _Stream_get_Position( stream, &pos );
ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr );
@@ -103,11 +106,21 @@ static void test_Stream(void)
ok( hr == S_OK, "got %08x\n", hr );
ok( state == adStateOpen, "got %u\n", state );
+ size = -1;
+ hr = _Stream_get_Size( stream, &size );
+ ok( hr == S_OK, "got %08x\n", hr );
+ ok( !size, "got %d\n", size );
+
pos = -1;
hr = _Stream_get_Position( stream, &pos );
ok( hr == S_OK, "got %08x\n", hr );
ok( !pos, "got %d\n", pos );
+ size = -1;
+ hr = _Stream_get_Size( stream, &size );
+ ok( hr == S_OK, "got %08x\n", hr );
+ ok( !size, "got %d\n", size );
+
hr = _Stream_Read( stream, 2, &val );
ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr );
More information about the wine-cvs
mailing list