Ros-diffs August 2015

ros-diffs@reactos.org

15 participants
301 discussions

[dreimer] 68825: [CMD] Update German translation by ... ME
by dreimer＠svn.reactos.org 25 Aug '15

25 Aug '15

Author: dreimer Date: Tue Aug 25 21:19:30 2015 New Revision: 68825 URL: http://svn.reactos.org/svn/reactos?rev=68825&view=rev Log: [CMD] Update German translation by ... ME Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Tue Aug 25 21:19:30 2015 @@ -162,7 +162,7 @@ G Verzeichnisse zuerst - vorangestellt kehrt die\n\ /P Pausiert nach jeder vollen Bildschirmseite.\n\ /Q Gibt den Besitzer der Datei aus.\n\ - /R Displays alternate data streams of the files.\n\ + /R Zeigt alternative DatenstrÃ¶me der Datei an.\n\ /S Listet Dateien und alle Unterverzeichnisse auf.\n\ /T Bestimmt welche Zeit verwendet wird.\n\ timefield C Erstellung\n\

1 0

[pschweitzer] 68824: [CMD] Remove an useless if
by pschweitzer＠svn.reactos.org 25 Aug '15

25 Aug '15

Author: pschweitzer Date: Tue Aug 25 20:39:53 2015 New Revision: 68824 URL: http://svn.reactos.org/svn/reactos?rev=68824&view=rev Log: [CMD] Remove an useless if 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=6… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Tue Aug 25 20:39:53 2015 @@ -1418,93 +1418,88 @@ return 1; } - /* If cmd_alloc fails we go to next file in hope it works, - without braking the linked list! */ - if (ptrNextNode->ptrNext) - { - /* Copy the info of search at linked list */ - memcpy(&ptrNextNode->ptrNext->stInfo.stFindInfo, - &wfdFileInfo, - sizeof(WIN32_FIND_DATA)); - - /* If lower case is selected do it here */ - if (lpFlags->bLowerCase) + /* Copy the info of search at linked list */ + memcpy(&ptrNextNode->ptrNext->stInfo.stFindInfo, + &wfdFileInfo, + sizeof(WIN32_FIND_DATA)); + + /* If lower case is selected do it here */ + if (lpFlags->bLowerCase) + { + _tcslwr(ptrNextNode->ptrNext->stInfo.stFindInfo.cAlternateFileName); + _tcslwr(ptrNextNode->ptrNext->stInfo.stFindInfo.cFileName); + } + + /* No streams (yet?) */ + ptrNextNode->ptrNext->stInfo.ptrHead = NULL; + + /* Alternate streams are only displayed with new long list */ + if (lpFlags->bNewLongList && lpFlags->bDataStreams) + { + /* Try to get stream information */ + hStreams = FindFirstStreamW(wfdFileInfo.cFileName, FindStreamInfoStandard, &wfsdStreamInfo, 0); + if (hStreams != INVALID_HANDLE_VALUE) { - _tcslwr(ptrNextNode->ptrNext->stInfo.stFindInfo.cAlternateFileName); - _tcslwr(ptrNextNode->ptrNext->stInfo.stFindInfo.cFileName); + /* We totally ignore first stream. It contains data about ::$DATA */ + ptrCurNode = &ptrNextNode->ptrNext->stInfo.ptrHead; + while (FindNextStreamW(hStreams, &wfsdStreamInfo)) + { + *ptrCurNode = cmd_alloc(sizeof(DIRFINDSTREAMNODE)); + if (*ptrCurNode == NULL) + { + WARN("DEBUG: Cannot allocate memory for *ptrCurNode!\n"); + while (ptrStartNode) + { + ptrNextNode = ptrStartNode->ptrNext; + while (ptrStartNode->stInfo.ptrHead) + { + ptrFreeNode = ptrStartNode->stInfo.ptrHead; + ptrStartNode->stInfo.ptrHead = ptrFreeNode->ptrNext; + cmd_free(ptrFreeNode); + } + cmd_free(ptrStartNode); + ptrStartNode = ptrNextNode; + dwCount--; + } + FindClose(hStreams); + FindClose(hSearch); + return 1; + } + + memcpy(&(*ptrCurNode)->stStreamInfo, &wfsdStreamInfo, + sizeof(WIN32_FIND_STREAM_DATA)); + + /* If lower case is selected do it here */ + if (lpFlags->bLowerCase) + { + _tcslwr((*ptrCurNode)->stStreamInfo.cStreamName); + } + + ptrCurNode = &(*ptrCurNode)->ptrNext; + } + + FindClose(hStreams); + *ptrCurNode = NULL; } - - /* No streams (yet?) */ - ptrNextNode->ptrNext->stInfo.ptrHead = NULL; - - /* Alternate streams are only displayed with new long list */ - if (lpFlags->bNewLongList && lpFlags->bDataStreams) - { - /* Try to get stream information */ - hStreams = FindFirstStreamW(wfdFileInfo.cFileName, FindStreamInfoStandard, &wfsdStreamInfo, 0); - if (hStreams != INVALID_HANDLE_VALUE) - { - /* We totally ignore first stream. It contains data about ::$DATA */ - ptrCurNode = &ptrNextNode->ptrNext->stInfo.ptrHead; - while (FindNextStreamW(hStreams, &wfsdStreamInfo)) - { - *ptrCurNode = cmd_alloc(sizeof(DIRFINDSTREAMNODE)); - if (*ptrCurNode == NULL) - { - WARN("DEBUG: Cannot allocate memory for *ptrCurNode!\n"); - while (ptrStartNode) - { - ptrNextNode = ptrStartNode->ptrNext; - while (ptrStartNode->stInfo.ptrHead) - { - ptrFreeNode = ptrStartNode->stInfo.ptrHead; - ptrStartNode->stInfo.ptrHead = ptrFreeNode->ptrNext; - cmd_free(ptrFreeNode); - } - cmd_free(ptrStartNode); - ptrStartNode = ptrNextNode; - dwCount--; - } - FindClose(hStreams); - FindClose(hSearch); - return 1; - } - - memcpy(&(*ptrCurNode)->stStreamInfo, &wfsdStreamInfo, - sizeof(WIN32_FIND_STREAM_DATA)); - - /* If lower case is selected do it here */ - if (lpFlags->bLowerCase) - { - _tcslwr((*ptrCurNode)->stStreamInfo.cStreamName); - } - - ptrCurNode = &(*ptrCurNode)->ptrNext; - } - - FindClose(hStreams); - *ptrCurNode = NULL; - } - } - - /* Continue at next node at linked list */ - ptrNextNode = ptrNextNode->ptrNext; - dwCount ++; - - /* Grab statistics */ - if (wfdFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - { - /* Directory */ - dwCountDirs++; - } - else - { - /* File */ - dwCountFiles++; - u64Temp.HighPart = wfdFileInfo.nFileSizeHigh; - u64Temp.LowPart = wfdFileInfo.nFileSizeLow; - u64CountBytes += u64Temp.QuadPart; - } + } + + /* Continue at next node at linked list */ + ptrNextNode = ptrNextNode->ptrNext; + dwCount ++; + + /* Grab statistics */ + if (wfdFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + /* Directory */ + dwCountDirs++; + } + else + { + /* File */ + dwCountFiles++; + u64Temp.HighPart = wfdFileInfo.nFileSizeHigh; + u64Temp.LowPart = wfdFileInfo.nFileSizeLow; + u64CountBytes += u64Temp.QuadPart; } } } while (FindNextFile(hSearch, &wfdFileInfo));

1 0

[pschweitzer] 68823: [CMD] Implement switch /R for dir command. It allows enumerating alternate data streams of files Commit dedicated to Ged
by pschweitzer＠svn.reactos.org 25 Aug '15

25 Aug '15

