[PATCH 02/11] regedit: Move regproc.c functions from regproc.h to main.h
Hugh McMaster
hugh.mcmaster at outlook.com
Mon May 21 08:34:50 CDT 2018
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
programs/regedit/main.h | 10 +++++++++-
programs/regedit/regedit.c | 2 ++
programs/regedit/regproc.c | 2 ++
programs/regedit/regproc.h | 6 ------
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/programs/regedit/main.h b/programs/regedit/main.h
index 1d0109f9e5..a0c93534df 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 a69e929e48..1d732a850e 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 65087c97ee..0a34cfb049 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 bfb0cba04b..bf963a7425 100644
--- a/programs/regedit/regproc.h
+++ b/programs/regedit/regproc.h
@@ -27,9 +27,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);
--
2.17.0
More information about the wine-devel
mailing list