[EXTRAC32] Sync with Wine Staging 4.0. CORE-15682
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 25 Jan 2019 12:07:01 +0000 (13:07 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 25 Jan 2019 12:07:01 +0000 (13:07 +0100)
base/applications/extrac32/CMakeLists.txt
base/applications/extrac32/extrac32.c
media/doc/README.WINE

index d2b0435..50f6ca7 100644 (file)
@@ -1,4 +1,5 @@
 
+add_definitions(-D__WINESRC__)
 add_executable(extrac32 extrac32.c)
 target_link_libraries(extrac32 wine)
 set_module_type(extrac32 win32gui UNICODE)
index 63205e8..7ab936e 100644 (file)
@@ -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;
     }
index 264b235..05961c6 100644 (file)
@@ -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