Hugh McMaster : regedit: Move regproc.c functions from regproc.h to main.h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ff1f664d0851d30540c312e34155a1497f363d67
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=ff1f664d0851d30540c312e34...

Author: Hugh McMaster 
Date:   Mon May 21 13:34:50 2018 +0000

regedit: Move regproc.c functions from regproc.h to main.h.

Signed-off-by: Hugh McMaster 
Signed-off-by: Alexandre Julliard

---

programs/regedit/main.h    | 10 +++++++++-
 programs/regedit/regedit.c |  2 ++
 programs/regedit/regproc.c |  2 ++
 programs/regedit/regproc.h |  7 -------
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/programs/regedit/main.h b/programs/regedit/main.h
index 1d0109f..a0c9353 100644
--- a/programs/regedit/main.h
+++ b/programs/regedit/main.h
@@ -21,9 +21,9 @@
 #ifndef __MAIN_H__
 #define __MAIN_H__

+#include <stdio.h>
 #include "resource.h"

-
 #define STATUS_WINDOW   2001
 #define TREE_WINDOW     2002
 #define LIST_WINDOW     2003
@@ -141,6 +141,14 @@ extern LPCWSTR GetValueName(HWND hwndLV);
 extern BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result);
 extern BOOL IsDefaultValue(HWND hwndLV, int i);

+/* regproc.c */
+void *heap_xalloc(size_t size);
+void *heap_xrealloc(void *buf, size_t size);
+char *GetMultiByteString(const WCHAR *strW);
+BOOL import_registry_file(FILE *reg_file);
+void delete_registry_key(WCHAR *reg_key_name);
+BOOL export_registry_key(WCHAR *file_name, WCHAR *path, DWORD format);
+
 /* treeview.c */
 extern HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id);
 extern BOOL RefreshTreeView(HWND hWndTV);
diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c
index a69e929..1d732a8 100644
--- a/programs/regedit/regedit.c
+++ b/programs/regedit/regedit.c
@@ -21,10 +21,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <windows.h>
+#include <commctrl.h>
 #include <shellapi.h>
 #include "wine/unicode.h"
 #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 65087c9..0a34cfb 100644
--- a/programs/regedit/regproc.c
+++ b/programs/regedit/regproc.c
@@ -27,9 +27,11 @@
 #include <fcntl.h>
 #include <io.h>
 #include <windows.h>
+#include <commctrl.h>
 #include <wine/unicode.h>
 #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 bfb0cba..f57379b 100644
--- a/programs/regedit/regproc.h
+++ b/programs/regedit/regproc.h
@@ -26,10 +26,3 @@

void WINAPIV output_message(unsigned int id, ...);
 void WINAPIV error_exit(unsigned int id, ...);
-
-char *GetMultiByteString(const WCHAR *strW);
-void *heap_xalloc(size_t size);
-void *heap_xrealloc(void *buf, size_t size);
-BOOL import_registry_file(FILE *reg_file);
-void delete_registry_key(WCHAR *reg_key_name);
-BOOL export_registry_key(WCHAR *file_name, WCHAR *path, DWORD format);