April 2007 - Wine-Commits - list.winehq.org

Eric Pouech : winedbg: When reloading real PE modules from a minidump, also look in the search path (as we do for ELF modules).
by Alexandre Julliard April 2, 2007

April 2, 2007

Module: wine Branch: master Commit: 0fc4013f7cf73e986e027dab377e0c804b000ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fc4013f7cf73e986e027dab3… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Apr 1 12:31:57 2007 +0200 winedbg: When reloading real PE modules from a minidump, also look in the search path (as we do for ELF modules). --- programs/winedbg/tgt_minidump.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index 9e61130..ea04528 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -131,6 +131,29 @@ BOOL CALLBACK validate_file(PCWSTR name, void* user) return FALSE; /* get the first file we find !! */ } +static BOOL is_pe_module_embedded(struct tgt_process_minidump_data* data, + MINIDUMP_MODULE* pe_mm) +{ + ULONG size; + MINIDUMP_DIRECTORY* dir; + MINIDUMP_MODULE_LIST* mml; + + if (MiniDumpReadDumpStream(data->mapping, Wine_ElfModuleListStream, &dir, + (void**)&mml, &size)) + { + MINIDUMP_MODULE* mm; + unsigned i; + + for (i = 0, mm = &mml->Modules[0]; i < mml->NumberOfModules; i++, mm++) + { + if (mm->BaseOfImage <= pe_mm->BaseOfImage && + mm->BaseOfImage + mm->SizeOfImage >= pe_mm->BaseOfImage + pe_mm->SizeOfImage) + return TRUE; + } + } + return FALSE; +} + static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) { ULONG size; @@ -166,7 +189,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) mm = &mml->Modules[0]; mds = (MINIDUMP_STRING*)((char*)data->mapping + mm->ModuleNameRva); len = WideCharToMultiByte(CP_ACP, 0, mds->Buffer, - mds->Length / sizeof(WCHAR), + mds->Length / sizeof(WCHAR), exec_name, sizeof(exec_name) - 1, NULL, NULL); exec_name[len] = 0; for (ptr = exec_name + len - 1; ptr >= exec_name; ptr--) @@ -309,14 +332,24 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) } if (MiniDumpReadDumpStream(data->mapping, ModuleListStream, &dir, &stream, &size)) { + WCHAR buffer[MAX_PATH]; + mml = (MINIDUMP_MODULE_LIST*)stream; for (i = 0, mm = &mml->Modules[0]; i < mml->NumberOfModules; i++, mm++) { mds = (MINIDUMP_STRING*)((char*)data->mapping + mm->ModuleNameRva); memcpy(nameW, mds->Buffer, mds->Length); nameW[mds->Length / sizeof(WCHAR)] = 0; - SymLoadModuleExW(hProc, NULL, nameW, NULL, mm->BaseOfImage, mm->SizeOfImage, - NULL, 0); + if (SymFindFileInPathW(hProc, NULL, nameW, (void*)(DWORD_PTR)mm->TimeDateStamp, + mm->SizeOfImage, 0, SSRVOPT_DWORD, buffer, validate_file, NULL)) + SymLoadModuleExW(hProc, NULL, buffer, NULL, mm->BaseOfImage, mm->SizeOfImage, + NULL, 0); + else if (is_pe_module_embedded(data, mm)) + SymLoadModuleExW(hProc, NULL, nameW, NULL, mm->BaseOfImage, mm->SizeOfImage, + NULL, 0); + else + SymLoadModuleExW(hProc, NULL, nameW, NULL, mm->BaseOfImage, mm->SizeOfImage, + NULL, SLMFLAG_VIRTUAL); } } if (MiniDumpReadDumpStream(data->mapping, ExceptionStream, &dir, &stream, &size))

1 0

Jason Edmeades : xcopy: /E implies recursive ( fixes ActiveState Perl installer).
by Alexandre Julliard April 2, 2007

April 2, 2007

Module: wine Branch: master Commit: b8b8f254d87088eaec430115259d4edcb5eb5fb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8b8f254d87088eaec4301152… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sat Mar 31 21:31:35 2007 +0100 xcopy: /E implies recursive (fixes ActiveState Perl installer). --- programs/xcopy/xcopy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index eafc1d7..dfbb41d 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -181,7 +181,7 @@ int main (int argc, char *argv[]) XCOPY_FailMessage(ERROR_INVALID_PARAMETER); return RC_INITERROR; } else flags |= OPT_EXCLUDELIST; - } else flags |= OPT_EMPTYDIR; + } else flags |= OPT_EMPTYDIR | OPT_RECURSIVE; break; /* D can be /D or /D: */

1 0

Jason Edmeades : xcopy: Make displayed names mirror windows.
by Alexandre Julliard April 2, 2007

April 2, 2007

