[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

svn path=/trunk/; revision=61563

diff --git a/reactos/base/applications/rapps/installdlg.c b/reactos/base/applications/rapps/installdlg.c
index 392bf3d..d1960e2 100644 (file)
--- a/reactos/base/applications/rapps/installdlg.c
+++ b/reactos/base/applications/rapps/installdlg.c
@@ -10,7 +10,6 @@
 
 static PAPPLICATION_INFO AppInfo;
 
 
 static PAPPLICATION_INFO AppInfo;
 

-

 static
 INT_PTR CALLBACK
 InstallDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
 static
 INT_PTR CALLBACK
 InstallDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)

diff --git a/reactos/base/applications/rapps/listview.c b/reactos/base/applications/rapps/listview.c
index 17b9ad0..f343e99 100644 (file)
--- a/reactos/base/applications/rapps/listview.c
+++ b/reactos/base/applications/rapps/listview.c
@@ -11,7 +11,6 @@
 HWND hListView;
 BOOL bAscending = TRUE;
 
 HWND hListView;
 BOOL bAscending = TRUE;
 

-

 PVOID
 ListViewGetlParam(INT Index)
 {
 PVOID
 ListViewGetlParam(INT Index)
 {

diff --git a/reactos/base/applications/rapps/loaddlg.c b/reactos/base/applications/rapps/loaddlg.c
index 382d3ea..ae2ca11 100644 (file)
--- a/reactos/base/applications/rapps/loaddlg.c
+++ b/reactos/base/applications/rapps/loaddlg.c
@@ -25,9 +25,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
  * 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;
 #include "rapps.h"
 
 static PAPPLICATION_INFO AppInfo;

diff --git a/reactos/base/applications/rapps/misc.c b/reactos/base/applications/rapps/misc.c
index 836a3b2..348404e 100644 (file)
--- a/reactos/base/applications/rapps/misc.c
+++ b/reactos/base/applications/rapps/misc.c
@@ -8,7 +8,6 @@
 
 #include "rapps.h"
 
 
 #include "rapps.h"
 

-

 /* SESSION Operation */
 #define EXTRACT_FILLFILELIST  0x00000001
 #define EXTRACT_EXTRACTFILES  0x00000002
 /* SESSION Operation */
 #define EXTRACT_FILLFILELIST  0x00000001
 #define EXTRACT_EXTRACTFILES  0x00000002

diff --git a/reactos/base/applications/rapps/rapps.h b/reactos/base/applications/rapps/rapps.h
index 4c97d2e..28744f8 100644 (file)
--- a/reactos/base/applications/rapps/rapps.h
+++ b/reactos/base/applications/rapps/rapps.h
@@ -1,7 +1,10 @@
+#include <stdarg.h>
+

 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_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 <windef.h>
 #include <winbase.h>
 #include <winreg.h>


@@ -10,8 +13,6 @@
 #include <winuser.h>
 #include <wincon.h>
 #include <richedit.h>
 #include <winuser.h>
 #include <wincon.h>
 #include <richedit.h>

-#include <shellapi.h>
-#include <shlwapi.h>

 #include <shlobj.h>
 #include <stdio.h>
 
 #include <shlobj.h>
 #include <stdio.h>
 

diff --git a/reactos/base/applications/rapps/richedit.c b/reactos/base/applications/rapps/richedit.c
index 99b53d2..fad3ba3 100644 (file)
--- a/reactos/base/applications/rapps/richedit.c
+++ b/reactos/base/applications/rapps/richedit.c
@@ -8,10 +8,11 @@
 
 #include "rapps.h"
 
 
 #include "rapps.h"
 

+#include <shlwapi.h>
+

 HWND hRichEdit;
 PWSTR pLink = NULL;
 
 HWND hRichEdit;
 PWSTR pLink = NULL;
 

-

 VOID
 RichEditOnLink(HWND hwnd, ENLINK *Link)
 {
 VOID
 RichEditOnLink(HWND hwnd, ENLINK *Link)
 {

diff --git a/reactos/base/applications/rapps/settingsdlg.c b/reactos/base/applications/rapps/settingsdlg.c
index 278bd3f..5bbda1d 100644 (file)
--- a/reactos/base/applications/rapps/settingsdlg.c
+++ b/reactos/base/applications/rapps/settingsdlg.c
@@ -6,7 +6,6 @@
  * PROGRAMMERS:     Dmitry Chapyshev (dmitry@reactos.org)
  */
 
  * PROGRAMMERS:     Dmitry Chapyshev (dmitry@reactos.org)
  */
 

-#define _WIN32_DCOM // For CoInitializeEx, etc...

 #include "rapps.h"
 
 SETTINGS_INFO NewSettingsInfo;
 #include "rapps.h"
 
 SETTINGS_INFO NewSettingsInfo;

diff --git a/reactos/base/applications/rapps/treeview.c b/reactos/base/applications/rapps/treeview.c
index c8c4a10..211883c 100644 (file)
--- a/reactos/base/applications/rapps/treeview.c
+++ b/reactos/base/applications/rapps/treeview.c
@@ -10,7 +10,6 @@
 
 HWND hTreeView;
 
 
 HWND hTreeView;
 

-

 HTREEITEM
 TreeViewAddItem(HTREEITEM hParent, LPWSTR lpText, INT Image, INT SelectedImage, LPARAM lParam)
 {
 HTREEITEM
 TreeViewAddItem(HTREEITEM hParent, LPWSTR lpText, INT Image, INT SelectedImage, LPARAM lParam)
 {

diff --git a/reactos/base/applications/rapps/winmain.c b/reactos/base/applications/rapps/winmain.c
index 99d34fc..1892559 100644 (file)
--- a/reactos/base/applications/rapps/winmain.c
+++ b/reactos/base/applications/rapps/winmain.c
@@ -8,13 +8,14 @@
 
 #include "rapps.h"
 
 
 #include "rapps.h"
 

+#include <shellapi.h>
+

 HWND hMainWnd;
 HINSTANCE hInst;
 HIMAGELIST hImageTreeView = NULL;
 INT SelectedEnumType = ENUM_ALL_COMPONENTS;
 SETTINGS_INFO SettingsInfo;
 
 HWND hMainWnd;
 HINSTANCE hInst;
 HIMAGELIST hImageTreeView = NULL;
 INT SelectedEnumType = ENUM_ALL_COMPONENTS;
 SETTINGS_INFO SettingsInfo;
 

-

 VOID
 FillDefaultSettings(PSETTINGS_INFO pSettingsInfo)
 {
 VOID
 FillDefaultSettings(PSETTINGS_INFO pSettingsInfo)
 {