Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[weiden] 28076: Improve output of directory summaries
by weiden＠svn.reactos.org 01 Aug '07

01 Aug '07

Author: weiden Date: Wed Aug 1 22:18:26 2007 New Revision: 28076 URL: http://svn.reactos.org/svn/reactos?rev=28076&view=rev Log: Improve output of directory summaries Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c (original) +++ trunk/reactos/base/shell/cmd/dir.c Wed Aug 1 22:18:26 2007 @@ -864,7 +864,8 @@ ULONG ulFiles, ULONG ulDirs, ULARGE_INTEGER u64Bytes, - LPDIRSWITCHFLAGS lpFlags) + LPDIRSWITCHFLAGS lpFlags, + BOOL TotalSummary) { TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szBuffer[64]; @@ -886,7 +887,7 @@ /* Print recursive specific results */ /* Take this code offline to fix /S does not print duoble info */ - if (lpFlags->bRecursive) + if (TotalSummary && lpFlags->bRecursive) { ConvertULargeInteger(u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); LoadString(CMD_ModuleHandle, STRING_DIR_HELP5, szMsg, RC_STRING_MAX_SIZE); @@ -901,22 +902,18 @@ /* Print File Summary */ /* Condition to print summary is: If we are not in bare format and if we have results! */ - if (ulFiles > 0) - { - ConvertULargeInteger(u64Bytes, szBuffer, 20, lpFlags->bTSeperator); - LoadString(CMD_ModuleHandle, STRING_DIR_HELP8, szMsg, RC_STRING_MAX_SIZE); - if(lpFlags->bPause) - ConOutPrintfPaging(FALSE,szMsg,ulFiles, szBuffer); - else - ConOutPrintf(szMsg,ulFiles, szBuffer); - - } + ConvertULargeInteger(u64Bytes, szBuffer, 20, lpFlags->bTSeperator); + LoadString(CMD_ModuleHandle, STRING_DIR_HELP8, szMsg, RC_STRING_MAX_SIZE); + if(lpFlags->bPause) + ConOutPrintfPaging(FALSE,szMsg,ulFiles, szBuffer); + else + ConOutPrintf(szMsg,ulFiles, szBuffer); } - if (ulDirs != 2) - { - /* Print total directories and freespace */ + /* Print total directories and freespace */ + if (!lpFlags->bRecursive || (TotalSummary && lpFlags->bRecursive)) + { GetUserDiskFreeSpace(szPath, &uliFree); ConvertULargeInteger(uliFree, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); LoadString(CMD_ModuleHandle, STRING_DIR_HELP6, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); @@ -1693,6 +1690,16 @@ /* Print Data */ DirPrintFiles(ptrFileArray, dwCount, szFullPath, lpFlags); + if (lpFlags->bRecursive) + { + PrintSummary(szFullPath, + dwCountFiles, + dwCountDirs, + u64CountBytes, + lpFlags, + FALSE); + } + /* Free array */ cmd_free(ptrFileArray); if (CheckCtrlBreak(BREAK_INPUT)) @@ -1901,7 +1908,8 @@ recurse_file_cnt, recurse_dir_cnt, recurse_bytes, - &stFlags); + &stFlags, + TRUE); } ret = 0;

1 0

[weiden] 28075: - Correctly detect volume changes when querying in multiple directories - "dir directory" displays the contents of a directory
by weiden＠svn.reactos.org 01 Aug '07

01 Aug '07

