[WUAPI] Sync with Wine Staging 3.3. CORE-14434
authorAmine Khaldi <amine.khaldi@reactos.org>
Sun, 25 Mar 2018 11:43:17 +0000 (12:43 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sun, 25 Mar 2018 11:43:17 +0000 (12:43 +0100)
dll/win32/wuapi/CMakeLists.txt
dll/win32/wuapi/downloader.c
dll/win32/wuapi/installer.c
dll/win32/wuapi/main.c
dll/win32/wuapi/precomp.h [new file with mode: 0644]
dll/win32/wuapi/searcher.c
dll/win32/wuapi/session.c
dll/win32/wuapi/systeminfo.c
dll/win32/wuapi/updates.c
dll/win32/wuapi/wuapi_private.h
media/doc/README.WINE

index 3329a67..c5afb5a 100644 (file)
@@ -14,7 +14,7 @@ list(APPEND SOURCE
     session.c
     systeminfo.c
     updates.c
-    wuapi_private.h)
+    precomp.h)
 
 add_typelib(wuapi_tlb.idl)
 set_source_files_properties(wuapi.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/wuapi_tlb.tlb)
@@ -28,5 +28,5 @@ set_module_type(wuapi win32dll)
 target_link_libraries(wuapi uuid wine wuguid)
 add_importlibs(wuapi msvcrt kernel32 ntdll)
 add_dependencies(wuapi stdole2) # wuapi_tlb.tlb needs stdole2.tlb
-add_pch(wuapi wuapi_private.h SOURCE)
+add_pch(wuapi precomp.h SOURCE)
 add_cd_file(TARGET wuapi DESTINATION reactos/system32 FOR all)
index 9fd6e84..e17e155 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define COBJMACROS
+
+#include "config.h"
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "ole2.h"
+#include "initguid.h"
+#include "wuapi.h"
 #include "wuapi_private.h"
 
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
+
 typedef struct _update_downloader
 {
     IUpdateDownloader IUpdateDownloader_iface;
index e2f41e8..46c8699 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define COBJMACROS
+
+#include "config.h"
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "ole2.h"
+#include "wuapi.h"
 #include "wuapi_private.h"
 
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
+
 typedef struct _update_installer
 {
     IUpdateInstaller IUpdateInstaller_iface;
index 104bfe1..0527ee5 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define COBJMACROS
+
+#include "config.h"
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "ole2.h"
+#include "rpcproxy.h"
+#include "wuapi.h"
+
+#include "wine/debug.h"
 #include "wuapi_private.h"
 
-#include <rpcproxy.h>
+WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
 
 typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj );
 
diff --git a/dll/win32/wuapi/precomp.h b/dll/win32/wuapi/precomp.h
new file mode 100644 (file)
index 0000000..a52e44b
--- /dev/null
@@ -0,0 +1,23 @@
+
+#ifndef _WUAPI_PRECOMP_H_
+#define _WUAPI_PRECOMP_H_
+
+#include <wine/config.h>
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+
+#define COBJMACROS
+
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
+#include <wuapi.h>
+
+#include <wine/debug.h>
+
+#include "wuapi_private.h"
+
+#endif /* !_WUAPI_PRECOMP_H_ */
index bf9d0c1..1ca8020 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define COBJMACROS
+
+#include "config.h"
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "ole2.h"
+#include "wuapi.h"
 #include "wuapi_private.h"
 
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
+
 typedef struct _update_searcher
 {
     IUpdateSearcher IUpdateSearcher_iface;
index 48cdee9..acc7cb0 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define COBJMACROS
+
+#include "config.h"
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "ole2.h"
+#include "wuapi.h"
+
+#include "wine/debug.h"
 #include "wuapi_private.h"
 
+WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
+
 typedef struct _update_session
 {
     IUpdateSession IUpdateSession_iface;
index a30879f..7c62bed 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define COBJMACROS
+
+#include "config.h"
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "ole2.h"
+#include "wuapi.h"
 #include "wuapi_private.h"
 
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
+
 typedef struct _systeminfo
 {
     ISystemInformation ISystemInformation_iface;
index fd3ad42..4f6648c 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define COBJMACROS
+
+#include "config.h"
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "ole2.h"
+#include "wuapi.h"
 #include "wuapi_private.h"
 
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
+
 typedef struct _automatic_updates
 {
     IAutomaticUpdates IAutomaticUpdates_iface;
index 4ef2f51..62b6dec 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef _WUAPI_PRIVATE_H_
-#define _WUAPI_PRIVATE_H_
-
-#include <wine/config.h>
-
-#include <stdarg.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <wuapi.h>
-
-#include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
-
 extern HRESULT AutomaticUpdates_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
 extern HRESULT UpdateSession_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
 extern HRESULT UpdateSearcher_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
 extern HRESULT UpdateDownloader_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
 extern HRESULT UpdateInstaller_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
 extern HRESULT SystemInformation_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
-
-#endif /* _WUAPI_PRIVATE_H_ */
index 4b31b28..9d32801 100644 (file)
@@ -213,7 +213,7 @@ reactos/dll/win32/wmiutils            # Synced to WineStaging-3.3
 reactos/dll/win32/wmvcore             # Synced to WineStaging-3.3
 reactos/dll/win32/wshom.ocx           # Synced to WineStaging-3.3
 reactos/dll/win32/wtsapi32            # Synced to WineStaging-3.3
-reactos/dll/win32/wuapi               # Synced to WineStaging-2.9
+reactos/dll/win32/wuapi               # Synced to WineStaging-3.3
 reactos/dll/win32/xinput1_1           # Synced to WineStaging-2.9
 reactos/dll/win32/xinput1_2           # Synced to WineStaging-2.9
 reactos/dll/win32/xinput1_3           # Synced to WineStaging-2.9