Author: pschweitzer Date: Tue Aug 25 20:35:51 2015 New Revision: 68823 URL: http://svn.reactos.org/svn/reactos?rev=68823&view=rev Log: [CMD] Implement switch /R for dir command. It allows enumerating alternate data streams of files Commit dedicated to Ged Modified: trunk/reactos/base/shell/cmd/dir.c trunk/reactos/base/shell/cmd/lang/cs-CZ.rc trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/sk-SK.rc trunk/reactos/base/shell/cmd/lang/sq-AL.rc trunk/reactos/base/shell/cmd/lang/sv-SE.rc trunk/reactos/base/shell/cmd/lang/tr-TR.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/lang/zh-CN.rc Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=6… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -132,6 +132,9 @@ * Removed variables formerly in use to handle pagination * Pagination belongs to ConOutPrintfPaging * Removed already commented out code of old pagination + * + * 25-Aug-2015 (Pierre Schweitzer) + * Implemented /R switch */ #include "precomp.h" @@ -172,6 +175,7 @@ BOOL bRecursive; /* Displays files in specified directory and all sub */ BOOL bShortName; /* Displays the sort name of files if exist */ BOOL b4Digit; /* Four digit year */ + BOOL bDataStreams; /* Displays alternate data streams */ struct { DWORD dwAttribVal; /* The desired state of attribute */ @@ -189,9 +193,21 @@ } stTimeField; /* The time field to display or use for sorting */ } DIRSWITCHFLAGS, *LPDIRSWITCHFLAGS; +typedef struct _DIRFINDSTREAMNODE +{ + WIN32_FIND_STREAM_DATA stStreamInfo; + struct _DIRFINDSTREAMNODE *ptrNext; +} DIRFINDSTREAMNODE, *PDIRFINDSTREAMNODE; + +typedef struct _DIRFINDINFO +{ + WIN32_FIND_DATA stFindInfo; + PDIRFINDSTREAMNODE ptrHead; +} DIRFINDINFO, *PDIRFINDINFO; + typedef struct _DIRFINDLISTNODE { - WIN32_FIND_DATA stFindInfo; + DIRFINDINFO stInfo; struct _DIRFINDLISTNODE *ptrNext; } DIRFINDLISTNODE, *PDIRFINDLISTNODE; @@ -325,6 +341,8 @@ lpFlags->bRecursive = ! bNegative; else if (cCurUChar == _T('X')) lpFlags->bShortName = ! bNegative; + else if (cCurChar == _T('R')) + lpFlags->bDataStreams = ! bNegative; else if (cCurChar == _T('4')) lpFlags->b4Digit = ! bNegative; else if (cCurChar == _T('?')) @@ -838,7 +856,7 @@ * The function that prints in new style */ static VOID -DirPrintNewList(LPWIN32_FIND_DATA ptrFiles[], /* [IN]Files' Info */ +DirPrintNewList(PDIRFINDINFO ptrFiles[], /* [IN]Files' Info */ DWORD dwCount, /* [IN] The quantity of files */ TCHAR *szCurPath, /* [IN] Full path of current directory */ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ @@ -850,17 +868,18 @@ TCHAR szTime[20]; INT iSizeFormat; ULARGE_INTEGER u64FileSize; + PDIRFINDSTREAMNODE ptrCurStream; for (i = 0; i < dwCount && !bCtrlBreak; i++) { /* Calculate size */ - if (ptrFiles[i]->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) + if (ptrFiles[i]->stFindInfo.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) { /* Junction */ iSizeFormat = -14; _tcscpy(szSize, _T("<JUNCTION>")); } - else if (ptrFiles[i]->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + else if (ptrFiles[i]->stFindInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { /* Directory */ iSizeFormat = -14; @@ -870,18 +889,18 @@ { /* File */ iSizeFormat = 14; - u64FileSize.HighPart = ptrFiles[i]->nFileSizeHigh; - u64FileSize.LowPart = ptrFiles[i]->nFileSizeLow; + u64FileSize.HighPart = ptrFiles[i]->stFindInfo.nFileSizeHigh; + u64FileSize.LowPart = ptrFiles[i]->stFindInfo.nFileSizeLow; ConvertULargeInteger(u64FileSize.QuadPart, szSize, 20, lpFlags->bTSeperator); } /* Calculate short name */ szShortName[0] = _T('\0'); if (lpFlags->bShortName) - _stprintf(szShortName, _T(" %-12s"), ptrFiles[i]->cAlternateFileName); + _stprintf(szShortName, _T(" %-12s"), ptrFiles[i]->stFindInfo.cAlternateFileName); /* Format date and time */ - DirPrintFileDateTime(szDate, szTime, ptrFiles[i], lpFlags); + DirPrintFileDateTime(szDate, szTime, &ptrFiles[i]->stFindInfo, lpFlags); /* Print the line */ DirPrintf(lpFlags, _T("%10s %-6s %*s%s %s\n"), @@ -890,7 +909,25 @@ iSizeFormat, szSize, szShortName, - ptrFiles[i]->cFileName); + ptrFiles[i]->stFindInfo.cFileName); + + /* Now, loop on the streams */ + ptrCurStream = ptrFiles[i]->ptrHead; + while (ptrCurStream) + { + ConvertULargeInteger(ptrCurStream->stStreamInfo.StreamSize.QuadPart, szSize, 20, lpFlags->bTSeperator); + + /* Print the line */ + DirPrintf(lpFlags, _T("%10s %-6s %*s%s %s%s\n"), + L"", + L"", + 16, + szSize, + L"", + ptrFiles[i]->stFindInfo.cFileName, + ptrCurStream->stStreamInfo.cStreamName); + ptrCurStream = ptrCurStream->ptrNext; + } } } @@ -901,7 +938,7 @@ * The function that prints in wide list */ static VOID -DirPrintWideList(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */ +DirPrintWideList(PDIRFINDINFO ptrFiles[], /* [IN] Files' Info */ DWORD dwCount, /* [IN] The quantity of files */ TCHAR *szCurPath, /* [IN] Full path of current directory */ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ @@ -919,16 +956,16 @@ iLongestName = 1; for (i = 0; i < dwCount; i++) { - if (ptrFiles[i]->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + if (ptrFiles[i]->stFindInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { /* Directories need 2 additinal characters for brackets */ - if ((_tcslen(ptrFiles[i]->cFileName) + 2) > iLongestName) - iLongestName = _tcslen(ptrFiles[i]->cFileName) + 2; + if ((_tcslen(ptrFiles[i]->stFindInfo.cFileName) + 2) > iLongestName) + iLongestName = _tcslen(ptrFiles[i]->stFindInfo.cFileName) + 2; } else { - if (_tcslen(ptrFiles[i]->cFileName) > iLongestName) - iLongestName = _tcslen(ptrFiles[i]->cFileName); + if (_tcslen(ptrFiles[i]->stFindInfo.cFileName) > iLongestName) + iLongestName = _tcslen(ptrFiles[i]->stFindInfo.cFileName); } } @@ -963,10 +1000,10 @@ if (temp >= dwCount) break; - if (ptrFiles[temp]->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - _stprintf(szTempFname, _T("[%s]"), ptrFiles[temp]->cFileName); + if (ptrFiles[temp]->stFindInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + _stprintf(szTempFname, _T("[%s]"), ptrFiles[temp]->stFindInfo.cFileName); else - _stprintf(szTempFname, _T("%s"), ptrFiles[temp]->cFileName); + _stprintf(szTempFname, _T("%s"), ptrFiles[temp]->stFindInfo.cFileName); DirPrintf(lpFlags, _T("%-*s"), iLongestName + 1, szTempFname); } @@ -983,7 +1020,7 @@ * The function that prints in old style */ static VOID -DirPrintOldList(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */ +DirPrintOldList(PDIRFINDINFO ptrFiles[], /* [IN] Files' Info */ DWORD dwCount, /* [IN] The quantity of files */ TCHAR * szCurPath, /* [IN] Full path of current directory */ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ @@ -999,21 +1036,21 @@ for (i = 0; i < dwCount && !bCtrlBreak; i++) { /* Broke 8.3 format */ - if (*ptrFiles[i]->cAlternateFileName ) + if (*ptrFiles[i]->stFindInfo.cAlternateFileName ) { /* If the file is long named then we read the alter name */ - getName( ptrFiles[i]->cAlternateFileName, szName); - _tcscpy(szExt, getExt( ptrFiles[i]->cAlternateFileName)); + getName( ptrFiles[i]->stFindInfo.cAlternateFileName, szName); + _tcscpy(szExt, getExt( ptrFiles[i]->stFindInfo.cAlternateFileName)); } else { /* If the file is not long name we read its original name */ - getName( ptrFiles[i]->cFileName, szName); - _tcscpy(szExt, getExt( ptrFiles[i]->cFileName)); + getName( ptrFiles[i]->stFindInfo.cFileName, szName); + _tcscpy(szExt, getExt( ptrFiles[i]->stFindInfo.cFileName)); } /* Calculate size */ - if (ptrFiles[i]->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + if (ptrFiles[i]->stFindInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { /* Directory, no size it's a directory*/ iSizeFormat = -17; @@ -1023,13 +1060,13 @@ { /* File */ iSizeFormat = 17; - u64FileSize.HighPart = ptrFiles[i]->nFileSizeHigh; - u64FileSize.LowPart = ptrFiles[i]->nFileSizeLow; + u64FileSize.HighPart = ptrFiles[i]->stFindInfo.nFileSizeHigh; + u64FileSize.LowPart = ptrFiles[i]->stFindInfo.nFileSizeLow; ConvertULargeInteger(u64FileSize.QuadPart, szSize, 20, lpFlags->bTSeperator); } /* Format date and time */ - DirPrintFileDateTime(szDate,szTime,ptrFiles[i],lpFlags); + DirPrintFileDateTime(szDate,szTime,&ptrFiles[i]->stFindInfo,lpFlags); /* Print the line */ DirPrintf(lpFlags, _T("%-8s %-3s %*s %s %s\n"), @@ -1048,7 +1085,7 @@ * The function that prints in bare format */ static VOID -DirPrintBareList(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */ +DirPrintBareList(PDIRFINDINFO ptrFiles[], /* [IN] Files' Info */ DWORD dwCount, /* [IN] The number of files */ LPTSTR lpCurPath, /* [IN] Full path of current directory */ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ @@ -1057,8 +1094,8 @@ for (i = 0; i < dwCount && !bCtrlBreak; i++) { - if ((_tcscmp(ptrFiles[i]->cFileName, _T(".")) == 0) || - (_tcscmp(ptrFiles[i]->cFileName, _T("..")) == 0)) + if ((_tcscmp(ptrFiles[i]->stFindInfo.cFileName, _T(".")) == 0) || + (_tcscmp(ptrFiles[i]->stFindInfo.cFileName, _T("..")) == 0)) { /* at bare format we don't print "." and ".." folder */ continue; @@ -1066,12 +1103,12 @@ if (lpFlags->bRecursive) { /* at recursive mode we print full path of file */ - DirPrintf(lpFlags, _T("%s\\%s\n"), lpCurPath, ptrFiles[i]->cFileName); + DirPrintf(lpFlags, _T("%s\\%s\n"), lpCurPath, ptrFiles[i]->stFindInfo.cFileName); } else { /* if we are not in recursive mode we print the file names */ - DirPrintf(lpFlags, _T("%s\n"), ptrFiles[i]->cFileName); + DirPrintf(lpFlags, _T("%s\n"), ptrFiles[i]->stFindInfo.cFileName); } } } @@ -1083,7 +1120,7 @@ * The functions that prints the files list */ static VOID -DirPrintFiles(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */ +DirPrintFiles(PDIRFINDINFO ptrFiles[], /* [IN] Files' Info */ DWORD dwCount, /* [IN] The quantity of files */ TCHAR *szCurPath, /* [IN] Full path of current directory */ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ @@ -1139,8 +1176,8 @@ * Compares 2 files based on the order criteria */ static BOOL -CompareFiles(LPWIN32_FIND_DATA lpFile1, /* [IN] A pointer to WIN32_FIND_DATA of file 1 */ - LPWIN32_FIND_DATA lpFile2, /* [IN] A pointer to WIN32_FIND_DATA of file 2 */ +CompareFiles(PDIRFINDINFO lpFile1, /* [IN] A pointer to WIN32_FIND_DATA of file 1 */ + PDIRFINDINFO lpFile2, /* [IN] A pointer to WIN32_FIND_DATA of file 2 */ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags that we use to list */ { ULARGE_INTEGER u64File1; @@ -1157,10 +1194,10 @@ { case ORDER_SIZE: /* Order by size /o:s */ /* concat the 32bit integers to a 64bit */ - u64File1.LowPart = lpFile1->nFileSizeLow; - u64File1.HighPart = lpFile1->nFileSizeHigh; - u64File2.LowPart = lpFile2->nFileSizeLow; - u64File2.HighPart = lpFile2->nFileSizeHigh; + u64File1.LowPart = lpFile1->stFindInfo.nFileSizeLow; + u64File1.HighPart = lpFile1->stFindInfo.nFileSizeHigh; + u64File2.LowPart = lpFile2->stFindInfo.nFileSizeLow; + u64File2.HighPart = lpFile2->stFindInfo.nFileSizeHigh; /* In case that differnce is too big for a long */ if (u64File1.QuadPart < u64File2.QuadPart) @@ -1172,16 +1209,16 @@ break; case ORDER_DIRECTORY: /* Order by directory attribute /o:g */ - iComp = ((lpFile2->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)- - (lpFile1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)); + iComp = ((lpFile2->stFindInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)- + (lpFile1->stFindInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)); break; case ORDER_EXTENSION: /* Order by extension name /o:e */ - iComp = _tcsicmp(getExt(lpFile1->cFileName),getExt(lpFile2->cFileName)); + iComp = _tcsicmp(getExt(lpFile1->stFindInfo.cFileName),getExt(lpFile2->stFindInfo.cFileName)); break; case ORDER_NAME: /* Order by filename /o:n */ - iComp = _tcsicmp(lpFile1->cFileName, lpFile2->cFileName); + iComp = _tcsicmp(lpFile1->stFindInfo.cFileName, lpFile2->stFindInfo.cFileName); break; case ORDER_TIME: /* Order by file's time /o:t */ @@ -1190,24 +1227,24 @@ { case TF_CREATIONDATE: /* concat the 32bit integers to a 64bit */ - u64File1.LowPart = lpFile1->ftCreationTime.dwLowDateTime; - u64File1.HighPart = lpFile1->ftCreationTime.dwHighDateTime ; - u64File2.LowPart = lpFile2->ftCreationTime.dwLowDateTime; - u64File2.HighPart = lpFile2->ftCreationTime.dwHighDateTime ; + u64File1.LowPart = lpFile1->stFindInfo.ftCreationTime.dwLowDateTime; + u64File1.HighPart = lpFile1->stFindInfo.ftCreationTime.dwHighDateTime ; + u64File2.LowPart = lpFile2->stFindInfo.ftCreationTime.dwLowDateTime; + u64File2.HighPart = lpFile2->stFindInfo.ftCreationTime.dwHighDateTime ; break; case TF_LASTACCESSEDDATE : /* concat the 32bit integers to a 64bit */ - u64File1.LowPart = lpFile1->ftLastAccessTime.dwLowDateTime; - u64File1.HighPart = lpFile1->ftLastAccessTime.dwHighDateTime ; - u64File2.LowPart = lpFile2->ftLastAccessTime.dwLowDateTime; - u64File2.HighPart = lpFile2->ftLastAccessTime.dwHighDateTime ; + u64File1.LowPart = lpFile1->stFindInfo.ftLastAccessTime.dwLowDateTime; + u64File1.HighPart = lpFile1->stFindInfo.ftLastAccessTime.dwHighDateTime ; + u64File2.LowPart = lpFile2->stFindInfo.ftLastAccessTime.dwLowDateTime; + u64File2.HighPart = lpFile2->stFindInfo.ftLastAccessTime.dwHighDateTime ; break; case TF_MODIFIEDDATE: /* concat the 32bit integers to a 64bit */ - u64File1.LowPart = lpFile1->ftLastWriteTime.dwLowDateTime; - u64File1.HighPart = lpFile1->ftLastWriteTime.dwHighDateTime ; - u64File2.LowPart = lpFile2->ftLastWriteTime.dwLowDateTime; - u64File2.HighPart = lpFile2->ftLastWriteTime.dwHighDateTime ; + u64File1.LowPart = lpFile1->stFindInfo.ftLastWriteTime.dwLowDateTime; + u64File1.HighPart = lpFile1->stFindInfo.ftLastWriteTime.dwHighDateTime ; + u64File2.LowPart = lpFile2->stFindInfo.ftLastWriteTime.dwLowDateTime; + u64File2.HighPart = lpFile2->stFindInfo.ftLastWriteTime.dwHighDateTime ; break; } @@ -1240,12 +1277,12 @@ * Sort files by the order criterias using quicksort method */ static VOID -QsortFiles(LPWIN32_FIND_DATA ptrArray[], /* [IN/OUT] The array with file info pointers */ +QsortFiles(PDIRFINDINFO ptrArray[], /* [IN/OUT] The array with file info pointers */ int i, /* [IN] The index of first item in array */ int j, /* [IN] The index to last item in array */ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags that we will use to sort */ { - LPWIN32_FIND_DATA lpTemp; /* A temporary pointer */ + PDIRFINDINFO lpTemp; /* A temporary pointer */ BOOL Way; if (i < j) @@ -1289,8 +1326,9 @@ BOOL fPoint; /* If szPath is a file with extension fPoint will be True*/ HANDLE hSearch; /* The handle of the search */ HANDLE hRecSearch; /* The handle for searching recursivly */ + HANDLE hStreams; /* The handle for alternate streams */ WIN32_FIND_DATA wfdFileInfo; /* The info of file that found */ - LPWIN32_FIND_DATA * ptrFileArray; /* An array of pointers with all the files */ + PDIRFINDINFO * ptrFileArray; /* An array of pointers with all the files */ 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 \ */ @@ -1301,6 +1339,9 @@ DWORD dwCountDirs; /* Counter for directories */ ULONGLONG u64CountBytes; /* Counter for bytes */ ULARGE_INTEGER u64Temp; /* A temporary counter */ + WIN32_FIND_STREAM_DATA wfsdStreamInfo; + PDIRFINDSTREAMNODE * ptrCurNode; /* The pointer to the first stream */ + PDIRFINDSTREAMNODE ptrFreeNode; /* The pointer used during cleanup */ /* Initialize Variables */ ptrStartNode = NULL; @@ -1363,6 +1404,12 @@ while (ptrStartNode) { ptrNextNode = ptrStartNode->ptrNext; + while (ptrStartNode->stInfo.ptrHead) + { + ptrFreeNode = ptrStartNode->stInfo.ptrHead; + ptrStartNode->stInfo.ptrHead = ptrFreeNode->ptrNext; + cmd_free(ptrFreeNode); + } cmd_free(ptrStartNode); ptrStartNode = ptrNextNode; dwCount--; @@ -1376,15 +1423,68 @@ if (ptrNextNode->ptrNext) { /* Copy the info of search at linked list */ - memcpy(&ptrNextNode->ptrNext->stFindInfo, + memcpy(&ptrNextNode->ptrNext->stInfo.stFindInfo, &wfdFileInfo, sizeof(WIN32_FIND_DATA)); /* If lower case is selected do it here */ if (lpFlags->bLowerCase) { - _tcslwr(ptrNextNode->ptrNext->stFindInfo.cAlternateFileName); - _tcslwr(ptrNextNode->ptrNext->stFindInfo.cFileName); + _tcslwr(ptrNextNode->ptrNext->stInfo.stFindInfo.cAlternateFileName); + _tcslwr(ptrNextNode->ptrNext->stInfo.stFindInfo.cFileName); + } + + /* No streams (yet?) */ + ptrNextNode->ptrNext->stInfo.ptrHead = NULL; + + /* Alternate streams are only displayed with new long list */ + if (lpFlags->bNewLongList && lpFlags->bDataStreams) + { + /* Try to get stream information */ + hStreams = FindFirstStreamW(wfdFileInfo.cFileName, FindStreamInfoStandard, &wfsdStreamInfo, 0); + if (hStreams != INVALID_HANDLE_VALUE) + { + /* We totally ignore first stream. It contains data about ::$DATA */ + ptrCurNode = &ptrNextNode->ptrNext->stInfo.ptrHead; + while (FindNextStreamW(hStreams, &wfsdStreamInfo)) + { + *ptrCurNode = cmd_alloc(sizeof(DIRFINDSTREAMNODE)); + if (*ptrCurNode == NULL) + { + WARN("DEBUG: Cannot allocate memory for *ptrCurNode!\n"); + while (ptrStartNode) + { + ptrNextNode = ptrStartNode->ptrNext; + while (ptrStartNode->stInfo.ptrHead) + { + ptrFreeNode = ptrStartNode->stInfo.ptrHead; + ptrStartNode->stInfo.ptrHead = ptrFreeNode->ptrNext; + cmd_free(ptrFreeNode); + } + cmd_free(ptrStartNode); + ptrStartNode = ptrNextNode; + dwCount--; + } + FindClose(hStreams); + FindClose(hSearch); + return 1; + } + + memcpy(&(*ptrCurNode)->stStreamInfo, &wfsdStreamInfo, + sizeof(WIN32_FIND_STREAM_DATA)); + + /* If lower case is selected do it here */ + if (lpFlags->bLowerCase) + { + _tcslwr((*ptrCurNode)->stStreamInfo.cStreamName); + } + + ptrCurNode = &(*ptrCurNode)->ptrNext; + } + + FindClose(hStreams); + *ptrCurNode = NULL; + } } /* Continue at next node at linked list */ @@ -1415,13 +1515,19 @@ ptrNextNode->ptrNext = NULL; /* Calculate and allocate space need for making an array of pointers */ - ptrFileArray = cmd_alloc(sizeof(LPWIN32_FIND_DATA) * dwCount); + ptrFileArray = cmd_alloc(sizeof(PDIRFINDINFO) * dwCount); if (ptrFileArray == NULL) { WARN("DEBUG: Cannot allocate memory for ptrFileArray!\n"); while (ptrStartNode) { ptrNextNode = ptrStartNode->ptrNext; + while (ptrStartNode->stInfo.ptrHead) + { + ptrFreeNode = ptrStartNode->stInfo.ptrHead; + ptrStartNode->stInfo.ptrHead = ptrFreeNode->ptrNext; + cmd_free(ptrFreeNode); + } cmd_free(ptrStartNode); ptrStartNode = ptrNextNode; dwCount --; @@ -1437,7 +1543,7 @@ dwCount = 0; while (ptrNextNode->ptrNext) { - *(ptrFileArray + dwCount) = &ptrNextNode->ptrNext->stFindInfo; + *(ptrFileArray + dwCount) = &ptrNextNode->ptrNext->stInfo; ptrNextNode = ptrNextNode->ptrNext; dwCount++; } @@ -1467,6 +1573,12 @@ while (ptrStartNode) { ptrNextNode = ptrStartNode->ptrNext; + while (ptrStartNode->stInfo.ptrHead) + { + ptrFreeNode = ptrStartNode->stInfo.ptrHead; + ptrStartNode->stInfo.ptrHead = ptrFreeNode->ptrNext; + cmd_free(ptrFreeNode); + } cmd_free(ptrStartNode); ptrStartNode = ptrNextNode; dwCount --; @@ -1543,6 +1655,7 @@ /* Initialize Switch Flags < Default switches are setted here!> */ stFlags.b4Digit = TRUE; stFlags.bBareFormat = FALSE; + stFlags.bDataStreams = FALSE; stFlags.bLowerCase = FALSE; stFlags.bNewLongList = TRUE; stFlags.bPause = FALSE; @@ -1620,6 +1733,7 @@ TRACE(" Order Criteria [%i]: %i (Reversed: %i)\n",i, stFlags.stOrderBy.eCriteria[i], stFlags.stOrderBy.bCriteriaRev[i] ); TRACE("(P) Pause : %i\n", stFlags.bPause ); TRACE("(Q) Owner : %i\n", stFlags.bUser ); + TRACE("(R) Data stream : %i\n", stFlags.bDataStreams ); TRACE("(S) Recursive : %i\n", stFlags.bRecursive ); TRACE("(T) Time field : %i\n", stFlags.stTimeField.eTimeField ); TRACE("(X) Short names : %i\n", stFlags.bShortName ); Modified: trunk/reactos/base/shell/cmd/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/cs-CZ.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/cs-CZ.rc [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -148,7 +148,7 @@ /m specifiy than n are milliseconds\n\ otherwise n are seconds\n" STRING_DIR_HELP1 "DIR [drive:][path][filename] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ + [/O[[:]sortorder]] [/P] [/Q] [/R] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ [drive:][path][filename]\n\ Specifies drive, directory, and/or files to list.\n\n\ /A Displays files with specified attributes.\n\ @@ -167,6 +167,7 @@ G Group directories first - Prefix to reverse order\n\ /P Pauses after each screenful of information.\n\ /Q Display the owner of the file.\n\ + /R Displays alternate data streams of the files.\n\ /S Displays files in specified directory and all subdirectories.\n\ /T Controls which time field displayed or used for sorting\n\ timefield C Creation\n\ Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -142,7 +142,7 @@ /m Millisekunden, ansonsten Sekunden\n" STRING_DIR_HELP1 "Listet die Dateien und Unterverzeichnisse eines Verzeichnisses auf.\n\n\ DIR [Laufwerk:][Pfad][Dateiname] [/A[[:]Attribute]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]Reihenfolge]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ + [/O[[:]Reihenfolge]] [/P] [/Q] [/R] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ [Laufwerk:][path][Dateiname]\n\ Bezeichnet Laufwerk, Verzeichnis und/oder Dateien.\n\n\ /A Listet Dateien mit angegebenen Attributen auf.\n\ @@ -162,6 +162,7 @@ G Verzeichnisse zuerst - vorangestellt kehrt die\n\ /P Pausiert nach jeder vollen Bildschirmseite.\n\ /Q Gibt den Besitzer der Datei aus.\n\ + /R Displays alternate data streams of the files.\n\ /S Listet Dateien und alle Unterverzeichnisse auf.\n\ /T Bestimmt welche Zeit verwendet wird.\n\ timefield C Erstellung\n\ Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -147,7 +147,7 @@ /m specifiy than n are milliseconds\n\ otherwise n are seconds\n" STRING_DIR_HELP1 "DIR [Î´Î¯ÏÎºÎ¿Ï:][Î¼Î¿Î½Î¿ÏÎ¬ÏÎ¹][Î±ÏÏÎµÎ¯Î¿] [/A[[:]ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÎ¬]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ + [/O[[:]sortorder]] [/P] [/Q] [/R] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ [Î´Î¯ÏÎºÎ¿Ï:][Î¼Î¿Î½Î¿ÏÎ¬ÏÎ¹][Î±ÏÏÎµÎ¯Î¿]\n\ ÎÎ±Î¸Î¿ÏÎ¯Î¶ÎµÎ¹ Î¼Î¿Î½Î¬Î´Î± Î´Î¯ÏÎºÎ¿Ï, ÎºÎ±ÏÎ¬Î»Î¿Î³Î¿ Î®/ÎºÎ±Î¹ Î±ÏÏÎµÎ¯Î± ÏÎ¿Ï Î¸Î± ÏÎ±ÏÎ±ÏÎµÎ¸Î¿ÏÎ½ ÏÎµ Î»Î¯ÏÏÎ±.\n\n\ /A ÎÎ¼ÏÎ±Î½Î¯Î¶ÎµÎ¹ Î±ÏÏÎµÎ¯Î± Î¼Îµ ÏÎ± ÎºÎ±Î¸Î¿ÏÎ¹ÏÎ¼ÎÎ½Î± ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÎ¬..\n\ @@ -166,6 +166,7 @@ G Î ÏÏÏÎ± Î¿Î¹ ÎºÎ±ÏÎ¬Î»Î¿Î³Î¿Î¹ Î¿Î¼Î¬Î´ÏÎ½ - Î ÏÏÎ¸ÎµÎ¼Î± Î³Î¹Î± Î±Î½ÏÎ¹ÏÏÏÎ¿ÏÎ® ÏÎ·Ï ÏÎµÎ¹ÏÎ¬Ï\n\ /P Î£ÏÎ±Î¼Î±ÏÎ¬ÎµÎ¹ ÏÏÎ±Î½ Î¿Î¹ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ Î³ÎµÎ¼Î¯ÏÎ¿ÏÎ½ Î¼Î¯Î± Î¿Î¸ÏÎ½Î·.\n\ /Q ÎÎ¼ÏÎ¬Î½Î¹ÏÎ· ÏÎ¿Ï Î¹Î´Î¹Î¿ÎºÏÎ®ÏÎ· ÏÎ¿Ï Î±ÏÏÎµÎ¯Î¿Ï.\n\ + /R Displays alternate data streams of the files.\n\ /S ÎÎ¼ÏÎ±Î½Î¯Î¶ÎµÎ¹ ÏÎ± Î±ÏÏÎµÎ¯Î± ÏÏÎ¿Î½ ÎºÎ±Î¸Î¿ÏÎ¹ÏÎ¼ÎÎ½Î¿ ÎºÎ±ÏÎ¬Î»Î¿Î³Î¿ ÎºÎ±Î¹ ÏÎµ ÏÎ»Î¿ÏÏ ÏÎ¿ÏÏ ÏÏÎ¿ÎºÎ±ÏÎ±Î»ÏÎ³Î¿ÏÏ.\n\ /T ÎÎ»ÎÎ³ÏÎµÎ¹ ÏÎ¿Î¹Î¿ ÏÎµÎ´Î¯Î¿ ÏÏÏÎ½Î¿Ï Î¸Î± ÎµÎ¼ÏÎ±Î½Î¹ÏÏÎµÎ¯ Î® Î¸Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î·Î¸ÎµÎ¯ Î³Î¹Î± ÏÎ·Î½ ÏÎ±Î¾Î¹Î½ÏÎ¼Î·ÏÎ·\n\ ÏÎµÎ´Î¯Î¿ ÏÏÏÎ½Î¿Ï C ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î¯Î±\n\ Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -143,7 +143,7 @@ /m specifiy than n are milliseconds\n\ otherwise n are seconds\n" STRING_DIR_HELP1 "DIR [drive:][path][filename] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ + [/O[[:]sortorder]] [/P] [/Q] [/R] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ [drive:][path][filename]\n\ Specifies drive, directory, and/or files to list.\n\n\ /A Displays files with specified attributes.\n\ @@ -162,6 +162,7 @@ G Group directories first - Prefix to reverse order\n\ /P Pauses after each screenful of information.\n\ /Q Display the owner of the file.\n\ + /R Displays alternate data streams of the files.\n\ /S Displays files in specified directory and all subdirectories.\n\ /T Controls which time field displayed or used for sorting\n\ timefield C Creation\n\ Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -145,7 +145,7 @@ /m Especifica que n son milisegundos\n\ En otro caso n son segundos\n" STRING_DIR_HELP1 "DIR [unidad:][ruta][nombre de archivo] [/A[[:]atributos]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]orden]] [/P] [/Q] [/S] [/T[[:]fecha]] [/W] [/X] [/4]\n\n\ + [/O[[:]orden]] [/P] [/Q] [/R] [/S] [/T[[:]fecha]] [/W] [/X] [/4]\n\n\ [unidad:][ruta][nombre de archivo]\n\ Especifica la unidad, el directorio o los archivos a listar.\n\n\ /A Muestra los archivos con los atributos especificados.\n\ @@ -165,6 +165,7 @@ G Los directorios primero - Prefijo para el orden inverso\n\ /P Pausa despuÃ©s de cada pantalla llena de informaciÃ³n.\n\ /Q Muestra el propietario del archivo.\n\ + /R Displays alternate data streams of the files.\n\ /S Muestra los archivos en el directorio especificado y sus subdirectorios.\n\ /T Controla que campo de tiempo se muestra o es usado para ordenar:\n\ campo de tiempo C CreaciÃ³n\n\ Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -151,7 +151,7 @@ /m spÃ©cifie que n est en millisecondes\n\ sinon n est en secondes" STRING_DIR_HELP1 "DIR [lecteur:][chemin][fichier] [/A[[:]attributs]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]ordredetri]] [/P] [/Q] [/S] [/T[[:]heure]] [/W] [/X] [/4]\n\n\ + [/O[[:]ordredetri]] [/P] [/Q] [/R] [/S] [/T[[:]heure]] [/W] [/X] [/4]\n\n\ [lecteur:][chemin][fichier]\n\ SpÃ©cifie le disque, le rÃ©pertoire, et/ou les fichiers Ã lister.\n\n\ /A Affiche les fichiers avec les attributs indiquÃ©s.\n\ @@ -173,6 +173,7 @@ G RÃ©pertoires d'abord - PrÃ©fixe pour inverser l'ordre\n\ /P S'arrÃªte aprÃ¨s chaque page d'information.\n\ /Q Affiche le propriÃ©taire du fichier.\n\ + /R Affiche les flux de donnÃ©es alternatifs du fichier.\n\ /S Affiche les fichiers dans le rÃ©pertoire indiquÃ© et\n\ tous les sous-rÃ©pertoires.\n\ /T ContrÃ´le quel champ de temps sera affichÃ© ou utilisÃ©\n\ Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -136,7 +136,7 @@ /m specifiy than n are milliseconds\n\ otherwise n are seconds\n" STRING_DIR_HELP1 "DIR [meghajtÃ³:][elÃ©rÃ©si_Ãºt][Ã¡llomÃ¡nynÃ©v] [/A[[:]attribÃºtumok]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]rendezÃ©si_feltÃ©tel]] [/P] [/Q] [/S] [/T[[:]idÃµ]] [/W] [/X] [/4]\n\n\ + [/O[[:]rendezÃ©si_feltÃ©tel]] [/P] [/Q] [/R] [/S] [/T[[:]idÃµ]] [/W] [/X] [/4]\n\n\ [meghajtÃ³:][elÃ©rÃ©si_Ãºt][Ã¡llomÃ¡nyname]\n\ Az adott hely Ã¡llomÃ¡nyait Ã©s mappÃ¡it jelenÃti meg.\n\n\ /A A megadott attribÃºtumu Ã¡llomÃ¡nyokat jelenÃti csak meg.\n\ @@ -154,6 +154,7 @@ G MappÃ¡k legelÃµl - ""Nem"" prefixel fordÃtott rendezÃ©s\n\ /P Csak egy kÃ©pernyÃµnyi adat megjelenÃtÃ©se egyszerre.\n\ /Q ÃllomÃ¡ny tulajdonsosÃ¡nak megjelenÃtÃ©se.\n\ + /R Displays alternate data streams of the files.\n\ /S AlmappÃ¡k tartalmÃ¡t is megjelenÃti.\n\ /T Controls which time field displayed or used for sorting\n\ timefield C LÃ©trehozÃ¡s\n\ Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -145,7 +145,7 @@ /m menetapkan bahwa n adalah milidetik\n\ sebaliknya n adalah detik\n" STRING_DIR_HELP1 "DIR [drive:][path][filename] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ + [/O[[:]sortorder]] [/P] [/Q] [/R] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ [drive:][path][filename]\n\ Menetapkan drive, direktori, dan/atau files ke daftar.\n\n\ /A Menampilkan file dengan atribut yang ditetapkan.\n\ @@ -164,6 +164,7 @@ G Grup direktori pertama - Prefiks untuk membalik urutan\n\ /P Menunda setelah setiap layar penuh informasi.\n\ /Q Menampilkan pemilik file.\n\ + /R Displays alternate data streams of the files.\n\ /S Menampilkan file dalam direktori dan semua subdirektorinya.\n\ /T Mengontrol field waktu mana atau dipakai untuk mengurut\n\ timefield C Pembuatan\n\ Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -143,7 +143,7 @@ /m precisa che n Ã¨ in millisecondi\n\ altrimenti n Ã¨ in secondi\n" STRING_DIR_HELP1 "DIR [disco:][percorso][nomefilen] [/A[[:]attributi]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]orderinamento]] [/P] [/Q] [/S] [/T[[:]tempo]] [/W] [/X] [/4]\n\n\ + [/O[[:]orderinamento]] [/P] [/Q] [/R] [/S] [/T[[:]tempo]] [/W] [/X] [/4]\n\n\ [disco:][percorso][nomefilen]\n\ Indica disco, percorso e/o file da elencare.\n\n\ /A Visualizza i file con gli attributi indicati.\n\ @@ -162,6 +162,7 @@ G Le cartelle per prime - Prefisso per invertire l'ordine\n\ /P Pasa dopo ogni schermata piena.\n\ /Q Visualizza il proprietario del file.\n\ + /R Displays alternate data streams of the files.\n\ /S Visualizza i file nella cartella indicata e nelle sottocartelle.\n\ /T Sceglie quale campo di tempo Ã¨ usato per gli ordinamenti.\n\ timefield C Creazione\n\ Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -148,7 +148,7 @@ æå®ããªãå ´åãåä½ã«ã¯ç§ãä½¿ããã¾ãã\n" STRING_DIR_HELP1 "ãã£ã¬ã¯ããªä¸ã®ãã¡ã¤ã«ã¨ãµããã£ã¬ã¯ããªãä¸è¦§è¡¨ç¤ºãã¾ãã\n\n\ DIR [ãã©ã¤ã:][ãã¹][ãã¡ã¤ã«å] [/A[[:]å±æ§]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]ã½ã¼ãé ]] [/P] [/Q] [/S] [/T[[:]ã¿ã¤ã ãã£ã¼ã«ã]] [/W] [/X] [/4]\n\n\ + [/O[[:]ã½ã¼ãé ]] [/P] [/Q] [/R] [/S] [/T[[:]ã¿ã¤ã ãã£ã¼ã«ã]] [/W] [/X] [/4]\n\n\ [ãã©ã¤ã:][ãã¹][ãã¡ã¤ã«å]\n\ ä¸è¦§è¡¨ç¤ºãããã©ã¤ãããã£ã¬ã¯ããªãã¾ãã¯ãã¡ã¤ã«ãæå®ãã¾ãã\n\ /A æå®ãããå±æ§ã®ãã¡ã¤ã«ãè¡¨ç¤ºãã¾ãã\n\ @@ -167,6 +167,7 @@ G ã°ã«ã¼ã (ãã£ã¬ã¯ããªãã) - éé \n\ /P 1 ç»é¢ãã¨ã«åæ¢ãã¦è¡¨ç¤ºãã¾ãã\n\ /Q ãã¡ã¤ã«ã®ææèãè¡¨ç¤ºãã¾ãã\n\ + /R Displays alternate data streams of the files.\n\ /S æå®ããããã£ã¬ã¯ããªããã³ãã®ãµããã£ã¬ã¯ããªã®ãã¹ã¦ã®\n\ ãã¡ã¤ã«ãè¡¨ç¤ºãã¾ãã\n\ /T ã©ã®ã¿ã¤ã ãã£ã¼ã«ããè¡¨ç¤ºããããã¾ãã¯ä¸¦ã¹æ¿ãã«ä½¿ç¨ãããã\n\ Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -143,7 +143,7 @@ /m spesifiserer at n er mikrosekunder\n\ ellers er n sekunder\n" STRING_DIR_HELP1 "DIR [stasjon:][mappe][filnavn] [/A[[:]attributter]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]sortering]] [/P] [/Q] [/S] [/T[[:]tidsfelt]] [/W] [/X] [/4]\n\n\ + [/O[[:]sortering]] [/P] [/Q] [/R] [/S] [/T[[:]tidsfelt]] [/W] [/X] [/4]\n\n\ [stasjon:][mappe][filnavn]\n\ Spesifisere stasjon, mappe, og/eller filer som skal listes.\n\n\ /A Vis filer ved Ã¥ spesifisere attributter.\n\ @@ -162,6 +162,7 @@ G Gruppere mapper fÃ¸rst - Prefiks for Ã¥ reversere orden\n\ /P Pause etter hvert hele skjermbilde.\n\ /Q Viser hvem som eier filen.\n\ + /R Displays alternate data streams of the files.\n\ /S Viser alle filer i angitt mappe og alle undermapper.\n\ /T Styrer hvilket tidsfelt som vises eller blir brukt for sortering\n\ timefelt C Opprettet \n\ Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -151,7 +151,7 @@ /m wymusza traktowanie n jako milisekund,\n\ w innym wypadku bÄdzie traktowane jako sekundy\n" STRING_DIR_HELP1 "DIR [napÄd:][ÅcieÅ¼ka][pliki] [/A[[:]atrybuty]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]porzÄdek]] [/P] [/Q] [/S] [/T[[:]czas]] [/W] [/X] [/4]\n\n\ + [/O[[:]porzÄdek]] [/P] [/Q] [/R] [/S] [/T[[:]czas]] [/W] [/X] [/4]\n\n\ [napÄd:][ÅcieÅ¼ka][nazwa_pliku]\n\ Wyznacza literÄ napÄdu, katalog, i/lub pliki do wyÅwietlenia.\n\n\ /A WyÅwietla pliki o okreÅlonych atrybutach.\n\ @@ -170,6 +170,7 @@ G WyÅwietla najpierw katalogi - Odwraca kolejnoÅÄ\n\ /P Pauza po kaÅ¼dym peÅnym ekranie.\n\ /Q WyÅwietla wÅaÅciciela plikÃ³w\n\ + /R Displays alternate data streams of the files.\n\ /S WyÅwietla pliki w danym katalogu i wszystkich podkatalogach.\n\ /T Pole czasu, odpowiedzialne za wyÅwietlanie/sortowanie \n\ czas C Utworzenia\n\ Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -160,7 +160,7 @@ /m SpecificÄ faptul cÄ Â«nÂ» sunt milisecunde\n\ altfel Â«nÂ» sunt considerate secunde.\n" STRING_DIR_HELP1 "DIR [unitate:][cale][fiÈier] [/A[[:]atribute]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]ordonare]] [/P] [/Q] [/S] [/T[[:]timp]] [/W] [/X] [/4]\n\n\ + [/O[[:]ordonare]] [/P] [/Q] [/R] [/S] [/T[[:]timp]] [/W] [/X] [/4]\n\n\ [unitate:][cale][fiÈier]\n\ SpecificÄ unitatea, directorul Èi/sau fiÈierele de enumerat.\n\n\ /A AfiÈeazÄ fiÈierele dupÄ atributele specificate.\n\ @@ -182,6 +182,7 @@ - Prefix pentru inversarea ordinii\n\ /P PauzÄ dupÄ un ecran de informaÈii.\n\ /Q AfiÈeazÄ posesorul fiÈierului.\n\ + /R Displays alternate data streams of the files.\n\ /S AfiÈeazÄ fiÈierele din directorul specificat Èi\n\ din toate subdirectoarele sale.\n\ /T DeterminÄ care timp este afiÈat sau folosit la ordonare\n\ Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -146,7 +146,7 @@ /m ÑÐºÐ°Ð·ÑÐ²Ð°ÐµÑ, ÑÑÐ¾ n Ð¾Ð·Ð½Ð°ÑÐ°ÐµÑ ÐºÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ Ð¼Ð¸Ð»Ð»Ð¸ÑÐµÐºÑÐ½Ð´\n\ Ð¸Ð½Ð°ÑÐµ n Ð¾Ð·Ð½Ð°ÑÐ°ÐµÑ ÐºÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ ÑÐµÐºÑÐ½Ð´\n" STRING_DIR_HELP1 "DIR [Ð´Ð¸ÑÐº:][Ð¿ÑÑÑ][Ð¸Ð¼Ñ_ÑÐ°Ð¹Ð»Ð°] [/A[[:]Ð°ÑÑÐ¸Ð±ÑÑÑ]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]ÑÐ¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ°]] [/P] [/Q] [/S] [/T[[:]Ð²ÑÐµÐ¼Ñ]] [/W] [/X] [/4]\n\n\ + [/O[[:]ÑÐ¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ°]] [/P] [/Q] [/R] [/S] [/T[[:]Ð²ÑÐµÐ¼Ñ]] [/W] [/X] [/4]\n\n\ [Ð´Ð¸ÑÐº:][Ð¿ÑÑÑ][Ð¸Ð¼Ñ_ÑÐ°Ð¹Ð»Ð°]\n\ ÐÐ¸ÑÐº, ÐºÐ°ÑÐ°Ð»Ð¾Ð³ Ð¸/Ð¸Ð»Ð¸ ÑÐ°Ð¹Ð»Ñ, ÐºÐ¾ÑÐ¾ÑÑÐµ ÑÐ»ÐµÐ´ÑÐµÑ Ð²ÐºÐ»ÑÑÐ¸ÑÑ Ð² ÑÐ¿Ð¸ÑÐ¾Ðº.\n\n\ /A ÐÑÐ²Ð¾Ð´ ÑÐ°Ð¹Ð»Ð¾Ð² Ñ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¼Ð¸ Ð°ÑÑÐ¸Ð±ÑÑÐ°Ð¼Ð¸.\n\ @@ -165,6 +165,7 @@ G ÐÐ°ÑÐ°ÑÑ ÑÐ¿Ð¸ÑÐ¾Ðº Ñ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð² ÐÑÐµÑÐ¸ÐºÑ ""-"" Ð¾Ð±ÑÐ°ÑÐ°ÐµÑ Ð¿Ð¾ÑÑÐ´Ð¾Ðº\n\ /P ÐÐ°ÑÐ·Ð° Ð¿Ð¾ÑÐ»Ðµ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ ÑÐºÑÐ°Ð½Ð°.\n\ /Q ÐÑÐ²Ð¾Ð´ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ð¹ Ð¾ Ð²Ð»Ð°Ð´ÐµÐ»ÑÑÐµ ÑÐ°Ð¹Ð»Ð°.\n\ + /R Displays alternate data streams of the files.\n\ /S ÐÑÐ²Ð¾Ð´ ÑÐ¿Ð¸ÑÐºÐ° ÑÐ°Ð¹Ð»Ð¾Ð² Ð¸Ð· ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð° Ð¸ ÐµÐ³Ð¾ Ð¿Ð¾Ð´ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð².\n\ /T ÐÑÐ±Ð¾Ñ Ð¿Ð¾Ð»Ñ Ð²ÑÐµÐ¼ÐµÐ½Ð¸ Ð´Ð»Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð¸ ÑÐ¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ¸\n\ Ð²ÑÐµÐ¼Ñ C Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ\n\ Modified: trunk/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -149,7 +149,7 @@ /m specifiy than n are milliseconds\n\ otherwise n are seconds\n" STRING_DIR_HELP1 "DIR [drive:][path][filename] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ + [/O[[:]sortorder]] [/P] [/Q] [/R] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ [drive:][path][filename]\n\ Specifies drive, directory, and/or files to list.\n\n\ /A Displays files with specified attributes.\n\ @@ -168,6 +168,7 @@ G Group directories first - Prefix to reverse order\n\ /P Pauses after each screenful of information.\n\ /Q Display the owner of the file.\n\ + /R Displays alternate data streams of the files.\n\ /S Displays files in specified directory and all subdirectories.\n\ /T Controls which time field displayed or used for sorting\n\ timefield C Creation\n\ Modified: trunk/reactos/base/shell/cmd/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sq-AL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sq-AL.rc [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -147,7 +147,7 @@ /m specifikoni se n janÃ« millisekonda\n\ ndryshe n janÃ« sekonda\n" STRING_DIR_HELP1 "DIR [drive:][rrugÃ«][emer] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]radhitje]] [/P] [/Q] [/S] [/T[[:]koha]] [/W] [/X] [/4]\n\n\ + [/O[[:]radhitje]] [/P] [/Q] [/R] [/S] [/T[[:]koha]] [/W] [/X] [/4]\n\n\ [drive:][rrugÃ«][emer]\n\ PÃ«rcakton, Drejtorin, dhe / ose dokumentin nÃ« listÃ«.\n\n\ /A Shfaq dokumentat me atributet e specifikuara.\n\ @@ -166,6 +166,7 @@ G Grupi skedave se pari - Parashtese tÃ« kthejÃ« renditjen\n\ /P Pauzo pas Ã§do informacioni nÃ« ekran.\n\ /Q Shfaq zotÃ«ruesin e dosjes.\n\ + /R Displays alternate data streams of the files.\n\ /S Shfaq dokumentet nÃ« skedÃ«n e specifikuar dhe tÃ« gjitha nÃ«n-skedat.\n\ /T Kontrollon secilen fushÃ« kohohore e shfaqura ose e pÃ«rdorur pÃ«r klasifikimin\n\ timefield C Krijim\n\ Modified: trunk/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sv-SE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -143,7 +143,7 @@ /m anger at n Ã¤r mikrosekunder\n\ annars Ã¤r n sekunder\n" STRING_DIR_HELP1 "DIR [enhet:][mapp][filnamn] [/A[[:]attribut]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]sortering]] [/P] [/Q] [/S] [/T[[:]tidsfÃ¤lt]] [/W] [/X] [/4]\n\n\ + [/O[[:]sortering]] [/P] [/Q] [/R] [/S] [/T[[:]tidsfÃ¤lt]] [/W] [/X] [/4]\n\n\ [enhet:][mapp][filnamn]\n\ Anger enhet, mapp, och/eller filer som skall listes.\n\n\ /A Vis filer ved att ange attributter.\n\ @@ -162,6 +162,7 @@ G Gruppera mappar fÃ¶rst - Prefix fÃ¶r omvÃ¤nd ordning\n\ /P Pausa efter varje hel skÃ¤rmbild.\n\ /Q Viser vem som Ã¤ger filen.\n\ + /R Displays alternate data streams of the files.\n\ /S Viser alla filer i angiven mapp och alla undermappar.\n\ /T Kontrollerar vilket tidsfÃ¤lt som visas eller blir anvÃ¤nt fÃ¶r sortering\n\ timefelt C Skapelse \n\ Modified: trunk/reactos/base/shell/cmd/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/tr-TR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/tr-TR.rc [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -146,7 +146,7 @@ /m n milisÃ¢niye olarak belirtir\n\ yoksa n sÃ¢niyedir\n" STRING_DIR_HELP1 "DIR [sÃ¼rÃ¼cÃ¼:][yol][kÃ¼tÃ¼k adÄ±] [/A[[:]Ã¶z nitelikler]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]dizme dÃ¼zeni]] [/P] [/Q] [/S] [/T[[:]zaman aralÄ±ÄÄ±]] [/W] [/X] [/4]\n\n\ + [/O[[:]dizme dÃ¼zeni]] [/P] [/Q] [/R] [/S] [/T[[:]zaman aralÄ±ÄÄ±]] [/W] [/X] [/4]\n\n\ [sÃ¼rÃ¼cÃ¼:][yol][kÃ¼tÃ¼k adÄ±]\n\ Dizelgelenecek sÃ¼rÃ¼cÃ¼, dizin veyÃ¢ kÃ¼tÃ¼kleri belirtir.\n\n\ /A Belirtilen Ã¶z nitelikli kÃ¼tÃ¼kleri gÃ¶rÃ¼ntÃ¼ler.\n\ @@ -166,6 +166,7 @@ G Ãnce dizinleri Ã¶bekle - Ters dizme iÃ§in Ã¶n ek\n\ /P Bir bilgi gÃ¶rÃ¼ntÃ¼lÃ¼ÄÃ¼nden sonra duraklatÄ±r.\n\ /Q KÃ¼tÃ¼ÄÃ¼n iyesini gÃ¶ster.\n\ + /R Displays alternate data streams of the files.\n\ /S Belirtilen dizindeki ve tÃ¼m alt dizinlerdeki kÃ¼tÃ¼kleri\n\ gÃ¶rÃ¼ntÃ¼ler.\n\ /T Dizme iÃ§in hangi zaman aralÄ±ÄÄ±nÄ±n gÃ¶rÃ¼ntÃ¼leneceÄini ya da\n\ Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -154,7 +154,7 @@ /m Ð²ÐºÐ°Ð·ÑÑ, ÑÐ¾ n ÑÐµ Ð¼iÐ»iÑÐµÐºÑÐ½Ð´Ð¸\n\ iÐ½Ð°ÐºÑÐµ n ÑÐµ ÐºiÐ»ÑÐºiÑÑÑ ÑÐµÐºÑÐ½Ð´\n" STRING_DIR_HELP1 "DIR [Ð´Ð¸ÑÐº:][ÑÐ»ÑÑ][iÐ¼'Ñ_ÑÐ°Ð¹Ð»Ñ] [/A[[:]Ð°ÑÑÐ¸Ð±ÑÑÐ¸]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]Ð¿Ð¾ÑÑÐ´Ð¾Ðº]] [/P] [/Q] [/S] [/T[[:]ÑÐ°Ñ]] [/W] [/X] [/4]\n\n\ + [/O[[:]Ð¿Ð¾ÑÑÐ´Ð¾Ðº]] [/P] [/Q] [/R] [/S] [/T[[:]ÑÐ°Ñ]] [/W] [/X] [/4]\n\n\ [Ð´Ð¸ÑÐº:][ÑÐ»ÑÑ][iÐ¼'Ñ_ÑÐ°Ð¹Ð»Ñ]\n\ ÐÐ¸Ð·Ð½Ð°ÑÐ°Ñ Ð´Ð¸ÑÐº, Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÑ, ÑÐ°/ÑÐ¸ ÑÐ°Ð¹Ð»Ð¸ Ð´Ð»Ñ ÑÑ Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð² ÑÐ¿Ð¸ÑÐºÑ.\n\n\ /A ÐiÐ´Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ ÑÐ°Ð¹Ð»iÐ² Ð· Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ð¼Ð¸ Ð°ÑÑÐ¸Ð±ÑÑÐ°Ð¼Ð¸.\n\ @@ -173,6 +173,7 @@ G ÐÐ¾ÑÐ°ÑÐ¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð· ÐºÐ°ÑÐ°Ð»Ð¾Ð³iÐ² ÐÑÐµÑiÐºÑ ""-"" Ð´Ð»Ñ Ð·Ð²Ð¾ÑÐ¾ÑÐ½ÑÐ¾Ð³Ð¾ Ð¿Ð¾ÑÑÐ´ÐºÑ\n\ /P ÐÐ°ÑÐ·Ð° Ð¿iÑÐ»Ñ ÐºÐ¾Ð¶Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ ÐµÐºÑÐ°Ð½Ñ.\n\ /Q ÐiÐ´Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ Ð¿ÑÐ¾ Ð²Ð»Ð°ÑÐ½Ð¸ÐºÐ° ÑÐ°Ð¹Ð»Ñ.\n\ + /R Displays alternate data streams of the files.\n\ /S ÐiÐ´Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ ÑÐ°Ð¹Ð»iÐ² Ð· Ð²ÐºÐ°Ð·Ð°Ð½Ð¾Ð³Ð¾ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ñ ÑÐ° Ð²ÑiÑ Ð¿iÐ´ÐºÐ°ÑÐ°Ð»Ð¾Ð³iÐ².\n\ /T ÐÐ¸Ð±iÑ Ð¿Ð¾Ð»Ñ ÑÐ°ÑÑ Ð´Ð»Ñ Ð²iÐ´Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ ÑÐ¸ ÑÐ¾ÑÑÑÐ²Ð°Ð½Ð½Ñ\n\ ÑÐ°Ñ C Ð¡ÑÐ²Ð¾ÑÐµÐ½Ð½Ñ\n\ Modified: trunk/reactos/base/shell/cmd/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-CN.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] Tue Aug 25 20:35:51 2015 @@ -138,7 +138,7 @@ DELAY [/m]n\n\n\ /m æå® n çåä½ä½¿ç¨æ¯«ç§ï¼å¦åä¸ºç§ã\n" STRING_DIR_HELP1 "DIR [é©±å¨å¨:][è·¯å¾][æä»¶å] [/A[[:]å±æ§]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]æåºé¡ºåº]] [/P] [/Q] [/S] [/T[[:]æ¶é´åæ®µ]] [/W] [/X] [/4]\n\n\ + [/O[[:]æåºé¡ºåº]] [/P] [/Q] [/R] [/S] [/T[[:]æ¶é´åæ®µ]] [/W] [/X] [/4]\n\n\ [é©±å¨å¨:][è·¯å¾][æä»¶å]\n\ æå®è¦åè¡¨æ¾ç¤ºçé©±å¨å¨ãç®å½å/ææä»¶ã\n\n\ /A æ¾ç¤ºå·ææå®å±æ§çæä»¶ã\n\ @@ -156,6 +156,7 @@ G åç»ç®å½å¨å - åè½¬é¡ºåºçåç¼\n\ /P å¨æ¯å±å¹ä¿¡æ¯è¾åºååé¡¿ã\n\ /Q æ¾ç¤ºæä»¶çææèã\n\ + /R Displays alternate data streams of the files.\n\ /S æ¾ç¤ºæå®ç®å½åææåç®å½ä¸çæä»¶ã\n\ /T æ§å¶è¦æ¾ç¤ºæèç¨äºæåºçæ¶é´åæ®µã\n\ æ¶é´åæ®µ C åå»ºæ¶é´\n\