Module: wine Branch: master Commit: da977e5579e4df4a5875b82095bf3baae2bb7373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da977e5579e4df4a5875b8209… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sat Mar 31 21:24:17 2007 +0100 xcopy: Make displayed names mirror windows. --- programs/xcopy/xcopy.c | 123 +++++++++++++++++++++++++++++------------------ 1 files changed, 76 insertions(+), 47 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 0de0b6f..eafc1d7 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -48,7 +48,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(xcopy); /* Prototypes */ -static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, WCHAR *spec); +static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, + WCHAR *spec, DWORD flags); static int XCOPY_ProcessDestParm(WCHAR *supplieddestination, WCHAR *stem, WCHAR *spec, WCHAR *srcspec, DWORD flags); static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, @@ -255,7 +256,7 @@ int main (int argc, char *argv[]) WINE_TRACE("Destination : '%s'\n", wine_dbgstr_w(supplieddestination)); /* Extract required information from source specification */ - rc = XCOPY_ProcessSourceParm(suppliedsource, sourcestem, sourcespec); + rc = XCOPY_ProcessSourceParm(suppliedsource, sourcestem, sourcespec, flags); /* Extract required information from destination specification */ rc = XCOPY_ProcessDestParm(supplieddestination, destinationstem, @@ -307,11 +308,13 @@ int main (int argc, char *argv[]) XCOPY_ProcessSourceParm - Takes the supplied source parameter, and converts it into a stem and a filespec ========================================================================= */ -static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, WCHAR *spec) +static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, + WCHAR *spec, DWORD flags) { WCHAR actualsource[MAX_PATH]; WCHAR *starPos; WCHAR *questPos; + DWORD attribs; /* * Validate the source, expanding to full path ensuring it exists @@ -321,56 +324,79 @@ static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, WCHAR *sp return RC_INITERROR; } + /* If full names required, convert to using the full path */ + if (flags & OPT_FULL) { + lstrcpyW(suppliedsource, actualsource); + } + /* * Work out the stem of the source */ - /* If no wildcard were supplied then the source is either a single - file or a directory - in which case thats the stem of the search, - otherwise split off the wildcards and use the higher level as the - stem */ - lstrcpyW(stem, actualsource); - starPos = wcschr(stem, '*'); - questPos = wcschr(stem, '?'); + /* If a directory is supplied, use that as-is (either fully or + partially qualified) + If a filename is supplied + a directory or drive path, use that + as-is + Otherwise + If no directory or path specified, add eg. C: + stem is Drive/Directory is bit up to last \ (or first :) + spec is bit after that */ + + starPos = wcschr(suppliedsource, '*'); + questPos = wcschr(suppliedsource, '?'); if (starPos || questPos) { - WCHAR *lastDir; - - if (starPos) *starPos = 0x00; - if (questPos) *questPos = 0x00; - - lastDir = wcsrchr(stem, '\\'); - if (lastDir) *(lastDir+1) = 0x00; - else { - WINE_FIXME("Unexpected syntax error in source parameter\n"); - return RC_INITERROR; - } - lstrcpyW(spec, actualsource + (lastDir - stem)+1); + attribs = 0x00; /* Ensures skips invalid or directory check below */ } else { + attribs = GetFileAttributes(actualsource); + } - DWORD attribs = GetFileAttributes(actualsource); + if (attribs == INVALID_FILE_ATTRIBUTES) { + XCOPY_FailMessage(GetLastError()); + return RC_INITERROR; - if (attribs == INVALID_FILE_ATTRIBUTES) { - XCOPY_FailMessage(GetLastError()); - return RC_INITERROR; + /* Directory: + stem should be exactly as supplied plus a '\', unless it was + eg. C: in which case no slash required */ + } else if (attribs & FILE_ATTRIBUTE_DIRECTORY) { + WCHAR lastChar; - /* Directory: */ - } else if (attribs & FILE_ATTRIBUTE_DIRECTORY) { + WINE_TRACE("Directory supplied\n"); + lstrcpyW(stem, suppliedsource); + lastChar = stem[lstrlenW(stem)-1]; + if (lastChar != '\\' && lastChar != ':') { lstrcatW(stem, wchr_slash); - lstrcpyW(spec, wchr_star); + } + lstrcpyW(spec, wchr_star); - /* File: */ + /* File or wildcard search: + stem should be: + Up to and including last slash if directory path supplied + If c:filename supplied, just the c: + Otherwise stem should be the current drive letter + ':' */ + } else { + WCHAR *lastDir; + + WINE_TRACE("Filename supplied\n"); + lastDir = wcsrchr(suppliedsource, '\\'); + + if (lastDir) { + lstrcpyW(stem, suppliedsource); + stem[(lastDir-suppliedsource) + 1] = 0x00; + lstrcpyW(spec, (lastDir+1)); + } else if (suppliedsource[1] == ':') { + lstrcpyW(stem, suppliedsource); + stem[2] = 0x00; + lstrcpyW(spec, suppliedsource+2); } else { - WCHAR drive[MAX_PATH]; - WCHAR dir[MAX_PATH]; - WCHAR fname[MAX_PATH]; - WCHAR ext[MAX_PATH]; - _wsplitpath(actualsource, drive, dir, fname, ext); - lstrcpyW(stem, drive); - lstrcatW(stem, dir); - lstrcpyW(spec, fname); - lstrcatW(spec, ext); + WCHAR curdir[MAXSTRING]; + GetCurrentDirectory (sizeof(curdir), curdir); + stem[0] = curdir[0]; + stem[1] = curdir[1]; + stem[2] = 0x00; + lstrcpyW(spec, suppliedsource); } } + return RC_OK; } @@ -868,14 +894,17 @@ static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) { /* Strip CRLF */ buffer[length-1] = 0x00; - thisEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCLUDELIST)); - thisEntry->next = excludeList; - excludeList = thisEntry; - thisEntry->name = HeapAlloc(GetProcessHeap(), 0, - (length * sizeof(WCHAR))+1); - lstrcpyW(thisEntry->name, buffer); - CharUpperBuff(thisEntry->name, length); - WINE_TRACE("Read line : '%s'\n", wine_dbgstr_w(thisEntry->name)); + /* If more than CRLF */ + if (length > 1) { + thisEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCLUDELIST)); + thisEntry->next = excludeList; + excludeList = thisEntry; + thisEntry->name = HeapAlloc(GetProcessHeap(), 0, + (length * sizeof(WCHAR))+1); + lstrcpyW(thisEntry->name, buffer); + CharUpperBuff(thisEntry->name, length); + WINE_TRACE("Read line : '%s'\n", wine_dbgstr_w(thisEntry->name)); + } } /* See if EOF or error occurred */

