Ros-diffs April 2012

ros-diffs@reactos.org

11 participants
156 discussions

[tkreuzer] 56353: [EXPLORER] Expand the environment variables when running startup programs Patch by Edijs Kolesnikovics, slightly modified by me See issue #6953 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 15 19:11:29 2012 New Revision: 56353 URL: http://svn.reactos.org/svn/reactos?rev=56353&view=rev Log: [EXPLORER] Expand the environment variables when running startup programs Patch by Edijs Kolesnikovics, slightly modified by me See issue #6953 for more details. Modified: trunk/reactos/base/shell/explorer/services/startup.c Modified: trunk/reactos/base/shell/explorer/services/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/servic… ============================================================================== --- trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] Sun Apr 15 19:11:29 2012 @@ -243,6 +243,9 @@ STARTUPINFOW si; PROCESS_INFORMATION info; DWORD exit_code=0; + WCHAR szCmdLineExp[MAX_PATH+1]= L"\0"; + + ExpandEnvironmentStrings(cmdline, szCmdLineExp, sizeof(szCmdLineExp)); memset(&si, 0, sizeof(si)); si.cb=sizeof(si); @@ -253,7 +256,7 @@ } memset(&info, 0, sizeof(info)); - if (!CreateProcessW(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, dir, &si, &info)) + if (!CreateProcessW(NULL, szCmdLineExp, NULL, NULL, FALSE, 0, NULL, dir, &si, &info)) { printf("Failed to run command (%ld)\n", GetLastError()); @@ -261,7 +264,7 @@ } printf("Successfully ran command\n"); //%s - Created process handle %p\n", - //wine_dbgstr_w(cmdline), info.hProcess); + //wine_dbgstr_w(szCmdLineExp), info.hProcess); if (wait) { /* wait for the process to exit */

12 years, 8 months

[tkreuzer] 56352: [RTL/AMD64] - Fix a bug in DbgBreakPointWithStatus: the int 3 must be after RtlpBreakWithStatusInstruction

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 15 13:52:00 2012 New Revision: 56352 URL: http://svn.reactos.org/svn/reactos?rev=56352&view=rev Log: [RTL/AMD64] - Fix a bug in DbgBreakPointWithStatus: the int 3 must be after RtlpBreakWithStatusInstruction Modified: trunk/reactos/lib/rtl/amd64/debug_asm.S Modified: trunk/reactos/lib/rtl/amd64/debug_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/amd64/debug_asm.S?… ============================================================================== --- trunk/reactos/lib/rtl/amd64/debug_asm.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/amd64/debug_asm.S [iso-8859-1] Sun Apr 15 13:52:00 2012 @@ -38,8 +38,6 @@ .PROC DbgBreakPointWithStatus .endprolog mov eax, ecx - int 3 - ret .ENDP .PROC RtlpBreakWithStatusInstruction

12 years, 8 months

[jimtabor] 56351: - Allow warnings when needed.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Apr 15 01:32:04 2012 New Revision: 56351 URL: http://svn.reactos.org/svn/reactos?rev=56351&view=rev Log: - Allow warnings when needed. Modified: trunk/rostests/winetests/user32/CMakeLists.txt Modified: trunk/rostests/winetests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/CMakeLis… ============================================================================== --- trunk/rostests/winetests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/CMakeLists.txt [iso-8859-1] Sun Apr 15 01:32:04 2012 @@ -41,5 +41,6 @@ if(NOT MSVC) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 #add_target_compile_flags(user32_winetest "-Wno-format") + #allow_warnings(user32_winetest) set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format") endif()

12 years, 8 months