1 0

[pschweitzer] 68822: [NTFS] Properly set StreamNameLength (with the length of extra data we append). This fixes truncated output from FindFirstStreamW/FindNextStreamW
by pschweitzer＠svn.reactos.org 25 Aug '15

25 Aug '15

Author: pschweitzer Date: Tue Aug 25 20:11:53 2015 New Revision: 68822 URL: http://svn.reactos.org/svn/reactos?rev=68822&view=rev Log: [NTFS] Properly set StreamNameLength (with the length of extra data we append). This fixes truncated output from FindFirstStreamW/FindNextStreamW Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Tue Aug 25 20:11:53 2015 @@ -265,7 +265,7 @@ } CurrentInfo->NextEntryOffset = 0; - CurrentInfo->StreamNameLength = Attribute->NameLength * sizeof(WCHAR); + CurrentInfo->StreamNameLength = (Attribute->NameLength + wcslen(L"::$DATA")) * sizeof(WCHAR); CurrentInfo->StreamSize.QuadPart = AttributeDataLength(Attribute); CurrentInfo->StreamAllocationSize.QuadPart = AttributeAllocatedLength(Attribute); CurrentInfo->StreamName[0] = L':';

1 0

[bfreisen] 68821: Some fixes to the scf file registry entry; added some missing entries (patch by gonzoMD)
by bfreisen＠svn.reactos.org 25 Aug '15