1 0

Jason Edmeades : xcopy: Add help.
by Alexandre Julliard April 2, 2007

April 2, 2007

Module: wine Branch: master Commit: a8914b9494ffb32e0e464706bee3a5cebd692fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8914b9494ffb32e0e464706b… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Fri Mar 30 19:20:22 2007 +0100 xcopy: Add help. --- programs/xcopy/En.rc | 34 ++++++++++++++++++++++++++++++++++ programs/xcopy/xcopy.c | 3 ++- programs/xcopy/xcopy.h | 1 + 3 files changed, 37 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/En.rc b/programs/xcopy/En.rc index dd02352..d7d4344 100644 --- a/programs/xcopy/En.rc +++ b/programs/xcopy/En.rc @@ -42,4 +42,38 @@ STRINGTABLE STRING_ALL_CHAR, "A" STRING_FILE_CHAR,"F" STRING_DIR_CHAR, "D" + + STRING_HELP, +"XCOPY - Copies source files or directory trees to a destination\n\ +\n\ +Syntax:\n\ +XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Where:\n\ +\n\ +[/I] Assume directory if destination does not exist and copying 2 or \n\ +\tmore files\n\ +[/S] Copy directories and subdirectories\n\ +[/E] Copy directories and subdirectories, including any empty ones\n\ +[/Q] Do not list names during copy, ie quiet.\n\ +[/F] Show full source and destination names during copy\n\ +[/L] Simulate operation, showing names which would be copied\n\ +[/W] Prompts before beginning the copy operation\n\ +[/T] Creates empty directory structure but does not copy files\n\ +[/Y] Suppress prompting when overwriting files\n\ +[/-Y] Enable prompting when overwriting files\n\ +[/P] Prompts on each source file before copying\n\ +[/N] Copy using short names\n\ +[/U] Copy only files which already exist in destination\n\ +[/R] Overwrite any read only files\n\ +[/H] Include hidden and system files in the copy\n\ +[/C] Continue even if an error occurs during the copy\n\ +[/A] Only copy files with archive attribute set\n\ +[/M] Only copy files with archive attribute set, removes \n\ +\tarchive attribute\n\ +[/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\ +\t\tIf no date is supplied, only copy if destination is older\n\ +\t\tthan source\n\n" + } diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 3f6a7c6..0de0b6f 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -27,7 +27,6 @@ * /O - Copy file ownership + ACL info * /G - Copy encrypted files to unencrypted destination * /V - Verifies files - * /? (or no parms) - List Help */ /* @@ -235,6 +234,8 @@ int main (int argc, char *argv[]) case '-': if (toupper(argvW[0][2])=='Y') flags &= ~OPT_NOPROMPT; break; + case '?': wprintf(XCOPY_LoadMessage(STRING_HELP)); + return RC_OK; default: WINE_TRACE("Unhandled parameter '%s'\n", wine_dbgstr_w(*argvW)); wprintf(XCOPY_LoadMessage(STRING_INVPARM), *argvW); diff --git a/programs/xcopy/xcopy.h b/programs/xcopy/xcopy.h index 750e053..ee4bd91 100644 --- a/programs/xcopy/xcopy.h +++ b/programs/xcopy/xcopy.h @@ -65,3 +65,4 @@ #define STRING_ALL_CHAR 114 #define STRING_FILE_CHAR 115 #define STRING_DIR_CHAR 116 +#define STRING_HELP 117

1 0

Jason Edmeades : xcopy: Update comments with unsupported operations and current status.
by Alexandre Julliard April 2, 2007

April 2, 2007

Module: wine Branch: master Commit: bb2b2d7d3e442a23c21c00454bb66782a95e0eb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb2b2d7d3e442a23c21c00454… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Fri Mar 30 19:20:21 2007 +0100 xcopy: Update comments with unsupported operations and current status. --- programs/xcopy/xcopy.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index afc8a0c..3f6a7c6 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -19,6 +19,18 @@ */ /* + * FIXME: + * This should now support all options listed in the xcopy help from + * windows XP except: + * /Z - Copy from network drives in restartable mode + * /X - Copy file audit settings (sets /O) + * /O - Copy file ownership + ACL info + * /G - Copy encrypted files to unencrypted destination + * /V - Verifies files + * /? (or no parms) - List Help + */ + +/* * Notes: * Apparently, valid return codes are: * 0 - OK

1 0

Jason Edmeades : xcopy: Move all messages into an English resource file.
by Alexandre Julliard April 2, 2007

April 2, 2007

Module: wine Branch: master Commit: 9ff8b4be5b85f481174a3a325d71a38f8ee673af URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ff8b4be5b85f481174a3a325… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Fri Mar 30 19:20:20 2007 +0100 xcopy: Move all messages into an English resource file. --- .gitignore | 1 + programs/xcopy/En.rc | 45 ++++++++++ programs/xcopy/Makefile.in | 2 + programs/xcopy/rsrc.rc | 24 ++++++ programs/xcopy/xcopy.c | 191 ++++++++++++++++++++------------------------ programs/xcopy/xcopy.h | 67 +++++++++++++++ 6 files changed, 227 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ff8b4be5b85f481174a3…

1 0

Jason Edmeades : xcopy: Rearrange code to closely match windows ordering.
by Alexandre Julliard April 2, 2007

April 2, 2007

Module: wine Branch: master Commit: a5cbc372b3dcc519aa7cb538543929d587bea4fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5cbc372b3dcc519aa7cb5385… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Fri Mar 30 19:20:19 2007 +0100 xcopy: Rearrange code to closely match windows ordering. Effectively work out if we are interested in a file before worrying about prompting for copy or overwrite. --- programs/xcopy/xcopy.c | 86 ++++++++++++++++++++++++------------------------ 1 files changed, 43 insertions(+), 43 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index b95d748..73d4306 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -585,25 +585,6 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, skipFile = TRUE; } - /* Prompt each file if necessary */ - if (!skipFile && (flags & OPT_SRCPROMPT)) { - DWORD count; - char answer[10]; - BOOL answered = FALSE; - - while (!answered) { - printf("%S? (Yes|No)\n", copyFrom); - ReadFile (GetStdHandle(STD_INPUT_HANDLE), answer, sizeof(answer), - &count, NULL); - - answered = TRUE; - if (toupper(answer[0]) == 'N') - skipFile = TRUE; - else if (toupper(answer[0]) != 'Y') - answered = FALSE; - } - } - /* See if file exists */ destAttribs = GetFileAttributesW(copyTo); WINE_TRACE("Dest attribs: %d\n", srcAttribs); @@ -633,6 +614,49 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, } } + /* See if exclude list provided. Note since filenames are case + insensitive, need to uppercase the filename before doing + strstr */ + if (!skipFile && (flags & OPT_EXCLUDELIST)) { + EXCLUDELIST *pos = excludeList; + WCHAR copyFromUpper[MAX_PATH]; + + /* Uppercase source filename */ + lstrcpyW(copyFromUpper, copyFrom); + CharUpperBuff(copyFromUpper, lstrlenW(copyFromUpper)); + + /* Loop through testing each exclude line */ + while (pos) { + if (wcsstr(copyFromUpper, pos->name) != NULL) { + WINE_TRACE("Skipping file as matches exclude '%s'\n", + wine_dbgstr_w(pos->name)); + skipFile = TRUE; + pos = NULL; + } else { + pos = pos->next; + } + } + } + + /* Prompt each file if necessary */ + if (!skipFile && (flags & OPT_SRCPROMPT)) { + DWORD count; + char answer[10]; + BOOL answered = FALSE; + + while (!answered) { + printf("%S? (Yes|No)\n", copyFrom); + ReadFile (GetStdHandle(STD_INPUT_HANDLE), answer, sizeof(answer), + &count, NULL); + + answered = TRUE; + if (toupper(answer[0]) == 'N') + skipFile = TRUE; + else if (toupper(answer[0]) != 'Y') + answered = FALSE; + } + } + if (!skipFile && destAttribs != INVALID_FILE_ATTRIBUTES && !(flags & OPT_NOPROMPT)) { DWORD count; @@ -659,30 +683,6 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, skipFile = TRUE; } - /* See if exclude list provided. Note since filenames are case - insensitive, need to uppercase the filename before doing - strstr */ - if (!skipFile && (flags & OPT_EXCLUDELIST)) { - EXCLUDELIST *pos = excludeList; - WCHAR copyFromUpper[MAX_PATH]; - - /* Uppercase source filename */ - lstrcpyW(copyFromUpper, copyFrom); - CharUpperBuff(copyFromUpper, lstrlenW(copyFromUpper)); - - /* Loop through testing each exclude line */ - while (pos) { - if (wcsstr(copyFromUpper, pos->name) != NULL) { - WINE_TRACE("Skipping file as matches exclude '%s'\n", - wine_dbgstr_w(pos->name)); - skipFile = TRUE; - pos = NULL; - } else { - pos = pos->next; - } - } - } - /* Output a status message */ if (!skipFile) { if (flags & OPT_QUIET) {

1 0

Jason Edmeades : xcopy: Add support for /D and /D:m-d-y.
by Alexandre Julliard April 2, 2007

April 2, 2007

Module: wine Branch: master Commit: 3645c30ba1202fab8a501952b9fb7f6b94f52079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3645c30ba1202fab8a501952b… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Fri Mar 30 19:20:18 2007 +0100 xcopy: Add support for /D and /D:m-d-y. --- programs/xcopy/xcopy.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 0b62e31..b95d748 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -58,6 +58,8 @@ #define OPT_ARCHIVEONLY 0x00008000 #define OPT_REMOVEARCH 0x00010000 #define OPT_EXCLUDELIST 0x00020000 +#define OPT_DATERANGE 0x00040000 +#define OPT_DATENEWER 0x00080000 #define MAXSTRING 8192 @@ -85,6 +87,7 @@ typedef struct _EXCLUDELIST /* Global variables */ static ULONG filesCopied = 0; /* Number of files copied */ static EXCLUDELIST *excludeList = NULL; /* Excluded strings list */ +static FILETIME dateRange; /* Date range to copy after*/ static const WCHAR wchr_slash[] = {'\\', 0}; static const WCHAR wchr_star[] = {'*', 0}; static const WCHAR wchr_dot[] = {'.', 0}; @@ -209,6 +212,68 @@ int main (int argc, char *argv[]) } else flags |= OPT_EMPTYDIR; break; + /* D can be /D or /D: */ + case 'D': if ((argvW[0][2])==':' && isdigit(argvW[0][3])) { + SYSTEMTIME st; + WCHAR *pos = &argvW[0][3]; + BOOL isError = FALSE; + memset(&st, 0x00, sizeof(st)); + + /* Parse the arg : Month */ + st.wMonth = _wtol(pos); + while (*pos && isdigit(*pos)) pos++; + if (*pos++ != '-') isError = TRUE; + + /* Parse the arg : Day */ + if (!isError) { + st.wDay = _wtol(pos); + while (*pos && isdigit(*pos)) pos++; + if (*pos++ != '-') isError = TRUE; + } + + /* Parse the arg : Day */ + if (!isError) { + st.wYear = _wtol(pos); + if (st.wYear < 100) st.wYear+=2000; + } + + if (!isError && SystemTimeToFileTime(&st, &dateRange)) { + SYSTEMTIME st; + WCHAR datestring[32], timestring[32]; + + flags |= OPT_DATERANGE; + + /* Debug info: */ + FileTimeToSystemTime (&dateRange, &st); + GetDateFormat (0, DATE_SHORTDATE, &st, NULL, datestring, + sizeof(datestring)); + GetTimeFormat (0, TIME_NOSECONDS, &st, + NULL, timestring, sizeof(timestring)); + + WINE_TRACE("Date being used is: %s %s\n", + wine_dbgstr_w(datestring), wine_dbgstr_w(timestring)); + } else { + LPWSTR lpMsgBuf; + int status; + + status = FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM, + NULL, ERROR_INVALID_PARAMETER, 0, + (LPTSTR) &lpMsgBuf, 0, NULL); + if (!status) { + WINE_FIXME("FIXME: Cannot display message for error %d, status %d\n", + ERROR_INVALID_PARAMETER, GetLastError()); + } else { + printf("%S\n", lpMsgBuf); + LocalFree ((HLOCAL)lpMsgBuf); + } + return RC_INITERROR; + } + } else { + flags |= OPT_DATENEWER; + } + break; + case '-': if (toupper(argvW[0][2])=='Y') flags &= ~OPT_NOPROMPT; break; default: @@ -543,6 +608,31 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, destAttribs = GetFileAttributesW(copyTo); WINE_TRACE("Dest attribs: %d\n", srcAttribs); + /* Check date ranges if a destination file already exists */ + if (!skipFile && (flags & OPT_DATERANGE) && + (CompareFileTime(&finddata->ftLastWriteTime, &dateRange) < 0)) { + WINE_TRACE("Skipping file as modified date too old\n"); + skipFile = TRUE; + } + + /* If just /D supplied, only overwrite if src newer than dest */ + if (!skipFile && (flags & OPT_DATENEWER) && + (destAttribs != INVALID_FILE_ATTRIBUTES)) { + HANDLE h = CreateFile(copyTo, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, + NULL); + if (h != INVALID_HANDLE_VALUE) { + FILETIME writeTime; + GetFileTime(h, NULL, NULL, &writeTime); + + if (CompareFileTime(&finddata->ftLastWriteTime, &writeTime) <= 0) { + WINE_TRACE("Skipping file as dest newer or same date\n"); + skipFile = TRUE; + } + CloseHandle(h); + } + } + if (!skipFile && destAttribs != INVALID_FILE_ATTRIBUTES && !(flags & OPT_NOPROMPT)) { DWORD count;

1 0

Jason Edmeades : xcopy: Add support for /EXCLUDELIST:file1+file2 etc.
by Alexandre Julliard April 2, 2007

April 2, 2007

Module: wine Branch: master Commit: 54b1d19c5b265d9a1b69d25f2f99c03dfcd09d06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b1d19c5b265d9a1b69d25f2… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Fri Mar 30 19:20:17 2007 +0100 xcopy: Add support for /EXCLUDELIST:file1+file2 etc. --- programs/xcopy/xcopy.c | 160 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 159 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index f957c83..0b62e31 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -57,6 +57,7 @@ #define OPT_SRCPROMPT 0x00004000 #define OPT_ARCHIVEONLY 0x00008000 #define OPT_REMOVEARCH 0x00010000 +#define OPT_EXCLUDELIST 0x00020000 #define MAXSTRING 8192 @@ -70,9 +71,20 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, WCHAR *deststem, WCHAR *destspec, DWORD flags); static BOOL XCOPY_CreateDirectory(const WCHAR* path); +static BOOL XCOPY_ProcessExcludeList(WCHAR* parms); +static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName); + +/* Typedefs */ +typedef struct _EXCLUDELIST +{ + struct _EXCLUDELIST *next; + WCHAR *name; +} EXCLUDELIST; + /* Global variables */ static ULONG filesCopied = 0; /* Number of files copied */ +static EXCLUDELIST *excludeList = NULL; /* Excluded strings list */ static const WCHAR wchr_slash[] = {'\\', 0}; static const WCHAR wchr_star[] = {'*', 0}; static const WCHAR wchr_dot[] = {'.', 0}; @@ -107,6 +119,7 @@ int main (int argc, char *argv[]) const WCHAR PROMPTSTR1[] = {'/', 'Y', 0}; const WCHAR PROMPTSTR2[] = {'/', 'y', 0}; const WCHAR COPYCMD[] = {'C', 'O', 'P', 'Y', 'C', 'M', 'D', 0}; + const WCHAR EXCLUDE[] = {'E', 'X', 'C', 'L', 'U', 'D', 'E', ':', 0}; /* * Parse the command line @@ -155,7 +168,6 @@ int main (int argc, char *argv[]) switch (toupper(argvW[0][1])) { case 'I': flags |= OPT_ASSUMEDIR; break; case 'S': flags |= OPT_RECURSIVE; break; - case 'E': flags |= OPT_EMPTYDIR; break; case 'Q': flags |= OPT_QUIET; break; case 'F': flags |= OPT_FULL; break; case 'L': flags |= OPT_SIMULATE; break; @@ -171,6 +183,32 @@ int main (int argc, char *argv[]) case 'A': flags |= OPT_ARCHIVEONLY; break; case 'M': flags |= OPT_ARCHIVEONLY | OPT_REMOVEARCH; break; + + /* E can be /E or /EXCLUDE */ + case 'E': if (CompareString (LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + &argvW[0][1], 8, + EXCLUDE, -1) == 2) { + if (XCOPY_ProcessExcludeList(&argvW[0][9])) { + LPWSTR lpMsgBuf; + int status; + + status = FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM, + NULL, ERROR_INVALID_PARAMETER, 0, + (LPTSTR) &lpMsgBuf, 0, NULL); + if (!status) { + WINE_FIXME("FIXME: Cannot display message for error %d, status %d\n", + ERROR_INVALID_PARAMETER, GetLastError()); + } else { + printf("%S\n", lpMsgBuf); + LocalFree ((HLOCAL)lpMsgBuf); + } + return RC_INITERROR; + } else flags |= OPT_EXCLUDELIST; + } else flags |= OPT_EMPTYDIR; + break; + case '-': if (toupper(argvW[0][2])=='Y') flags &= ~OPT_NOPROMPT; break; default: @@ -218,6 +256,14 @@ int main (int argc, char *argv[]) destinationstem, destinationspec, flags); + /* Clear up exclude list allocated memory */ + while (excludeList) { + EXCLUDELIST *pos = excludeList; + excludeList = excludeList -> next; + HeapFree(GetProcessHeap(), 0, pos->name); + HeapFree(GetProcessHeap(), 0, pos); + } + /* Finished - print trailer and exit */ if (flags & OPT_SIMULATE) { printf("%d file(s) would be copied\n", filesCopied); @@ -523,6 +569,30 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, skipFile = TRUE; } + /* See if exclude list provided. Note since filenames are case + insensitive, need to uppercase the filename before doing + strstr */ + if (!skipFile && (flags & OPT_EXCLUDELIST)) { + EXCLUDELIST *pos = excludeList; + WCHAR copyFromUpper[MAX_PATH]; + + /* Uppercase source filename */ + lstrcpyW(copyFromUpper, copyFrom); + CharUpperBuff(copyFromUpper, lstrlenW(copyFromUpper)); + + /* Loop through testing each exclude line */ + while (pos) { + if (wcsstr(copyFromUpper, pos->name) != NULL) { + WINE_TRACE("Skipping file as matches exclude '%s'\n", + wine_dbgstr_w(pos->name)); + skipFile = TRUE; + pos = NULL; + } else { + pos = pos->next; + } + } + } + /* Output a status message */ if (!skipFile) { if (flags & OPT_QUIET) { @@ -680,3 +750,91 @@ static BOOL XCOPY_CreateDirectory(const WCHAR* path) HeapFree(GetProcessHeap(),0,new_path); return ret; } + +/* ========================================================================= + * Process the /EXCLUDE: file list, building up a list of substrings to + * avoid copying + * Returns TRUE on any failure + * ========================================================================= */ +static BOOL XCOPY_ProcessExcludeList(WCHAR* parms) { + + WCHAR *filenameStart = parms; + + WINE_TRACE("/EXCLUDE parms: '%s'\n", wine_dbgstr_w(parms)); + excludeList = NULL; + + while (*parms && *parms != ' ' && *parms != '/') { + + /* If found '+' then process the file found so far */ + if (*parms == '+') { + if (XCOPY_ProcessExcludeFile(filenameStart, parms)) { + return TRUE; + } + filenameStart = parms+1; + } + parms++; + } + + if (filenameStart != parms) { + if (XCOPY_ProcessExcludeFile(filenameStart, parms)) { + return TRUE; + } + } + + return FALSE; +} + +/* ========================================================================= + * Process a single file from the /EXCLUDE: file list, building up a list + * of substrings to avoid copying + * Returns TRUE on any failure + * ========================================================================= */ +static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) { + + WCHAR endChar = *endOfName; + WCHAR buffer[MAXSTRING]; + FILE *inFile = NULL; + const WCHAR readTextMode[] = {'r', 't', 0}; + + /* Null terminate the filename (temporarily updates the filename hence + parms not const) */ + *endOfName = 0x00; + + /* Open the file */ + inFile = _wfopen(filename, readTextMode); + if (inFile == NULL) { + printf("Failed to open '%S'\n", filename); + *endOfName = endChar; + return TRUE; + } + + /* Process line by line */ + while (fgetws(buffer, sizeof(buffer), inFile) != NULL) { + EXCLUDELIST *thisEntry; + int length = lstrlenW(buffer); + + /* Strip CRLF */ + buffer[length-1] = 0x00; + + thisEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCLUDELIST)); + thisEntry->next = excludeList; + excludeList = thisEntry; + thisEntry->name = HeapAlloc(GetProcessHeap(), 0, + (length * sizeof(WCHAR))+1); + lstrcpyW(thisEntry->name, buffer); + CharUpperBuff(thisEntry->name, length); + WINE_TRACE("Read line : '%s'\n", wine_dbgstr_w(thisEntry->name)); + } + + /* See if EOF or error occurred */ + if (!feof(inFile)) { + printf("Failed during reading of '%S'\n", filename); + *endOfName = endChar; + return TRUE; + } + + /* Revert the input string to original form, and cleanup + return */ + *endOfName = endChar; + fclose(inFile); + return FALSE; +}

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard April 2, 2007

April 2, 2007

Module: wine Branch: master Commit: f44cb11a7376ce28c9581db2215c5ae3c0b3ac81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f44cb11a7376ce28c9581db22… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Mar 31 17:44:32 2007 +0100 comctl32: Constify some variables. --- dlls/comctl32/smoothscroll.c | 2 +- dlls/comctl32/status.c | 36 ++++++++++++++++++------------------ dlls/comctl32/string.c | 4 ++-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/smoothscroll.c b/dlls/comctl32/smoothscroll.c index 4c57ea9..e71fac3 100644 --- a/dlls/comctl32/smoothscroll.c +++ b/dlls/comctl32/smoothscroll.c @@ -68,7 +68,7 @@ typedef struct tagSMOOTHSCROLLSTRUCT { * Currently only scrolls ONCE. The comctl32 implementation uses GetTickCount * and what else to do smooth scrolling. */ -BOOL WINAPI SmoothScrollWindow( SMOOTHSCROLLSTRUCT *smooth ) { +BOOL WINAPI SmoothScrollWindow( const SMOOTHSCROLLSTRUCT *smooth ) { LPRECT lpupdaterect = smooth->lpupdaterect; HRGN hrgnupdate = smooth->hrgnupdate; RECT tmprect; diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index dea1937..522123c 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -168,7 +168,7 @@ STATUSBAR_DrawSizeGrip (HTHEME theme, HDC hdc, LPRECT lpRect) static void -STATUSBAR_DrawPart (STATUS_INFO *infoPtr, HDC hdc, STATUSWINDOWPART *part, int itemID) +STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART *part, int itemID) { RECT r = part->bound; UINT border = BDR_SUNKENOUTER; @@ -215,7 +215,7 @@ STATUSBAR_DrawPart (STATUS_INFO *infoPtr, HDC hdc, STATUSWINDOWPART *part, int i static void -STATUSBAR_RefreshPart (STATUS_INFO *infoPtr, HDC hdc, STATUSWINDOWPART *part, int itemID) +STATUSBAR_RefreshPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART *part, int itemID) { HBRUSH hbrBk; HFONT hOldFont; @@ -357,7 +357,7 @@ STATUSBAR_SetPartBounds (STATUS_INFO *infoPtr) static LRESULT -STATUSBAR_Relay2Tip (STATUS_INFO *infoPtr, UINT uMsg, +STATUSBAR_Relay2Tip (const STATUS_INFO *infoPtr, UINT uMsg, WPARAM wParam, LPARAM lParam) { MSG msg; @@ -375,7 +375,7 @@ STATUSBAR_Relay2Tip (STATUS_INFO *infoPtr, UINT uMsg, static BOOL -STATUSBAR_GetBorders (STATUS_INFO *infoPtr, INT out[]) +STATUSBAR_GetBorders (const STATUS_INFO *infoPtr, INT out[]) { TRACE("\n"); out[0] = infoPtr->horizontalBorder; @@ -387,7 +387,7 @@ STATUSBAR_GetBorders (STATUS_INFO *infoPtr, INT out[]) static BOOL -STATUSBAR_SetBorders (STATUS_INFO *infoPtr, INT in[]) +STATUSBAR_SetBorders (STATUS_INFO *infoPtr, const INT in[]) { TRACE("\n"); infoPtr->horizontalBorder = in[0]; @@ -400,7 +400,7 @@ STATUSBAR_SetBorders (STATUS_INFO *infoPtr, INT in[]) static HICON -STATUSBAR_GetIcon (STATUS_INFO *infoPtr, INT nPart) +STATUSBAR_GetIcon (const STATUS_INFO *infoPtr, INT nPart) { TRACE("%d\n", nPart); /* MSDN says: "simple parts are indexed with -1" */ @@ -415,7 +415,7 @@ STATUSBAR_GetIcon (STATUS_INFO *infoPtr, INT nPart) static INT -STATUSBAR_GetParts (STATUS_INFO *infoPtr, INT num_parts, INT parts[]) +STATUSBAR_GetParts (const STATUS_INFO *infoPtr, INT num_parts, INT parts[]) { INT i; @@ -430,7 +430,7 @@ STATUSBAR_GetParts (STATUS_INFO *infoPtr, INT num_parts, INT parts[]) static BOOL -STATUSBAR_GetRect (STATUS_INFO *infoPtr, INT nPart, LPRECT rect) +STATUSBAR_GetRect (const STATUS_INFO *infoPtr, INT nPart, LPRECT rect) { TRACE("part %d\n", nPart); if(nPart >= infoPtr->numParts || nPart < 0) @@ -524,7 +524,7 @@ STATUSBAR_GetTextLength (STATUS_INFO *infoPtr, INT nPart) } static LRESULT -STATUSBAR_GetTipTextA (STATUS_INFO *infoPtr, INT id, LPSTR tip, INT size) +STATUSBAR_GetTipTextA (const STATUS_INFO *infoPtr, INT id, LPSTR tip, INT size) { TRACE("\n"); if (tip) { @@ -546,7 +546,7 @@ STATUSBAR_GetTipTextA (STATUS_INFO *infoPtr, INT id, LPSTR tip, INT size) static LRESULT -STATUSBAR_GetTipTextW (STATUS_INFO *infoPtr, INT id, LPWSTR tip, INT size) +STATUSBAR_GetTipTextW (const STATUS_INFO *infoPtr, INT id, LPWSTR tip, INT size) { TRACE("\n"); if (tip) { @@ -793,7 +793,7 @@ STATUSBAR_SetTextT (STATUS_INFO *infoPtr, INT nPart, WORD style, static LRESULT -STATUSBAR_SetTipTextA (STATUS_INFO *infoPtr, INT id, LPSTR text) +STATUSBAR_SetTipTextA (const STATUS_INFO *infoPtr, INT id, LPSTR text) { TRACE("part %d: \"%s\"\n", id, text); if (infoPtr->hwndToolTip) { @@ -811,7 +811,7 @@ STATUSBAR_SetTipTextA (STATUS_INFO *infoPtr, INT id, LPSTR text) static LRESULT -STATUSBAR_SetTipTextW (STATUS_INFO *infoPtr, INT id, LPWSTR text) +STATUSBAR_SetTipTextW (const STATUS_INFO *infoPtr, INT id, LPWSTR text) { TRACE("part %d: \"%s\"\n", id, debugstr_w(text)); if (infoPtr->hwndToolTip) { @@ -892,7 +892,7 @@ STATUSBAR_WMDestroy (STATUS_INFO *infoPtr) static LRESULT -STATUSBAR_WMCreate (HWND hwnd, LPCREATESTRUCTA lpCreate) +STATUSBAR_WMCreate (HWND hwnd, const CREATESTRUCTA *lpCreate) { STATUS_INFO *infoPtr; NONCLIENTMETRICSW nclm; @@ -1048,7 +1048,7 @@ create_fail: /* in contrast to SB_GETTEXT*, WM_GETTEXT handles the text * of the first part only (usual behaviour) */ static INT -STATUSBAR_WMGetText (STATUS_INFO *infoPtr, INT size, LPWSTR buf) +STATUSBAR_WMGetText (const STATUS_INFO *infoPtr, INT size, LPWSTR buf) { INT len; @@ -1074,7 +1074,7 @@ STATUSBAR_WMGetText (STATUS_INFO *infoPtr, INT size, LPWSTR buf) static BOOL -STATUSBAR_WMNCHitTest (STATUS_INFO *infoPtr, INT x, INT y) +STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y) { if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) { RECT rect; @@ -1125,7 +1125,7 @@ STATUSBAR_WMSetFont (STATUS_INFO *infoPtr, HFONT font, BOOL redraw) static BOOL -STATUSBAR_WMSetText (STATUS_INFO *infoPtr, LPCSTR text) +STATUSBAR_WMSetText (const STATUS_INFO *infoPtr, LPCSTR text) { STATUSWINDOWPART *part; int len; @@ -1190,7 +1190,7 @@ STATUSBAR_WMSize (STATUS_INFO *infoPtr, WORD flags) /* update theme after a WM_THEMECHANGED message */ -static LRESULT theme_changed (STATUS_INFO* infoPtr) +static LRESULT theme_changed (const STATUS_INFO* infoPtr) { HTHEME theme = GetWindowTheme (infoPtr->Self); CloseThemeData (theme); @@ -1211,7 +1211,7 @@ STATUSBAR_NotifyFormat (STATUS_INFO *infoPtr, HWND from, INT cmd) static LRESULT -STATUSBAR_SendNotify (STATUS_INFO *infoPtr, UINT code) +STATUSBAR_SendNotify (const STATUS_INFO *infoPtr, UINT code) { NMHDR nmhdr; diff --git a/dlls/comctl32/string.c b/dlls/comctl32/string.c index 33effbd..00f72ad 100644 --- a/dlls/comctl32/string.c +++ b/dlls/comctl32/string.c @@ -427,7 +427,7 @@ LPSTR WINAPI StrStrIA(LPCSTR lpszStr, LPCSTR lpszSearch) * The signed integer value represented by the string, or 0 if no integer is * present. */ -INT WINAPI StrToIntA (LPSTR lpszStr) +INT WINAPI StrToIntA (LPCSTR lpszStr) { return atoi(lpszStr); } @@ -449,7 +449,7 @@ LPWSTR WINAPI StrStrIW(LPCWSTR lpszStr, LPCWSTR lpszSearch) * * See StrToIntA. */ -INT WINAPI StrToIntW (LPWSTR lpString) +INT WINAPI StrToIntW (LPCWSTR lpString) { return atoiW(lpString); }

1 0