https://git.reactos.org/?p=reactos.git;a=commitdiff;h=502927fd0e0e2e3c90540…
commit 502927fd0e0e2e3c90540c7f97b986e5b23990f0
Author: Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sun Jan 21 22:08:40 2018 +0100
Commit: Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sun Jan 21 22:08:40 2018 +0100
[XCOPY] Sync with Wine 3.0. CORE-14225
---
base/applications/cmdutils/xcopy/xcopy.c | 2 +-
media/doc/README.WINE | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/base/applications/cmdutils/xcopy/xcopy.c
b/base/applications/cmdutils/xcopy/xcopy.c
index e8455f0c6c..cda6e4eb63 100644
--- a/base/applications/cmdutils/xcopy/xcopy.c
+++ b/base/applications/cmdutils/xcopy/xcopy.c
@@ -99,7 +99,7 @@ static WCHAR *XCOPY_LoadMessage(UINT id) {
* and hence required WriteConsoleW to output it, however if file i/o is
* redirected, it needs to be WriteFile'd using OEM (not ANSI) format
* ========================================================================= */
-static int __cdecl XCOPY_wprintf(const WCHAR *format, ...) {
+static int WINAPIV XCOPY_wprintf(const WCHAR *format, ...) {
static WCHAR *output_bufW = NULL;
static char *output_bufA = NULL;
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 5afbe03c2f..46b7bafe5a 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -232,7 +232,7 @@ reactos/base/applications/cmdutils/schtasks # Synced to
WineStaging-2.9
reactos/base/applications/cmdutils/taskkill # Synced to Wine-3.0
reactos/base/applications/cmdutils/wmic # Synced to WineStaging-2.9
reactos/base/applications/cmdutils/wscript # Synced to WineStaging-2.9
-reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-2.9
+reactos/base/applications/cmdutils/xcopy # Synced to Wine-3.0
reactos/base/applications/games/winmine # Synced to WineStaging-2.16 with our own
resources.
reactos/base/applications/extrac32 # Synced to WineStaging-2.9
reactos/base/applications/iexplore # Synced to WineStaging-2.9