* 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
This commit is contained in:
Amine Khaldi 2014-01-07 17:07:36 +00:00
parent 6ead2b3ba8
commit 6731470ec2
9 changed files with 8 additions and 13 deletions

View file

@ -10,7 +10,6 @@
static PAPPLICATION_INFO AppInfo; static PAPPLICATION_INFO AppInfo;
static static
INT_PTR CALLBACK INT_PTR CALLBACK
InstallDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) InstallDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)

View file

@ -11,7 +11,6 @@
HWND hListView; HWND hListView;
BOOL bAscending = TRUE; BOOL bAscending = TRUE;
PVOID PVOID
ListViewGetlParam(INT Index) ListViewGetlParam(INT Index)
{ {

View file

@ -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" #include "rapps.h"
static PAPPLICATION_INFO AppInfo; static PAPPLICATION_INFO AppInfo;

View file

@ -8,7 +8,6 @@
#include "rapps.h" #include "rapps.h"
/* SESSION Operation */ /* SESSION Operation */
#define EXTRACT_FILLFILELIST 0x00000001 #define EXTRACT_FILLFILELIST 0x00000001
#define EXTRACT_EXTRACTFILES 0x00000002 #define EXTRACT_EXTRACTFILES 0x00000002

View file

@ -1,7 +1,10 @@
#include <stdarg.h>
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#define _INC_WINDOWS #define _INC_WINDOWS
#define COM_NO_WINDOWS_H #define COM_NO_WINDOWS_H
#include <stdarg.h> #define COBJMACROS
#include <windef.h> #include <windef.h>
#include <winbase.h> #include <winbase.h>
#include <winreg.h> #include <winreg.h>
@ -10,8 +13,6 @@
#include <winuser.h> #include <winuser.h>
#include <wincon.h> #include <wincon.h>
#include <richedit.h> #include <richedit.h>
#include <shellapi.h>
#include <shlwapi.h>
#include <shlobj.h> #include <shlobj.h>
#include <stdio.h> #include <stdio.h>

View file

@ -8,10 +8,11 @@
#include "rapps.h" #include "rapps.h"
#include <shlwapi.h>
HWND hRichEdit; HWND hRichEdit;
PWSTR pLink = NULL; PWSTR pLink = NULL;
VOID VOID
RichEditOnLink(HWND hwnd, ENLINK *Link) RichEditOnLink(HWND hwnd, ENLINK *Link)
{ {

View file

@ -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" #include "rapps.h"
SETTINGS_INFO NewSettingsInfo; SETTINGS_INFO NewSettingsInfo;

View file

@ -10,7 +10,6 @@
HWND hTreeView; HWND hTreeView;
HTREEITEM HTREEITEM
TreeViewAddItem(HTREEITEM hParent, LPWSTR lpText, INT Image, INT SelectedImage, LPARAM lParam) TreeViewAddItem(HTREEITEM hParent, LPWSTR lpText, INT Image, INT SelectedImage, LPARAM lParam)
{ {

View file

@ -8,13 +8,14 @@
#include "rapps.h" #include "rapps.h"
#include <shellapi.h>
HWND hMainWnd; HWND hMainWnd;
HINSTANCE hInst; HINSTANCE hInst;
HIMAGELIST hImageTreeView = NULL; HIMAGELIST hImageTreeView = NULL;
INT SelectedEnumType = ENUM_ALL_COMPONENTS; INT SelectedEnumType = ENUM_ALL_COMPONENTS;
SETTINGS_INFO SettingsInfo; SETTINGS_INFO SettingsInfo;
VOID VOID
FillDefaultSettings(PSETTINGS_INFO pSettingsInfo) FillDefaultSettings(PSETTINGS_INFO pSettingsInfo)
{ {