[tkreuzer] 56350: [CMD] Add quotes to autocompleted names, when certain characters are present, not only spaces. Not sure if that's really all, but should be the most common.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Apr 14 22:22:20 2012 New Revision: 56350 URL: http://svn.reactos.org/svn/reactos?rev=56350&view=rev Log: [CMD] Add quotes to autocompleted names, when certain characters are present, not only spaces. Not sure if that's really all, but should be the most common. Modified: trunk/reactos/base/shell/cmd/filecomp.c Modified: trunk/reactos/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/filecomp.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] Sat Apr 14 22:22:20 2012 @@ -505,6 +505,41 @@ cmd_free(File2); return ret; } + +BOOL +FileNameContainsSpecialCharacters(LPTSTR pszFileName) +{ + TCHAR chr; + + while ((chr = *pszFileName++) != _T('\0')) + { + if ((chr == _T(' ')) || + (chr == _T('!')) || + (chr == _T('%')) || + (chr == _T('&')) || + (chr == _T('(')) || + (chr == _T(')')) || + (chr == _T('{')) || + (chr == _T('}')) || + (chr == _T('[')) || + (chr == _T(']')) || + (chr == _T('=')) || + (chr == _T('\'')) || + (chr == _T('`')) || + (chr == _T(',')) || + (chr == _T(';')) || + (chr == _T('^')) || + (chr == _T('~')) || + (chr == _T('+')) || + (chr == 0xB4)) // '´' + { + return TRUE; + } + } + + return FALSE; +} + VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, UINT cusor) { @@ -695,8 +730,8 @@ so return the first thing in the list */ strOut[0] = _T('\0'); - /* space in the name */ - if(_tcschr(FileList[Sel].Name, _T(' '))) + /* Special character in the name */ + if (FileNameContainsSpecialCharacters(FileList[Sel].Name)) { INT LastSpace; BOOL bInside;

12 years, 8 months

[tkreuzer] 56349: [CMD] Handle the + character only optionally as a token seperator, so that other commands like rename are not affected.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Apr 14 21:35:58 2012 New Revision: 56349 URL: http://svn.reactos.org/svn/reactos?rev=56349&view=rev Log: [CMD] Handle the + character only optionally as a token seperator, so that other commands like rename are not affected. Modified: trunk/reactos/base/shell/cmd/attrib.c trunk/reactos/base/shell/cmd/chcp.c trunk/reactos/base/shell/cmd/choice.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/copy.c trunk/reactos/base/shell/cmd/date.c trunk/reactos/base/shell/cmd/del.c trunk/reactos/base/shell/cmd/free.c trunk/reactos/base/shell/cmd/internal.c trunk/reactos/base/shell/cmd/misc.c trunk/reactos/base/shell/cmd/mklink.c trunk/reactos/base/shell/cmd/ren.c trunk/reactos/base/shell/cmd/replace.c trunk/reactos/base/shell/cmd/time.c trunk/reactos/base/shell/cmd/timer.c trunk/reactos/base/shell/cmd/type.c Modified: trunk/reactos/base/shell/cmd/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/attrib.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/attrib.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/attrib.c [iso-8859-1] Sat Apr 14 21:35:58 2012 @@ -213,7 +213,7 @@ nErrorLevel = 0; /* build parameter array */ - arg = split (param, &argc, FALSE); + arg = split (param, &argc, FALSE, FALSE); /* check for options */ for (i = 0; i < argc; i++) Modified: trunk/reactos/base/shell/cmd/chcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/chcp.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/chcp.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/chcp.c [iso-8859-1] Sat Apr 14 21:35:58 2012 @@ -33,7 +33,7 @@ nErrorLevel = 0; /* get parameters */ - arg = split (param, &args, FALSE); + arg = split (param, &args, FALSE, FALSE); if (args == 0) { Modified: trunk/reactos/base/shell/cmd/choice.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/choice.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/choice.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/choice.c [iso-8859-1] Sat Apr 14 21:35:58 2012 @@ -150,7 +150,7 @@ } /* build parameter array */ - arg = split (param, &argc, FALSE); + arg = split (param, &argc, FALSE, FALSE); /* evaluate arguments */ if (argc > 0) Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Sat Apr 14 21:35:58 2012 @@ -332,7 +332,7 @@ TCHAR cgetchar (VOID); BOOL CheckCtrlBreak (INT); BOOL add_entry (LPINT ac, LPTSTR **arg, LPCTSTR entry); -LPTSTR *split (LPTSTR, LPINT, BOOL); +LPTSTR *split (LPTSTR, LPINT, BOOL, BOOL); LPTSTR *splitspace (LPTSTR, LPINT); VOID freep (LPTSTR *); LPTSTR _stpcpy (LPTSTR, LPCTSTR); Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] Sat Apr 14 21:35:58 2012 @@ -438,7 +438,7 @@ /* Split the user input into array */ - arg = split(param, &argc, FALSE); + arg = split(param, &argc, FALSE, TRUE); nFiles = argc; /* Read switches and count files */ Modified: trunk/reactos/base/shell/cmd/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/date.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/date.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/date.c [iso-8859-1] Sat Apr 14 21:35:58 2012 @@ -193,7 +193,7 @@ nErrorLevel = 0; /* build parameter array */ - arg = split (param, &argc, FALSE); + arg = split (param, &argc, FALSE, FALSE); /* check for options */ for (i = 0; i < argc; i++) Modified: trunk/reactos/base/shell/cmd/del.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/del.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/del.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/del.c [iso-8859-1] Sat Apr 14 21:35:58 2012 @@ -275,7 +275,7 @@ } while (FindNextFile (hFile, &f)); FindClose (hFile); - } + } else error_sfile_not_found(szFullPath); return dwFiles; } @@ -385,7 +385,7 @@ nErrorLevel = 0; - arg = split (param, &args, FALSE); + arg = split (param, &args, FALSE, FALSE); if (args == 0) { Modified: trunk/reactos/base/shell/cmd/free.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/free.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/free.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/free.c [iso-8859-1] Sat Apr 14 21:35:58 2012 @@ -106,7 +106,7 @@ else szParam = param; - arg = split (szParam, &argc, FALSE); + arg = split (szParam, &argc, FALSE, FALSE); for (i = 0; i < argc; i++) PrintDiskInfo (arg[i]); Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] Sat Apr 14 21:35:58 2012 @@ -321,7 +321,7 @@ return 0; } - p = split (param, &argc, FALSE); + p = split (param, &argc, FALSE, FALSE); if (argc == 0) { ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING); @@ -411,7 +411,7 @@ return 0; } - arg = split (param, &args, FALSE); + arg = split (param, &args, FALSE, FALSE); dirCount = 0; /* check for options anywhere in command line */ Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] Sat Apr 14 21:35:58 2012 @@ -275,7 +275,7 @@ * are spaces and slashes ('/'). */ -LPTSTR *split (LPTSTR s, LPINT args, BOOL expand_wildcards) +LPTSTR *split (LPTSTR s, LPINT args, BOOL expand_wildcards, BOOL handle_plus) { LPTSTR *arg; LPTSTR start; @@ -315,7 +315,7 @@ /* check for separators */ if (_istspace(*s) || (*s == _T('/')) || - (*s == _T('+'))) + (handle_plus && (*s == _T('+')))) { /* Make length at least one character */ if (s == start) s++; Modified: trunk/reactos/base/shell/cmd/mklink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/mklink.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/mklink.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/mklink.c [iso-8859-1] Sat Apr 14 21:35:58 2012 @@ -132,7 +132,7 @@ return 0; } - arg = split(param, &argc, FALSE); + arg = split(param, &argc, FALSE, FALSE); for (i = 0; i < argc; i++) { if (arg[i][0] == _T('/')) Modified: trunk/reactos/base/shell/cmd/ren.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ren.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/ren.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/ren.c [iso-8859-1] Sat Apr 14 21:35:58 2012 @@ -3,7 +3,7 @@ * * * History: - * + * * * 27-Jul-1998 (John P Price <linux-guru(a)gcfl.net>) * added config.h include @@ -20,13 +20,13 @@ * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) * Remove all hardcode string to En.rc * 25-Nov-2008 (Victor Martinez) <vicmarcal(a)hotmail.com> Patch dedicated to Myrjala because her comprenhension and love :D - * Fixing following Bugs: + * Fixing following Bugs: * -Wrong behavior with wildcards when Source and Destiny are Paths(FIXED). * -Wrong general behavior (MSDN:"Rename cant move files between subdirectories")(FIXED) * -Wrong behavior when renaming without path in destiny:(i.e) "ren C:\text\as.txt list.txt" it moves as.txt and then rename it(FIXED) * (MSDN: If there is a Path in Source and no Path in Destiny, then Destiny Path is Source Path,because never Ren has to be used to move.) * -Implemented checkings if SourcePath and DestinyPath are differents. - * + * */ #include <precomp.h> @@ -59,13 +59,13 @@ DWORD dwFiles = 0; /* number of renamedd files */ INT i; - + LPTSTR srcPattern = NULL; /* Source Argument*/ TCHAR srcPath[MAX_PATH]; /*Source Path Directories*/ LPTSTR srcFILE = NULL; /*Contains the files name(s)*/ - TCHAR srcFinal[MAX_PATH]; - - + TCHAR srcFinal[MAX_PATH]; + + LPTSTR dstPattern = NULL; /*Destiny Argument*/ TCHAR dstPath[MAX_PATH]; /*Source Path Directories*/ LPTSTR dstFILE = NULL; /*Contains the files name(s)*/ @@ -75,12 +75,12 @@ BOOL bDstWildcard = FALSE; BOOL bPath = FALSE; - - - - - - + + + + + + LPTSTR p,q,r; HANDLE hFile; @@ -88,8 +88,8 @@ /*If the PARAM=/? then show the help*/ if (!_tcsncmp(param, _T("/?"), 2)) { - - + + ConOutResPaging(TRUE,STRING_REN_HELP1); return 0; } @@ -97,8 +97,8 @@ nErrorLevel = 0; /* Split the argument list.Args will be saved in arg vector*/ - arg = split(param, &args, FALSE); - + arg = split(param, &args, FALSE, FALSE); + if (args < 2) { if (!(dwFlags & REN_ERROR)) @@ -124,7 +124,7 @@ case _T('N'): dwFlags |= REN_NOTHING; break; - + case _T('P'): dwFlags |= REN_PROMPT; break; @@ -158,8 +158,8 @@ freep(arg); return 1; } - - + + /* Get destination pattern and source pattern*/ for (i = 0; i < args; i++) { @@ -167,16 +167,16 @@ continue; dstPattern = arg[i]; //we save the Last argument as dstPattern srcPattern = arg[i-1]; - + } - - - - + + + + if (_tcschr(srcPattern, _T('\\'))) //Checking if the Source (srcPattern) is a Path to the file - { - + { + bPath= TRUE; //Splitting srcPath and srcFile. @@ -190,11 +190,11 @@ if(!_tcschr(srcFILE, _T('\\'))) break; } _tcsncpy(srcPath,srcPattern,_tcslen(srcPattern)-_tcslen(srcFILE)); - - - + + + if(_tcschr(dstPattern, _T('\\'))) //Checking if the Destiny (dstPattern)is also a Path.And splitting dstPattern in dstPath and srcPath. - { + { dstFILE = _tcschr(dstPattern, _T('\\')); nSlash=0; while(_tcschr(dstFILE, _T('\\'))) @@ -204,53 +204,53 @@ if(!_tcschr(dstFILE, _T('\\'))) break; } _tcsncpy(dstPath,dstPattern,_tcslen(dstPattern)-_tcslen(dstFILE)); - + if((_tcslen(dstPath)!=_tcslen(srcPath))||(_tcsncmp(srcPath,dstPath,_tcslen(srcPath))!=0)) //If it has a Path,then MUST be equal than srcPath { error_syntax(dstPath); freep(arg); return 1; } - }else { //If Destiny hasnt a Path,then (MSDN says) srcPath is its Path. - + }else { //If Destiny hasnt a Path,then (MSDN says) srcPath is its Path. + _tcscpy(dstPath,srcPath); - + dstFILE=dstPattern; - + } - - + + } - + if (!_tcschr(srcPattern, _T('\\'))) //If srcPattern isnt a Path but a name: - { + { srcFILE=srcPattern; if(_tcschr(dstPattern, _T('\\'))) - { + { error_syntax(dstPattern); - + freep(arg); return 1; }else dstFILE=dstPattern; } - + //Checking Wildcards. if (_tcschr(dstFILE, _T('*')) || _tcschr(dstFILE, _T('?'))) bDstWildcard = TRUE; - - - + + + TRACE("\n\nSourcePattern: %s SourcePath: %s SourceFile: %s", debugstr_aw(srcPattern),debugstr_aw(srcPath),debugstr_aw(srcFILE)); TRACE("\n\nDestinationPattern: %s Destination Path:%s Destination File: %s\n", debugstr_aw(dstPattern),debugstr_aw(dstPath),debugstr_aw(dstFILE)); - + hFile = FindFirstFile(srcPattern, &f); - + if (hFile == INVALID_HANDLE_VALUE) { if (!(dwFlags & REN_ERROR)) error_file_not_found(); - + } do { @@ -271,7 +271,7 @@ continue; TRACE("Found source name: %s\n", debugstr_aw(f.cFileName)); - /* So here we have splitted the dstFILE and we have find a f.cFileName(thanks to srcPattern) + /* So here we have splitted the dstFILE and we have find a f.cFileName(thanks to srcPattern) * Now we have to use the mask (dstFILE) (which can have Wildcards) with f.cFileName to find destination file name(dstLast) */ p = f.cFileName; q = dstFILE; @@ -310,37 +310,37 @@ *r = 0; //Well we have splitted the Paths,so now we have to paste them again(if needed),thanks bPath. if( bPath == TRUE) - { - + { + _tcscpy(srcFinal,srcPath); - + _tcscat(srcFinal,f.cFileName); - + _tcscpy(dstFinal,dstPath); _tcscat(dstFinal,dstLast); - - + + }else{ _tcscpy(srcFinal,f.cFileName); _tcscpy(dstFinal,dstLast); } - + TRACE("DestinationPath: %s\n", debugstr_aw(dstFinal)); - - + + if (!(dwFlags & REN_QUIET) && !(dwFlags & REN_TOTAL)) - + ConOutPrintf(_T("%s -> %s\n"),srcFinal , dstFinal); /* Rename the file */ if (!(dwFlags & REN_NOTHING)) - { - - - + { + + + if (MoveFile(srcFinal, dstFinal)) { dwFiles++; @@ -354,12 +354,12 @@ } } } - + while (FindNextFile(hFile, &f)); //Closing and Printing errors. - + FindClose(hFile); - + if (!(dwFlags & REN_QUIET)) { @@ -368,9 +368,9 @@ else ConOutResPrintf(STRING_REN_HELP3, dwFiles); } - + freep(arg); - + return 0; } Modified: trunk/reactos/base/shell/cmd/replace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/replace.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/replace.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/replace.c [iso-8859-1] Sat Apr 14 21:35:58 2012 @@ -376,7 +376,7 @@ } /* Divide the argument in to an array of c-strings */ - arg = split (param, &argc, FALSE); + arg = split (param, &argc, FALSE, FALSE); nFiles = argc; /* Read options */ Modified: trunk/reactos/base/shell/cmd/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/time.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/time.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/time.c [iso-8859-1] Sat Apr 14 21:35:58 2012 @@ -145,7 +145,7 @@ nErrorLevel = 0; /* build parameter array */ - arg = split (param, &argc, FALSE); + arg = split (param, &argc, FALSE, FALSE); /* check for options */ for (i = 0; i < argc; i++) Modified: trunk/reactos/base/shell/cmd/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/timer.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/timer.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/timer.c [iso-8859-1] Sat Apr 14 21:35:58 2012 @@ -100,7 +100,7 @@ nErrorLevel = 0; - p = split (param, &argc, FALSE); + p = split (param, &argc, FALSE, FALSE); //read options for (i = 0; i < argc; i++) Modified: trunk/reactos/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/type.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/type.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/type.c [iso-8859-1] Sat Apr 14 21:35:58 2012 @@ -56,7 +56,7 @@ return 1; } - argv = split (param, &argc, TRUE); + argv = split (param, &argc, TRUE, FALSE); for(i = 0; i < argc; i++) {

12 years, 8 months

[tkreuzer] 56348: Remove confusing comments

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Apr 14 21:19:12 2012 New Revision: 56348 URL: http://svn.reactos.org/svn/reactos?rev=56348&view=rev Log: Remove confusing comments Modified: trunk/reactos/base/shell/cmd/copy.c Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] Sat Apr 14 21:19:12 2012 @@ -293,9 +293,9 @@ (most likely Eric Kohl) and it was taken from ren.c */ static void BuildFileName( - LPTSTR pszSource, // original - LPTSTR pszTarget, // template - LPTSTR pszOutput) // taget + LPTSTR pszSource, + LPTSTR pszTarget, + LPTSTR pszOutput) { /* build destination file name */ while (*pszTarget != 0)

12 years, 8 months

[pschweitzer] 56347: [PSDK] Ensure mmc.idl passes widl

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Apr 14 20:59:51 2012 New Revision: 56347 URL: http://svn.reactos.org/svn/reactos?rev=56347&view=rev Log: [PSDK] Ensure mmc.idl passes widl Modified: branches/iut-mmc/include/psdk/mmc.idl Modified: branches/iut-mmc/include/psdk/mmc.idl URL: http://svn.reactos.org/svn/reactos/branches/iut-mmc/include/psdk/mmc.idl?re… ============================================================================== --- branches/iut-mmc/include/psdk/mmc.idl [iso-8859-1] (original) +++ branches/iut-mmc/include/psdk/mmc.idl [iso-8859-1] Sat Apr 14 20:59:51 2012 @@ -754,7 +754,6 @@ [ object, uuid(43136EB6-D36C-11CF-ADBC-00AA00A80033), - object, pointer_default(unique) ] @@ -1052,7 +1051,7 @@ { MMC_TASK_DISPLAY_TYPE eDisplayType; [switch_type(MMC_TASK_DISPLAY_TYPE), switch_is((MMC_TASK_DISPLAY_TYPE)eDisplayType)] - _ANONYMOUS_UNION union + union { [case(MMC_TASK_DISPLAY_TYPE_BITMAP,MMC_TASK_DISPLAY_TYPE_VANILLA_GIF,MMC_TASK_DISPLAY_TYPE_CHOCOLATE_GIF)] MMC_TASK_DISPLAY_BITMAP uBitmap; @@ -1076,7 +1075,7 @@ LPOLESTR szText; LPOLESTR szHelpString; MMC_ACTION_TYPE eActionType; - _ANONYMOUS_UNION union + union { LONG_PTR nCommandID; LPOLESTR szActionURL; @@ -1316,21 +1315,21 @@ DWORD dwMiscOptions; [switch_type(MMC_VIEW_TYPE), switch_is((MMC_VIEW_TYPE)eViewType)] - _ANONYMOUS_UNION union + union { [case(MMC_VIEW_TYPE_LIST)] DWORD dwListOptions; [case(MMC_VIEW_TYPE_HTML)] - _ANONYMOUS_STRUCT struct + struct { DWORD dwHTMLOptions; LPOLESTR pstrURL; } DUMMYSTRUCTNAME; [case(MMC_VIEW_TYPE_OCX)] - _ANONYMOUS_STRUCT struct + struct { DWORD dwOCXOptions; LPUNKNOWN pUnkControl;

12 years, 8 months

[tkreuzer] 56346: [CMD] Fix several bugs in the copy command: - "x:" is not a valid source path (see bug #5709) - when appending files using "+", cmd must distinguish between + as operator and + as...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Apr 14 20:57:38 2012 New Revision: 56346 URL: http://svn.reactos.org/svn/reactos?rev=56346&view=rev Log: [CMD] Fix several bugs in the copy command: - "x:" is not a valid source path (see bug #5709) - when appending files using "+", cmd must distinguish between + as operator and + as part of the source file, when being put in "". For that reason the tokenizer was modified to make + a seperate token, which is replaced with | when creating the string of multiple files (since + is a valid file character) - ? was not correctly handled when passed in the output file name - factor out the code to create the file name from wildcards and make it readable (no, p, q, r are NOT reasonable variable names!) - Move code out of the loop that doesn't belong there - Make sure the file names are printed when multiple files are copied or appended - write the count of written files (which is 1 when appending), not source files after the copy process is done - Remove an excessive newline when writing strings with ConPuts() - Improve readability a bit Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/console.c trunk/reactos/base/shell/cmd/copy.c trunk/reactos/base/shell/cmd/misc.c trunk/reactos/base/shell/cmd/type.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sat Apr 14 20:57:38 2012 @@ -1536,15 +1536,15 @@ if (RegOpenKeyEx(hkeyRoot, _T("SOFTWARE\\Microsoft\\Command Processor"), - 0, - KEY_READ, + 0, + KEY_READ, &hkey ) == ERROR_SUCCESS) { - if(RegQueryValueEx(hkey, + if(RegQueryValueEx(hkey, _T("AutoRun"), - 0, - 0, - (LPBYTE)autorun, + 0, + 0, + (LPBYTE)autorun, &len) == ERROR_SUCCESS) { if (*autorun) @@ -1749,10 +1749,10 @@ if (!*ptr) { /* If neither /C or /K was given, display a simple version string */ - ConOutResPrintf(STRING_REACTOS_VERSION, + ConOutResPrintf(STRING_REACTOS_VERSION, _T(KERNEL_RELEASE_STR), _T(KERNEL_VERSION_BUILD_STR)); - ConOutPuts(_T("(C) Copyright 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team.")); + ConOutPuts(_T("(C) Copyright 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team.\n")); } if (AutoRun) Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Sat Apr 14 20:57:38 2012 @@ -166,7 +166,6 @@ VOID ConPuts(LPTSTR szText, DWORD nStdHandle) { ConWrite(szText, _tcslen(szText), nStdHandle); - ConWrite(_T("\r\n"), 2, nStdHandle); } VOID ConOutResPaging(BOOL NewPage, UINT resID) Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] Sat Apr 14 20:57:38 2012 @@ -48,11 +48,11 @@ }; INT -copy (TCHAR source[MAX_PATH], - TCHAR dest[MAX_PATH], - INT append, - DWORD lpdwFlags, - BOOL bTouch) +copy(TCHAR source[MAX_PATH], + TCHAR dest[MAX_PATH], + INT append, + DWORD lpdwFlags, + BOOL bTouch) { FILETIME srctime,NewFileTime; HANDLE hFileSrc; @@ -289,8 +289,45 @@ return res; } - -INT cmd_copy (LPTSTR param) +/* The following lines of copy were written by someone else +(most likely Eric Kohl) and it was taken from ren.c */ +static void +BuildFileName( + LPTSTR pszSource, // original + LPTSTR pszTarget, // template + LPTSTR pszOutput) // taget +{ + /* build destination file name */ + while (*pszTarget != 0) + { + if (*pszTarget == _T('*')) + { + pszTarget++; + while ((*pszSource != 0) && (*pszSource != *pszTarget)) + { + *pszOutput++ = *pszSource++; + } + } + else if (*pszTarget == _T('?')) + { + pszTarget++; + if (*pszSource != 0) + { + *pszOutput++ = *pszSource++; + } + } + else + { + *pszOutput++ = *pszTarget++; + if (*pszSource != 0) + pszSource++; + } + } + + *pszOutput = 0; +} + +INT cmd_copy(LPTSTR param) { LPTSTR *arg; INT argc, i, nFiles, nOverwrite = 0, nSrc = -1, nDes = -1; @@ -301,11 +338,10 @@ /* If this is the type of copy where we are adding files */ BOOL bAppend = FALSE; WIN32_FIND_DATA findBuffer; - HANDLE hFile; + HANDLE hFile = NULL; BOOL bTouch = FALSE; /* Used when something like "copy c*.exe d*.exe" during the process of figuring out the new name */ - TCHAR tmpName[MAX_PATH] = _T(""); /* Pointer to keep track of how far through the append input(file1+file2+file3) we are */ TCHAR * appendPointer = _T("\0"); /* The full path to src and dest. This has drive letter, folders, and filename */ @@ -315,17 +351,16 @@ BOOL bSrcName = FALSE; /* Seems like a waste but it is a pointer used to copy from input to PreserveName */ TCHAR * UseThisName; - /* Stores the name( i.e. blah.txt or blah*.txt) which later we might need */ - TCHAR PreserveName[MAX_PATH]; /* for CMDCOPY env */ TCHAR *evar; int size; TCHAR * szTouch; - BOOL bDone = FALSE; + BOOL bHasWildcard, bDone = FALSE, bMoreFiles = FALSE; + BOOL bMultipleSource = FALSE, bMultipleDest = FALSE; /* Show help/usage info */ - if (!_tcsncmp (param, _T("/?"), 2)) + if (!_tcsncmp(param, _T("/?"), 2)) { ConOutResPaging(TRUE, STRING_COPY_HELP2); return 0; @@ -350,11 +385,12 @@ } /* check see if we did get any env variable */ - if (size !=0) - { - int t=0; + if (size != 0) + { + int t = 0; + /* scan and set the flags */ - for (t=0;t<size;t++) + for (t = 0; t < size; t++) { if (_tcsncicmp(_T("/A"),&evar[t],2) == 0) { @@ -402,9 +438,8 @@ /* Split the user input into array */ - arg = split (param, &argc, FALSE); + arg = split(param, &argc, FALSE); nFiles = argc; - /* Read switches and count files */ for (i = 0; i < argc; i++) @@ -469,28 +504,35 @@ else { /* If it isn't a switch then it is the source or destination */ - if(nSrc == -1) + if (nSrc == -1) { nSrc = i; } - else if(*arg[i] == _T('+') || *arg[i] == _T(',')) - { - /* Add these onto the source string + else if (*arg[i] == _T('+')) + { + /* Next file should be appended */ + bMoreFiles = TRUE; + nFiles -= 1; + } + else if (bMoreFiles) + { + /* Add this file to the source string this way we can do all checks directly on source string later on */ TCHAR * ptr; - int length = (_tcslen(arg[nSrc]) +_tcslen(arg[i]) + _tcslen(arg[i+1]) + 1) * sizeof(TCHAR); + int length = (_tcslen(arg[nSrc]) + _tcslen(arg[i]) + 2) * sizeof(TCHAR); ptr = cmd_alloc(length); if (ptr) { _tcscpy(ptr, arg[nSrc]); + _tcscat(ptr, _T("|")); _tcscat(ptr, arg[i]); - _tcscat(ptr, arg[i+1]); cmd_free(arg[nSrc]); arg[nSrc] = ptr; - i++; - nFiles -= 2; + nFiles -= 1; } + + bMoreFiles = FALSE; } else if(nDes == -1) { @@ -501,100 +543,149 @@ /* keep quiet within batch files */ if (bc != NULL) - { + { dwFlags |= COPY_NO_PROMPT; dwFlags &= ~COPY_PROMPT; - } - - if(nFiles < 1) + } + + if (nFiles < 1) { /* There are not enough files, there has to be at least 1 */ ConOutResPuts(STRING_ERROR_REQ_PARAM_MISSING); - freep (arg); + freep(arg); return 1; } - if(nFiles > 2) + if (nFiles > 2) { /* There are too many file names in command */ ConErrResPrintf(STRING_ERROR_TOO_MANY_PARAMETERS,_T("")); nErrorLevel = 1; - freep (arg); + freep(arg); return 1; } - if (nDes != -1) /* you can only append files when there is a destination */ - { - if(((_tcschr (arg[nSrc], _T('+')) != NULL) || - (_tcschr (arg[nSrc], _T('*')) != NULL && _tcschr (arg[nDes], _T('*')) == NULL) || - (IsExistingDirectory (arg[nSrc]) && (_tcschr (arg[nDes], _T('*')) == NULL && !IsExistingDirectory (arg[nDes]))) - )) - { - /* There is a + in the source filename, this means - that there is more then one file being put into - one file. */ - bAppend = TRUE; - if(_tcschr (arg[nSrc], _T('+')) != NULL) - appendPointer = arg[nSrc]; - } + if ((_tcschr(arg[nSrc], _T('|')) != NULL) || + (_tcschr(arg[nSrc], _T('*')) != NULL) || + (_tcschr(arg[nSrc], _T('?')) != NULL) || + IsExistingDirectory(arg[nSrc])) + { + bMultipleSource = TRUE; } /* Reusing the number of files variable */ nFiles = 0; + /* Check if no destination argument is passed */ + if (nDes == -1) + { + /* If no destination was entered then just use + the current directory as the destination */ + GetCurrentDirectory(MAX_PATH, szDestPath); + printf("szDestPath = %S\n", szDestPath); + } + else + { + /* Check if the destination is 'x:' */ + if ((arg[nDes][1] == _T(':')) && (arg[nDes][2] == _T('\0'))) + { + GetRootPath(arg[nDes], szDestPath, MAX_PATH); + } + else + { + /* If the user entered two file names then form the full string path */ + GetFullPathName(arg[nDes], MAX_PATH, szDestPath, NULL); + } + + /* Make sure there is an ending slash to the path if the dest is a folder */ + if ((_tcschr(szDestPath, _T('*')) == NULL) && + IsExistingDirectory(szDestPath)) + { + bMultipleDest = TRUE; + if (szDestPath[_tcslen(szDestPath) - 1] != _T('\\')) + _tcscat(szDestPath, _T("\\")); + } + + /* Check if the destination uses wildcards */ + if ((_tcschr(arg[nDes], _T('*')) != NULL) || + (_tcschr(arg[nDes], _T('?')) != NULL)) + { + bMultipleDest = TRUE; + } + } + + if (nDes != -1) /* you can only append files when there is a destination */ + { + if (bMultipleSource && !bMultipleDest) + { + /* We have multiple source files, but not multiple destination + files. This means we are appending the soruce files. */ + bAppend = TRUE; + if (_tcschr(arg[nSrc], _T('|')) != NULL) + appendPointer = arg[nSrc]; + } + } + + /* Save the name the user entered */ + UseThisName = _tcsrchr(szDestPath,_T('\\')); + if (UseThisName) + { + /* Split the name from the path */ + *UseThisName++ = _T('\0'); + + /* Check if the dest path ends with '\*' or '\' */ + if (((UseThisName[0] == _T('*')) && (UseThisName[1] == _T('\0'))) || + (UseThisName[0] == _T('\0'))) + { + /* In this case we will be using the same name as the source file + for the destination file because destination is a folder */ + bSrcName = TRUE; + UseThisName = NULL; + } + } + else + { + /* Something's seriously wrong! */ + UseThisName = szDestPath; + printf("\n##########\n\n"); + } + do { - /* Set up the string that is the path to the destination */ - if(nDes != -1) - { - if(_tcslen(arg[nDes]) == 2 && arg[nDes][1] == _T(':')) - { - GetRootPath(arg[nDes],szDestPath,MAX_PATH); - } - else - /* If the user entered two file names then form the full string path */ - GetFullPathName (arg[nDes], MAX_PATH, szDestPath, NULL); - } - else - { - /* If no destination was entered then just use - the current directory as the destination */ - GetCurrentDirectory (MAX_PATH, szDestPath); - } - /* Get the full string of the path to the source file */ - if(_tcschr (arg[nSrc], _T('+')) != NULL) - { - _tcscpy(tmpName,_T("\0")); + if (_tcschr(arg[nSrc], _T('|')) != NULL) + { + /* Reset the source path */ + szSrcPath[0] = _T('\0'); + /* Loop through the source file name and copy all the chars one at a time until it gets too + */ while(TRUE) { - if(!_tcsncmp (appendPointer,_T("+"),1) || !_tcsncmp (appendPointer,_T("\0"),1)) + if (appendPointer[0] == _T('|')) { - /* Now that the pointer is on the + we - need to go to the start of the next filename */ - if(!_tcsncmp (appendPointer,_T("+"),1)) - appendPointer++; - else - bDone = TRUE; + /* Skip the | and go to the next file name */ + appendPointer++; break; } - - _tcsncat(tmpName,appendPointer,1); + else if (appendPointer[0] == _T('\0')) + { + bDone = TRUE; + break; + } + + _tcsncat(szSrcPath, appendPointer, 1); appendPointer++; } - - /* Finish the string off with a null char */ - _tcsncat(tmpName,_T("\0"),1); - - if(_tcschr (arg[nSrc], _T(',')) != NULL) +printf("szSrcPath = %S\n\n", szSrcPath); + + if (_tcschr(arg[nSrc], _T(',')) != NULL) { /* Only time there is a , in the source is when they are using touch Cant have a destination and can only have on ,, at the end of the string Cant have more then one file name */ - szTouch = _tcsstr (arg[nSrc], _T("+")); - if(_tcsncmp (szTouch,_T("+,,\0"),4) || nDes != -1) + szTouch = _tcsstr(arg[nSrc], _T("|")); + if (_tcsncmp(szTouch,_T("|,,\0"), 4) || (nDes != -1)) { ConErrResPrintf(STRING_ERROR_INVALID_PARAM_FORMAT,arg[nSrc]); nErrorLevel = 1; @@ -608,175 +699,123 @@ else { bDone = TRUE; - _tcscpy(tmpName, arg[nSrc]); - } - - /* Get full path or root names */ - if(_tcslen(tmpName) == 2 && tmpName[1] == _T(':')) - { - GetRootPath(tmpName,szSrcPath,MAX_PATH); - } - else - { - /* Get the full path to first file in the string of file names */ - GetFullPathName (tmpName, MAX_PATH, szSrcPath, NULL); - - /* We got a device path of form \\.\x */ - /* FindFirstFile cannot handle this, therefore use the short path */ - if (szSrcPath[0] == _T('\\') && szSrcPath[1] == _T('\\') && - szSrcPath[2] == _T('.') && szSrcPath[3] == _T('\\')) - { - _tcscpy(szSrcPath, tmpName); - } - } + _tcscpy(szSrcPath, arg[nSrc]); + } + + /* "x:" is not a valid source path format. */ + if ((szSrcPath[1] == _T(':')) && (szSrcPath[2] == _T('\0'))) + { + ConOutPrintf(_T("%s\n"), szSrcPath); + ConOutFormatMessage(ERROR_FILE_NOT_FOUND, szSrcPath); + nErrorLevel = 1; + break; + } + /* From this point on, we can assume that the shortest path is 3 letters long and that would be [DriveLetter]:\ */ - /* If there is no * in the path name and it is a folder - then we will need to add a wildcard to the pathname - so FindFirstFile comes up with all the files in that - folder */ - if(_tcschr (szSrcPath, _T('*')) == NULL && - IsExistingDirectory (szSrcPath)) + /* Check if the path has a wildcard */ + bHasWildcard = (_tcschr(szSrcPath, _T('*')) != NULL); + + /* If there is no * in the path name and it is a folder then we will + need to add a wildcard to the pathname so FindFirstFile comes up + with all the files in that folder */ + if (!bHasWildcard && IsExistingDirectory(szSrcPath)) { /* If it doesnt have a \ at the end already then on needs to be added */ - if(szSrcPath[_tcslen(szSrcPath) - 1] != _T('\\')) - _tcscat (szSrcPath, _T("\\")); - /* Add a wildcard after the \ */ - _tcscat (szSrcPath, _T("*")); - } - /* Make sure there is an ending slash to the path if the dest is a folder */ - if(_tcschr (szDestPath, _T('*')) == NULL && - IsExistingDirectory(szDestPath)) - { - if(szDestPath[_tcslen(szDestPath) - 1] != _T('\\')) - _tcscat (szDestPath, _T("\\")); + if (szSrcPath[_tcslen(szSrcPath) - 1] != _T('\\')) + _tcscat(szSrcPath, _T("\\")); + _tcscat(szSrcPath, _T("*")); + bHasWildcard = TRUE; + } + + /* If the path ends with '\' add a wildcard at the end */ + if (szSrcPath[_tcslen(szSrcPath) - 1] == _T('\\')) + { + _tcscat(szSrcPath, _T("*")); + bHasWildcard = TRUE; } /* Get a list of all the files */ - hFile = FindFirstFile (szSrcPath, &findBuffer); - - /* We need to figure out what the name of the file in the is going to be */ - if((szDestPath[_tcslen(szDestPath) - 1] == _T('*') && szDestPath[_tcslen(szDestPath) - 2] == _T('\\')) || - szDestPath[_tcslen(szDestPath) - 1] == _T('\\')) - { - /* In this case we will be using the same name as the source file - for the destination file because destination is a folder */ - bSrcName = TRUE; - } - else - { - /* Save the name the user entered */ - UseThisName = _tcsrchr(szDestPath,_T('\\')); - UseThisName++; - _tcscpy(PreserveName,UseThisName); + hFile = FindFirstFile(szSrcPath, &findBuffer); + + /* If it couldnt open the file handle, print out the error */ + if (hFile == INVALID_HANDLE_VALUE) + { + /* only print source name when more then one file */ + if (bMultipleSource) + ConOutPrintf(_T("%s\n"), szSrcPath); + + ConOutFormatMessage(GetLastError(), szSrcPath); + freep(arg); + nErrorLevel = 1; + return 1; } /* Strip the paths back to the folder they are in */ - for(i = (_tcslen(szSrcPath) - 1); i > -1; i--) - if(szSrcPath[i] != _T('\\')) + for (i = (_tcslen(szSrcPath) - 1); i > -1; i--) + if (szSrcPath[i] != _T('\\')) szSrcPath[i] = _T('\0'); else break; - for(i = (_tcslen(szDestPath) - 1); i > -1; i--) - if(szDestPath[i] != _T('\\')) - szDestPath[i] = _T('\0'); - else - break; - do { /* Check Breaker */ - if(CheckCtrlBreak(BREAK_INPUT)) + if (CheckCtrlBreak(BREAK_INPUT)) { freep(arg); return 1; } + /* Set the override to yes each new file */ nOverwrite = 1; - /* If it couldnt open the file handle, print out the error */ - if(hFile == INVALID_HANDLE_VALUE) - { - ConOutFormatMessage (GetLastError(), szSrcPath); - freep (arg); + /* Ignore the . and .. files */ + if (!_tcscmp(findBuffer.cFileName, _T(".")) || + !_tcscmp(findBuffer.cFileName, _T("..")) || + findBuffer.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + continue; + } + + /* Copy the base folder over to a tmp string */ + _tcscpy(tmpDestPath, szDestPath); + _tcscat(tmpDestPath, _T("\\")); + + /* Can't put a file into a folder that isnt there */ + if (_tcscmp(tmpDestPath, _T("\\\\.\\")) && + !IsExistingDirectory(tmpDestPath)) + { + ConOutFormatMessage(GetLastError(), szSrcPath); + freep(arg); nErrorLevel = 1; return 1; } - /* Ignore the . and .. files */ - if(!_tcscmp (findBuffer.cFileName, _T(".")) || - !_tcscmp (findBuffer.cFileName, _T(".."))|| - findBuffer.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - continue; - - /* Copy the base folder over to a tmp string */ - _tcscpy(tmpDestPath,szDestPath); - - /* Can't put a file into a folder that isnt there */ - if(_tcscmp (szDestPath, _T("\\\\.\\")) && !IsExistingDirectory(szDestPath)) - { - ConOutFormatMessage (GetLastError (), szSrcPath); - freep (arg); - nErrorLevel = 1; - return 1; - } /* Copy over the destination path name */ - if(bSrcName) - _tcscat (tmpDestPath, findBuffer.cFileName); + if (bSrcName) + _tcscat(tmpDestPath, findBuffer.cFileName); else { /* If there is no wildcard you can use the name the user entered */ - if(_tcschr (PreserveName, _T('*')) == NULL) + if ((_tcschr(UseThisName, _T('*')) == NULL) && + (_tcschr(UseThisName, _T('?')) == NULL)) { - _tcscat (tmpDestPath, PreserveName); + _tcscat(tmpDestPath, UseThisName); } else { - /* The following lines of copy were written by someone else - (most likely Eric Khoul) and it was taken from ren.c */ - LPTSTR p,q,r; TCHAR DoneFile[MAX_PATH]; - /* build destination file name */ - p = findBuffer.cFileName; - q = PreserveName; - r = DoneFile; - while(*q != 0) - { - if (*q == '*') - { - q++; - while (*p != 0 && *p != *q) - { - *r = *p; - p++; - r++; - } - } - else if (*q == '?') - { - q++; - if (*p != 0) - { - *r = *p; - p++; - r++; - } - } - else - { - *r = *q; - if (*p != 0) - p++; - q++; - r++; - } - } - *r = 0; + + BuildFileName(findBuffer.cFileName, + UseThisName, + DoneFile); + + /* Add the filename to the tmp string path */ - _tcscat (tmpDestPath, DoneFile); + _tcscat(tmpDestPath, DoneFile); } } @@ -785,7 +824,7 @@ _tcscat (tmpSrcPath, findBuffer.cFileName); /* Check to see if the file is the same file */ - if(!bTouch && !_tcscmp (tmpSrcPath, tmpDestPath)) + if(!bTouch && !_tcscmp(tmpSrcPath, tmpDestPath)) { ConOutResPrintf(STRING_COPY_ERROR2); @@ -793,21 +832,22 @@ break; } + /* only print source name when more then one file */ + if (bMultipleSource) + ConOutPrintf(_T("%s\n"), tmpSrcPath); + /* Handle any overriding / prompting that needs to be done */ - if(((!(dwFlags & COPY_NO_PROMPT) && IsExistingFile (tmpDestPath)) || dwFlags & COPY_PROMPT) && !bTouch) + if (((!(dwFlags & COPY_NO_PROMPT) && IsExistingFile (tmpDestPath)) || dwFlags & COPY_PROMPT) && !bTouch) nOverwrite = CopyOverwrite(tmpDestPath); - if(nOverwrite == PROMPT_NO || nOverwrite == PROMPT_BREAK) + if (nOverwrite == PROMPT_NO || nOverwrite == PROMPT_BREAK) continue; - if(nOverwrite == PROMPT_ALL || (nOverwrite == PROMPT_YES && bAppend)) + if (nOverwrite == PROMPT_ALL || (nOverwrite == PROMPT_YES && bAppend)) dwFlags |= COPY_NO_PROMPT; /* Tell weather the copy was successful or not */ if(copy(tmpSrcPath,tmpDestPath, bAppend, dwFlags, bTouch)) { nFiles++; - /* only print source name when more then one file */ - if(_tcschr (arg[nSrc], _T('+')) != NULL || _tcschr (arg[nSrc], _T('*')) != NULL) - ConOutPrintf(_T("%s\n"),findBuffer.cFileName); //LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE); } else @@ -819,15 +859,15 @@ } /* Loop through all wildcard files */ - } while(FindNextFile (hFile, &findBuffer)); + } while (FindNextFile(hFile, &findBuffer)); /* Loop through all files in src string with a + */ } while(!bDone); /* print out the number of files copied */ - ConOutResPrintf(STRING_COPY_FILE, nFiles); - - FindClose(hFile); + ConOutResPrintf(STRING_COPY_FILE, bAppend ? 1 : nFiles); + + if (hFile) FindClose(hFile); if (arg != NULL) freep(arg); Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] Sat Apr 14 20:57:38 2012 @@ -294,7 +294,7 @@ BOOL bQuoted = FALSE; /* skip leading spaces */ - while (*s && (_istspace (*s) || _istcntrl (*s))) + while (*s && (_istspace(*s) || _istcntrl(*s))) ++s; start = s; @@ -304,10 +304,25 @@ ++s; /* skip to next word delimiter or start of next option */ - while (_istprint(*s) && (bQuoted || (!_istspace(*s) && *s != _T('/')))) + while (_istprint(*s)) { /* if quote (") then set bQuoted */ bQuoted ^= (*s == _T('\"')); + + /* Check if we have unquoted text */ + if (!bQuoted) + { + /* check for separators */ + if (_istspace(*s) || + (*s == _T('/')) || + (*s == _T('+'))) + { + /* Make length at least one character */ + if (s == start) s++; + break; + } + } + ++s; } @@ -322,7 +337,7 @@ memcpy (q, start, len * sizeof (TCHAR)); q[len] = _T('\0'); StripQuotes(q); - if (expand_wildcards && _T('/') != *start && + if (expand_wildcards && (_T('/') != *start) && (NULL != _tcschr(q, _T('*')) || NULL != _tcschr(q, _T('?')))) { if (! expand(&ac, &arg, q)) Modified: trunk/reactos/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/type.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/type.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/type.c [iso-8859-1] Sat Apr 14 20:57:38 2012 @@ -128,6 +128,7 @@ } } + ConOutPrintf(_T("\n")); CloseHandle(hFile); }

12 years, 8 months

[tkreuzer] 56345: [SHELL32] Fix a trace message, noticed by Edijus

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Apr 14 12:10:02 2012 New Revision: 56345 URL: http://svn.reactos.org/svn/reactos?rev=56345&view=rev Log: [SHELL32] Fix a trace message, noticed by Edijus Modified: trunk/reactos/dll/win32/shell32/shelllink.cpp Modified: trunk/reactos/dll/win32/shell32/shelllink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] Sat Apr 14 12:10:02 2012 @@ -592,7 +592,7 @@ if (hdr.dwFlags & SLDF_HAS_ARGS) { hr = Stream_LoadString(stm, unicode, &sArgs); - TRACE("Working Dir -> %s\n", debugstr_w(sArgs)); + TRACE("Arguments -> %s\n", debugstr_w(sArgs)); } if (FAILED(hr)) goto end;

12 years, 8 months

[tkreuzer] 56344: [SHELL32] Remove trailing backslash in shellink working dir Patch by Edijs Kolesnikovics (terminedijs at yahoo dot com) See issue #7000 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Apr 14 10:40:21 2012 New Revision: 56344 URL: http://svn.reactos.org/svn/reactos?rev=56344&view=rev Log: [SHELL32] Remove trailing backslash in shellink working dir Patch by Edijs Kolesnikovics (terminedijs at yahoo dot com) See issue #7000 for more details. Modified: trunk/reactos/dll/win32/shell32/shelllink.cpp Modified: trunk/reactos/dll/win32/shell32/shelllink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] Sat Apr 14 10:40:21 2012 @@ -583,6 +583,7 @@ if (hdr.dwFlags & SLDF_HAS_WORKINGDIR) { hr = Stream_LoadString(stm, unicode, &sWorkDir); + PathRemoveBackslash(sWorkDir); TRACE("Working Dir -> %s\n", debugstr_w(sWorkDir)); } if (FAILED(hr))

12 years, 8 months

← Newer
1
...
8
9
10
11
12
13
14
15
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2012