[akhaldi] 61691: [APPWIZ] * 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: Sun Jan 19 10:17:54 2014
New Revision: 61691

URL: http://svn.reactos.org/svn/reactos?rev=61691&view=rev
Log:
[APPWIZ]
* 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/cpl/appwiz/addons.c
    trunk/reactos/dll/cpl/appwiz/appwiz.c
    trunk/reactos/dll/cpl/appwiz/appwiz.h
    trunk/reactos/dll/cpl/appwiz/createlink.c

Modified: trunk/reactos/dll/cpl/appwiz/addons.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/addons.c?rev...
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/addons.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz/addons.c	[iso-8859-1] Sun Jan 19 10:17:54 2014
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#include <config.h>
-#include <wine/port.h>
+#include "appwiz.h"

#include <stdio.h>

@@ -25,19 +24,7 @@
 # include <unistd.h>
 #endif

-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
 #include <msi.h>
-
-#include "appwiz.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(appwiz);

#define GECKO_VERSION "2.21"

Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.c?rev...
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/appwiz.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz/appwiz.c	[iso-8859-1] Sun Jan 19 10:17:54 2014
@@ -6,12 +6,11 @@
  *                          Dmitry Chapyshev ([e-mail])
  */

-#include <config.h>
-#include <wine/port.h>
-
 #include "appwiz.h"

-WINE_DEFAULT_DEBUG_CHANNEL(appwiz);
+#include <shellapi.h>
+#include <cpl.h>
+#include <wine/unicode.h>

HINSTANCE hApplet = NULL;

Modified: trunk/reactos/dll/cpl/appwiz/appwiz.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.h?rev...
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/appwiz.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz/appwiz.h	[iso-8859-1] Sun Jan 19 10:17:54 2014
@@ -1,19 +1,22 @@
-#define COBJMACROS
+#include <config.h>
+#include <wine/port.h>
+
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
-#include <stdarg.h>
+
+#define COBJMACROS
+
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
 #include <winnls.h>
-#include <shellapi.h>
-#include <cpl.h>
-#include <tchar.h>
 #include <shlobj.h>

#include <wine/debug.h>
-#include <wine/unicode.h>
+WINE_DEFAULT_DEBUG_CHANNEL(appwiz);

#include "resource.h"

Modified: trunk/reactos/dll/cpl/appwiz/createlink.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.c...
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/createlink.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz/createlink.c	[iso-8859-1] Sun Jan 19 10:17:54 2014
@@ -10,6 +10,8 @@
  */

#include "appwiz.h"
+
+#include <tchar.h>

BOOL
 IsShortcut(HKEY hKey)