[SHELL32] CDrivesFolder: Implement the eject and disconnect menu items. CORE-13841

[reactos.git] / dll / win32 / windowscodecs / stream.c

diff --git a/dll/win32/windowscodecs/stream.c b/dll/win32/windowscodecs/stream.c
index 619c021..f585036 100644 (file)
--- a/dll/win32/windowscodecs/stream.c
+++ b/dll/win32/windowscodecs/stream.c
@@ -16,22 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <wine/debug.h>
-
-#define COBJMACROS
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <objbase.h>
-#include <shlwapi.h>
-#include <wincodec.h>
 #include "wincodecs_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+#include <shlwapi.h>
 
 /******************************************
  * StreamOnMemory implementation
@@ -761,7 +748,7 @@ static HRESULT WINAPI IWICStreamImpl_QueryInterface(IWICStream *iface,
     if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IStream, iid) ||
         IsEqualIID(&IID_ISequentialStream, iid) || IsEqualIID(&IID_IWICStream, iid))
     {
-        *ppv = This;
+        *ppv = &This->IWICStream_iface;
         IUnknown_AddRef((IUnknown*)*ppv);
         return S_OK;
     }