Author: weiden Date: Wed Aug 1 21:48:08 2007 New Revision: 28075 URL: http://svn.reactos.org/svn/reactos?rev=28075&view=rev Log: - Correctly detect volume changes when querying in multiple directories - "dir directory" displays the contents of a directory Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c (original) +++ trunk/reactos/base/shell/cmd/dir.c Wed Aug 1 21:48:08 2007 @@ -869,7 +869,6 @@ TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szBuffer[64]; ULARGE_INTEGER uliFree; - TCHAR szRoot[] = _T("A:\\"); /* Here we check if we didn't find anything */ @@ -914,15 +913,18 @@ } } - /* Print total directories and freespace */ - szRoot[0] = szPath[0]; - GetUserDiskFreeSpace(szRoot, &uliFree); - ConvertULargeInteger(uliFree, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); - LoadString(CMD_ModuleHandle, STRING_DIR_HELP6, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); - if(lpFlags->bPause) - ConOutPrintfPaging(FALSE,szMsg,ulDirs, szBuffer); - else - ConOutPrintf(szMsg,ulDirs, szBuffer); + + if (ulDirs != 2) + { + /* Print total directories and freespace */ + GetUserDiskFreeSpace(szPath, &uliFree); + ConvertULargeInteger(uliFree, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); + LoadString(CMD_ModuleHandle, STRING_DIR_HELP6, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); + if(lpFlags->bPause) + ConOutPrintfPaging(FALSE,szMsg,ulDirs, szBuffer); + else + ConOutPrintf(szMsg,ulDirs, szBuffer); + } return 0; } @@ -1565,6 +1567,15 @@ pszFilePart = NULL; } + /* If no wildcard or file was specified and this is a directory, then + display all files in it */ + wfdFileInfo.dwFileAttributes = GetFileAttributes(szFullPath); + if (wfdFileInfo.dwFileAttributes != INVALID_FILE_ATTRIBUTES && + (wfdFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { + _tcscat(szFullPath, _T("\\*")); + } + /* Prepare the linked list, first node is allocated */ ptrStartNode = cmd_alloc(sizeof(DIRFINDLISTNODE)); if (ptrStartNode == NULL) @@ -1767,19 +1778,14 @@ CommandDir(LPTSTR first, LPTSTR rest) { TCHAR dircmd[256]; /* A variable to store the DIRCMD enviroment variable */ - TCHAR cDrive; - TCHAR szPath[MAX_PATH]; + TCHAR volume[MAX_PATH]; + TCHAR prev_volume[MAX_PATH]; LPTSTR* params = NULL; INT entries = 0; UINT loop = 0; DIRSWITCHFLAGS stFlags; INT ret = 1; - - /* Initialize variables */ - cDrive = 0; - recurse_dir_cnt = 0L; - recurse_file_cnt = 0L; - recurse_bytes.QuadPart = 0; + BOOL ChangedVolume; /* Initialize Switch Flags < Default switches are setted here!> */ stFlags.b4Digit = TRUE; @@ -1825,7 +1831,8 @@ goto cleanup; } } - szPath[0] = _T('\0'); + + prev_volume[0] = _T('\0'); for(loop = 0; loop < entries; loop++) { @@ -1835,7 +1842,9 @@ goto cleanup; } - _tcscpy(szPath, params[loop]); + recurse_dir_cnt = 0L; + recurse_file_cnt = 0L; + recurse_bytes.QuadPart = 0; /* <Debug :> Uncomment this to show the final state of switch flags*/ @@ -1861,16 +1870,24 @@ } #endif - /* Print the drive header if the drive changed */ - if(cDrive != params[loop][0] && !stFlags.bBareFormat) { + /* Print the drive header if the volume changed */ + ChangedVolume = TRUE; + + if (!stFlags.bBareFormat && + GetVolumePathName(params[loop], volume, sizeof(volume) / sizeof(TCHAR))) + { + if (!_tcscmp(volume, prev_volume)) + ChangedVolume = FALSE; + else + _tcscpy(prev_volume, volume); + } + + if (ChangedVolume && !stFlags.bBareFormat) { if (!PrintDirectoryHeader (params[loop], &stFlags)) { nErrorLevel = 1; goto cleanup; } - - cDrive = params[loop][0]; - } - + } /* do the actual dir */ if (DirList (params[loop], &stFlags)) @@ -1879,14 +1896,13 @@ goto cleanup; } - } - - /* print the footer */ - PrintSummary(szPath, // FIXME: root of initial dir? - recurse_file_cnt, - recurse_dir_cnt, - recurse_bytes, - &stFlags); + /* print the footer */ + PrintSummary(params[loop], + recurse_file_cnt, + recurse_dir_cnt, + recurse_bytes, + &stFlags); + } ret = 0;

1 0

[weiden] 28074: Simplify and fix code by using GetFullPathName and GetVolumePathName instead of re-inventing the wheel once again. See issue #2041 for more details.
by weiden＠svn.reactos.org 01 Aug '07

01 Aug '07

