https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01c1091e51bb6cd50d6712a2bb0e6ac9acbe37d3
commit 01c1091e51bb6cd50d6712a2bb0e6ac9acbe37d3 Author: winesync <[email protected]> AuthorDate: Sun Jan 16 20:25:19 2022 +0100 Commit: Thomas Csovcsity <[email protected]> CommitDate: Sun Jun 19 13:06:30 2022 +0200 [WINESYNC] reg: Merge common header #includes into reg.h. Signed-off-by: Hugh McMaster <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id 7803c53cfe6635a5d3e0d9f58e743235746ec9d2 by Hugh McMaster <[email protected]> --- base/applications/cmdutils/reg/add.c | 2 -- base/applications/cmdutils/reg/delete.c | 2 -- base/applications/cmdutils/reg/export.c | 4 ---- base/applications/cmdutils/reg/import.c | 6 +----- base/applications/cmdutils/reg/query.c | 2 -- base/applications/cmdutils/reg/reg.c | 4 +--- base/applications/cmdutils/reg/reg.h | 2 ++ sdk/tools/winesync/reg.cfg | 2 +- 8 files changed, 5 insertions(+), 19 deletions(-) diff --git a/base/applications/cmdutils/reg/add.c b/base/applications/cmdutils/reg/add.c index 2d8521f9234..054023df7ab 100644 --- a/base/applications/cmdutils/reg/add.c +++ b/base/applications/cmdutils/reg/add.c @@ -18,8 +18,6 @@ #include <errno.h> #include <stdlib.h> -#include <windows.h> -#include <wine/heap.h> #include "reg.h" static DWORD wchar_get_type(const WCHAR *type_name) diff --git a/base/applications/cmdutils/reg/delete.c b/base/applications/cmdutils/reg/delete.c index 530d4513ece..e0730e5c12f 100644 --- a/base/applications/cmdutils/reg/delete.c +++ b/base/applications/cmdutils/reg/delete.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> -#include <wine/heap.h> #include "reg.h" int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, diff --git a/base/applications/cmdutils/reg/export.c b/base/applications/cmdutils/reg/export.c index 50d27b45d37..4e069bdda18 100644 --- a/base/applications/cmdutils/reg/export.c +++ b/base/applications/cmdutils/reg/export.c @@ -16,12 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> #include <stdio.h> #include <stdlib.h> - -#include <wine/heap.h> - #include "reg.h" static void write_file(HANDLE hFile, const WCHAR *str) diff --git a/base/applications/cmdutils/reg/import.c b/base/applications/cmdutils/reg/import.c index 7ad7b35d5dc..9e21bcc6a7e 100644 --- a/base/applications/cmdutils/reg/import.c +++ b/base/applications/cmdutils/reg/import.c @@ -16,15 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> #include <errno.h> #include <stdio.h> #include <stdlib.h> - -#include <wine/debug.h> -#include <wine/heap.h> - #include "reg.h" +#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(reg); diff --git a/base/applications/cmdutils/reg/query.c b/base/applications/cmdutils/reg/query.c index 3d81d120bd2..b24edb2f0b2 100644 --- a/base/applications/cmdutils/reg/query.c +++ b/base/applications/cmdutils/reg/query.c @@ -17,8 +17,6 @@ */ #include <stdio.h> -#include <windows.h> -#include <wine/heap.h> #include "reg.h" static const WCHAR *reg_type_to_wchar(DWORD type) diff --git a/base/applications/cmdutils/reg/reg.c b/base/applications/cmdutils/reg/reg.c index 26cb3e26b96..4645f22aec7 100644 --- a/base/applications/cmdutils/reg/reg.c +++ b/base/applications/cmdutils/reg/reg.c @@ -16,11 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> #include <stdlib.h> -#include <wine/debug.h> -#include <wine/heap.h> #include "reg.h" +#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(reg); diff --git a/base/applications/cmdutils/reg/reg.h b/base/applications/cmdutils/reg/reg.h index 4cb31c4671a..b29c2c21a1f 100644 --- a/base/applications/cmdutils/reg/reg.h +++ b/base/applications/cmdutils/reg/reg.h @@ -19,6 +19,8 @@ #ifndef __REG_H__ #define __REG_H__ +#include <windows.h> +#include <wine/heap.h> #include "resource.h" #define MAX_SUBKEY_LEN 257 diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg index 769f8b11b04..c83a928ad45 100644 --- a/sdk/tools/winesync/reg.cfg +++ b/sdk/tools/winesync/reg.cfg @@ -4,4 +4,4 @@ directories: files: programs/reg/resource.h: base/applications/cmdutils/reg/resource.h tags: - wine: ab94653e8bb093b88406f7c509c7157ac7033f28 + wine: 7803c53cfe6635a5d3e0d9f58e743235746ec9d2
