From 984d7ff19ccbe1d02e4b85ab2ec55dc9e6556938 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Wed, 4 Dec 2013 16:17:23 +0000
Subject: [PATCH] [XCOPY] * Sync with Wine 1.7.1. CORE-7469

svn path=/trunk/; revision=61219
---
 reactos/base/applications/cmdutils/xcopy/xcopy.c | 9 +++++----
 reactos/media/doc/README.WINE                    | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/reactos/base/applications/cmdutils/xcopy/xcopy.c b/reactos/base/applications/cmdutils/xcopy/xcopy.c
index 8f02fbdbf3c..1f2a3b73381 100644
--- a/reactos/base/applications/cmdutils/xcopy/xcopy.c
+++ b/reactos/base/applications/cmdutils/xcopy/xcopy.c
@@ -41,8 +41,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-//#include <tchar.h>
-//#include <malloc.h>
 
 #include <windef.h>
 #include <winbase.h>
@@ -298,6 +296,7 @@ static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) {
     if (!feof(inFile)) {
         XCOPY_wprintf(XCOPY_LoadMessage(STRING_READFAIL), filename);
         *endOfName = endChar;
+        fclose(inFile);
         return TRUE;
     }
 
@@ -634,6 +633,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec,
             /* Find next one */
             findres = FindNextFileW(h, finddata);
         }
+        FindClose(h);
     }
 
 cleanup:
@@ -768,7 +768,7 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource,
             case 'E': if (CompareStringW(LOCALE_USER_DEFAULT,
                                          NORM_IGNORECASE | SORT_STRINGSORT,
                                          &word[1], 8,
-                                         EXCLUDE, -1) == 2) {
+                                         EXCLUDE, -1) == CSTR_EQUAL) {
                         if (XCOPY_ProcessExcludeList(&word[9])) {
                           XCOPY_FailMessage(ERROR_INVALID_PARAMETER);
                           goto out;
@@ -827,7 +827,8 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource,
                       break;
 
             case '-': if (toupper(word[2])=='Y')
-                          flags &= ~OPT_NOPROMPT; break;
+                          flags &= ~OPT_NOPROMPT;
+                      break;
             case '?': XCOPY_wprintf(XCOPY_LoadMessage(STRING_HELP));
                       rc = RC_HELP;
                       goto out;
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index d96a4cef21f..d9ee157d52b 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -228,7 +228,7 @@ ReactOS shares the following programs with Winehq.
 reactos/base/applications/cmdutils/reg      # Synced to Wine-1.7.1
 reactos/base/applications/cmdutils/taskkill # Synced to Wine-1.7.1
 reactos/base/applications/cmdutils/wmic     # Synced to Wine-1.7.1
-reactos/base/applications/cmdutils/xcopy    # Synced to Wine-1.3.37
+reactos/base/applications/cmdutils/xcopy    # Synced to Wine-1.7.1
 reactos/base/applications/games/winmine     # Forked at Wine-1_3_5
 reactos/base/applications/extrac32          # Autosync
 reactos/base/applications/iexplore          # Synced to Wine-1.5.26