Author: weiden Date: Wed Aug 1 20:20:16 2007 New Revision: 28074 URL: http://svn.reactos.org/svn/reactos?rev=28074&view=rev Log: Simplify and fix code by using GetFullPathName and GetVolumePathName instead of re-inventing the wheel once again. See issue #2041 for more details. Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c (original) +++ trunk/reactos/base/shell/cmd/dir.c Wed Aug 1 20:20:16 2007 @@ -622,189 +622,6 @@ /* - * ExtendFilespec - * - * extend the filespec, possibly adding wildcards - */ -static VOID -ExtendFilespec (LPTSTR file) -{ - INT len = 0; - - if (!file) - return; - - - /* if no file spec, change to "*.*" */ - if (*file == _T('\0')) - { - _tcscpy (file, _T("*.*")); - return; - } - - // add support for *. - if ((file[0] == _T('*')) && (file[1] == _T('.') )) - { - return; - } - - /* if starts with . add * in front */ - if (*file == _T('.')) - { - memmove (&file[1], &file[0], (_tcslen (file) + 1) * sizeof(TCHAR)); - file[0] = _T('*'); - } - - /* if no . add .* */ - if (!_tcschr (file, _T('.'))) - { - _tcscat (file, _T(".*")); - return; - } - - - - /* if last character is '.' add '*' */ - len = _tcslen (file); - if (file[len - 1] == _T('.')) - { - _tcscat (file, _T("*")); - return; - } -} - - -/* - * dir_parse_pathspec - * - * split the pathspec into drive, directory, and filespec - */ -static INT -DirParsePathspec (LPTSTR szPathspec, LPTSTR szPath, LPTSTR szFilespec) -{ - TCHAR szOrigPath[MAX_PATH]; - LPTSTR start; - LPTSTR tmp; - INT i; - BOOL bWildcards = FALSE; - - GetCurrentDirectory (MAX_PATH, szOrigPath); - - /* get the drive and change to it */ - if (szPathspec[1] == _T(':')) - { - TCHAR szRootPath[] = _T("A:"); - - szRootPath[0] = szPathspec[0]; - start = szPathspec + 2; - if (!SetCurrentDirectory (szRootPath)) - { - ErrorMessage (GetLastError(), NULL); - return 1; - } - } - else - { - start = szPathspec; - } - - - /* check for wildcards */ - for (i = 0; szPathspec[i]; i++) - { - if (szPathspec[i] == _T('*') || szPathspec[i] == _T('?')) - bWildcards = TRUE; - } - - /* check if this spec is a directory */ - if (!bWildcards) - { - if (SetCurrentDirectory (szPathspec)) - { - _tcscpy (szFilespec, _T("*.*")); - - if (!GetCurrentDirectory (MAX_PATH, szPath)) - { - szFilespec[0] = _T('\0'); - SetCurrentDirectory (szOrigPath); - error_out_of_memory(); - return 1; - } - - SetCurrentDirectory (szOrigPath); - return 0; - } - } - - /* find the file spec */ - tmp = _tcsrchr (start, _T('\\')); - - /* if no path is specified */ - if (!tmp) - { - _tcscpy (szFilespec, start); - ExtendFilespec (szFilespec); - if (!GetCurrentDirectory (MAX_PATH, szPath)) - { - szFilespec[0] = _T('\0'); - SetCurrentDirectory (szOrigPath); - error_out_of_memory(); - return 1; - } - - SetCurrentDirectory (szOrigPath); - return 0; - } - - /* get the filename */ - _tcscpy (szFilespec, tmp+1); - ExtendFilespec (szFilespec); - - if (tmp == start) - { - /* change to the root directory */ - if (!SetCurrentDirectory (_T("\\"))) - { - szFilespec[0] = _T('\0'); - SetCurrentDirectory (szOrigPath); - error_path_not_found (); - return 1; - } - } - else - { - *tmp = _T('\0'); - - /* change to this directory */ - if (!SetCurrentDirectory (start)) - { - *tmp = _T('\\'); - szFilespec[0] = _T('\0'); - SetCurrentDirectory (szOrigPath); - error_path_not_found (); - return 1; - } - } - - /* get the full name of the directory */ - if (!GetCurrentDirectory (MAX_PATH, szPath)) - { - *tmp = _T('\\'); - szFilespec[0] = _T('\0'); - SetCurrentDirectory (szOrigPath); - error_out_of_memory (); - return 1; - } - - *tmp = _T('\\'); - - SetCurrentDirectory (szOrigPath); - - return 0; -} - - -/* * PrintDirectoryHeader * * print the header for the dir command @@ -813,58 +630,30 @@ PrintDirectoryHeader(LPTSTR szPath, LPDIRSWITCHFLAGS lpFlags) { TCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szFullDir[MAX_PATH]; TCHAR szRootName[MAX_PATH]; TCHAR szVolName[80]; + LPTSTR pszFilePart; DWORD dwSerialNr; - LPTSTR p; if (lpFlags->bBareFormat) return TRUE; - /* build usable root path */ - if (szPath[1] == _T(':') && szPath[2] == _T('\\')) + if (GetFullPathName(szPath, sizeof(szFullDir) / sizeof(TCHAR), szFullDir, &pszFilePart) == 0) { - /* normal path */ - szRootName[0] = szPath[0]; - szRootName[1] = _T(':'); - szRootName[2] = _T('\\'); - szRootName[3] = 0; + ErrorMessage(GetLastError(), _T("Failed to build full directory path")); + return FALSE; } - else if (szPath[0] == _T('\\') && szPath[1] == _T('\\')) - { - /* UNC path */ - p = _tcschr(&szPath[2], _T('\\')); - if (p == NULL) - { - error_invalid_drive(); - return(FALSE); - } - p = _tcschr(p+1, _T('\\')); - if (p == NULL) - { - _tcscpy(szRootName, szPath); - _tcscat(szRootName, _T("\\")); - } - else - { - *p = 0; - _tcscpy(szRootName, szPath); - _tcscat(szRootName, _T("\\")); - *p = _T('\\'); - } - } - else - { - error_invalid_drive(); - return(FALSE); - } + + if (pszFilePart != NULL) + *pszFilePart = _T('\0'); /* get the media ID of the drive */ - if (!GetVolumeInformation(szRootName, szVolName, 80, &dwSerialNr, + if (!GetVolumePathName(szFullDir, szRootName, sizeof(szRootName) / sizeof(TCHAR)) || + !GetVolumeInformation(szRootName, szVolName, 80, &dwSerialNr, NULL, NULL, NULL, 0)) { - error_invalid_drive(); - return(FALSE); + return(TRUE); } /* print drive info */ @@ -1522,12 +1311,18 @@ { TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szTemp[MAX_PATH]; /* A buffer to format the directory header */ + LPTSTR pszFilePart; SIZE_T len; - /* Print directory header */ - _tcscpy(szTemp, szCurPath); - /* We cut the trailing \ of the full path, unless the path is a drive */ + if (GetFullPathName(szCurPath, sizeof(szTemp) / sizeof(TCHAR), szTemp, &pszFilePart) == 0) + { + pszFilePart = NULL; + _tcscpy(szTemp, szCurPath); + } + else if (pszFilePart != NULL) + *pszFilePart = _T('\0'); + len = _tcslen(szTemp); if ((len != 3 || szTemp[len - 2] != _T(':')) && szTemp[len - 1] == _T('\\')) szTemp[len-1] = _T('\0'); @@ -1736,7 +1531,6 @@ */ static INT DirList(LPTSTR szPath, /* [IN] The path that dir starts */ - LPTSTR szFilespec, /* [IN] The type of file that we are looking for */ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags of the listing */ { HANDLE hSearch; /* The handle of the search */ @@ -1746,7 +1540,8 @@ PDIRFINDLISTNODE ptrStartNode; /* The pointer to the first node */ PDIRFINDLISTNODE ptrNextNode; /* A pointer used for relatives refernces */ TCHAR szFullPath[MAX_PATH]; /* The full path that we are listing with trailing \ */ -TCHAR szFullFileSpec[MAX_PATH]; /* The full path with file specs that we ll request\ */ +TCHAR szSubPath[MAX_PATH]; +LPTSTR pszFilePart; DWORD dwCount; /* A counter of files found in directory */ DWORD dwCountFiles; /* Counter for files */ DWORD dwCountDirs; /* Counter for directories */ @@ -1761,12 +1556,14 @@ dwCountDirs = 0; u64CountBytes.QuadPart = 0; - /* Create szFullPath and szFullFileSpec */ - _tcscpy (szFullPath, szPath); - if (szFullPath[_tcslen(szFullPath) - 1] != _T('\\')) - _tcscat (szFullPath, _T("\\")); - _tcscpy (szFullFileSpec, szFullPath); - _tcscat (szFullFileSpec, szFilespec); + /* Create szFullPath */ + if (GetFullPathName(szPath, sizeof(szFullPath) / sizeof(TCHAR), szFullPath, &pszFilePart) == 0) + { + _tcscpy (szFullPath, szPath); + if (szFullPath[_tcslen(szFullPath) - 1] != _T('\\')) + _tcscat (szFullPath, _T("\\")); + pszFilePart = NULL; + } /* Prepare the linked list, first node is allocated */ ptrStartNode = cmd_alloc(sizeof(DIRFINDLISTNODE)); @@ -1780,7 +1577,7 @@ ptrNextNode = ptrStartNode; /* Collect the results for the current folder */ - hSearch = FindFirstFile(szFullFileSpec, &wfdFileInfo); + hSearch = FindFirstFile(szFullPath, &wfdFileInfo); do { if (hSearch != INVALID_HANDLE_VALUE) @@ -1902,9 +1699,17 @@ if (lpFlags->bRecursive) { /* The new search is involving any *.* file */ - _tcscpy(szFullFileSpec, szFullPath); - _tcscat(szFullFileSpec, _T("*.*")); - hRecSearch = FindFirstFile (szFullFileSpec, &wfdFileInfo); + if (pszFilePart != NULL) + { + memcpy(szSubPath, szFullPath, (pszFilePart - szFullPath) * sizeof(TCHAR)); + szSubPath[pszFilePart - szFullPath] = _T('\0'); + } + else + _tcscpy(szSubPath, szFullPath); + + _tcscat(szSubPath, _T("*.*")); + + hRecSearch = FindFirstFile (szSubPath, &wfdFileInfo); do { if (hRecSearch != INVALID_HANDLE_VALUE) @@ -1915,10 +1720,21 @@ (wfdFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { /* Concat the path and the directory to do recursive */ - _tcscpy(szFullFileSpec, szFullPath); - _tcscat(szFullFileSpec, wfdFileInfo.cFileName); - /* We do the same for tha folder */ - if (DirList(szFullFileSpec, szFilespec, lpFlags) != 0) + if (pszFilePart != NULL) + { + memcpy(szSubPath, szFullPath, (pszFilePart - szFullPath) * sizeof(TCHAR)); + szSubPath[pszFilePart - szFullPath] = _T('\0'); + } + else + _tcscpy(szSubPath, szFullPath); + + _tcscat(szSubPath, wfdFileInfo.cFileName); + _tcscat(szSubPath, _T("\\")); + if (pszFilePart != NULL) + _tcscat(szSubPath, pszFilePart); + + /* We do the same for the folder */ + if (DirList(szSubPath, lpFlags) != 0) { return 1; } @@ -1953,7 +1769,6 @@ TCHAR dircmd[256]; /* A variable to store the DIRCMD enviroment variable */ TCHAR cDrive; TCHAR szPath[MAX_PATH]; - TCHAR szFilespec[MAX_PATH]; LPTSTR* params = NULL; INT entries = 0; UINT loop = 0; @@ -1987,7 +1802,7 @@ stFlags.stOrderBy.bUnSet = FALSE; nErrorLevel = 0; - + /* read the parameters from the DIRCMD environment variable */ if (GetEnvironmentVariable (_T("DIRCMD"), dircmd, 256)) if (!DirReadParam(dircmd, &params, &entries, &stFlags)) @@ -2005,20 +1820,22 @@ /* default to current directory */ if(entries == 0) { - if(!add_entry(&entries, &params, _T("."))) { + if(!add_entry(&entries, &params, _T("*"))) { nErrorLevel = 1; goto cleanup; } } + szPath[0] = _T('\0'); for(loop = 0; loop < entries; loop++) { - /* parse the directory info */ - if (DirParsePathspec (params[loop], szPath, szFilespec) || CheckCtrlBreak(BREAK_INPUT)) + if (CheckCtrlBreak(BREAK_INPUT)) { nErrorLevel = 1; goto cleanup; } + + _tcscpy(szPath, params[loop]); /* <Debug :> Uncomment this to show the final state of switch flags*/ @@ -2045,26 +1862,27 @@ #endif /* Print the drive header if the drive changed */ - if(cDrive != szPath[0] && !stFlags.bBareFormat) { - if (!PrintDirectoryHeader (szPath, &stFlags)) { + if(cDrive != params[loop][0] && !stFlags.bBareFormat) { + if (!PrintDirectoryHeader (params[loop], &stFlags)) { nErrorLevel = 1; goto cleanup; } - cDrive = szPath[0]; + cDrive = params[loop][0]; } /* do the actual dir */ - if (DirList (szPath, szFilespec, &stFlags)) + if (DirList (params[loop], &stFlags)) { nErrorLevel = 1; goto cleanup; } + } /* print the footer */ - PrintSummary(szPath, + PrintSummary(szPath, // FIXME: root of initial dir? recurse_file_cnt, recurse_dir_cnt, recurse_bytes,

1 0

[weiden] 28073: Fix a memory leak in the dir command
by weiden＠svn.reactos.org 01 Aug '07

01 Aug '07

Author: weiden Date: Wed Aug 1 18:32:57 2007 New Revision: 28073 URL: http://svn.reactos.org/svn/reactos?rev=28073&view=rev Log: Fix a memory leak in the dir command Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c (original) +++ trunk/reactos/base/shell/cmd/dir.c Wed Aug 1 18:32:57 2007 @@ -1954,10 +1954,11 @@ TCHAR cDrive; TCHAR szPath[MAX_PATH]; TCHAR szFilespec[MAX_PATH]; - LPTSTR* params; + LPTSTR* params = NULL; INT entries = 0; UINT loop = 0; DIRSWITCHFLAGS stFlags; + INT ret = 1; /* Initialize variables */ cDrive = 0; @@ -1992,21 +1993,21 @@ if (!DirReadParam(dircmd, &params, &entries, &stFlags)) { nErrorLevel = 1; - return 1; + goto cleanup; } /* read the parameters */ if (!DirReadParam(rest, &params, &entries, &stFlags) || CheckCtrlBreak(BREAK_INPUT)) { nErrorLevel = 1; - return 1; + goto cleanup; } /* default to current directory */ if(entries == 0) { if(!add_entry(&entries, &params, _T("."))) { nErrorLevel = 1; - return 1; + goto cleanup; } } @@ -2016,7 +2017,7 @@ if (DirParsePathspec (params[loop], szPath, szFilespec) || CheckCtrlBreak(BREAK_INPUT)) { nErrorLevel = 1; - return 1; + goto cleanup; } /* <Debug :> @@ -2047,7 +2048,7 @@ if(cDrive != szPath[0] && !stFlags.bBareFormat) { if (!PrintDirectoryHeader (szPath, &stFlags)) { nErrorLevel = 1; - return 1; + goto cleanup; } cDrive = szPath[0]; @@ -2058,7 +2059,7 @@ if (DirList (szPath, szFilespec, &stFlags)) { nErrorLevel = 1; - return 1; + goto cleanup; } } @@ -2068,8 +2069,13 @@ recurse_dir_cnt, recurse_bytes, &stFlags); - - return 0; + + ret = 0; + +cleanup: + freep(params); + + return ret; } #endif

1 0

[weiden] 28072: Fix buffer overflow bug in mkdir command See issue #2499 for more details.
by weiden＠svn.reactos.org 01 Aug '07

01 Aug '07

Author: weiden Date: Wed Aug 1 17:34:48 2007 New Revision: 28072 URL: http://svn.reactos.org/svn/reactos?rev=28072&view=rev Log: Fix buffer overflow bug in mkdir command See issue #2499 for more details. Modified: trunk/reactos/base/shell/cmd/internal.c 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 (original) +++ trunk/reactos/base/shell/cmd/internal.c Wed Aug 1 17:34:48 2007 @@ -463,7 +463,7 @@ { LPTSTR dir; /* pointer to the directory to change to */ LPTSTR place; /* used to search for the \ when no space is used */ - LPTSTR *p = NULL; + LPTSTR new_dir, *p = NULL; INT argc; nErrorLevel = 0; if (!_tcsncmp (param, _T("/?"), 2)) @@ -482,7 +482,13 @@ break; if (*place) - dir = place; + { + argc = 0; + if (add_entry(&argc, &p, place)) + dir = place; + else + dir = NULL; + } else /* signal that there are no parameters */ dir = NULL; @@ -512,7 +518,14 @@ /* Add a \ at the end of the path is there isnt on already */ if (dir[_tcslen (dir) - 1] != _T('\\')) - _tcscat(dir,_T("\\")); + { + new_dir = cmd_realloc(dir, (_tcslen (dir) + 2) * sizeof(TCHAR)); + if (new_dir != NULL) + { + p[0] = dir = new_dir; + _tcscat(dir,_T("\\")); + } + } if (!MakeFullPath(dir)) {

1 0

[weiden] 28071: Remove debug statements I accidently committed
by weiden＠svn.reactos.org 01 Aug '07

01 Aug '07

