[PATCH 04/11] regedit: Move remaining definitions from regproc.h to main.h

[Hugh McMaster]

Signed-off-by: Hugh McMaster 
---
 programs/regedit/childwnd.c | 1 -
 programs/regedit/edit.c     | 1 -
 programs/regedit/framewnd.c | 1 -
 programs/regedit/hexedit.c  | 1 -
 programs/regedit/listview.c | 1 -
 programs/regedit/main.h     | 6 +++++-
 programs/regedit/regedit.c  | 1 -
 programs/regedit/regproc.c  | 1 -
 programs/regedit/regproc.h  | 3 ---
 programs/regedit/treeview.c | 1 -
 10 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c
index 0c6d895193..ceeeb1d75a 100644
--- a/programs/regedit/childwnd.c
+++ b/programs/regedit/childwnd.c
@@ -24,7 +24,6 @@
 #include <stdio.h>

#include "main.h"
-#include "regproc.h"

#include "wine/debug.h"
 #include "wine/heap.h"
diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c
index 63cc7a564c..bd6d720f2a 100644
--- a/programs/regedit/edit.c
+++ b/programs/regedit/edit.c
@@ -32,7 +32,6 @@
 #include "wine/heap.h"
 #include "wine/unicode.h"
 #include "main.h"
-#include "regproc.h"

static const WCHAR* editValueName;
 static WCHAR* stringValueData;
diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c
index 804573e0c0..99f7686879 100644
--- a/programs/regedit/framewnd.c
+++ b/programs/regedit/framewnd.c
@@ -29,7 +29,6 @@
 #include <shellapi.h>

#include "main.h"
-#include "regproc.h"
 #include "wine/debug.h"
 #include "wine/heap.h"
 #include "wine/unicode.h"
diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c
index c7bdd0ae52..0d28388e21 100644
--- a/programs/regedit/hexedit.c
+++ b/programs/regedit/hexedit.c
@@ -37,7 +37,6 @@

#include "wine/heap.h"
 #include "main.h"
-#include "regproc.h"

/* spaces dividing hex and ASCII */
 #define DIV_SPACES 4
diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c
index 404699fab8..4f3593fe7c 100644
--- a/programs/regedit/listview.c
+++ b/programs/regedit/listview.c
@@ -26,7 +26,6 @@
 #include <stdio.h>

#include "main.h"
-#include "regproc.h"
 #include "wine/heap.h"
 #include "wine/unicode.h"

diff --git a/programs/regedit/main.h b/programs/regedit/main.h
index c9143c1767..af61252565 100644
--- a/programs/regedit/main.h
+++ b/programs/regedit/main.h
@@ -32,7 +32,11 @@

#define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A))

-#define MAX_NEW_KEY_LEN 128
+#define MAX_NEW_KEY_LEN  128
+#define KEY_MAX_LEN      1024
+
+#define REG_FORMAT_5     1
+#define REG_FORMAT_4     2

/* Pop-Up Menus */
 #define PM_COMPUTER      0
diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c
index 1d732a850e..7e5887cd08 100644
--- a/programs/regedit/regedit.c
+++ b/programs/regedit/regedit.c
@@ -27,7 +27,6 @@
 #include "wine/debug.h"
 #include "wine/heap.h"
 #include "main.h"
-#include "regproc.h"

WINE_DEFAULT_DEBUG_CHANNEL(regedit);

diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c
index 0a34cfb049..c4900e6c6d 100644
--- a/programs/regedit/regproc.c
+++ b/programs/regedit/regproc.c
@@ -32,7 +32,6 @@
 #include <wine/debug.h>
 #include <wine/heap.h>
 #include "main.h"
-#include "regproc.h"

WINE_DEFAULT_DEBUG_CHANNEL(regedit);

diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h
index 58f707b854..cec59e7153 100644
--- a/programs/regedit/regproc.h
+++ b/programs/regedit/regproc.h
@@ -19,8 +19,5 @@

#include "resource.h"

-#define KEY_MAX_LEN             1024

-#define REG_FORMAT_5 1
-#define REG_FORMAT_4 2

diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c
index 86224e231b..9d75a31dd6 100644
--- a/programs/regedit/treeview.c
+++ b/programs/regedit/treeview.c
@@ -32,7 +32,6 @@

#include "wine/heap.h"
 #include "main.h"
-#include "regproc.h"

WINE_DEFAULT_DEBUG_CHANNEL(regedit);