[SHLWAPI] Sync with Wine Staging 3.3. CORE-14434

[reactos.git] / dll / win32 / shlwapi / regstream.c

diff --git a/dll/win32/shlwapi/regstream.c b/dll/win32/shlwapi/regstream.c
index 2ef0da2..63615d3 100644 (file)
--- a/dll/win32/shlwapi/regstream.c
+++ b/dll/win32/shlwapi/regstream.c
@@ -19,23 +19,19 @@
  * 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 <stdarg.h>
-//#include <string.h>
+#include <string.h>
 
 #define COBJMACROS
 
-//#include "winerror.h"
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <winreg.h>
-//#include "shlwapi.h"
+#include "winerror.h"
+#include "windef.h"
+#include "winbase.h"
+#include "objbase.h"
+#include "winreg.h"
+#include "shlwapi.h"
 
-#include <wine/debug.h>
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
@@ -71,10 +67,8 @@ static HRESULT WINAPI IStream_fnQueryInterface(IStream *iface, REFIID riid, LPVO
 
        *ppvObj = NULL;
 
-       if(IsEqualIID(riid, &IID_IUnknown))     /*IUnknown*/
-         *ppvObj = This;
-       else if(IsEqualIID(riid, &IID_IStream)) /*IStream*/
-         *ppvObj = This;
+       if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IStream))
+         *ppvObj = &This->IStream_iface;
 
        if(*ppvObj)
        {