Author: weiden Date: Wed Aug 1 17:27:16 2007 New Revision: 28071 URL: http://svn.reactos.org/svn/reactos?rev=28071&view=rev Log: Remove debug statements I accidently committed Modified: trunk/reactos/base/shell/cmd/misc.c 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 (original) +++ trunk/reactos/base/shell/cmd/misc.c Wed Aug 1 17:27:16 2007 @@ -204,10 +204,8 @@ { return FALSE; } - cmd_checkbuffer(q); + _tcscpy (q, entry); - cmd_checkbuffer(q); - oldarg = *arg; *arg = cmd_realloc (oldarg, (*ac + 2) * sizeof (LPTSTR)); if (NULL == *arg) @@ -215,13 +213,10 @@ *arg = oldarg; return FALSE; } -cmd_checkbuffer(*arg); + /* save new entry */ (*arg)[*ac] = q; -cmd_checkbuffer(*arg); (*arg)[++(*ac)] = NULL; - - cmd_checkbuffer(*arg); return TRUE; }

1 0

[weiden] 28070: - Detect memory leaks when cmd exits - Use _tmain
by weiden＠svn.reactos.org 01 Aug '07

01 Aug '07

Author: weiden Date: Wed Aug 1 16:34:49 2007 New Revision: 28070 URL: http://svn.reactos.org/svn/reactos?rev=28070&view=rev Log: - Detect memory leaks when cmd exits - Use _tmain Removed: trunk/reactos/base/shell/cmd/main.c Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.rbuild trunk/reactos/base/shell/cmd/cmddbg.c trunk/reactos/base/shell/cmd/cmddbg.h trunk/reactos/base/shell/cmd/misc.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c (original) +++ trunk/reactos/base/shell/cmd/cmd.c Wed Aug 1 16:34:49 2007 @@ -1611,7 +1611,7 @@ * */ static VOID -Initialize (int argc, TCHAR* argv[]) +Initialize (int argc, const TCHAR* argv[]) { TCHAR commandline[CMDLINE_LENGTH]; TCHAR ModuleName[_MAX_PATH + 1]; @@ -1673,7 +1673,7 @@ if (argc >= 2 && !_tcsncmp (argv[1], _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_CMD_HELP8); - ExitProcess(0); + cmd_exit(0); } SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT); @@ -1720,11 +1720,11 @@ } ParseCommandLine(commandline); - ExitProcess (ProcessInput (TRUE)); + cmd_exit (ProcessInput (TRUE)); } else { - ExitProcess (0); + cmd_exit (0); } } else if (!_tcsicmp (argv[i], _T("/k"))) @@ -1789,7 +1789,7 @@ } -static VOID Cleanup (int argc, TCHAR *argv[]) +static VOID Cleanup (int argc, const TCHAR *argv[]) { /* run cmdexit.bat */ if (IsExistingFile (_T("cmdexit.bat"))) @@ -1836,20 +1836,11 @@ /* * main function */ -#ifdef _UNICODE -int _main(void) -#else -int _main (int argc, char *argv[]) -#endif +int _tmain (int argc, const TCHAR *argv[]) { TCHAR startPath[MAX_PATH]; CONSOLE_SCREEN_BUFFER_INFO Info; INT nExitCode; -#ifdef _UNICODE - PWCHAR * argv; - int argc=0; - argv = CommandLineToArgvW(GetCommandLineW(), &argc); -#endif GetCurrentDirectory(MAX_PATH,startPath); _tchdir(startPath); @@ -1882,6 +1873,7 @@ /* do the cleanup */ Cleanup(argc, argv); + cmd_exit(nExitCode); return(nExitCode); } Modified: trunk/reactos/base/shell/cmd/cmd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rbuild?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.rbuild (original) +++ trunk/reactos/base/shell/cmd/cmd.rbuild Wed Aug 1 16:34:49 2007 @@ -1,12 +1,14 @@ -<module name="cmd_base" type="objectlibrary"> +<module name="cmd" type="win32cui" installbase="system32" installname="cmd.exe" unicode="yes"> <include base="ReactOS">include/reactos/wine</include> - <include base="cmd_base">.</include> + <include base="cmd">.</include> <define name="__USE_W32API" /> <define name="ANONYMOUSUNIONS" /> <define name="_WIN32_WINNT">0x0501</define> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_DEBUG_MEM" /> + <library>kernel32</library> + <library>advapi32</library> + <library>shell32</library> + <library>user32</library> <pch>precomp.h</pch> <compilationunit name="unit.c"> <file>alias.c</file> @@ -64,20 +66,5 @@ <file>where.c</file> <file>window.c</file> </compilationunit> -</module> -<module name="cmd" type="win32cui" installbase="system32" installname="cmd.exe" > - <include base="ReactOS">include/reactos/wine</include> - <include base="cmd">.</include> - <define name="__USE_W32API" /> - <define name="ANONYMOUSUNIONS" /> - <define name="_WIN32_WINNT">0x0501</define> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <library>cmd_base</library> - <library>kernel32</library> - <library>advapi32</library> - <library>shell32</library> - <library>user32</library> - <file>main.c</file> <file>cmd.rc</file> </module> Modified: trunk/reactos/base/shell/cmd/cmddbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmddbg.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/cmddbg.c (original) +++ trunk/reactos/base/shell/cmd/cmddbg.c Wed Aug 1 16:34:49 2007 @@ -12,6 +12,9 @@ const char *file; int line; } alloc_info, *palloc_info; + +static size_t allocations = 0; +static size_t allocated_memory = 0; static void * get_base_ptr(void *ptr) @@ -92,7 +95,11 @@ newptr = malloc(calculate_size_with_redzone(size)); if (newptr != NULL) + { + allocations++; + allocated_memory += size; newptr = write_redzone(newptr, size, file, line); + } return newptr; } @@ -100,6 +107,7 @@ void * cmd_realloc_dbg(void *ptr, size_t size, const char *file, int line) { + size_t prev_size; void *newptr = NULL; if (ptr == NULL) @@ -111,11 +119,15 @@ } ptr = get_base_ptr(ptr); + prev_size = ((palloc_info)ptr)->size; check_redzone(ptr, file, line); newptr = realloc(ptr, calculate_size_with_redzone(size)); if (newptr != NULL) + { + allocated_memory += size - prev_size; newptr = write_redzone(newptr, size, file, line); + } return newptr; } @@ -127,6 +139,8 @@ { ptr = get_base_ptr(ptr); check_redzone(ptr, file, line); + allocations--; + allocated_memory -= ((palloc_info)ptr)->size; } free(ptr); @@ -145,6 +159,11 @@ void cmd_exit(int code) { + if (allocations != 0 || allocated_memory != 0) + { + DbgPrint("CMD: Leaking %lu bytes of memory in %lu blocks! Exit code: %d\n", allocated_memory, allocations, code); + } + ExitProcess(code); } Modified: trunk/reactos/base/shell/cmd/cmddbg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmddbg.h?re… ============================================================================== --- trunk/reactos/base/shell/cmd/cmddbg.h (original) +++ trunk/reactos/base/shell/cmd/cmddbg.h Wed Aug 1 16:34:49 2007 @@ -17,6 +17,9 @@ void cmd_checkbuffer_dbg(void *ptr, const char *file, int line); +void +cmd_exit(int code); + #else #define cmd_alloc(size) malloc(size) Removed: trunk/reactos/base/shell/cmd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/main.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/main.c (original) +++ trunk/reactos/base/shell/cmd/main.c (removed) @@ -1,25 +1,0 @@ -#include <precomp.h> - -#ifdef _UNICODE -extern int _main (void); -#else -extern int _main (int argc, char *argv[]); -#endif - -/* - * main function - */ -#ifdef _UNICODE -int main(void) -#else -int main (int argc, char *argv[]) -#endif -{ -#ifdef _UNICODE - return _main(); -#else - return _main(argc, argv); -#endif -} - -/* EOF */ 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 (original) +++ trunk/reactos/base/shell/cmd/misc.c Wed Aug 1 16:34:49 2007 @@ -204,7 +204,9 @@ { return FALSE; } + cmd_checkbuffer(q); _tcscpy (q, entry); + cmd_checkbuffer(q); oldarg = *arg; *arg = cmd_realloc (oldarg, (*ac + 2) * sizeof (LPTSTR)); @@ -213,10 +215,13 @@ *arg = oldarg; return FALSE; } - +cmd_checkbuffer(*arg); /* save new entry */ (*arg)[*ac] = q; +cmd_checkbuffer(*arg); (*arg)[++(*ac)] = NULL; + + cmd_checkbuffer(*arg); return TRUE; }

