[akhaldi] 61219: [XCOPY] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Wed Dec  4 16:17:23 2013
New Revision: 61219

URL: http://svn.reactos.org/svn/reactos?rev=61219&view=rev
Log:
[XCOPY]
* Sync with Wine 1.7.1.
CORE-7469

Modified:
    trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c	[iso-8859-1] Wed Dec  4 16:17:23 2013
@@ -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 @@
     if (!feof(inFile)) {
         XCOPY_wprintf(XCOPY_LoadMessage(STRING_READFAIL), filename);
         *endOfName = endChar;
+        fclose(inFile);
         return TRUE;
     }

@@ -634,6 +633,7 @@
             /* Find next one */
             findres = FindNextFileW(h, finddata);
         }
+        FindClose(h);
     }

cleanup:
@@ -768,7 +768,7 @@
             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 @@
                       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;

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Wed Dec  4 16:17:23 2013
@@ -228,7 +228,7 @@
 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