[PATCH 2/3] shlwapi: Fix QueryInterface for file-based streams

Nikolay Sivov nsivov at codeweavers.com
Thu Mar 30 09:23:28 CDT 2017


Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
 dlls/shlwapi/istream.c       | 5 +++--
 dlls/shlwapi/tests/istream.c | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c
index 946d2c84b6..44443b11ba 100644
--- a/dlls/shlwapi/istream.c
+++ b/dlls/shlwapi/istream.c
@@ -69,8 +69,9 @@ static HRESULT WINAPI IStream_fnQueryInterface(IStream *iface, REFIID riid, LPVO
 
   *ppvObj = NULL;
 
-  if(IsEqualIID(riid, &IID_IUnknown) ||
-     IsEqualIID(riid, &IID_IStream))
+  if (IsEqualIID(riid, &IID_IStream) ||
+      IsEqualIID(riid, &IID_ISequentialStream) ||
+      IsEqualIID(riid, &IID_IUnknown))
   {
     IStream_AddRef(iface);
     *ppvObj = iface;
diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c
index 54a73fcf5e..59c07347ff 100644
--- a/dlls/shlwapi/tests/istream.c
+++ b/dlls/shlwapi/tests/istream.c
@@ -30,6 +30,7 @@
 
 static void test_IStream_invalid_operations(IStream * stream, DWORD mode)
 {
+    ISequentialStream *seqstream;
     HRESULT ret;
     IStream * clone;
     ULONG refcount;
@@ -39,6 +40,11 @@ static void test_IStream_invalid_operations(IStream * stream, DWORD mode)
     ULONG count;
     char data[256];
 
+    ret = IStream_QueryInterface(stream, &IID_ISequentialStream, (void **)&seqstream);
+    ok(ret == S_OK, "got 0x%08x\n", ret);
+    ok(seqstream == (ISequentialStream *)stream, "unexpected interface pointer\n");
+    ISequentialStream_Release(seqstream);
+
     U(uzero).HighPart = 0;
     U(uzero).LowPart = 0;
     U(uret).HighPart = 0;
-- 
2.11.0




More information about the wine-patches mailing list