1 0

[tkreuzer] 28069: implement Arc, ArcTo, Chord, calling NtGdiArcInternal
by tkreuzer＠svn.reactos.org 01 Aug '07

01 Aug '07

Author: tkreuzer Date: Wed Aug 1 16:34:38 2007 New Revision: 28069 URL: http://svn.reactos.org/svn/reactos?rev=28069&view=rev Log: implement Arc, ArcTo, Chord, calling NtGdiArcInternal Added: trunk/reactos/dll/win32/gdi32/objects/arc.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Wed Aug 1 16:34:38 2007 @@ -19,8 +19,8 @@ AngleArc@24 AnimatePalette@16=NtGdiAnimatePalette@16 AnyLinkedFonts@0 -Arc@36=NtGdiArc@36 -ArcTo@36=NtGdiArcTo@36 +Arc@36 +ArcTo@36 BeginPath@4 BRUSHOBJ_hGetColorTransform@4 BRUSHOBJ_pvAllocRbrush@8 Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Wed Aug 1 16:34:38 2007 @@ -27,6 +27,7 @@ <file>wingl.c</file> </directory> <directory name="objects"> + <file>arc.c</file> <file>bitmap.c</file> <file>brush.c</file> <file>dc.c</file> Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Wed Aug 1 16:34:38 2007 @@ -27,29 +27,6 @@ STDCALL CancelDC( HDC a0 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL -STDCALL -Chord( - HDC a0, - int a1, - int a2, - int a3, - int a4, - int a5, - int a6, - int a7, - int a8 ) { UNIMPLEMENTED; Added: trunk/reactos/dll/win32/gdi32/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/ar… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/arc.c (added) +++ trunk/reactos/dll/win32/gdi32/objects/arc.c Wed Aug 1 16:34:38 2007 @@ -1,0 +1,79 @@ +#include "precomp.h" + +BOOL +WINAPI +Arc( + HDC hDC, + int nLeftRect, + int nTopRect, + int nRightRect, + int nBottomRect, + int nXStartArc, + int nYStartArc, + int nXEndArc, + int nYEndArc +) +{ + return NtGdiArcInternal(GdiTypeArc, + hDC, + nLeftRect, + nTopRect, + nRightRect, + nBottomRect, + nXStartArc, + nYStartArc, + nXEndArc, + nYEndArc); +} + +BOOL +WINAPI +ArcTo( + HDC hDC, + int nLeftRect, + int nTopRect, + int nRightRect, + int nBottomRect, + int nXRadial1, + int nYRadial1, + int nXRadial2, + int nYRadial2) +{ + return NtGdiArcInternal(GdiTypeArcTo, + hDC, + nLeftRect, + nTopRect, + nRightRect, + nBottomRect, + nXRadial1, + nYRadial1, + nXRadial2, + nYRadial2); +} + +BOOL +WINAPI +Chord( + HDC hDC, + int nLeftRect, + int nTopRect, + int nRightRect, + int nBottomRect, + int nXRadial1, + int nYRadial1, + int nXRadial2, + int nYRadial2) +{ + return NtGdiArcInternal(GdiTypeChord, + hDC, + nLeftRect, + nTopRect, + nRightRect, + nBottomRect, + nXRadial1, + nYRadial1, + nXRadial2, + nYRadial2); +} + +

