Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[XCOPY]

Browse source 
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=61219
This commit is contained in:
Amine Khaldi 2013-12-04 16:17:23 +00:00
parent 057af0c3fe
commit 984d7ff19c
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
reactos/base/applications/cmdutils/xcopy/xcopy.c
View file

@ -41,8 +41,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
//#include <tchar.h>
//#include <malloc.h>
#include <windef.h> #include <windef.h>
#include <winbase.h> #include <winbase.h>
@ -298,6 +296,7 @@ static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) {
if (!feof(inFile)) { if (!feof(inFile)) {
XCOPY_wprintf(XCOPY_LoadMessage(STRING_READFAIL), filename); XCOPY_wprintf(XCOPY_LoadMessage(STRING_READFAIL), filename);
*endOfName = endChar; *endOfName = endChar;
fclose(inFile);
return TRUE; return TRUE;
} }
@ -634,6 +633,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec,
/* Find next one */ /* Find next one */
findres = FindNextFileW(h, finddata); findres = FindNextFileW(h, finddata);
} }
FindClose(h);
} }
cleanup: cleanup:
@ -768,7 +768,7 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource,
case 'E': if (CompareStringW(LOCALE_USER_DEFAULT, case 'E': if (CompareStringW(LOCALE_USER_DEFAULT,
NORM_IGNORECASE | SORT_STRINGSORT, NORM_IGNORECASE | SORT_STRINGSORT,
&word[1], 8, &word[1], 8,
EXCLUDE, -1) == 2) { EXCLUDE, -1) == CSTR_EQUAL) {
if (XCOPY_ProcessExcludeList(&word[9])) { if (XCOPY_ProcessExcludeList(&word[9])) {
XCOPY_FailMessage(ERROR_INVALID_PARAMETER); XCOPY_FailMessage(ERROR_INVALID_PARAMETER);
goto out; goto out;
@ -827,7 +827,8 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource,
break; break;
case '-': if (toupper(word[2])=='Y') case '-': if (toupper(word[2])=='Y')
flags &= ~OPT_NOPROMPT; break; flags &= ~OPT_NOPROMPT;
break;
case '?': XCOPY_wprintf(XCOPY_LoadMessage(STRING_HELP)); case '?': XCOPY_wprintf(XCOPY_LoadMessage(STRING_HELP));
rc = RC_HELP; rc = RC_HELP;
goto out; goto out;

2
reactos/media/doc/README.WINE
View file

@ -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/reg # Synced to Wine-1.7.1
reactos/base/applications/cmdutils/taskkill # 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/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/games/winmine # Forked at Wine-1_3_5
reactos/base/applications/extrac32 # Autosync reactos/base/applications/extrac32 # Autosync
reactos/base/applications/iexplore # Synced to Wine-1.5.26 reactos/base/applications/iexplore # Synced to Wine-1.5.26