25 Aug '15

Author: bfreisen Date: Tue Aug 25 14:24:41 2015 New Revision: 68821 URL: http://svn.reactos.org/svn/reactos?rev=68821&view=rev Log: Some fixes to the scf file registry entry; added some missing entries (patch by gonzoMD) Modified: trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Tue Aug 25 14:24:41 2015 @@ -272,11 +272,16 @@ ; shell command files (e.g. "Show Desktop" in quicklaunch bar) HKCR,".scf","",0x00000000,"SHCmdFile" +HKCR,"SHCmdFile","",0x00000000,"ReactOS Explorer Command" HKCR,"SHCmdFile","NeverShowExt",0x00000000,"" -HKCR,"SHCmdFile","IsShortcut",0x00000000,"yes" -HKCR,"SHCmdFile\shell\open\command","",0x00000000,"explorer.exe ""%1""" +HKCR,"SHCmdFile","InfoTip",0x00000000,"prop:DocComments" +HKCR,"SHCmdFile\shell\open\command","",0x00000000,"%systemroot%\explorer.exe" +HKCR,"SHCmdFile\shell\open\ddeexec","",0x00000000,"[ShellFile(\"%1\",\"%1\",%S)]" +HKCR,"SHCmdFile\shell\open\ddeexec\Application","",0x00000000,"Folders" +HKCR,"SHCmdFile\shell\open\ddeexec\Topic","",0x00000000,"AppProperties" HKCR,"SHCmdFile\CLSID","",0x00000000,"{57651662-CE3E-11D0-8D77-00C04FC99D61}" HKCR,"SHCmdFile\shellex\IconHandler","",0x00000000,"{57651662-CE3E-11D0-8D77-00C04FC99D61}" +HKCR,"SHCmdFile\shellex\DropHandler","",0x00000000,"{86C86720-42A0-1069-A2E8-08002B30309D}" ; System-Files HKCR,".sys","",0x00000000,"sysfile"

1 0

[bfreisen] 68820: [PSDK] Add methods to Gdiplus::Color
by bfreisen＠svn.reactos.org 25 Aug '15

25 Aug '15

Author: bfreisen Date: Tue Aug 25 14:13:19 2015 New Revision: 68820 URL: http://svn.reactos.org/svn/reactos?rev=68820&view=rev Log: [PSDK] Add methods to Gdiplus::Color Modified: trunk/reactos/include/psdk/gdipluscolor.h trunk/reactos/include/psdk/gdiplusheaders.h trunk/reactos/include/psdk/gdiplusmatrix.h Modified: trunk/reactos/include/psdk/gdipluscolor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdipluscolor.… ============================================================================== --- trunk/reactos/include/psdk/gdipluscolor.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdipluscolor.h [iso-8859-1] Tue Aug 25 14:13:19 2015 @@ -1,5 +1,6 @@ /* - * Copyright (C) 2808 Google (Lei Zhang) + * Copyright (C) 2008 Google (Lei Zhang) + * 2015 Benedikt Freisen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,9 +31,94 @@ #ifdef __cplusplus -/* FIXME: missing the methods. */ class Color { +public: + Color(VOID) + { + Argb = 0xff000000; + } + + Color(ARGB argb) + { + Argb = argb; + } + + Color(BYTE r, BYTE g, BYTE b) + { + Argb = 0xff << 24 | r << 16 | g << 8 | b; + } + + Color(BYTE a, BYTE r, BYTE g, BYTE b) + { + Argb = a << 24 | r << 16 | g << 8 | b; + } + + BYTE GetA(VOID) + { + return (Argb >> 24) & 0xff; + } + + BYTE GetAlpha(VOID) + { + return (Argb >> 24) & 0xff; + } + + BYTE GetB(VOID) + { + return Argb & 0xff; + } + + BYTE GetBlue(VOID) + { + return Argb & 0xff; + } + + BYTE GetG(VOID) + { + return (Argb >> 8) & 0xff; + } + + BYTE GetGreen(VOID) + { + return (Argb >> 8) & 0xff; + } + + BYTE GetR(VOID) + { + return (Argb >> 16) & 0xff; + } + + BYTE GetRed(VOID) + { + return (Argb >> 16) & 0xff; + } + + ARGB GetValue(VOID) + { + return Argb; + } + + static ARGB MakeARGB(BYTE a, BYTE r, BYTE g, BYTE b) + { + return a << 24 | r << 16 | g << 8 | b; + } + + VOID SetFromCOLORREF(COLORREF rgb) + { + Argb = 0xff000000 | rgb & 0x000000ff << 16 | rgb & 0x0000ff00 | rgb & 0x00ff0000 >> 16; + } + + VOID SetValue(ARGB argb) + { + Argb = argb; + } + + COLORREF ToCOLORREF(VOID) + { + return Argb & 0x000000ff << 16 | Argb & 0x0000ff00 | Argb & 0x00ff0000 >> 16; + } + protected: ARGB Argb; }; Modified: trunk/reactos/include/psdk/gdiplusheaders.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusheader… ============================================================================== --- trunk/reactos/include/psdk/gdiplusheaders.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusheaders.h [iso-8859-1] Tue Aug 25 14:13:19 2015 @@ -24,202 +24,252 @@ public: friend class Graphics; - Image(IStream *stream, BOOL useEmbeddedColorManagement) - { - } - - Image(const WCHAR *filename, BOOL useEmbeddedColorManagement) - { + Image(IStream *stream, BOOL useEmbeddedColorManagement = FALSE) + { + if (useEmbeddedColorManagement) + status = DllExports::GdipLoadImageFromStreamICM(stream, &image); + else + status = DllExports::GdipLoadImageFromStream(stream, &image); + } + + Image(const WCHAR *filename, BOOL useEmbeddedColorManagement = FALSE) + { + if (useEmbeddedColorManagement) + status = DllExports::GdipLoadImageFromFileICM(filename, &image); + else + status = DllExports::GdipLoadImageFromFile(filename, &image); } Image *Clone(VOID) { - return NULL; - } - - static Image *FromFile(const WCHAR *filename, BOOL useEmbeddedColorManagement) - { - return NULL; - } - - static Image *FromStream(IStream *stream, BOOL useEmbeddedColorManagement) - { - return NULL; + Image *newImage = new Image(); + SetStatus(DllExports::GdipCloneImage(image, &(newImage->image))); + return newImage; + } + + static Image *FromFile(const WCHAR *filename, BOOL useEmbeddedColorManagement = FALSE) + { + return new Image(filename, useEmbeddedColorManagement); + } + + static Image *FromStream(IStream *stream, BOOL useEmbeddedColorManagement = FALSE) + { + return new Image(stream, useEmbeddedColorManagement); } Status GetAllPropertyItems(UINT totalBufferSize, UINT numProperties, PropertyItem *allItems) { - return NotImplemented; + return SetStatus(DllExports::GdipGetAllPropertyItems(image, totalBufferSize, numProperties, allItems)); } Status GetBounds(RectF *srcRect, Unit *srcUnit) { - return NotImplemented; + return SetStatus(DllExports::GdipGetImageBounds(image, srcRect, srcUnit)); } Status GetEncoderParameterList(const CLSID *clsidEncoder, UINT size, EncoderParameters *buffer) { - return NotImplemented; + return SetStatus(DllExports::GdipGetEncoderParameterList(image, clsidEncoder, size, buffer)); } UINT GetEncoderParameterListSize(const CLSID *clsidEncoder) { - return 0; + UINT size; + SetStatus(DllExports::GdipGetEncoderParameterListSize(image, clsidEncoder, &size)); + return size; } UINT GetFlags(VOID) { - return 0; + UINT flags; + SetStatus(DllExports::GdipGetImageFlags(image, &flags)); + return flags; } UINT GetFrameCount(const GUID *dimensionID) { - return 0; + UINT count; + SetStatus(DllExports::GdipImageGetFrameCount(image, dimensionID, &count)); + return count; } UINT GetFrameDimensionsCount(VOID) { - return 0; + UINT count; + SetStatus(DllExports::GdipImageGetFrameDimensionsCount(image, &count)); + return count; } Status GetFrameDimensionsList(GUID *dimensionIDs, UINT count) { - return NotImplemented; + return SetStatus(DllExports::GdipImageGetFrameDimensionsList(image, dimensionIDs, count)); } UINT GetHeight(VOID) { - return 0; + UINT height; + SetStatus(DllExports::GdipGetImageHeight(image, &height)); + return height; } REAL GetHorizontalResolution(VOID) { - return 0; + REAL resolution; + SetStatus(DllExports::GdipGetImageHorizontalResolution(image, &resolution)); + return resolution; } Status GetLastStatus(VOID) { - return NotImplemented; + return status; } Status GetPalette(ColorPalette *palette, INT size) { - return NotImplemented; + return SetStatus(DllExports::GdipGetImagePalette(image, palette, size)); } INT GetPaletteSize(VOID) { - return 0; + INT size; + SetStatus(DllExports::GdipGetImagePaletteSize(image, &size)); + return size; } Status GetPhysicalDimension(SizeF *size) { - return NotImplemented; + return SetStatus(DllExports::GdipGetImagePhysicalDimension(image, &(size->Width), &(size->Height))); } PixelFormat GetPixelFormat(VOID) { - return PixelFormatUndefined; + PixelFormat format; + SetStatus(DllExports::GdipGetImagePixelFormat(image, &format)); + return format; } UINT GetPropertyCount(VOID) { - return 0; + UINT numOfProperty; + SetStatus(DllExports::GdipGetPropertyCount(image, &numOfProperty)); + return numOfProperty; } Status GetPropertyIdList(UINT numOfProperty, PROPID *list) { - return NotImplemented; + return SetStatus(DllExports::GdipGetPropertyIdList(image, numOfProperty, list)); } Status GetPropertyItem(PROPID propId, UINT propSize, PropertyItem *buffer) { - return NotImplemented; + return SetStatus(DllExports::GdipGetPropertyItem(image, propId, propSize, buffer)); } UINT GetPropertyItemSize(PROPID propId) { - return 0; + UINT size; + SetStatus(DllExports::GdipGetPropertyItemSize(image, propId, &size)); + return size; } Status GetPropertySize(UINT *totalBufferSize, UINT *numProperties) { - return NotImplemented; + return SetStatus(DllExports::GdipGetPropertySize(image, totalBufferSize, numProperties)); } Status GetRawFormat(GUID *format) { - return NotImplemented; + return SetStatus(DllExports::GdipGetRawFormat(image, format)); } Image *GetThumbnailImage(UINT thumbWidth, UINT thumbHeight, GetThumbnailImageAbort callback, VOID *callbackData) { - return NULL; + Image *thumbImage = new Image(); + SetStatus(DllExports::GdipGetImageThumbnail(image, thumbWidth, thumbHeight, &(thumbImage->image), callback, callbackData)); + return thumbImage; } ImageType GetType(VOID) { - return ImageTypeUnknown; + ImageType type; + SetStatus(DllExports::GdipGetImageType(image, &type)); + return type; } REAL GetVerticalResolution(VOID) { - return 0; + REAL resolution; + SetStatus(DllExports::GdipGetImageVerticalResolution(image, &resolution)); + return resolution; } UINT GetWidth(VOID) { - return 0; + UINT width; + SetStatus(DllExports::GdipGetImageWidth(image, &width)); + return width; } Status RemovePropertyItem(PROPID propId) { - return NotImplemented; + return SetStatus(DllExports::GdipRemovePropertyItem(image, propId)); } Status RotateFlip(RotateFlipType rotateFlipType) { - return NotImplemented; + return SetStatus(DllExports::GdipImageRotateFlip(image, rotateFlipType)); } Status Save(IStream *stream, const CLSID *clsidEncoder, const EncoderParameters *encoderParams) { - return NotImplemented; + return SetStatus(DllExports::GdipSaveImageToStream(image, stream, clsidEncoder, encoderParams)); } Status Save(const WCHAR *filename, const CLSID *clsidEncoder, const EncoderParameters *encoderParams) { - return NotImplemented; + return SetStatus(DllExports::GdipSaveImageToFile(image, filename, clsidEncoder, encoderParams)); } Status SaveAdd(const EncoderParameters* encoderParams) { - return NotImplemented; + return SetStatus(DllExports::GdipSaveAdd(image, encoderParams)); } Status SaveAdd(Image *newImage, const EncoderParameters *encoderParams) { - return NotImplemented; + return SetStatus(DllExports::GdipSaveAddImage(image, newImage->image, encoderParams)); } Status SelectActiveFrame(const GUID *dimensionID, UINT frameIndex) { - return NotImplemented; + return SetStatus(DllExports::GdipImageSelectActiveFrame(image, dimensionID, frameIndex)); } Status SetPalette(const ColorPalette* palette) { - return NotImplemented; + return SetStatus(DllExports::GdipSetImagePalette(image, palette)); } Status SetPropertyItem(const PropertyItem* item) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPropertyItem(image, item)); } protected: Image() { + } + +private: + mutable Status status; + GpImage *image; + + Status SetStatus(Status status) const + { + if (status == Ok) + return status; + this->status = status; + return status; } }; @@ -229,14 +279,17 @@ public: Bitmap(IDirectDrawSurface7 *surface) { + status = DllExports::GdipCreateBitmapFromDirectDrawSurface(surface, &bitmap); } Bitmap(INT width, INT height, Graphics *target) { + status = DllExports::GdipCreateBitmapFromGraphics(width, height, target->graphics, &bitmap); } Bitmap(const BITMAPINFO *gdiBitmapInfo, VOID *gdiBitmapData) { + status = DllExports::GdipCreateBitmapFromGdiDib(gdiBitmapInfo, gdiBitmapData, &bitmap); } Bitmap(INT width, INT height, PixelFormat format) @@ -245,116 +298,157 @@ Bitmap(HBITMAP hbm, HPALETTE hpal) { + status = DllExports::GdipCreateBitmapFromHBITMAP(hbm, hpal, &bitmap); } Bitmap(INT width, INT height, INT stride, PixelFormat format, BYTE *scan0) { + status = DllExports::GdipCreateBitmapFromScan0(width, height, stride, format, scan0, &bitmap); } Bitmap(const WCHAR *filename, BOOL useIcm) { + if (useIcm) + status = DllExports::GdipCreateBitmapFromFileICM(filename, &bitmap); + else + status = DllExports::GdipCreateBitmapFromFile(filename, &bitmap); } Bitmap(HINSTANCE hInstance, const WCHAR *bitmapName) { + status = DllExports::GdipCreateBitmapFromResource(hInstance, bitmapName, &bitmap); } Bitmap(HICON hicon) { + status = DllExports::GdipCreateBitmapFromHICON(hicon, &bitmap); } Bitmap(IStream *stream, BOOL useIcm) { + if (useIcm) + status = DllExports::GdipCreateBitmapFromStreamICM(stream, &bitmap); + else + status = DllExports::GdipCreateBitmapFromStream(stream, &bitmap); } Bitmap *Clone(const Rect &rect, PixelFormat format) { - return NULL; + Bitmap *dstBitmap = new Bitmap(); + SetStatus(DllExports::GdipCloneBitmapAreaI(rect.X, rect.Y, rect.Width, rect.Height, format, bitmap, &(dstBitmap->bitmap))); + return dstBitmap; } Bitmap *Clone(const RectF &rect, PixelFormat format) { - return NULL; + Bitmap *dstBitmap = new Bitmap(); + SetStatus(DllExports::GdipCloneBitmapArea(rect.X, rect.Y, rect.Width, rect.Height, format, bitmap, &(dstBitmap->bitmap))); + return dstBitmap; } Bitmap *Clone(REAL x, REAL y, REAL width, REAL height, PixelFormat format) { - return NULL; + Bitmap *dstBitmap = new Bitmap(); + SetStatus(DllExports::GdipCloneBitmapArea(x, y, width, height, format, bitmap, &(dstBitmap->bitmap))); + return dstBitmap; } Bitmap *Clone(INT x, INT y, INT width, INT height, PixelFormat format) { - return NULL; + Bitmap *dstBitmap = new Bitmap(); + SetStatus(DllExports::GdipCloneBitmapAreaI(x, y, width, height, format, bitmap, &(dstBitmap->bitmap))); + return dstBitmap; } static Bitmap *FromBITMAPINFO(const BITMAPINFO *gdiBitmapInfo, VOID *gdiBitmapData) { - return NULL; + return new Bitmap(gdiBitmapInfo, gdiBitmapData); } static Bitmap *FromDirectDrawSurface7(IDirectDrawSurface7 *surface) { - return NULL; + return new Bitmap(surface); } static Bitmap *FromFile(const WCHAR *filename, BOOL useEmbeddedColorManagement) { - return NULL; + return new Bitmap(filename, useEmbeddedColorManagement); } static Bitmap *FromHBITMAP(HBITMAP hbm, HPALETTE hpal) { - return NULL; + return new Bitmap(hbm, hpal); } static Bitmap *FromHICON(HICON hicon) { - return NULL; + return new Bitmap(hicon); } static Bitmap *FromResource(HINSTANCE hInstance, const WCHAR *bitmapName) { - return NULL; + return new Bitmap(hInstance, bitmapName); } static Bitmap *FromStream(IStream *stream, BOOL useEmbeddedColorManagement) { - return NULL; + return new Bitmap(stream, useEmbeddedColorManagement); } Status GetHBITMAP(const Color &colorBackground, HBITMAP *hbmReturn) { - return NotImplemented; + return SetStatus(DllExports::GdipCreateHBITMAPFromBitmap(bitmap, hbmReturn, colorBackground.GetValue())); } Status GetHICON(HICON *hicon) { - return NotImplemented; + return SetStatus(DllExports::GdipCreateHICONFromBitmap(bitmap, hbmReturn)); } Status GetPixel(INT x, INT y, Color *color) { - return NotImplemented; + ARGB argb; + Status s = SetStatus(DllExports::GdipBitmapGetPixel(bitmap, x, y, &argb)); + if (color != NULL) + color->SetValue(argb); + return s; } Status LockBits(const Rect *rect, UINT flags, PixelFormat format, BitmapData *lockedBitmapData) { - return NotImplemented; + return SetStatus(DllExports::GdipBitmapLockBits(bitmap, rect, flags, format, lockedBitmapData)); } Status SetPixel(INT x, INT y, const Color &color) { - return NotImplemented; + return SetStatus(DllExports::GdipBitmapSetPixel(bitmap, x, y, color.GetValue())); } Status SetResolution(REAL xdpi, REAL ydpi) { - return NotImplemented; + return SetStatus(DllExports::GdipBitmapSetResolution(bitmap, xdpi, ydpi)); } Status UnlockBits(BitmapData *lockedBitmapData) { - return NotImplemented; + return SetStatus(DllExports::GdipBitmapUnlockBits(bitmap, lockedBitmapData)); + } + +protected: + Bitmap() + { + } + +private: + mutable Status status; + GpBitmap *bitmap; + + Status SetStatus(Status status) const + { + if (status == Ok) + return status; + this->status = status; + return status; } }; @@ -364,12 +458,17 @@ public: CachedBitmap(Bitmap *bitmap, Graphics *graphics) { + status = DllExports::GdipCreateCachedBitmap(bitmap, graphics, &cachedBitmap); } Status GetLastStatus(VOID) { - return NotImplemented; - } + return status; + } + +private: + mutable Status status; + GpCachedBitmap *cachedBitmap; }; @@ -378,9 +477,11 @@ public: friend class FontFamily; friend class FontCollection; + friend class Graphics; Font(const FontFamily *family, REAL emSize, INT style, Unit unit) { + status = DllExports::GdipCreateFont(family->fontFamily, emSize, style. unit, &font); } Font(HDC hdc, const HFONT hfont) @@ -389,10 +490,12 @@ Font(HDC hdc, const LOGFONTA *logfont) { + status = DllExports::GdipCreateFontFromLogfontA(hdc, logfont, &font); } Font(HDC hdc, const LOGFONTW *logfont) { + status = DllExports::GdipCreateFontFromLogfontW(hdc, logfont, &font); } Font(const WCHAR *familyName, REAL emSize, INT style, Unit unit, const FontCollection *fontCollection) @@ -401,61 +504,86 @@ Font(HDC hdc) { + status = DllExports::GdipCreateFontFromDC(hdc, &font); } Font *Clone(VOID) const { - return NULL; + Font *cloneFont = new Font(); + cloneFont->status = DllExports::GdipCloneFont(font, &(cloneFont->font)); + return cloneFont; } Status GetFamily(FontFamily* family) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetFamily(font, &(family->fontFamily))); } REAL GetHeight(const Graphics* graphics) const { - return 0; + REAL height; + SetStatus(DllExports::GdipGetFontHeight(font, graphics->graphics, &height)); + return height; } REAL GetHeight(REAL dpi) const { - return 0; + REAL height; + SetStatus(DllExports::GdipGetFontHeightGivenDPI(font, dpi, &height)); + return height; } Status GetLastStatus(VOID) const { - return NotImplemented; + return status; } Status GetLogFontA(const Graphics *g, LOGFONTA *logfontA) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetLogFontA(font, g->graphics, logfontA)); } Status GetLogFontW(const Graphics *g, LOGFONTW *logfontW) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetLogFontW(font, g->graphics, logfontW)); } REAL GetSize(VOID) const { - return 0; + REAL size; + SetStatus(DllExports::GdipGetFontSize(font, &size)); + return size; } INT GetStyle(VOID) const { - return 0; + INT style; + SetStatus(DllExports::GdipGetFontStyle(font, &style)); + return style; } Unit GetUnit(VOID) const { - return UnitWorld; + Unit unit; + SetStatus(DllExports::GdipGetFontUnit(font, &unit); + return unit; } BOOL IsAvailable(VOID) const { return FALSE; + } + +private: + mutable Status status; + GpFont *font; + + Status SetStatus(Status status) const + { + if (status == Ok) + return status; + this->status = status; + return status; } }; @@ -493,6 +621,7 @@ FontFamily(const WCHAR *name, const FontCollection *fontCollection) { + status = DllExports::GdipCreateFontFamilyFromName(name, fontCollection, &fontFamily); } FontFamily *Clone(VOID) @@ -502,47 +631,61 @@ static const FontFamily *GenericMonospace(VOID) { - return NULL; + FontFamily *genericMonospace = new FontFamily(); + genericMonospace->status = DllExports::GdipGetGenericFontFamilyMonospace(&(genericMonospace->fontFamily)); + return genericMonospace; } static const FontFamily *GenericSansSerif(VOID) { - return NULL; + FontFamily *genericSansSerif = new FontFamily(); + genericSansSerif->status = DllExports::GdipGetGenericFontFamilySansSerif(&(genericSansSerif->fontFamily)); + return genericSansSerif; } static const FontFamily *GenericSerif(VOID) { - return NULL; + FontFamily *genericSerif = new FontFamily(); + genericSerif->status = DllExports::GdipGetGenericFontFamilyMonospace(&(genericSerif->fontFamily)); + return genericSerif; } UINT16 GetCellAscent(INT style) const { - return 0; + UINT16 CellAscent; + SetStatus(DllExports::GdipGetCellAscent(fontFamily, style, &CellAscent)); + return CellAscent; } UINT16 GetCellDescent(INT style) const { - return 0; + UINT16 CellDescent; + SetStatus(DllExports::GdipGetCellDescent(fontFamily, style, &CellDescent)); + return CellDescent; } UINT16 GetEmHeight(INT style) { - return 0; + UINT16 EmHeight; + SetStatus(DllExports::GdipGetEmHeight(fontFamily, style, &EmHeight)); + return EmHeight; } Status GetFamilyName(WCHAR name[LF_FACESIZE], WCHAR language) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetFamilyName(fontFamily, name, language)); } Status GetLastStatus(VOID) const { - return NotImplemented; + return status; } UINT16 GetLineSpacing(INT style) const { - return 0; + UINT16 LineSpacing; + SetStatus(DllExports::GdipGetLineSpacing(fontFamily, style, &LineSpacing)); + return LineSpacing; } BOOL IsAvailable(VOID) const @@ -552,7 +695,21 @@ BOOL IsStyleAvailable(INT style) const { - return FALSE; + BOOL StyleAvailable; + SetStatus(DllExports::GdipIsStyleAvailable(fontFamily, style, &StyleAvailable)); + return StyleAvailable; + } + +private: + mutable Status status; + GpFontFamily *fontFamily; + + Status SetStatus(Status status) const + { + if (status == Ok) + return status; + this->status = status; + return status; } }; @@ -588,266 +745,315 @@ class Region : public GdiplusBase { public: + friend class Graphics; friend class GraphicsPath; friend class Matrix; Region(const Rect &rect) { + status = DllExports::GdipCreateRegionRectI(&rect, &region); } Region(VOID) { + status = DllExports::GdipCreateRegion(&region); } Region(const BYTE *regionData, INT size) { + status = DllExports::GdipCreateRegionRgnData(regionData, size, &region); } Region(const GraphicsPath *path) { + status = DllExports::GdipCreateRegionPath(path->path, &region); } Region(HRGN hRgn) { + status = DllExports::GdipCreateRegionHrgn(hRgn, &region); } Region(const RectF &rect) { + status = DllExports::GdipCreateRegionRectF(&rect, &region); } Region *Clone(VOID) { - return NULL; + region *cloneRegion = new Region(); + cloneRegion->status = DllExports::GdipCloneRegion(region, &cloneRegion); + return cloneRegion; } Status Complement(const GraphicsPath *path) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionPath(region, path->path, CombineModeComplement)); } Status Complement(const Region *region) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRegion(this->region, region->region, CombineModeComplement)); } Status Complement(const Rect &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRectI(region, &rect, CombineModeComplement)); } Status Complement(const RectF &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRect(region, &rect, CombineModeComplement)); } BOOL Equals(const Region *region, const Graphics *g) const { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsEqualRegion(this->region, region->region, g->graphics, &result)); + return result; } Status Exclude(const GraphicsPath *path) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionPath(region, path->path, CombineModeExclude)); } Status Exclude(const RectF &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRect(region, &rect, CombineModeExclude)); } Status Exclude(const Rect &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRectI(region, &rect, CombineModeExclude)); } Status Exclude(const Region *region) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRegion(this->region, region->region, CombineModeExclude)); } static Region *FromHRGN(HRGN hRgn) { - return NULL; + return new Region(hRgn); } Status GetBounds(Rect *rect, const Graphics *g) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetRegionBoundsI(region, g->graphics, rect)); } Status GetBounds(RectF *rect, const Graphics *g) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetRegionBounds(region, g->graphics, rect)); } Status GetData(BYTE *buffer, UINT bufferSize, UINT *sizeFilled) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetRegionData(region, budder, bufferSize, sizeFilled)); } UINT GetDataSize(VOID) const { - return 0; + UINT bufferSize; + SetStatus(DllExports::GdipGetRegionDataSize(region, &bufferSize)); + return bufferSize; } HRGN GetHRGN(const Graphics *g) const { - return NULL; + HRGN hRgn; + SetStatus(DllExports::GdipGetRegionHRgn(region, g->graphics, &hRgn)); + return hRgn; } Status GetLastStatus(VOID) { - return NotImplemented; + return status; } Status GetRegionScans(const Matrix *matrix, Rect *rects, INT *count) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetRegionScansI(region, rects, count, matrix->matrix)); } Status GetRegionScans(const Matrix *matrix, RectF *rects, INT *count) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetRegionScans(region, rects, count, matrix->matrix)); } UINT GetRegionScansCount(const Matrix *matrix) const { - return 0; + UINT count; + SetStatus(DllExports::GdipGetRegionScansCount(region, &count, matrix->matrix)); + return count; } Status Intersect(const Rect &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRectI(region, &rect, CombineModeIntersect)); } Status Intersect(const GraphicsPath *path) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionPath(region, path->path, CombineModeIntersect)); } Status Intersect(const RectF &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRect(region, &rect, CombineModeIntersect)); } Status Intersect(const Region *region) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRegion(this->region, region->region, CombineModeIntersect)); } BOOL IsEmpty(const Graphics *g) const { - return NotImplemented; + BOOL result; + SetStatus(DllExports::GdipIsEmptyRegion(region, g->graphics, &result)); + return result; } BOOL IsInfinite(const Graphics *g) const { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsInfiniteRegion(region, g->graphics, &result)); + return result; } BOOL IsVisible(const PointF &point, const Graphics *g) const { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsVisibleRegionPoint(region, point.x, point.y, g->graphics, &result)); + return result; } BOOL IsVisible(const RectF &rect, const Graphics *g) const { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsVisibleRegionRect(region, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, g->graphics, &result)); + return result; } BOOL IsVisible(const Rect &rect, const Graphics *g) const { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsVisibleRegionRectI(region, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, g->graphics, &result)); + return result; } BOOL IsVisible(INT x, INT y, const Graphics *g) const { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsVisibleRegionPointI(region, x, y, g->graphics, &result)); + return result; } BOOL IsVisible(REAL x, REAL y, const Graphics *g) const { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsVisibleRegionPoint(region, x, y, g->graphics, &result)); + return result; } BOOL IsVisible(INT x, INT y, INT width, INT height, const Graphics *g) const { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsVisibleRegionRectI(region, x, y, width, height, g->graphics, &result)); + return result; } BOOL IsVisible(const Point &point, const Graphics *g) const { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsVisibleRegionPointI(region, point.x, point.y, g->graphics, &result)); + return result; } BOOL IsVisible(REAL x, REAL y, REAL width, REAL height, const Graphics *g) const { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsVisibleRegionRect(region, x, y, width, height, g->graphics, &result)); + return result; } Status MakeEmpty(VOID) { - return NotImplemented; + return SetStatus(DllExports::GdipSetEmpty(region)); } Status MakeInfinite(VOID) { - return NotImplemented; + return SetStatus(DllExports::GdipSetInfinite(region)); } Status Transform(const Matrix *matrix) { - return NotImplemented; + return SetStatus(DllExports::GdipTransformRegion(region, matrix->matrix)); } Status Translate(REAL dx, REAL dy) { - return NotImplemented; + return SetStatus(DllExports::GdipTranslateRegion(region, dx, dy)); } Status Translate(INT dx, INT dy) { - return NotImplemented; + return SetStatus(DllExports::GdipTranslateRegionI(region, dx, dy)); } Status Union(const Rect &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRectI(region, &rect, CombineModeUnion)); } Status Union(const Region *region) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRegion(this->region, region->region, CombineModeUnion)); } Status Union(const RectF &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRect(region, &rect, CombineModeUnion)); } Status Union(const GraphicsPath *path) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionPath(region, path->path, CombineModeUnion)); } Status Xor(const GraphicsPath *path) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionPath(region, path->path, CombineModeXor)); } Status Xor(const RectF &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRect(region, &rect, CombineModeXor)); } Status Xor(const Rect &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRectI(region, &rect, CombineModeXor)); } Status Xor(const Region *region) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRegion(this->region, region->region, CombineModeXor)); + } + +private: + mutable Status status; + GpRegion *region; + + Status SetStatus(Status status) const + { + if (status == Ok) + return status; + this->status = status; + return status; } }; Modified: trunk/reactos/include/psdk/gdiplusmatrix.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusmatrix… ============================================================================== --- trunk/reactos/include/psdk/gdiplusmatrix.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusmatrix.h [iso-8859-1] Tue Aug 25 14:13:19 2015 @@ -24,58 +24,75 @@ public: Matrix(const RectF &rect, const PointF *dstplg) { + status = DllExports::GdipCreateMatrix3(&rect, dstplg, &matrix); } Matrix(const Rect &rect, const Point *dstplg) { + status = DllExports::GdipCreateMatrix3I(&rect, dstplg, &matrix); } Matrix(VOID) { + status = DllExports::GdipCreateMatrix(&matrix); } Matrix(REAL m11, REAL m12, REAL m21, REAL m22, REAL dx, REAL dy) { + status = DllExports::GdipCreateMatrix2(m11, m12, m21, m22, dx, dy, &matrix); } Matrix *Clone(VOID) { - return NULL; + Matrix *cloneMatrix = new Matrix(); // FIXME: Matrix::matrix already initialized --> potential memory leak + cloneMatrix->status = DllExports::GdipCloneMatrix(matrix, &cloneMatrix); + return cloneMatrix; } - static BOOL Equals(const Matrix* matrix) + ~Matrix(VOID) { - return FALSE; + DllExports::GdipDeleteMatrix(matrix); + } + + BOOL Equals(const Matrix* matrix) + { + BOOL result; + SetStatus(DllExports::GdipIsMatrixEqual(this->matrix, matrix->matrix, &result)); + return result; } Status GetElements(REAL *m) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetMatrixElements(matrix, m)); } Status GetLastStatus(VOID) { - return NotImplemented; + return status; } Status Invert(VOID) { - return NotImplemented; + return SetStatus(DllExports::GdipInvertMatrix(matrix)); } BOOL IsIdentity(VOID) { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsMatrixIdentity(matrix, &result)); + return result; } BOOL IsInvertible(VOID) { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsMatrixInvertible(matrix, &result)); + return result; } Status Multiply(const Matrix *matrix, MatrixOrder order) { - return NotImplemented; + return SetStatus(DllExports::GdipMultiplyMatrix(this->matrix, matrix->matrix, order)); } REAL OffsetX(VOID) @@ -95,7 +112,7 @@ Status Rotate(REAL angle, MatrixOrder order) { - return NotImplemented; + return SetStatus(DllExports::GdipRotateMatrix(matrix, angle, order)); } Status RotateAt(REAL angle, const PointF &center, MatrixOrder order) @@ -105,42 +122,54 @@ Status Scale(REAL scaleX, REAL scaleY, MatrixOrder order) { - return NotImplemented; + return SetStatus(DllExports::GdipScaleMatrix(matrix, scaleX, scaleY, order)); } Status SetElements(REAL m11, REAL m12, REAL m21, REAL m22, REAL dx, REAL dy) { - return NotImplemented; + return SetStatus(DllExports::GdipSetMatrixElements(matrix, m11, m12, m21, m22, dx, dy)); } Status Shear(REAL shearX, REAL shearY, REAL order) { - return NotImplemented; + return SetStatus(DllExports::GdipShearMatrix(matrix, shearX, shearY, order)); } Status TransformPoints(Point *pts, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipTransformMatrixPointsI(matrix, pts, count)); } Status TransformPoints(PointF *pts, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipTransformMatrixPoints(matrix, pts, count)); } Status TransformVectors(Point *pts, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipVectorTransformMatrixPointsI(matrix, pts, count)); } Status TransformVectors(PointF *pts, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipVectorTransformMatrixPoints(matrix, pts, count)); } Status Translate(REAL offsetX, REAL offsetY, REAL order) { - return NotImplemented; + return SetStatus(DllExports::GdipTranslateMatrix(matrix, offsetX, offsetY, order)); + } + +private: + mutable Status status; + GpMatrix *matrix; + + Status SetStatus(Status status) const + { + if (status == Ok) + return status; + this->status = status; + return status; } };

1 0

[hbelusca] 68819: [NTVDM]: Initialize the correct buffer! (aka. fix confusion between ConsoleFramebuffer and Graphics Framebuffer; fixes text -> graphic transitions). Addendum for r68812
by hbelusca＠svn.reactos.org 25 Aug '15

25 Aug '15

Author: hbelusca Date: Tue Aug 25 12:46:40 2015 New Revision: 68819 URL: http://svn.reactos.org/svn/reactos?rev=68819&view=rev Log: [NTVDM]: Initialize the correct buffer! (aka. fix confusion between ConsoleFramebuffer and Graphics Framebuffer; fixes text -> graphic transitions). Addendum for r68812 Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Tue Aug 25 12:46:40 2015 @@ -1014,7 +1014,7 @@ ConsoleMutex = GraphicsBufferInfo.hMutex; /* Clear the framebuffer */ - RtlZeroMemory(ConsoleFramebuffer, BitmapInfo->bmiHeader.biSizeImage); + RtlZeroMemory(GraphicsFramebuffer, BitmapInfo->bmiHeader.biSizeImage); /* Set the active buffer */ VgaSetActiveScreenBuffer(GraphicsConsoleBuffer);

1 0

[hbelusca] 68818: [SHELL32]: Add the trailing '...' after the "Run as" command in order to indicate more information is needed before performing the action. CORE-10039 #comment '...' added in r68818.
by hbelusca＠svn.reactos.org 25 Aug '15

