[WUAPI]

* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716

svn path=/trunk/; revision=61483

diff --git a/reactos/dll/win32/wuapi/downloader.c b/reactos/dll/win32/wuapi/downloader.c
index 3bd6cc2..5749ed8 100644 (file)
--- a/reactos/dll/win32/wuapi/downloader.c
+++ b/reactos/dll/win32/wuapi/downloader.c
@@ -18,24 +18,7 @@
  * 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 "initguid.h"
-#include <wuapi.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
+#include "wuapi_private.h"
 
 typedef struct _update_downloader
 {

diff --git a/reactos/dll/win32/wuapi/installer.c b/reactos/dll/win32/wuapi/installer.c
index d3a8e84..ae2e5ae 100644 (file)
--- a/reactos/dll/win32/wuapi/installer.c
+++ b/reactos/dll/win32/wuapi/installer.c
@@ -18,23 +18,7 @@
  * 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 <wuapi.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
+#include "wuapi_private.h"
 
 typedef struct _update_installer
 {

diff --git a/reactos/dll/win32/wuapi/main.c b/reactos/dll/win32/wuapi/main.c
index aa4b0cd..9449abd 100644 (file)
--- a/reactos/dll/win32/wuapi/main.c
+++ b/reactos/dll/win32/wuapi/main.c
@@ -18,26 +18,9 @@
  * 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 <wine/debug.h>
 #include "wuapi_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
+#include <rpcproxy.h>
 
 typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj );
 

diff --git a/reactos/dll/win32/wuapi/searcher.c b/reactos/dll/win32/wuapi/searcher.c
index 95caf7a..50253fe 100644 (file)
--- a/reactos/dll/win32/wuapi/searcher.c
+++ b/reactos/dll/win32/wuapi/searcher.c
@@ -18,23 +18,7 @@
  * 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 <wuapi.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
+#include "wuapi_private.h"
 
 typedef struct _update_searcher
 {

diff --git a/reactos/dll/win32/wuapi/session.c b/reactos/dll/win32/wuapi/session.c
index 8c4b930..59d3f6c 100644 (file)
--- a/reactos/dll/win32/wuapi/session.c
+++ b/reactos/dll/win32/wuapi/session.c
@@ -18,25 +18,8 @@
  * 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 <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/reactos/dll/win32/wuapi/systeminfo.c b/reactos/dll/win32/wuapi/systeminfo.c
index b70799a..680f02f 100644 (file)
--- a/reactos/dll/win32/wuapi/systeminfo.c
+++ b/reactos/dll/win32/wuapi/systeminfo.c
@@ -19,23 +19,7 @@
  * 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 <wuapi.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
+#include "wuapi_private.h"
 
 typedef struct _systeminfo
 {

diff --git a/reactos/dll/win32/wuapi/updates.c b/reactos/dll/win32/wuapi/updates.c
index a4ddcde..dad6ac1 100644 (file)
--- a/reactos/dll/win32/wuapi/updates.c
+++ b/reactos/dll/win32/wuapi/updates.c
@@ -18,23 +18,7 @@
  * 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 <wuapi.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
+#include "wuapi_private.h"
 
 typedef struct _automatic_updates
 {

diff --git a/reactos/dll/win32/wuapi/wuapi_private.h b/reactos/dll/win32/wuapi/wuapi_private.h
index 444722b..6e569a7 100644 (file)
--- a/reactos/dll/win32/wuapi/wuapi_private.h
+++ b/reactos/dll/win32/wuapi/wuapi_private.h
@@ -16,6 +16,23 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <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( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN;
 extern HRESULT UpdateSession_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN;
 extern HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN;