https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9be4c1ba359115e131c50e...
commit 9be4c1ba359115e131c50eb06d856e7bc60e42ee Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Sun Mar 25 12:56:35 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Sun Mar 25 12:56:35 2018 +0100
[XCOPY] Sync with Wine Staging 3.3. CORE-14434 --- base/applications/cmdutils/xcopy/xcopy.c | 11 +++-------- media/doc/README.WINE | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/base/applications/cmdutils/xcopy/xcopy.c b/base/applications/cmdutils/xcopy/xcopy.c index cda6e4eb63..a173cc14c7 100644 --- a/base/applications/cmdutils/xcopy/xcopy.c +++ b/base/applications/cmdutils/xcopy/xcopy.c @@ -39,17 +39,12 @@ * 5 - Disk write error */
+ #include <stdio.h> #include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <winnls.h> -#include <wincon.h> +#include <windows.h> #include <wine/debug.h> -//#include <wine/unicode.h> - +#include <wine/unicode.h> #include "xcopy.h"
WINE_DEFAULT_DEBUG_CHANNEL(xcopy); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 55be6ebd18..879cb70a37 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -232,7 +232,7 @@ 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 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.3 -reactos/base/applications/cmdutils/xcopy # Synced to Wine-3.0 +reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.3 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