25 Aug '15

Author: hbelusca Date: Tue Aug 25 12:18:32 2015 New Revision: 68818 URL: http://svn.reactos.org/svn/reactos?rev=68818&view=rev Log: [SHELL32]: Add the trailing '...' after the "Run as" command in order to indicate more information is needed before performing the action. CORE-10039 #comment '...' added in r68818. Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "ÐÑÐ²Ð°ÑÑÐ½Ðµ" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "ÐÐ·Ð¿ÑÐ»Ð½ÑÐ²Ð°Ð½Ðµ ÐºÐ°ÑÐ¾ " + IDS_RUNAS_VERB "ÐÐ·Ð¿ÑÐ»Ð½ÑÐ²Ð°Ð½Ðµ ÐºÐ°ÑÐ¾..." IDS_EDIT_VERB "ÐÐ±ÑÐ°Ð±Ð¾ÑÐºÐ°" IDS_FIND_VERB "Ð¢ÑÑÑÐµÐ½Ðµ" IDS_PRINT_VERB "Ð Ð°Ð·Ð¿ÐµÑÐ°ÑÐ²Ð°Ð½Ðµ" Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -800,7 +800,7 @@ IDS_OPEN_VERB "OtevÅÃt" IDS_EXPLORE_VERB "Prozkoumat" - IDS_RUNAS_VERB "Spustit jako " + IDS_RUNAS_VERB "Spustit jako..." IDS_EDIT_VERB "Upravit" IDS_FIND_VERB "NajÃt" IDS_PRINT_VERB "Tisknout" Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -800,7 +800,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -795,7 +795,7 @@ IDS_OPEN_VERB "Ãffnen" IDS_EXPLORE_VERB "Durchsuchen" - IDS_RUNAS_VERB "AusfÃ¼hren als " + IDS_RUNAS_VERB "AusfÃ¼hren als..." IDS_EDIT_VERB "Bearbeiten" IDS_FIND_VERB "Finden" IDS_PRINT_VERB "Drucken" Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -795,7 +795,7 @@ IDS_OPEN_VERB "Abrir" IDS_EXPLORE_VERB "Explorar" - IDS_RUNAS_VERB "Ejecutar como ..." + IDS_RUNAS_VERB "Ejecutar como..." IDS_EDIT_VERB "Editar" IDS_FIND_VERB "Buscar" IDS_PRINT_VERB "Imprimir" Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -351,7 +351,7 @@ IDD_RUN_AS DIALOGEX 0, 0, 240, 190 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Lancer en tant que" +CAPTION "ExÃ©cuter en tant que" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Quel compte d'utilisateur dÃ©sirez-vous utiliser pour lancer ce programme?", -1, 10, 20, 220, 20 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Ouvrir" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Lancer en tant que " + IDS_RUNAS_VERB "ExÃ©cuter en tant que..." IDS_EDIT_VERB "Ãditer" IDS_FIND_VERB "Chercher" IDS_PRINT_VERB "Imprimer" Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Apri" IDS_EXPLORE_VERB "Esplora" - IDS_RUNAS_VERB "Esegui come " + IDS_RUNAS_VERB "Esegui come..." IDS_EDIT_VERB "Modifica" IDS_FIND_VERB "Cerca" IDS_PRINT_VERB "Stampa" Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "éã" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "å¥ã®ã¦ã¼ã¶ã¼ã¨ãã¦å®è¡ " + IDS_RUNAS_VERB "å¥ã®ã¦ã¼ã¶ã¼ã¨ãã¦å®è¡..." IDS_EDIT_VERB "ç·¨é" IDS_FIND_VERB "æ¤ç´¢" IDS_PRINT_VERB "å°å·" Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Ãpne" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "KjÃ¸r som" + IDS_RUNAS_VERB "KjÃ¸r som..." IDS_EDIT_VERB "Rediger" IDS_FIND_VERB "Finn" IDS_PRINT_VERB "Skriv ut" Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -798,7 +798,7 @@ IDS_OPEN_VERB "OtwÃ³rz" IDS_EXPLORE_VERB "Eksploruj" - IDS_RUNAS_VERB "Uruchom jako " + IDS_RUNAS_VERB "Uruchom jako..." IDS_EDIT_VERB "Edytuj" IDS_FIND_VERB "Wyszukaj" IDS_PRINT_VERB "Drukuj" Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Abrir" IDS_EXPLORE_VERB "Explorar" - IDS_RUNAS_VERB "Executar como " + IDS_RUNAS_VERB "Executar como..." IDS_EDIT_VERB "Editar" IDS_FIND_VERB "Procurar" IDS_PRINT_VERB "Imprimir" Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -351,7 +351,7 @@ IDD_RUN_AS DIALOGEX 0, 0, 240, 190 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Executar Como..." +CAPTION "Executar Como" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Que conta de utilizador quer utilizar para executar este programa?", -1, 10, 20, 220, 20 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Abrir" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Executar como " + IDS_RUNAS_VERB "Executar como..." IDS_EDIT_VERB "Editar" IDS_FIND_VERB "Procurar" IDS_PRINT_VERB "Imprimir" Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -796,7 +796,7 @@ IDS_OPEN_VERB "ÐÑÐºÑÑÑÑ" IDS_EXPLORE_VERB "ÐÑÐºÑÑÑÑ Ð² Ð´ÐµÑÐµÐ²Ðµ" - IDS_RUNAS_VERB "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ÐºÐ°Ðº " + IDS_RUNAS_VERB "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ÐºÐ°Ðº..." IDS_EDIT_VERB "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ" IDS_FIND_VERB "ÐÐ¾Ð¸ÑÐº" IDS_PRINT_VERB "ÐÐµÑÐ°ÑÑ" Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "OtvoriÅ¥" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "SpustiÅ¥ ako " + IDS_RUNAS_VERB "SpustiÅ¥ ako..." IDS_EDIT_VERB "UpraviÅ¥" IDS_FIND_VERB "Find" IDS_PRINT_VERB "TlaÄiÅ¥" Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -798,7 +798,7 @@ IDS_OPEN_VERB "Hap" IDS_EXPLORE_VERB "Eksplorer" - IDS_RUNAS_VERB "Ekzekuto Si " + IDS_RUNAS_VERB "Ekzekuto Si..." IDS_EDIT_VERB "Modifiko" IDS_FIND_VERB "Gjej" IDS_PRINT_VERB "Printo" Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "AÃ§" IDS_EXPLORE_VERB "AraÅtÄ±r" - IDS_RUNAS_VERB "Birlikte aÃ§ " + IDS_RUNAS_VERB "Birlikte aÃ§..." IDS_EDIT_VERB "DÃ¼zenle" IDS_FIND_VERB "Bul" IDS_PRINT_VERB "YazdÄ±r" Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "ÐÑÐ´ÐºÑÐ¸ÑÐ¸" IDS_EXPLORE_VERB "ÐÑÐ´ÐºÑÐ¸ÑÐ¸ Ð² Ð´ÐµÑÐµÐ²Ñ" - IDS_RUNAS_VERB "ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸ ÑÐº " + IDS_RUNAS_VERB "ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸ ÑÐº..." IDS_EDIT_VERB "ÐÐ¼ÑÐ½Ð¸ÑÐ¸" IDS_FIND_VERB "ÐÐ¾ÑÑÐº" IDS_PRINT_VERB "ÐÑÑÐº" Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -801,7 +801,7 @@ IDS_OPEN_VERB "æå¼" IDS_EXPLORE_VERB "æµè§" - IDS_RUNAS_VERB "è¿è¡ä½ä¸º " + IDS_RUNAS_VERB "è¿è¡ä½ä¸º..." IDS_EDIT_VERB "ç¼è¾" IDS_FIND_VERB "æ¥æ¾" IDS_PRINT_VERB "æå°" Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -802,7 +802,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print"