1 0

[weiden] 28068: Compile memory heap corruption detection code with _DEBUG_MEM and define it by default (for now)
by weiden＠svn.reactos.org 01 Aug '07

01 Aug '07

Author: weiden Date: Wed Aug 1 16:04:49 2007 New Revision: 28068 URL: http://svn.reactos.org/svn/reactos?rev=28068&view=rev Log: Compile memory heap corruption detection code with _DEBUG_MEM and define it by default (for now) Modified: trunk/reactos/base/shell/cmd/cmd.rbuild trunk/reactos/base/shell/cmd/cmddbg.c trunk/reactos/base/shell/cmd/cmddbg.h Modified: trunk/reactos/base/shell/cmd/cmd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rbuild?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.rbuild (original) +++ trunk/reactos/base/shell/cmd/cmd.rbuild Wed Aug 1 16:04:49 2007 @@ -6,6 +6,7 @@ <define name="_WIN32_WINNT">0x0501</define> <define name="UNICODE" /> <define name="_UNICODE" /> + <define name="_DEBUG_MEM" /> <pch>precomp.h</pch> <compilationunit name="unit.c"> <file>alias.c</file> Modified: trunk/reactos/base/shell/cmd/cmddbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmddbg.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/cmddbg.c (original) +++ trunk/reactos/base/shell/cmd/cmddbg.c Wed Aug 1 16:04:49 2007 @@ -1,6 +1,6 @@ #include <precomp.h> -#ifdef _DEBUG +#ifdef _DEBUG_MEM #define REDZONE_SIZE 32 #define REDZONE_LEFT 0x78 @@ -63,6 +63,7 @@ DbgPrint(" Block: 0x%p Size: %lu\n", ptr, info->size); DbgPrint(" Allocated from %s:%d\n", info->file, info->line); DbgPrint(" Detected at: %s:%d\n", file, line); + ASSERT(FALSE); ExitProcess(1); } @@ -132,6 +133,16 @@ } void +cmd_checkbuffer_dbg(void *ptr, const char *file, int line) +{ + if (ptr != NULL) + { + ptr = get_base_ptr(ptr); + check_redzone(ptr, file, line); + } +} + +void cmd_exit(int code) { ExitProcess(code); Modified: trunk/reactos/base/shell/cmd/cmddbg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmddbg.h?re… ============================================================================== --- trunk/reactos/base/shell/cmd/cmddbg.h (original) +++ trunk/reactos/base/shell/cmd/cmddbg.h Wed Aug 1 16:04:49 2007 @@ -1,8 +1,9 @@ -#ifdef _DEBUG +#ifdef _DEBUG_MEM #define cmd_alloc(size) cmd_alloc_dbg(size, __FILE__, __LINE__) #define cmd_realloc(ptr,size) cmd_realloc_dbg(ptr, size, __FILE__, __LINE__) #define cmd_free(ptr) cmd_free_dbg(ptr, __FILE__, __LINE__) +#define cmd_checkbuffer(ptr) cmd_checkbuffer_dbg(ptr, __FILE__, __LINE__) void * cmd_alloc_dbg(size_t size, const char *file, int line); @@ -13,10 +14,14 @@ void cmd_free_dbg(void *ptr, const char *file, int line); +void +cmd_checkbuffer_dbg(void *ptr, const char *file, int line); + #else #define cmd_alloc(size) malloc(size) #define cmd_realloc(ptr,size) realloc(ptr, size) #define cmd_free(ptr) free(ptr) +#define cmd_checkbuffer(ptr) #endif

1 0

[weiden] 28067: Improve debug message
by weiden＠svn.reactos.org 01 Aug '07

01 Aug '07

Author: weiden Date: Wed Aug 1 14:41:22 2007 New Revision: 28067 URL: http://svn.reactos.org/svn/reactos?rev=28067&view=rev Log: Improve debug message Modified: trunk/reactos/base/shell/cmd/cmddbg.c Modified: trunk/reactos/base/shell/cmd/cmddbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmddbg.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/cmddbg.c (original) +++ trunk/reactos/base/shell/cmd/cmddbg.c Wed Aug 1 14:41:22 2007 @@ -62,7 +62,7 @@ DbgPrint("CMD: %s\n", msg); DbgPrint(" Block: 0x%p Size: %lu\n", ptr, info->size); DbgPrint(" Allocated from %s:%d\n", info->file, info->line); - DbgPrint(" Called from: %s:%d\n", file, line); + DbgPrint(" Detected at: %s:%d\n", file, line); ExitProcess(1); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2007