[akhaldi] 61563: [RAPPS] * Move some definitions to the main header. * Remove one time inclusions from the main header and put them back where they belong. CORE-7716

Author: akhaldi
Date: Tue Jan  7 17:07:36 2014
New Revision: 61563

URL: http://svn.reactos.org/svn/reactos?rev=61563&view=rev
Log:
[RAPPS]
* Move some definitions to the main header.
* Remove one time inclusions from the main header and put them back where they belong.
CORE-7716

Modified:
    trunk/reactos/base/applications/rapps/installdlg.c
    trunk/reactos/base/applications/rapps/listview.c
    trunk/reactos/base/applications/rapps/loaddlg.c
    trunk/reactos/base/applications/rapps/misc.c
    trunk/reactos/base/applications/rapps/rapps.h
    trunk/reactos/base/applications/rapps/richedit.c
    trunk/reactos/base/applications/rapps/settingsdlg.c
    trunk/reactos/base/applications/rapps/treeview.c
    trunk/reactos/base/applications/rapps/winmain.c

Modified: trunk/reactos/base/applications/rapps/installdlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/in…
==============================================================================
--- trunk/reactos/base/applications/rapps/installdlg.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/installdlg.c	[iso-8859-1] Tue Jan  7 17:07:36
2014
@@ -9,7 +9,6 @@
 #include "rapps.h"
 
 static PAPPLICATION_INFO AppInfo;
-
 
 static
 INT_PTR CALLBACK

Modified: trunk/reactos/base/applications/rapps/listview.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/li…
==============================================================================
--- trunk/reactos/base/applications/rapps/listview.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/listview.c	[iso-8859-1] Tue Jan  7 17:07:36
2014
@@ -10,7 +10,6 @@
 
 HWND hListView;
 BOOL bAscending = TRUE;
-
 
 PVOID
 ListViewGetlParam(INT Index)

Modified: trunk/reactos/base/applications/rapps/loaddlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo…
==============================================================================
--- trunk/reactos/base/applications/rapps/loaddlg.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/loaddlg.c	[iso-8859-1] Tue Jan  7 17:07:36 2014
@@ -25,9 +25,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define COBJMACROS
-#define WIN32_NO_STATUS
-
 #include "rapps.h"
 
 static PAPPLICATION_INFO AppInfo;

Modified: trunk/reactos/base/applications/rapps/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/mi…
==============================================================================
--- trunk/reactos/base/applications/rapps/misc.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/misc.c	[iso-8859-1] Tue Jan  7 17:07:36 2014
@@ -7,7 +7,6 @@
  */
 
 #include "rapps.h"
-
 
 /* SESSION Operation */
 #define EXTRACT_FILLFILELIST  0x00000001

Modified: trunk/reactos/base/applications/rapps/rapps.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
==============================================================================
--- trunk/reactos/base/applications/rapps/rapps.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/rapps.h	[iso-8859-1] Tue Jan  7 17:07:36 2014
@@ -1,7 +1,10 @@
+#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>
@@ -10,8 +13,6 @@
 #include <winuser.h>
 #include <wincon.h>
 #include <richedit.h>
-#include <shellapi.h>
-#include <shlwapi.h>
 #include <shlobj.h>
 #include <stdio.h>
 

Modified: trunk/reactos/base/applications/rapps/richedit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ri…
==============================================================================
--- trunk/reactos/base/applications/rapps/richedit.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/richedit.c	[iso-8859-1] Tue Jan  7 17:07:36
2014
@@ -8,9 +8,10 @@
 
 #include "rapps.h"
 
+#include <shlwapi.h>
+
 HWND hRichEdit;
 PWSTR pLink = NULL;
-
 
 VOID
 RichEditOnLink(HWND hwnd, ENLINK *Link)

Modified: trunk/reactos/base/applications/rapps/settingsdlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/se…
==============================================================================
--- trunk/reactos/base/applications/rapps/settingsdlg.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/settingsdlg.c	[iso-8859-1] Tue Jan  7 17:07:36
2014
@@ -6,7 +6,6 @@
  * PROGRAMMERS:     Dmitry Chapyshev (dmitry(a)reactos.org)
  */
 
-#define _WIN32_DCOM // For CoInitializeEx, etc...
 #include "rapps.h"
 
 SETTINGS_INFO NewSettingsInfo;

Modified: trunk/reactos/base/applications/rapps/treeview.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/tr…
==============================================================================
--- trunk/reactos/base/applications/rapps/treeview.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/treeview.c	[iso-8859-1] Tue Jan  7 17:07:36
2014
@@ -9,7 +9,6 @@
 #include "rapps.h"
 
 HWND hTreeView;
-
 
 HTREEITEM
 TreeViewAddItem(HTREEITEM hParent, LPWSTR lpText, INT Image, INT SelectedImage, LPARAM
lParam)

Modified: trunk/reactos/base/applications/rapps/winmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi…
==============================================================================
--- trunk/reactos/base/applications/rapps/winmain.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/winmain.c	[iso-8859-1] Tue Jan  7 17:07:36 2014
@@ -8,12 +8,13 @@
 
 #include "rapps.h"
 
+#include <shellapi.h>
+
 HWND hMainWnd;
 HINSTANCE hInst;
 HIMAGELIST hImageTreeView = NULL;
 INT SelectedEnumType = ENUM_ALL_COMPONENTS;
 SETTINGS_INFO SettingsInfo;
-
 
 VOID
 FillDefaultSettings(PSETTINGS_INFO pSettingsInfo)