1 0

[hbelusca] 68817: [FREELDR]: Fix typo in comment, spotted by "middings". CORE-10040 #resolve
by hbelusca＠svn.reactos.org 25 Aug '15

25 Aug '15

Author: hbelusca Date: Tue Aug 25 11:55:36 2015 New Revision: 68817 URL: http://svn.reactos.org/svn/reactos?rev=68817&view=rev Log: [FREELDR]: Fix typo in comment, spotted by "middings". CORE-10040 #resolve Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] Tue Aug 25 11:55:36 2015 @@ -344,7 +344,7 @@ /* Disable Interrupts */ _disable(); - /* Re-initalize EFLAGS */ + /* Re-initialize EFLAGS */ __writeeflags(0); /* Set the new PML4 */

1 0

[hbelusca] 68816: [NTVDM]: Correctly set last (and returned) errors when we fail at reallocating a memory block (in case this is the last block), or if the block is invalid. Do the same stuff also ...
by hbelusca＠svn.reactos.org 25 Aug '15

25 Aug '15

Author: hbelusca Date: Tue Aug 25 01:48:17 2015 New Revision: 68816 URL: http://svn.reactos.org/svn/reactos?rev=68816&view=rev Log: [NTVDM]: Correctly set last (and returned) errors when we fail at reallocating a memory block (in case this is the last block), or if the block is invalid. Do the same stuff also for few other memory functions. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Tue Aug 25 01:48:17 2015 @@ -1314,7 +1314,7 @@ else { Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; - setAX(ERROR_ARENA_TRASHED); + setAX(Sda->LastErrorCode); } break; Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] Tue Aug 25 01:48:17 2015 @@ -109,7 +109,7 @@ if (!ValidateMcb(NextMcb)) { DPRINT1("The DOS memory arena is corrupted!\n"); - // Sda->LastErrorCode = ERROR_ARENA_TRASHED; + Sda->LastErrorCode = ERROR_ARENA_TRASHED; return; } @@ -297,8 +297,8 @@ /* Make sure this is a valid and allocated block */ if (BlockData == 0 || !ValidateMcb(Mcb) || Mcb->OwnerPsp == 0) { + Sda->LastErrorCode = ERROR_INVALID_BLOCK; Success = FALSE; - Sda->LastErrorCode = ERROR_INVALID_HANDLE; goto Done; } @@ -310,6 +310,8 @@ /* We can't expand the last block */ if (Mcb->BlockType == 'Z') { + DPRINT("Cannot expand memory block 0x%04X: this is the last block (size 0x%04X)!\n", Segment, Mcb->Size); + Sda->LastErrorCode = ERROR_NOT_ENOUGH_MEMORY; Success = FALSE; goto Done; } @@ -416,7 +418,11 @@ PDOS_MCB Mcb = SEGMENT_TO_MCB(BlockData - 1); DPRINT("DosFreeMemory: BlockData 0x%04X\n", BlockData); - if (BlockData == 0) return FALSE; + if (BlockData == 0) + { + Sda->LastErrorCode = ERROR_INVALID_BLOCK; + return FALSE; + } DosMemValidate(); @@ -424,6 +430,7 @@ if (!ValidateMcb(Mcb)) { DPRINT("MCB block type '%c' not valid!\n", Mcb->BlockType); + Sda->LastErrorCode = ERROR_INVALID_BLOCK; return FALSE; }

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
31
Older →

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 2015