[WUAPI] Sync with Wine Staging 4.18. CORE-16441

[reactos.git] / dll / win32 / wuapi / main.c

diff --git a/dll/win32/wuapi/main.c b/dll/win32/wuapi/main.c
index b0cbca8..c2ed95e 100644 (file)
--- a/dll/win32/wuapi/main.c
+++ b/dll/win32/wuapi/main.c
@@ -18,28 +18,23 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
 #define COBJMACROS
 
-#include <config.h>
 #include <stdarg.h>
 
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "ole2.h"
-#include <objbase.h>
-#include <rpcproxy.h>
-#include <wuapi.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "ole2.h"
+#include "rpcproxy.h"
+#include "wuapi.h"
 
-#include <wine/debug.h>
+#include "wine/debug.h"
 #include "wuapi_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
 
-typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj );
+typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj );
 
 typedef struct _wucf
 {
@@ -89,14 +84,11 @@ static HRESULT WINAPI wucf_CreateInstance( IClassFactory *iface, LPUNKNOWN pOute
     if (pOuter)
         return CLASS_E_NOAGGREGATION;
 
-    r = This->pfnCreateInstance( pOuter, (LPVOID *)&punk );
+    r = This->pfnCreateInstance( (LPVOID *)&punk );
     if (FAILED(r))
         return r;
 
     r = IUnknown_QueryInterface( punk, riid, ppobj );
-    if (FAILED(r))
-        return r;
-
     IUnknown_Release( punk );
     return r;
 }
@@ -132,8 +124,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv )
         instance = hinst;
         DisableThreadLibraryCalls( hinst );
         break;
-    case DLL_PROCESS_DETACH:
-        break;
     }
     return TRUE;
 }