From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 23 Dec 2013 14:20:15 +0000 (+0000)
Subject: [ADVPACK]
X-Git-Tag: ReactOS-0.3.16~490
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=841399ed9501447df90f5c9869652eea669bfe19

[ADVPACK]
* 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=61345
---

diff --git a/reactos/dll/win32/advpack/advpack.c b/reactos/dll/win32/advpack/advpack.c
index 597846e43a6..7013c5decd7 100644
--- a/reactos/dll/win32/advpack/advpack.c
+++ b/reactos/dll/win32/advpack/advpack.c
@@ -19,24 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <winreg.h>
-#include <winternl.h>
-//#include "winnls.h"
-//#include "setupapi.h"
-#include <advpub.h>
-#include <wine/unicode.h>
-#include <wine/debug.h>
 #include "advpack_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(advpack);
-
 typedef HRESULT (WINAPI *DLLREGISTER) (void);
 
 #define MAX_FIELD_LENGTH    512
diff --git a/reactos/dll/win32/advpack/advpack_private.h b/reactos/dll/win32/advpack/advpack_private.h
index 205cc60dc2b..ec0955eecfc 100644
--- a/reactos/dll/win32/advpack/advpack_private.h
+++ b/reactos/dll/win32/advpack/advpack_private.h
@@ -21,6 +21,24 @@
 #ifndef __ADVPACK_PRIVATE_H
 #define __ADVPACK_PRIVATE_H
 
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <winreg.h>
+#include <winternl.h>
+#include <advpub.h>
+
+#include <wine/unicode.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(advpack);
+
 HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) DECLSPEC_HIDDEN;
 LPWSTR get_parameter(LPWSTR *params, WCHAR separator, BOOL quoted) DECLSPEC_HIDDEN;
 void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECLSPEC_HIDDEN;
diff --git a/reactos/dll/win32/advpack/files.c b/reactos/dll/win32/advpack/files.c
index 3c82c213dd8..a03bcc8ac40 100644
--- a/reactos/dll/win32/advpack/files.c
+++ b/reactos/dll/win32/advpack/files.c
@@ -18,25 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#include <stdarg.h>
-//#include <stdlib.h>
+#include "advpack_private.h"
 
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <winreg.h>
 #include <winver.h>
-#include <winternl.h>
-//#include "setupapi.h"
-#include <advpub.h>
 #include <fdi.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
-#include "advpack_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(advpack);
 
 /* converts an ansi double null-terminated list to a unicode list */
 static LPWSTR ansi_to_unicode_list(LPCSTR ansi_list)
diff --git a/reactos/dll/win32/advpack/install.c b/reactos/dll/win32/advpack/install.c
index dc251f0ef20..946e64bbd9a 100644
--- a/reactos/dll/win32/advpack/install.c
+++ b/reactos/dll/win32/advpack/install.c
@@ -18,27 +18,9 @@
  * 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 <stdlib.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <winreg.h>
-#include <winternl.h>
-//#include "winnls.h"
-//#include "setupapi.h"
-#include <advpub.h>
-#include <ole2.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
 #include "advpack_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(advpack);
+#include <ole2.h>
 
 #define SPAPI_ERROR     0xE0000000L
 #define SPAPI_PREFIX    0x800F0000L
diff --git a/reactos/dll/win32/advpack/reg.c b/reactos/dll/win32/advpack/reg.c
index b01438f4515..39f42e37ff1 100644
--- a/reactos/dll/win32/advpack/reg.c
+++ b/reactos/dll/win32/advpack/reg.c
@@ -18,20 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-//#include "winerror.h"
-#include <winuser.h>
-#include <winternl.h>
-#include <advpub.h>
-#include <wine/unicode.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(advpack);
+
+#include "advpack_private.h"
 
 static const WCHAR REGINST[] = {'R','E','G','I','N','S','T',0};
 static const WCHAR Strings[] = {'S','t','r','i','n','g','s',0};