01/01: [WUAPI] Sync with Wine Staging 3.3. CORE-14434

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=150fba8dffa9054ba4296…

commit 150fba8dffa9054ba4296c110938708811fc7633
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sun Mar 25 12:43:17 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sun Mar 25 12:43:17 2018 +0100

    [WUAPI] Sync with Wine Staging 3.3. CORE-14434
---
 dll/win32/wuapi/CMakeLists.txt  |  4 ++--
 dll/win32/wuapi/downloader.c    | 15 +++++++++++++++
 dll/win32/wuapi/installer.c     | 14 ++++++++++++++
 dll/win32/wuapi/main.c          | 15 ++++++++++++++-
 dll/win32/wuapi/precomp.h       | 23 +++++++++++++++++++++++
 dll/win32/wuapi/searcher.c      | 14 ++++++++++++++
 dll/win32/wuapi/session.c       | 14 ++++++++++++++
 dll/win32/wuapi/systeminfo.c    | 14 ++++++++++++++
 dll/win32/wuapi/updates.c       | 14 ++++++++++++++
 dll/win32/wuapi/wuapi_private.h | 22 ----------------------
 media/doc/README.WINE           |  2 +-
 11 files changed, 125 insertions(+), 26 deletions(-)

diff --git a/dll/win32/wuapi/CMakeLists.txt b/dll/win32/wuapi/CMakeLists.txt
index 3329a67ab8..c5afb5a95c 100644
--- a/dll/win32/wuapi/CMakeLists.txt
+++ b/dll/win32/wuapi/CMakeLists.txt
@@ -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)
diff --git a/dll/win32/wuapi/downloader.c b/dll/win32/wuapi/downloader.c
index 9fd6e849ad..e17e1554f8 100644
--- a/dll/win32/wuapi/downloader.c
+++ b/dll/win32/wuapi/downloader.c
@@ -18,8 +18,23 @@
  * 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;
diff --git a/dll/win32/wuapi/installer.c b/dll/win32/wuapi/installer.c
index e2f41e839a..46c8699fbe 100644
--- a/dll/win32/wuapi/installer.c
+++ b/dll/win32/wuapi/installer.c
@@ -18,8 +18,22 @@
  * 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;
diff --git a/dll/win32/wuapi/main.c b/dll/win32/wuapi/main.c
index 104bfe1a79..0527ee53ba 100644
--- a/dll/win32/wuapi/main.c
+++ b/dll/win32/wuapi/main.c
@@ -18,9 +18,22 @@
  * 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
index 0000000000..a52e44b9bf
--- /dev/null
+++ b/dll/win32/wuapi/precomp.h
@@ -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_ */
diff --git a/dll/win32/wuapi/searcher.c b/dll/win32/wuapi/searcher.c
index bf9d0c187e..1ca8020a09 100644
--- a/dll/win32/wuapi/searcher.c
+++ b/dll/win32/wuapi/searcher.c
@@ -18,8 +18,22 @@
  * 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;
diff --git a/dll/win32/wuapi/session.c b/dll/win32/wuapi/session.c
index 48cdee9fd5..acc7cb0a35 100644
--- a/dll/win32/wuapi/session.c
+++ b/dll/win32/wuapi/session.c
@@ -18,8 +18,22 @@
  * 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;
diff --git a/dll/win32/wuapi/systeminfo.c b/dll/win32/wuapi/systeminfo.c
index a30879f623..7c62bed529 100644
--- a/dll/win32/wuapi/systeminfo.c
+++ b/dll/win32/wuapi/systeminfo.c
@@ -19,8 +19,22 @@
  * 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;
diff --git a/dll/win32/wuapi/updates.c b/dll/win32/wuapi/updates.c
index fd3ad42d26..4f6648c5af 100644
--- a/dll/win32/wuapi/updates.c
+++ b/dll/win32/wuapi/updates.c
@@ -18,8 +18,22 @@
  * 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;
diff --git a/dll/win32/wuapi/wuapi_private.h b/dll/win32/wuapi/wuapi_private.h
index 4ef2f5115b..62b6dec521 100644
--- a/dll/win32/wuapi/wuapi_private.h
+++ b/dll/win32/wuapi/wuapi_private.h
@@ -16,31 +16,9 @@
  * 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_ */
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 4b31b28fcf..9d32801102 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -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