[akhaldi] 61345: [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...

Author: akhaldi
Date: Mon Dec 23 14:20:15 2013
New Revision: 61345

URL: http://svn.reactos.org/svn/reactos?rev=61345&view=rev
Log:
[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

Modified:
    trunk/reactos/dll/win32/advpack/advpack.c
    trunk/reactos/dll/win32/advpack/advpack_private.h
    trunk/reactos/dll/win32/advpack/files.c
    trunk/reactos/dll/win32/advpack/install.c
    trunk/reactos/dll/win32/advpack/reg.c

Modified: trunk/reactos/dll/win32/advpack/advpack.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack.…
==============================================================================
--- trunk/reactos/dll/win32/advpack/advpack.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advpack/advpack.c	[iso-8859-1] Mon Dec 23 14:20:15 2013
@@ -19,23 +19,7 @@
  * 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);
 

Modified: trunk/reactos/dll/win32/advpack/advpack_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack_…
==============================================================================
--- trunk/reactos/dll/win32/advpack/advpack_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advpack/advpack_private.h	[iso-8859-1] Mon Dec 23 14:20:15
2013
@@ -20,6 +20,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;

Modified: trunk/reactos/dll/win32/advpack/files.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/files.c?…
==============================================================================
--- trunk/reactos/dll/win32/advpack/files.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advpack/files.c	[iso-8859-1] Mon Dec 23 14:20:15 2013
@@ -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 <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <winreg.h>
+#include "advpack_private.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)

Modified: trunk/reactos/dll/win32/advpack/install.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/install.…
==============================================================================
--- trunk/reactos/dll/win32/advpack/install.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advpack/install.c	[iso-8859-1] Mon Dec 23 14:20:15 2013
@@ -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 "advpack_private.h"
+
 #include <ole2.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
-#include "advpack_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(advpack);
 
 #define SPAPI_ERROR     0xE0000000L
 #define SPAPI_PREFIX    0x800F0000L

Modified: trunk/reactos/dll/win32/advpack/reg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/reg.c?re…
==============================================================================
--- trunk/reactos/dll/win32/advpack/reg.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advpack/reg.c	[iso-8859-1] Mon Dec 23 14:20:15 2013
@@ -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};