[reactos] 01/01: [EXTRAC32] Sync with Wine Staging 4.0. CORE-15682

[Amine Khaldi]

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

commit f8052bd8d8bf2ee6780b83dd124b8de5ec6fde89
Author:     Amine Khaldi [e-mail]
AuthorDate: Fri Jan 25 13:07:01 2019 +0100
Commit:     Amine Khaldi [e-mail]
CommitDate: Fri Jan 25 13:07:01 2019 +0100

[EXTRAC32] Sync with Wine Staging 4.0. CORE-15682
---
 base/applications/extrac32/CMakeLists.txt | 1 +
 base/applications/extrac32/extrac32.c     | 2 +-
 media/doc/README.WINE                     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/base/applications/extrac32/CMakeLists.txt b/base/applications/extrac32/CMakeLists.txt
index d2b0435bdd..50f6ca75a2 100644
--- a/base/applications/extrac32/CMakeLists.txt
+++ b/base/applications/extrac32/CMakeLists.txt
@@ -1,4 +1,5 @@

+add_definitions(-D__WINESRC__)
 add_executable(extrac32 extrac32.c)
 target_link_libraries(extrac32 wine)
 set_module_type(extrac32 win32gui UNICODE)
diff --git a/base/applications/extrac32/extrac32.c b/base/applications/extrac32/extrac32.c
index 63205e8176..7ab936eec0 100644
--- a/base/applications/extrac32/extrac32.c
+++ b/base/applications/extrac32/extrac32.c
@@ -118,7 +118,7 @@ static void copy_file(LPCWSTR source, LPCWSTR destination)
         static const WCHAR overwriteMsg[] = {'O','v','e','r','w','r','i','t','e',' ','"','%','s','"','?',0};
         static const WCHAR titleMsg[] = {'E','x','t','r','a','c','t',0};
         WCHAR msg[MAX_PATH+100];
-        snprintfW(msg, sizeof(msg)/sizeof(msg[0]), overwriteMsg, destination);
+        snprintfW(msg, ARRAY_SIZE(msg), overwriteMsg, destination);
         if (MessageBoxW(NULL, msg, titleMsg, MB_YESNO | MB_ICONWARNING) != IDYES)
             return;
     }
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 264b235946..05961c6c29 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -235,7 +235,7 @@ reactos/base/applications/cmdutils/wmic     # Synced to WineStaging-4.0
 reactos/base/applications/cmdutils/wscript  # Synced to WineStaging-3.17
 reactos/base/applications/cmdutils/xcopy    # Synced to WineStaging-3.17
 reactos/base/applications/games/winmine     # Synced to WineStaging-2.16 with our own resources.
-reactos/base/applications/extrac32          # Synced to WineStaging-3.3
+reactos/base/applications/extrac32          # Synced to WineStaging-4.0
 reactos/base/applications/iexplore          # Synced to WineStaging-3.3
 reactos/base/applications/notepad           # Forked at Wine-20041201
 reactos/base/applications/regedit           # Out of sync