01/01: [REG] Sync with Wine Staging 3.17. CORE-15127

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5260a37425b39a1b6eb8db...

commit 5260a37425b39a1b6eb8dbeab9774d15be259dbc
Author:     Amine Khaldi [e-mail]
AuthorDate: Mon Oct 1 00:13:56 2018 +0100
Commit:     Amine Khaldi [e-mail]
CommitDate: Mon Oct 1 00:13:56 2018 +0100

[REG] Sync with Wine Staging 3.17. CORE-15127
---
 base/applications/cmdutils/reg/CMakeLists.txt | 1 +
 base/applications/cmdutils/reg/reg.h          | 1 -
 media/doc/README.WINE                         | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/base/applications/cmdutils/reg/CMakeLists.txt b/base/applications/cmdutils/reg/CMakeLists.txt
index 53d1fa4c2f..ef04aaf9df 100644
--- a/base/applications/cmdutils/reg/CMakeLists.txt
+++ b/base/applications/cmdutils/reg/CMakeLists.txt
@@ -2,6 +2,7 @@
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)

+add_definitions(-D__WINESRC__)
 add_executable(reg export.c import.c reg.c reg.rc)
 set_module_type(reg win32cui UNICODE)
 target_link_libraries(reg wine)
diff --git a/base/applications/cmdutils/reg/reg.h b/base/applications/cmdutils/reg/reg.h
index dbce738ecd..a27399d06a 100644
--- a/base/applications/cmdutils/reg/reg.h
+++ b/base/applications/cmdutils/reg/reg.h
@@ -21,7 +21,6 @@

#include "resource.h"

-#define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A))
 #define MAX_SUBKEY_LEN   257

/* reg.c */
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 63027239d4..518cef18c2 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -227,7 +227,7 @@ reactos/win32ss/printing/monitors/localmon/ui/  # Synced to WineStaging-3.3 (kno
 ReactOS shares the following programs with Winehq.

reactos/base/applications/cmdutils/cscript  # Synced to WineStaging-3.17
-reactos/base/applications/cmdutils/reg      # Synced to WineStaging-3.9
+reactos/base/applications/cmdutils/reg      # Synced to WineStaging-3.17
 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-3.3
 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.3
 reactos/base/applications/cmdutils/wmic     # Synced to WineStaging-3.3