Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [WLNOTIFY] Add sens service stubs
by Eric Kohl 07 Aug '18

07 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb5d5ecd64e1e47701e92… commit fb5d5ecd64e1e47701e922e08fd97b29a1d418be Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Aug 7 22:56:33 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Aug 7 22:56:33 2018 +0200 [WLNOTIFY] Add sens service stubs --- dll/win32/wlnotify/CMakeLists.txt | 1 + dll/win32/wlnotify/{test.c => senssvc.c} | 56 +++++++++++++++++--------------- dll/win32/wlnotify/test.c | 2 +- dll/win32/wlnotify/wlnotify.spec | 24 +++++++------- 4 files changed, 43 insertions(+), 40 deletions(-) diff --git a/dll/win32/wlnotify/CMakeLists.txt b/dll/win32/wlnotify/CMakeLists.txt index 1db47fffe2..6cbf00ce86 100644 --- a/dll/win32/wlnotify/CMakeLists.txt +++ b/dll/win32/wlnotify/CMakeLists.txt @@ -3,6 +3,7 @@ spec2def(wlnotify.dll wlnotify.spec ADD_IMPORTLIB) list(APPEND SOURCE schedsvc.c + senssvc.c test.c wlnotify.c precomp.h) diff --git a/dll/win32/wlnotify/test.c b/dll/win32/wlnotify/senssvc.c similarity index 86% copy from dll/win32/wlnotify/test.c copy to dll/win32/wlnotify/senssvc.c index e3911d3b75..e238a849a9 100644 --- a/dll/win32/wlnotify/test.c +++ b/dll/win32/wlnotify/senssvc.c @@ -1,12 +1,13 @@ /* * PROJECT: ReactOS system libraries * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/wlnotify/test.c - * PURPOSE: Winlogon notifications - * PROGRAMMER: Eric Kohl + * FILE: dll/win32/wlnotify/senssvc.c + * PURPOSE: SENS service logon notifications + * PROGRAMMER: Eric Kohl <eric.kohl(a)reactos.org> */ #include "precomp.h" +#include <winsvc.h> #define _NDEBUG #include <debug.h> @@ -14,10 +15,10 @@ VOID WINAPI -TestLogonEvent( +SensDisconnectEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestLogonEvent\n"); + DPRINT("SensDisconnectEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -31,10 +32,10 @@ TestLogonEvent( VOID WINAPI -TestLogoffEvent( +SensLockEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestLogoffEvent\n"); + DPRINT("SensLockEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -48,10 +49,10 @@ TestLogoffEvent( VOID WINAPI -TestLockEvent( +SensLogoffEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestLockEvent\n"); + DPRINT("SensLogoffEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -65,10 +66,10 @@ TestLockEvent( VOID WINAPI -TestUnlockEvent( +SensLogonEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestUnlockEvent\n"); + DPRINT("SensLogonEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -82,10 +83,10 @@ TestUnlockEvent( VOID WINAPI -TestStartupEvent( +SensPostShellEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestStartupEvent\n"); + DPRINT("SensPostShellEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -99,10 +100,10 @@ TestStartupEvent( VOID WINAPI -TestShutdownEvent( +SensReconnectEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestShutdownEvent\n"); + DPRINT("SensReconnectEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -116,10 +117,10 @@ TestShutdownEvent( VOID WINAPI -TestStartScreenSaverEvent( +SensShutdownEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestStartScreenSaverEvent\n"); + DPRINT("SensShutdownEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -133,10 +134,10 @@ TestStartScreenSaverEvent( VOID WINAPI -TestStopScreenSaverEvent( +SensStartScreenSaverEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestStopScreenSaverEvent\n"); + DPRINT("SensStartScreenSaverEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -150,10 +151,10 @@ TestStopScreenSaverEvent( VOID WINAPI -TestStartShellEvent( +SensStartShellEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestStartShellEvent\n"); + DPRINT("SensStartShellEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -167,10 +168,10 @@ TestStartShellEvent( VOID WINAPI -TestPostShellEvent( +SensStartupEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestStartShellEvent\n"); + DPRINT("SensStartupEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -181,12 +182,13 @@ TestPostShellEvent( DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); } + VOID WINAPI -TestDisconnectEvent( +SensStopScreenSaverEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestDisconnectEvent\n"); + DPRINT("SensStopScreenSaverEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -200,10 +202,10 @@ TestDisconnectEvent( VOID WINAPI -TestReconnectEvent( +SensUnlockEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestReconnectEvent\n"); + DPRINT("SensUnlockEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); diff --git a/dll/win32/wlnotify/test.c b/dll/win32/wlnotify/test.c index e3911d3b75..8f8705547a 100644 --- a/dll/win32/wlnotify/test.c +++ b/dll/win32/wlnotify/test.c @@ -170,7 +170,7 @@ WINAPI TestPostShellEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestStartShellEvent\n"); + DPRINT("TestPostShellEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); diff --git a/dll/win32/wlnotify/wlnotify.spec b/dll/win32/wlnotify/wlnotify.spec index 737448d4d9..2eb0b647c1 100644 --- a/dll/win32/wlnotify/wlnotify.spec +++ b/dll/win32/wlnotify/wlnotify.spec @@ -5,18 +5,18 @@ ;@ stub SCardSuspendCertProp @ stdcall SchedEventLogoff(ptr) @ stdcall SchedStartShell(ptr) -;@ stub SensDisconnectEvent -;@ stub SensLockEvent -;@ stub SensLogoffEvent -;@ stub SensLogonEvent -;@ stub SensPostShellEvent -;@ stub SensReconnectEvent -;@ stub SensShutdownEvent -;@ stub SensStartScreenSaverEvent -;@ stub SensStartShellEvent -;@ stub SensStartupEvent -;@ stub SensStopScreenSaverEvent -;@ stub SensUnlockEvent +@ stdcall SensDisconnectEvent(ptr) +@ stdcall SensLockEvent(ptr) +@ stdcall SensLogoffEvent(ptr) +@ stdcall SensLogonEvent(ptr) +@ stdcall SensPostShellEvent(ptr) +@ stdcall SensReconnectEvent(ptr) +@ stdcall SensShutdownEvent(ptr) +@ stdcall SensStartScreenSaverEvent(ptr) +@ stdcall SensStartShellEvent(ptr) +@ stdcall SensStartupEvent(ptr) +@ stdcall SensStopScreenSaverEvent(ptr) +@ stdcall SensUnlockEvent(ptr) ;@ stub ShowNotificationBallonW @ stdcall TestDisconnectEvent(ptr) @ stdcall TestLockEvent(ptr)

1 0

01/01: [NTOSKRNL] Round memory size up, "debug log" part
by Serge Gautherie 07 Aug '18

07 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ff9bd81c4259db3e0279… commit 9ff9bd81c4259db3e027999dd5c05341ffaa9b4e Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Feb 3 00:19:18 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 7 20:36:04 2018 +0200 [NTOSKRNL] Round memory size up, "debug log" part Assumed to better match actual physical RAM size. CORE-12321 --- ntoskrnl/ex/init.c | 5 +++-- ntoskrnl/kd/kdio.c | 9 ++++++--- ntoskrnl/kd64/kdinit.c | 3 ++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/ex/init.c b/ntoskrnl/ex/init.c index 826cc3b356..1e9a9c07f8 100644 --- a/ntoskrnl/ex/init.c +++ b/ntoskrnl/ex/init.c @@ -1580,8 +1580,9 @@ Phase1InitializationDiscard(IN PVOID Context) WINDOWS_NT_INFO_STRING, &MsgEntry); - /* Get total RAM size */ - Size = MmNumberOfPhysicalPages * PAGE_SIZE / 1024 / 1024; + /* Get total RAM size, in MiB */ + /* Round size up. Assumed to better match actual physical RAM size */ + Size = ALIGN_UP_BY(MmNumberOfPhysicalPages * PAGE_SIZE, 1024 * 1024) / (1024 * 1024); /* Create the string */ StringBuffer = InitBuffer->VersionBuffer; diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 53c99c43d4..38a1d3fc9a 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -93,7 +93,8 @@ KdpGetMemorySizeInMBs(IN PLOADER_PARAMETER_BLOCK LoaderBlock) } } - return NumberOfPhysicalPages * PAGE_SIZE / 1024 / 1024; + /* Round size up. Assumed to better match actual physical RAM size */ + return ALIGN_UP_BY(NumberOfPhysicalPages * PAGE_SIZE, 1024 * 1024) / (1024 * 1024); } /* See also: kd64\kdinit.c */ @@ -255,7 +256,8 @@ KdpInitDebugLog(PKD_DISPATCH_TABLE DispatchTable, KeInitializeSpinLock(&KdpDebugLogSpinLock); /* Display separator + ReactOS version at start of the debug log */ - MemSizeMBs = MmNumberOfPhysicalPages * PAGE_SIZE / 1024 / 1024; + /* Round size up. Assumed to better match actual physical RAM size */ + MemSizeMBs = ALIGN_UP_BY(MmNumberOfPhysicalPages * PAGE_SIZE, 1024 * 1024) / (1024 * 1024); KdpPrintBanner(MemSizeMBs); } else if (BootPhase == 2) @@ -554,7 +556,8 @@ KdpScreenInit(PKD_DISPATCH_TABLE DispatchTable, KeInitializeSpinLock(&KdpDmesgLogSpinLock); /* Display separator + ReactOS version at start of the debug log */ - MemSizeMBs = MmNumberOfPhysicalPages * PAGE_SIZE / 1024 / 1024; + /* Round size up. Assumed to better match actual physical RAM size */ + MemSizeMBs = ALIGN_UP_BY(MmNumberOfPhysicalPages * PAGE_SIZE, 1024 * 1024) / (1024 * 1024); KdpPrintBanner(MemSizeMBs); } else if (BootPhase == 2) diff --git a/ntoskrnl/kd64/kdinit.c b/ntoskrnl/kd64/kdinit.c index 64a7c7b519..b6a8beb9ce 100644 --- a/ntoskrnl/kd64/kdinit.c +++ b/ntoskrnl/kd64/kdinit.c @@ -62,7 +62,8 @@ KdpGetMemorySizeInMBs(IN PLOADER_PARAMETER_BLOCK LoaderBlock) } } - return NumberOfPhysicalPages * PAGE_SIZE / 1024 / 1024; + /* Round size up. Assumed to better match actual physical RAM size */ + return ALIGN_UP_BY(NumberOfPhysicalPages * PAGE_SIZE, 1024 * 1024) / (1024 * 1024); } /* See also: kd\kdio.c */

1 0

01/01: [BOOTDATA] Change the default open command for HTA files to open in Wine Internet Explorer. (#719)
by Jared Smudde 07 Aug '18

07 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=092c3710f2b7e94316eb6… commit 092c3710f2b7e94316eb6459b4dc3a874219b24c Author: Jared Smudde <computerwhiz02(a)hotmail.com> AuthorDate: Tue Aug 7 06:22:03 2018 -0500 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Aug 7 13:22:03 2018 +0200 [BOOTDATA] Change the default open command for HTA files to open in Wine Internet Explorer. (#719) It's a shortcut from implementing the function in mshtml but it works. Also add an edit option to the right click menu. --- boot/bootdata/hivecls.inf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf index 61d6f4f318..25b6a471ec 100644 --- a/boot/bootdata/hivecls.inf +++ b/boot/bootdata/hivecls.inf @@ -220,7 +220,9 @@ HKCR,"chm.file\shell\open\command","",0x00020000,"%SystemRoot%\hh.exe %1" HKCR,".hta","",0x00000000,"htafile" HKCR,"htafile","",0x00000000,"HTML Application" HKCR,"htafile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\mshta.exe,-1" -HKCR,"htafile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mshta.exe ""%1"" %*" +; HKCR,"htafile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mshta.exe ""%1"" %*" +HKCR,"htafile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" +HKCR,"htafile\shell\open\command","",0x00020000,"""%ProgramFiles%\Internet Explorer\iexplore.exe"" %1" ; set MIME type for .html and .htm because Tiny webserver needs it HKCR,".htm","",0x00000000,"htmlfile"

1 0

05/05: [CMD] Add speed-optimized checks for dot-directories "." and ".." .
by Hermès Bélusca-Maïto 06 Aug '18

06 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23b36fc1730022398cbec… commit 23b36fc1730022398cbec47f100444c9526e73f0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Aug 6 22:36:14 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 6 22:40:17 2018 +0200 [CMD] Add speed-optimized checks for dot-directories "." and ".." . Adapted from PR #592 by Katayama Hirofumi MZ. --- base/shell/cmd/dir.c | 57 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/base/shell/cmd/dir.c b/base/shell/cmd/dir.c index 17627b9bae..b59bf6c6c6 100644 --- a/base/shell/cmd/dir.c +++ b/base/shell/cmd/dir.c @@ -233,6 +233,28 @@ DirHelp(VOID) ConOutResPaging(TRUE, STRING_DIR_HELP1); } +/* Check whether this is a dot-directory "." or "..", speed-optimized */ +FORCEINLINE +BOOL +IsDotDirectory( + IN LPCTSTR pszPath) +{ + return ( pszPath[0] == _T('.') && + ( pszPath[1] == 0 || /* pszPath[1] == _T('\\') || */ + (pszPath[1] == _T('.') && (pszPath[2] == 0 /* || pszPath[2] == _T('\\') */)) + ) ); +} + +FORCEINLINE +BOOL +IsDotDirectoryN( + IN const TCHAR* pPath, + IN SIZE_T Length) +{ + return ((Length == 1 && pPath[0] == _T('.')) || + (Length == 2 && pPath[0] == _T('.') && pPath[1] == _T('.'))); +} + /* * DirReadParameters * @@ -822,11 +844,10 @@ getName(const TCHAR* file, TCHAR * dest) INT_PTR iLen; LPTSTR end; - /* Check for "." and ".." folders */ - if ((_tcscmp(file, _T(".")) == 0) || - (_tcscmp(file, _T("..")) == 0)) + /* Check for dot-directories "." and ".." */ + if (IsDotDirectory(file)) { - _tcscpy(dest,file); + _tcscpy(dest, file); return dest; } @@ -1087,20 +1108,19 @@ DirPrintBareList(PDIRFINDINFO ptrFiles[], /* [IN] Files' Info */ for (i = 0; i < dwCount && !CheckCtrlBreak(BREAK_INPUT); i++) { - if ((_tcscmp(ptrFiles[i]->stFindInfo.cFileName, _T(".")) == 0) || - (_tcscmp(ptrFiles[i]->stFindInfo.cFileName, _T("..")) == 0)) + if (IsDotDirectory(ptrFiles[i]->stFindInfo.cFileName)) { - /* at bare format we don't print "." and ".." folder */ + /* At bare format we don't print the dot-directories "." and ".." */ continue; } if (lpFlags->bRecursive) { - /* at recursive mode we print full path of file */ + /* At recursive mode we print full path of file */ DirPrintf(lpFlags, _T("%s\\%s\n"), szCurPath, ptrFiles[i]->stFindInfo.cFileName); } else { - /* if we are not in recursive mode we print the file names */ + /* If we are not in recursive mode we print the file names */ DirPrintf(lpFlags, _T("%s\n"), ptrFiles[i]->stFindInfo.cFileName); } } @@ -1376,7 +1396,7 @@ DirList(IN OUT LPTSTR szFullPath, /* [IN] The full path we are listing with tr ptrStartNode->stInfo.ptrHead = NULL; ptrNextNode = ptrStartNode; - /* Collect the results for the current folder */ + /* Collect the results for the current directory */ hSearch = FindFirstFile(szFullPath, &wfdFileInfo); if (hSearch != INVALID_HANDLE_VALUE) { @@ -1561,8 +1581,7 @@ DirList(IN OUT LPTSTR szFullPath, /* [IN] The full path we are listing with tr do { /* We search for directories other than "." and ".." */ - if ((_tcsicmp(wfdFileInfo.cFileName, _T(".")) != 0) && - (_tcsicmp(wfdFileInfo.cFileName, _T("..")) != 0) && + if (!IsDotDirectory(wfdFileInfo.cFileName) && (wfdFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { /* Concat the path and the directory to do recursive */ @@ -1572,7 +1591,7 @@ DirList(IN OUT LPTSTR szFullPath, /* [IN] The full path we are listing with tr pszSubFilePart = &szSubPath[_tcslen(szSubPath)]; _tcscat(pszSubFilePart, pszFilePart); - /* We do the same for the folder */ + /* We do the same for the directory */ if (DirList(szSubPath, pszSubFilePart, lpFlags) != 0) { FindClose(hRecSearch); @@ -1660,9 +1679,7 @@ ResolvePattern( break; /* Ignore the special "." and ".." directories that are correctly handled */ - if ((pNextDir - pCurDir == 0) || - (pNextDir - pCurDir == 1 && pCurDir[0] == _T('.')) || - (pNextDir - pCurDir == 2 && pCurDir[0] == _T('.') && pCurDir[1] == _T('.'))) + if ((pNextDir - pCurDir == 0) || IsDotDirectoryN(pCurDir, pNextDir - pCurDir)) { /* Found such a directory, ignore */ ++pNextDir; @@ -1758,9 +1775,7 @@ ResolvePattern( ASSERT(pszFullPath[_tcslen(pszFullPath)-1] == _T('\\')); /* Anything NOT being "." or ".." (the special directories) must be fully restored */ - if (*pNextDir && - (_tcsicmp(pNextDir, _T(".")) != 0) && - (_tcsicmp(pNextDir, _T("..")) != 0)) + if (*pNextDir && !IsDotDirectory(pNextDir)) { pszPatternPart = &pszFullPath[_tcslen(pszFullPath)]; _tcscpy(pszPatternPart, pNextDir); @@ -1777,9 +1792,7 @@ ResolvePattern( TRACE("pszPatternPart: %S is DIFFERENT from file criterion: %S\n", pszPatternPart, pNextDir); /* Anything NOT being "." or ".." (the special directories) must be fully restored */ - if (*pNextDir && - (_tcsicmp(pNextDir, _T(".")) != 0) && - (_tcsicmp(pNextDir, _T("..")) != 0)) + if (*pNextDir && !IsDotDirectory(pNextDir)) { /* Restore the correct file criterion */ _tcscpy(pszPatternPart, pNextDir);

1 0

04/05: [CMD] Fix the way the DIR-command pattern is interpreted when it contains paths or filenames with trailing dots.
by Hermès Bélusca-Maïto 06 Aug '18

06 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17ebc8421af13d0fc5709… commit 17ebc8421af13d0fc57095a16fa0d3440b059303 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Aug 6 21:46:38 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 6 22:40:17 2018 +0200 [CMD] Fix the way the DIR-command pattern is interpreted when it contains paths or filenames with trailing dots. Particular DIR commands like: "DIR .", "DIR .." now work as expected, and we also correctly fix the behavior for files without extension, that r38746 (2b06cfc0) originally tried to fix but broke the previous examples. Therefore "DIR *." and "DIR noextfile." work too. Pathological cases like "DIR \...", "DIR \...\.", "DIR ..\...\.." and the like (and with more than 3 dots) now work as expected. Adapted from PR #592 by Katayama Hirofumi MZ, but with extended bugfixing. CORE-13961 --- base/shell/cmd/dir.c | 321 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 254 insertions(+), 67 deletions(-) diff --git a/base/shell/cmd/dir.c b/base/shell/cmd/dir.c index 965cf74d6f..17627b9bae 100644 --- a/base/shell/cmd/dir.c +++ b/base/shell/cmd/dir.c @@ -121,20 +121,23 @@ * * 27-Feb-2005 (Konstantinos Paliouras <squarious(a)gmail.com>) * Implemented all the switches that were missing, and made - * the ros dir very similar to windows dir. Major part of + * the ROS dir very similar to windows dir. Major part of * the code is rewritten. /p is removed, to be rewritten in * the main cmd code. * * 1-Jul-2004 (Brandon Turner <turnerb7(a)msu.edu>) * Added /p back in using ConOutPrintfPaging * - * 3-feb-2007 (Paolo Devoti devotip at gmail) + * 3-Feb-2007 (Paolo Devoti devotip at gmail) * 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 + * + * 6-Aug-2018 (Hermes Belusca-Maito and Katayama Hirofumi MZ) + * Fix handling of patterns containing trailing dots. */ #include "precomp.h" @@ -572,23 +575,15 @@ static BOOL PrintDirectoryHeader(LPCTSTR szPath, LPDIRSWITCHFLAGS lpFlags) { TCHAR szMsg[RC_STRING_MAX_SIZE]; - TCHAR szFullDir[MAX_PATH]; + LPCTSTR szFullDir; TCHAR szRootName[MAX_PATH]; TCHAR szVolName[80]; - LPTSTR pszFilePart; DWORD dwSerialNr; if (lpFlags->bBareFormat) return TRUE; - if (GetFullPathName(szPath, ARRAYSIZE(szFullDir), szFullDir, &pszFilePart) == 0) - { - ErrorMessage(GetLastError(), _T("Failed to build full directory path")); - return FALSE; - } - - if (pszFilePart != NULL) - *pszFilePart = _T('\0'); + szFullDir = szPath; /* Get the media ID of the drive */ if (!GetVolumePathName(szFullDir, szRootName, ARRAYSIZE(szRootName)) || @@ -1339,10 +1334,10 @@ DirNodeCleanup(PDIRFINDLISTNODE ptrStartNode, * The function that does everything except for printing results */ static INT -DirList(LPTSTR szPath, /* [IN] The path that dir starts */ +DirList(IN OUT LPTSTR szFullPath, /* [IN] The full path we are listing with trailing '\', where dir starts */ + IN LPTSTR pszFilePart, /* [IN] Pointer in the szFullPath buffer where the file (pattern) part starts*/ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags of the listing */ { - 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 recursively */ HANDLE hStreams; /* The handle for alternate streams */ @@ -1350,9 +1345,9 @@ DirList(LPTSTR szPath, /* [IN] The path that dir starts */ 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 references */ - TCHAR szFullPath[MAX_PATH]; /* The full path that we are listing with trailing '\' */ - TCHAR szSubPath[MAX_PATH]; - LPTSTR pszFilePart; + TCHAR szSubPath[MAX_PATH]; /* The full path used for the recursive search */ + LPTSTR pszSubFilePart; + TCHAR cPathSep; DWORD dwCount; /* A counter of files found in directory */ DWORD dwCountFiles; /* Counter for files */ DWORD dwCountDirs; /* Counter for directories */ @@ -1370,24 +1365,6 @@ DirList(LPTSTR szPath, /* [IN] The path that dir starts */ dwCountFiles = 0; dwCountDirs = 0; u64CountBytes = 0; - fPoint= FALSE; - - /* Create szFullPath */ - if (GetFullPathName(szPath, ARRAYSIZE(szFullPath), szFullPath, &pszFilePart) == 0) - { - _tcscpy (szFullPath, szPath); - pszFilePart = NULL; - } - - /* If no wildcard or file was specified and this is a directory, then - display all files in it */ - if (pszFilePart == NULL || IsExistingDirectory(szFullPath)) - { - pszFilePart = &szFullPath[_tcslen(szFullPath)]; - if (pszFilePart[-1] != _T('\\')) - *pszFilePart++ = _T('\\'); - _tcscpy(pszFilePart, _T("*")); - } /* Prepare the linked list, first node is allocated */ ptrStartNode = cmd_alloc(sizeof(DIRFINDLISTNODE)); @@ -1399,24 +1376,14 @@ DirList(LPTSTR szPath, /* [IN] The path that dir starts */ ptrStartNode->stInfo.ptrHead = NULL; ptrNextNode = ptrStartNode; - /* Checking if szPath is a File with/wout extension */ - if (szPath[_tcslen(szPath) - 1] == _T('.')) - fPoint= TRUE; - /* Collect the results for the current folder */ hSearch = FindFirstFile(szFullPath, &wfdFileInfo); if (hSearch != INVALID_HANDLE_VALUE) { do { - /* If retrieved FileName has extension,and szPath doesnt have extension then JUMP the retrieved FileName */ - if (_tcschr(wfdFileInfo.cFileName,_T('.')) && (fPoint != FALSE)) - { - continue; - /* Here we filter all the specified attributes */ - } - else if ((wfdFileInfo.dwFileAttributes & lpFlags->stAttribs.dwAttribMask ) - == (lpFlags->stAttribs.dwAttribMask & lpFlags->stAttribs.dwAttribVal )) + if ((wfdFileInfo.dwFileAttributes & lpFlags->stAttribs.dwAttribMask) == + (lpFlags->stAttribs.dwAttribMask & lpFlags->stAttribs.dwAttribVal)) { ptrNextNode->ptrNext = cmd_alloc(sizeof(DIRFINDLISTNODE)); if (ptrNextNode->ptrNext == NULL) @@ -1548,9 +1515,9 @@ DirList(LPTSTR szPath, /* [IN] The path that dir starts */ QsortFiles(ptrFileArray, 0, dwCount-1, lpFlags); /* Print Data */ - pszFilePart[-1] = _T('\0'); /* truncate to directory name only */ + cPathSep = pszFilePart[-1]; + pszFilePart[-1] = _T('\0'); /* Truncate to directory name only */ DirPrintFiles(ptrFileArray, dwCount, szFullPath, lpFlags); - pszFilePart[-1] = _T('\\'); if (lpFlags->bRecursive) { @@ -1561,6 +1528,7 @@ DirList(LPTSTR szPath, /* [IN] The path that dir starts */ lpFlags, FALSE); } + pszFilePart[-1] = cPathSep; /* Free array */ cmd_free(ptrFileArray); @@ -1601,10 +1569,11 @@ DirList(LPTSTR szPath, /* [IN] The path that dir starts */ memcpy(szSubPath, szFullPath, (pszFilePart - szFullPath) * sizeof(TCHAR)); _tcscpy(&szSubPath[pszFilePart - szFullPath], wfdFileInfo.cFileName); _tcscat(szSubPath, _T("\\")); - _tcscat(szSubPath, pszFilePart); + pszSubFilePart = &szSubPath[_tcslen(szSubPath)]; + _tcscat(pszSubFilePart, pszFilePart); /* We do the same for the folder */ - if (DirList(szSubPath, lpFlags) != 0) + if (DirList(szSubPath, pszSubFilePart, lpFlags) != 0) { FindClose(hRecSearch); return 1; @@ -1618,6 +1587,225 @@ DirList(LPTSTR szPath, /* [IN] The path that dir starts */ return 0; } +static VOID +ResolvePattern( + IN LPTSTR pszPattern, + IN DWORD nBufferLength, + OUT LPTSTR pszFullPath, + OUT LPTSTR* ppszPatternPart OPTIONAL) +{ + LPTSTR pCurDir, pNextDir, ptr; + LPTSTR pszPatternPart; + TCHAR szNewPattern[MAX_PATH]; + + /* + * We are going to use GetFullPathName() to properly determine the actual + * full path from the pattern. However, due to the fact GetFullPathName() + * strips parts of the file name component in case the pattern contains + * path specification with trailing dots, it is required to perform a + * pre-treatment on the pattern and a post-treatment on the obtained path. + * This is mandatory in order to use the correct file search criterion. + * + * One particular case is when the pattern specifies a dots-only directory + * followed by either the "." or ".." special directories. In this case the + * GetFullPathName() function may completely miss the dots-only directory. + * An example is given by the pattern (C-string notation) "\\...\\." . + * To cope with this problem we need to partially canonicalize the pattern + * by collapsing any "." or ".." special directory that immediately follows + * a dots-only directory. We collapse in addition consecutive backslashes. + * + * Finally, trailing dots are skipped by GetFullPathName(). Therefore + * a pattern that matches files with no extension, for example: "*." , + * or: "dir\\noextfile." , are reduced to simply "*" or "dir\\noextfile", + * that match files with extensions. Or, a pattern specifying a trailing + * dots-only directory: "dir\\..." gets completely ignored and only the + * full path to "dir" is returned. + * To fix this second problem we need to restore the last part of the path + * pattern using the pattern that has been first partially canonicalized. + * + * Note however that the "." or ".." special directories are always + * interpreted correctly by GetFullPathName(). + */ + + /* Make a copy of the path pattern */ + ASSERT(_tcslen(pszPattern) < ARRAYSIZE(szNewPattern)); + _tcscpy(szNewPattern, pszPattern); + pszPattern = szNewPattern; + + TRACE("Original pszPattern: %S\n", pszPattern); + + /* Convert slashes into backslashes */ + pNextDir = pszPattern; + while ((pNextDir = _tcschr(pNextDir, _T('/')))) + *pNextDir++ = _T('\\'); + + /* + * Find any dots-only directory and collapse any "." or ".." special + * directory that immediately follows it. + * Note that we just start looking after the first path separator. Indeed, + * dots-only directories that are not preceded by a path separator, and so + * appear first in the pattern, for example: "...\dir", or: "..." , are + * either correctly handled by GetFullPathName() because they are followed + * by a non-pathological directory, or because they are handled when we + * restore the trailing dots pattern piece in the next step. + */ + pNextDir = pszPattern; + while (pNextDir) + { + pCurDir = pNextDir; + + /* Find the next path separator in the pattern */ + pNextDir = _tcschr(pNextDir, _T('\\')); + if (!pNextDir) + break; + + /* Ignore the special "." and ".." directories that are correctly handled */ + if ((pNextDir - pCurDir == 0) || + (pNextDir - pCurDir == 1 && pCurDir[0] == _T('.')) || + (pNextDir - pCurDir == 2 && pCurDir[0] == _T('.') && pCurDir[1] == _T('.'))) + { + /* Found such a directory, ignore */ + ++pNextDir; + continue; + } + + /* Check whether this is a dots-only directory */ + for (ptr = pCurDir; ptr < pNextDir; ++ptr) + { + if (*ptr != _T('.')) + break; + } + if (ptr < pNextDir) + { + /* Not a dots-only directory, ignore */ + ++pNextDir; + continue; + } + + /* Skip any consecutive backslashes */ + for (ptr = pNextDir; *ptr == _T('\\'); ++ptr) ; + + /* pCurDir is a dots-only directory, perform partial canonicalization */ + + /* Remove any following "." directory */ + if (ptr[0] == _T('.') && (ptr[1] == _T('\\') || ptr[1] == 0)) + { + memmove(pNextDir, ptr + 1, (_tcslen(ptr + 1) + 1) * sizeof(TCHAR)); + } + /* Remove any following ".." directory */ + else if (ptr[0] == _T('.') && ptr[1] == _T('.') && (ptr[2] == _T('\\') || ptr[2] == 0)) + { + /* Skip any consecutive backslashes before the next directory */ + for (ptr = ptr + 2; *ptr == _T('\\'); ++ptr) ; + + memmove(pCurDir, ptr, (_tcslen(ptr) + 1) * sizeof(TCHAR)); + pNextDir = pCurDir; + } + else + { + ++pNextDir; + + /* Collapse consecutive backslashes */ + if (ptr > pNextDir) + memmove(pNextDir, ptr, (_tcslen(ptr) + 1) * sizeof(TCHAR)); + } + } + + /* An empty pattern means we enumerate all files in the current directory */ + if (!*pszPattern) + _tcscpy(pszPattern, _T("*")); + + TRACE("New pszPattern: %S\n", pszPattern); + + /* Create the full path */ + if (GetFullPathName(pszPattern, nBufferLength, pszFullPath, &pszPatternPart) == 0) + { + _tcscpy(pszFullPath, pszPattern); + pszPatternPart = NULL; + } + + TRACE("pszFullPath (1): %S\n", pszFullPath); + TRACE("pszPatternPart (1): %S\n", pszPatternPart); + + /* + * Restore the correct file name component in case the pattern contained + * trailing dots that have been skipped by GetFullPathName(). + */ + + /* Find the last path separator in the original szPath */ + pNextDir = _tcsrchr(pszPattern, _T('\\')); + if (pNextDir) + { + /* Skip past the separator and look at the path */ + ++pNextDir; + } + else + { + /* The pattern is the path we need to look at */ + pNextDir = pszPattern; + } + + /* + * When pszPatternPart == NULL this means that pszFullPath should be a + * directory; however it might have happened that the original pattern + * was specifying a dots-only directory, that has been stripped off by + * GetFullPathName(). In both these cases we need to restore these as + * they are part of the actual directory path; the exception being if + * these are the special "." or ".." directories. + */ + if (pszPatternPart == NULL) + { + ASSERT(pszFullPath[_tcslen(pszFullPath)-1] == _T('\\')); + + /* Anything NOT being "." or ".." (the special directories) must be fully restored */ + if (*pNextDir && + (_tcsicmp(pNextDir, _T(".")) != 0) && + (_tcsicmp(pNextDir, _T("..")) != 0)) + { + pszPatternPart = &pszFullPath[_tcslen(pszFullPath)]; + _tcscpy(pszPatternPart, pNextDir); + pszPatternPart = NULL; + } + } + else if (_tcscmp(pNextDir, pszPatternPart) != 0) + { + /* + * For example, pszPatternPart == "." or ".." and we do not need to + * do anything for these, or pszPatternPart == "dir\\noextfile." and + * we need to restore all the trailing points. + */ + TRACE("pszPatternPart: %S is DIFFERENT from file criterion: %S\n", pszPatternPart, pNextDir); + + /* Anything NOT being "." or ".." (the special directories) must be fully restored */ + if (*pNextDir && + (_tcsicmp(pNextDir, _T(".")) != 0) && + (_tcsicmp(pNextDir, _T("..")) != 0)) + { + /* Restore the correct file criterion */ + _tcscpy(pszPatternPart, pNextDir); + } + } + + TRACE("pszFullPath (2): %S\n", pszFullPath); + + /* + * If no wildcard or file was specified and this is a directory, + * display all files in it. + */ + if (pszPatternPart == NULL || IsExistingDirectory(pszFullPath)) + { + pszPatternPart = &pszFullPath[_tcslen(pszFullPath)]; + if (pszPatternPart[-1] != _T('\\')) + *pszPatternPart++ = _T('\\'); + _tcscpy(pszPatternPart, _T("*")); + } + + TRACE("pszPatternPart (2): %S\n", pszPatternPart); + + if (ppszPatternPart) + *ppszPatternPart = pszPatternPart; +} + /* * dir * @@ -1627,10 +1815,11 @@ INT CommandDir(LPTSTR rest) { TCHAR dircmd[MAX_PATH]; /* A variable to store the DIRCMD environment variable */ - TCHAR path[MAX_PATH]; TCHAR prev_volume[MAX_PATH]; + TCHAR szFullPath[MAX_PATH]; LPTSTR* params = NULL; LPTSTR pszFilePart; + TCHAR cPathSep; INT entries = 0; UINT loop = 0; DIRSWITCHFLAGS stFlags; @@ -1729,40 +1918,38 @@ CommandDir(LPTSTR rest) ChangedVolume = TRUE; if (!stFlags.bBareFormat && - GetVolumePathName(params[loop], path, ARRAYSIZE(path))) + GetVolumePathName(params[loop], szFullPath, ARRAYSIZE(szFullPath))) { - if (!_tcscmp(path, prev_volume)) + if (!_tcscmp(szFullPath, prev_volume)) ChangedVolume = FALSE; else - _tcscpy(prev_volume, path); - } - else if (GetFullPathName(params[loop], ARRAYSIZE(path), path, &pszFilePart) != 0) - { - if (pszFilePart != NULL) - *pszFilePart = _T('\0'); - } - else - { - _tcscpy(path, params[loop]); + _tcscpy(prev_volume, szFullPath); } + /* Resolve the pattern */ + ResolvePattern(params[loop], ARRAYSIZE(szFullPath), szFullPath, &pszFilePart); + /* Print the header */ + cPathSep = pszFilePart[-1]; + pszFilePart[-1] = _T('\0'); /* Truncate to directory name only */ if (ChangedVolume && !stFlags.bBareFormat && - !PrintDirectoryHeader(params[loop], &stFlags)) + !PrintDirectoryHeader(szFullPath, &stFlags)) { nErrorLevel = 1; goto cleanup; } + pszFilePart[-1] = cPathSep; /* Perform the actual directory listing */ - if (DirList(params[loop], &stFlags) != 0) + if (DirList(szFullPath, pszFilePart, &stFlags) != 0) { nErrorLevel = 1; goto cleanup; } /* Print the footer */ - PrintSummary(path, + pszFilePart[-1] = _T('\0'); /* Truncate to directory name only */ + PrintSummary(szFullPath, recurse_file_cnt, recurse_dir_cnt, recurse_bytes,

1 0

03/05: [CMD] Code formatting; use LPCTSTR where possible; use a MAX_PATH sized dircmd buffer.
by Hermès Bélusca-Maïto 06 Aug '18

06 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c57d49d0c109dfc0d5c53… commit c57d49d0c109dfc0d5c53b2e0030cb3d7ff268cb Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Aug 6 21:22:27 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 6 22:40:17 2018 +0200 [CMD] Code formatting; use LPCTSTR where possible; use a MAX_PATH sized dircmd buffer. --- base/shell/cmd/dir.c | 115 +++++++++++++++++++++++++-------------------------- 1 file changed, 56 insertions(+), 59 deletions(-) diff --git a/base/shell/cmd/dir.c b/base/shell/cmd/dir.c index a44f9aca68..965cf74d6f 100644 --- a/base/shell/cmd/dir.c +++ b/base/shell/cmd/dir.c @@ -141,8 +141,6 @@ #ifdef INCLUDE_CMD_DIR - - /* Time Field enumeration */ enum ETimeField { @@ -571,7 +569,7 @@ DirPrintf(LPDIRSWITCHFLAGS lpFlags, LPTSTR szFormat, ...) * print the header for the dir command */ static BOOL -PrintDirectoryHeader(LPTSTR szPath, LPDIRSWITCHFLAGS lpFlags) +PrintDirectoryHeader(LPCTSTR szPath, LPDIRSWITCHFLAGS lpFlags) { TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szFullDir[MAX_PATH]; @@ -592,27 +590,27 @@ PrintDirectoryHeader(LPTSTR szPath, LPDIRSWITCHFLAGS lpFlags) if (pszFilePart != NULL) *pszFilePart = _T('\0'); - /* get the media ID of the drive */ + /* Get the media ID of the drive */ if (!GetVolumePathName(szFullDir, szRootName, ARRAYSIZE(szRootName)) || - !GetVolumeInformation(szRootName, szVolName, 80, &dwSerialNr, - NULL, NULL, NULL, 0)) + !GetVolumeInformation(szRootName, szVolName, ARRAYSIZE(szVolName), + &dwSerialNr, NULL, NULL, NULL, 0)) { return TRUE; } - /* print drive info */ + /* Print drive info */ if (szVolName[0] != _T('\0')) { LoadString(CMD_ModuleHandle, STRING_DIR_HELP2, szMsg, ARRAYSIZE(szMsg)); - DirPrintf(lpFlags, szMsg, szRootName[0], szVolName); + DirPrintf(lpFlags, szMsg, _totupper(szRootName[0]), szVolName); } else { LoadString(CMD_ModuleHandle, STRING_DIR_HELP3, szMsg, ARRAYSIZE(szMsg)); - DirPrintf(lpFlags, szMsg, szRootName[0]); + DirPrintf(lpFlags, szMsg, _totupper(szRootName[0])); } - /* print the volume serial number if the return was successful */ + /* Print the volume serial number if the return was successful */ LoadString(CMD_ModuleHandle, STRING_DIR_HELP4, szMsg, ARRAYSIZE(szMsg)); DirPrintf(lpFlags, szMsg, HIWORD(dwSerialNr), LOWORD(dwSerialNr)); @@ -752,7 +750,7 @@ GetUserDiskFreeSpace(LPCTSTR lpRoot, * Just copied Tim's Code and patched it a bit */ static INT -PrintSummary(LPTSTR szPath, +PrintSummary(LPCTSTR szPath, ULONG ulFiles, ULONG ulDirs, ULONGLONG u64Bytes, @@ -789,12 +787,12 @@ PrintSummary(LPTSTR szPath, /* Print File Summary */ /* Condition to print summary is: If we are not in bare format and if we have results! */ - ConvertULargeInteger(u64Bytes, szBuffer, 20, lpFlags->bTSeparator); + ConvertULargeInteger(u64Bytes, szBuffer, ARRAYSIZE(szBuffer), lpFlags->bTSeparator); LoadString(CMD_ModuleHandle, STRING_DIR_HELP8, szMsg, ARRAYSIZE(szMsg)); DirPrintf(lpFlags, szMsg, ulFiles, szBuffer); } - /* Print total directories and freespace */ + /* Print total directories and free space */ if (!lpFlags->bRecursive || TotalSummary) { GetUserDiskFreeSpace(szPath, &uliFree); @@ -858,7 +856,7 @@ getName(const TCHAR* file, TCHAR * dest) static VOID DirPrintNewList(PDIRFINDINFO ptrFiles[], /* [IN]Files' Info */ DWORD dwCount, /* [IN] The quantity of files */ - TCHAR *szCurPath, /* [IN] Full path of current directory */ + LPCTSTR szCurPath, /* [IN] Full path of current directory */ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ { DWORD i; @@ -940,7 +938,7 @@ DirPrintNewList(PDIRFINDINFO ptrFiles[], /* [IN]Files' Info */ static VOID DirPrintWideList(PDIRFINDINFO ptrFiles[], /* [IN] Files' Info */ DWORD dwCount, /* [IN] The quantity of files */ - TCHAR *szCurPath, /* [IN] Full path of current directory */ + LPCTSTR szCurPath, /* [IN] Full path of current directory */ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ { SHORT iScreenWidth; @@ -1022,7 +1020,7 @@ DirPrintWideList(PDIRFINDINFO ptrFiles[], /* [IN] Files' Info */ static VOID DirPrintOldList(PDIRFINDINFO ptrFiles[], /* [IN] Files' Info */ DWORD dwCount, /* [IN] The quantity of files */ - TCHAR * szCurPath, /* [IN] Full path of current directory */ + LPCTSTR szCurPath, /* [IN] Full path of current directory */ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ { DWORD i; /* An indexer for "for"s */ @@ -1087,7 +1085,7 @@ DirPrintOldList(PDIRFINDINFO ptrFiles[], /* [IN] Files' Info */ static VOID DirPrintBareList(PDIRFINDINFO ptrFiles[], /* [IN] Files' Info */ DWORD dwCount, /* [IN] The number of files */ - LPTSTR lpCurPath, /* [IN] Full path of current directory */ + LPCTSTR szCurPath, /* [IN] Full path of current directory */ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ { DWORD i; @@ -1103,7 +1101,7 @@ DirPrintBareList(PDIRFINDINFO ptrFiles[], /* [IN] Files' Info */ if (lpFlags->bRecursive) { /* at recursive mode we print full path of file */ - DirPrintf(lpFlags, _T("%s\\%s\n"), lpCurPath, ptrFiles[i]->stFindInfo.cFileName); + DirPrintf(lpFlags, _T("%s\\%s\n"), szCurPath, ptrFiles[i]->stFindInfo.cFileName); } else { @@ -1122,7 +1120,7 @@ DirPrintBareList(PDIRFINDINFO ptrFiles[], /* [IN] Files' Info */ static VOID DirPrintFiles(PDIRFINDINFO ptrFiles[], /* [IN] Files' Info */ DWORD dwCount, /* [IN] The quantity of files */ - TCHAR *szCurPath, /* [IN] Full path of current directory */ + LPCTSTR szCurPath, /* [IN] Full path of current directory */ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ { TCHAR szMsg[RC_STRING_MAX_SIZE]; @@ -1176,9 +1174,9 @@ DirPrintFiles(PDIRFINDINFO ptrFiles[], /* [IN] Files' Info */ * Compares 2 files based on the order criteria */ static BOOL -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 */ +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; ULARGE_INTEGER u64File2; @@ -1338,7 +1336,7 @@ DirNodeCleanup(PDIRFINDLISTNODE ptrStartNode, /* * DirList * - * The functions that does everything except for printing results + * The function that does everything except for printing results */ static INT DirList(LPTSTR szPath, /* [IN] The path that dir starts */ @@ -1365,7 +1363,7 @@ DirList(LPTSTR szPath, /* [IN] The path that dir starts */ static HANDLE (WINAPI *pFindFirstStreamW)(LPCWSTR, STREAM_INFO_LEVELS, LPVOID, DWORD); static BOOL (WINAPI *pFindNextStreamW)(HANDLE, LPVOID); - /* Initialize Variables */ + /* Initialize variables */ ptrStartNode = NULL; ptrNextNode = NULL; dwCount = 0; @@ -1499,7 +1497,7 @@ DirList(LPTSTR szPath, /* [IN] The path that dir starts */ /* Continue at next node at linked list */ ptrNextNode = ptrNextNode->ptrNext; - dwCount ++; + dwCount++; /* Grab statistics */ if (wfdFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) @@ -1589,14 +1587,14 @@ DirList(LPTSTR szPath, /* [IN] The path that dir starts */ memcpy(szSubPath, szFullPath, (pszFilePart - szFullPath) * sizeof(TCHAR)); _tcscpy(&szSubPath[pszFilePart - szFullPath], _T("*.*")); - hRecSearch = FindFirstFile (szSubPath, &wfdFileInfo); + hRecSearch = FindFirstFile(szSubPath, &wfdFileInfo); if (hRecSearch != INVALID_HANDLE_VALUE) { do { /* We search for directories other than "." and ".." */ - if ((_tcsicmp(wfdFileInfo.cFileName, _T(".")) != 0) && - (_tcsicmp(wfdFileInfo.cFileName, _T("..")) != 0 ) && + if ((_tcsicmp(wfdFileInfo.cFileName, _T(".")) != 0) && + (_tcsicmp(wfdFileInfo.cFileName, _T("..")) != 0) && (wfdFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { /* Concat the path and the directory to do recursive */ @@ -1628,7 +1626,7 @@ DirList(LPTSTR szPath, /* [IN] The path that dir starts */ INT CommandDir(LPTSTR rest) { - TCHAR dircmd[256]; /* A variable to store the DIRCMD enviroment variable */ + TCHAR dircmd[MAX_PATH]; /* A variable to store the DIRCMD environment variable */ TCHAR path[MAX_PATH]; TCHAR prev_volume[MAX_PATH]; LPTSTR* params = NULL; @@ -1639,7 +1637,7 @@ CommandDir(LPTSTR rest) INT ret = 1; BOOL ChangedVolume; - /* Initialize Switch Flags < Default switches are setted here!> */ + /* Initialize Switch Flags < Default switches are set here! > */ stFlags.b4Digit = TRUE; stFlags.bBareFormat = FALSE; stFlags.bDataStreams = FALSE; @@ -1659,8 +1657,8 @@ CommandDir(LPTSTR rest) nErrorLevel = 0; - /* read the parameters from the DIRCMD environment variable */ - if (GetEnvironmentVariable (_T("DIRCMD"), dircmd, 256)) + /* Read the parameters from the DIRCMD environment variable */ + if (GetEnvironmentVariable (_T("DIRCMD"), dircmd, ARRAYSIZE(dircmd))) { if (!DirReadParam(dircmd, &params, &entries, &stFlags)) { @@ -1669,14 +1667,14 @@ CommandDir(LPTSTR rest) } } - /* read the parameters */ + /* Read the parameters */ if (!DirReadParam(rest, &params, &entries, &stFlags) || CheckCtrlBreak(BREAK_INPUT)) { nErrorLevel = 1; goto cleanup; } - /* default to current directory */ + /* Default to current directory */ if (entries == 0) { if (!add_entry(&entries, &params, _T("*"))) @@ -1708,23 +1706,23 @@ CommandDir(LPTSTR rest) Uncomment this to show the final state of switch flags*/ { int i; - TRACE("Attributes mask/value %x/%x\n",stFlags.stAttribs.dwAttribMask,stFlags.stAttribs.dwAttribVal ); - TRACE("(B) Bare format : %i\n", stFlags.bBareFormat ); - TRACE("(C) Thousand : %i\n", stFlags.bTSeparator ); - TRACE("(W) Wide list : %i\n", stFlags.bWideList ); - TRACE("(D) Wide list sort by column : %i\n", stFlags.bWideListColSort ); - TRACE("(L) Lowercase : %i\n", stFlags.bLowerCase ); - TRACE("(N) New : %i\n", stFlags.bNewLongList ); - TRACE("(O) Order : %i\n", stFlags.stOrderBy.sCriteriaCount ); + TRACE("Attributes mask/value %x/%x\n",stFlags.stAttribs.dwAttribMask,stFlags.stAttribs.dwAttribVal); + TRACE("(B) Bare format : %i\n", stFlags.bBareFormat); + TRACE("(C) Thousand : %i\n", stFlags.bTSeparator); + TRACE("(W) Wide list : %i\n", stFlags.bWideList); + TRACE("(D) Wide list sort by column : %i\n", stFlags.bWideListColSort); + TRACE("(L) Lowercase : %i\n", stFlags.bLowerCase); + TRACE("(N) New : %i\n", stFlags.bNewLongList); + TRACE("(O) Order : %i\n", stFlags.stOrderBy.sCriteriaCount); for (i =0;i<stFlags.stOrderBy.sCriteriaCount;i++) - 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 ); - TRACE("Parameter : %s\n", debugstr_aw(params[loop]) ); + 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); + TRACE("Parameter : %s\n", debugstr_aw(params[loop])); } /* Print the drive header if the volume changed */ @@ -1748,23 +1746,22 @@ CommandDir(LPTSTR rest) _tcscpy(path, params[loop]); } - if (ChangedVolume && !stFlags.bBareFormat) + /* Print the header */ + if (ChangedVolume && !stFlags.bBareFormat && + !PrintDirectoryHeader(params[loop], &stFlags)) { - if (!PrintDirectoryHeader (params[loop], &stFlags)) - { - nErrorLevel = 1; - goto cleanup; - } + nErrorLevel = 1; + goto cleanup; } - /* do the actual dir */ - if (DirList(params[loop], &stFlags)) + /* Perform the actual directory listing */ + if (DirList(params[loop], &stFlags) != 0) { nErrorLevel = 1; goto cleanup; } - /* print the footer */ + /* Print the footer */ PrintSummary(path, recurse_file_cnt, recurse_dir_cnt,

1 0

02/05: [CMD] Create a DirNodeCleanup() helper for cleanup and simplify code (adapted from PR #592).
by Katayama Hirofumi MZ 06 Aug '18

06 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12517aa3099bac9294cfb… commit 12517aa3099bac9294cfb4fd0df02f6a3bb3af78 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 25 09:53:45 2018 +0900 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 6 22:40:16 2018 +0200 [CMD] Create a DirNodeCleanup() helper for cleanup and simplify code (adapted from PR #592). --- base/shell/cmd/dir.c | 79 +++++++++++++++++----------------------------------- 1 file changed, 26 insertions(+), 53 deletions(-) diff --git a/base/shell/cmd/dir.c b/base/shell/cmd/dir.c index 07d14d6f93..a44f9aca68 100644 --- a/base/shell/cmd/dir.c +++ b/base/shell/cmd/dir.c @@ -1314,6 +1314,27 @@ QsortFiles(PDIRFINDINFO ptrArray[], /* [IN/OUT] The array with file info } } +static VOID +DirNodeCleanup(PDIRFINDLISTNODE ptrStartNode, + PDWORD pdwCount) +{ + PDIRFINDLISTNODE ptrNextNode; + PDIRFINDSTREAMNODE ptrFreeNode; + 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; + --(*pdwCount); + } +} + /* * DirList * @@ -1341,7 +1362,6 @@ DirList(LPTSTR szPath, /* [IN] The path that dir starts */ 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 */ static HANDLE (WINAPI *pFindFirstStreamW)(LPCWSTR, STREAM_INFO_LEVELS, LPVOID, DWORD); static BOOL (WINAPI *pFindNextStreamW)(HANDLE, LPVOID); @@ -1404,19 +1424,7 @@ DirList(LPTSTR szPath, /* [IN] The path that dir starts */ if (ptrNextNode->ptrNext == NULL) { WARN("DEBUG: Cannot allocate memory for ptrNextNode->ptrNext!\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--; - } + DirNodeCleanup(ptrStartNode, &dwCount); FindClose(hSearch); return 1; } @@ -1466,19 +1474,7 @@ DirList(LPTSTR szPath, /* [IN] The path that dir starts */ 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--; - } + DirNodeCleanup(ptrStartNode, &dwCount); FindClose(hStreams); FindClose(hSearch); return 1; @@ -1532,19 +1528,7 @@ DirList(LPTSTR szPath, /* [IN] The path that dir starts */ 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 --; - } + DirNodeCleanup(ptrStartNode, &dwCount); return 1; } @@ -1582,20 +1566,9 @@ DirList(LPTSTR szPath, /* [IN] The path that dir starts */ /* Free array */ cmd_free(ptrFileArray); + /* Free linked list */ - 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 --; - } + DirNodeCleanup(ptrStartNode, &dwCount); if (CheckCtrlBreak(BREAK_INPUT)) return 1;

1 0

01/05: [CMD] Fix French translation.
by Hermès Bélusca-Maïto 06 Aug '18

06 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06504ee4bebc8ea9ef469… commit 06504ee4bebc8ea9ef469440ade359e4c35ac259 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jul 30 01:36:43 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 6 22:40:12 2018 +0200 [CMD] Fix French translation. --- base/shell/cmd/lang/fr-FR.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/shell/cmd/lang/fr-FR.rc b/base/shell/cmd/lang/fr-FR.rc index d82311e850..24543ab4c1 100644 --- a/base/shell/cmd/lang/fr-FR.rc +++ b/base/shell/cmd/lang/fr-FR.rc @@ -530,7 +530,7 @@ titre titre de la fenêtre" STRING_FREE_ERROR1 "Lecteur invalide" STRING_FREE_ERROR2 "sans nom" STRING_GOTO_ERROR1 "Pas de label indiqué pour GOTO" - STRING_GOTO_ERROR2 "Label '%s' non trouvé\n" + STRING_GOTO_ERROR2 "Label '%s' introuvable\n" STRING_MD_ERROR "Un sous répertoire ou un fichier existe déjà.\n" STRING_MD_ERROR2 "Le chemin vers le nouveau répertoire n'existe pas.\n" STRING_MOVE_ERROR1 "[OK]\n" @@ -538,12 +538,12 @@ titre titre de la fenêtre" STRING_REN_ERROR1 "MoveFile() a échoué. Erreur : %lu\n" STRING_TIME_ERROR1 "Heure invalide." STRING_TYPE_ERROR1 "Option invalide '/%s'\n" - STRING_WINDOW_ERROR1 "Fenêtre non trouvée" + STRING_WINDOW_ERROR1 "Fenêtre introuvable" STRING_ERROR_PARAMETERF_ERROR "Format du paramètre incorrect - %c\n" STRING_ERROR_INVALID_SWITCH "Paramètre invalide - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Trop de paramètres - %s\n" - STRING_ERROR_PATH_NOT_FOUND "Chemin non trouvé\n" - STRING_ERROR_FILE_NOT_FOUND "Fichier non trouvé\n" + STRING_ERROR_PATH_NOT_FOUND "Chemin introuvable\n" + STRING_ERROR_FILE_NOT_FOUND "Fichier introuvable\n" STRING_ERROR_REQ_PARAM_MISSING "Paramètre requis manquant\n" STRING_ERROR_INVALID_DRIVE "Lecteur spécifié introuvable\n" STRING_ERROR_INVALID_PARAM_FORMAT "Format de paramètre incorrect - %s\n" @@ -554,7 +554,7 @@ titre titre de la fenêtre" STRING_ERROR_DRIVER_NOT_READY "Lecteur non prêt" STRING_PATH_ERROR "CMD : Pas dans l'environnement '%s'\n" STRING_REPLACE_ERROR1 "Commutateur invalide - %s\n" - STRING_REPLACE_ERROR2 "Chemin non trouvé - %s\n" + STRING_REPLACE_ERROR2 "Chemin introuvable - %s\n" STRING_REPLACE_ERROR3 "La syntaxe du nom de fichier, du répertoire, ou du nom de volume est incorrecte.\n" STRING_REPLACE_ERROR4 "Combinaison de paramètres invalide\n" STRING_REPLACE_ERROR5 "Accès refusé - %s\n"

1 0

01/01: [NTOSKRNL] Fix a nullptr dereference in IopStartDevice
by Mark Jansen 06 Aug '18

06 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2b1c054e4dad11fe6775… commit b2b1c054e4dad11fe6775d10f35d65c68422e3b4 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 5 22:14:44 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 6 20:51:21 2018 +0200 [NTOSKRNL] Fix a nullptr dereference in IopStartDevice --- ntoskrnl/io/pnpmgr/pnpmgr.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index 62ad7a253f..e4cb7db6d6 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -786,7 +786,7 @@ IopStartDevice( { NTSTATUS Status; HANDLE InstanceHandle = NULL, ControlHandle = NULL; - UNICODE_STRING KeyName; + UNICODE_STRING KeyName, ValueString; OBJECT_ATTRIBUTES ObjectAttributes; if (DeviceNode->Flags & DNF_DISABLED) @@ -817,7 +817,10 @@ IopStartDevice( goto ByeBye; RtlInitUnicodeString(&KeyName, L"ActiveService"); - Status = ZwSetValueKey(ControlHandle, &KeyName, 0, REG_SZ, DeviceNode->ServiceName.Buffer, DeviceNode->ServiceName.Length + sizeof(UNICODE_NULL)); + ValueString = DeviceNode->ServiceName; + if (!ValueString.Buffer) + RtlInitUnicodeString(&ValueString, L""); + Status = ZwSetValueKey(ControlHandle, &KeyName, 0, REG_SZ, ValueString.Buffer, ValueString.Length + sizeof(UNICODE_NULL)); // } ByeBye:

1 0

02/02: [WINLOGON] Hack-fix for CORE-14877 ; see commit bcec1fd6.
by Hermès Bélusca-Maïto 06 Aug '18

06 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10c5bfb8feac6b37348e1… commit 10c5bfb8feac6b37348e19a8dc3b33d967a7264a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Aug 6 17:30:21 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 6 17:38:00 2018 +0200 [WINLOGON] Hack-fix for CORE-14877 ; see commit bcec1fd6. --- base/system/winlogon/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/system/winlogon/setup.c b/base/system/winlogon/setup.c index f5ef367318..af76e2a950 100644 --- a/base/system/winlogon/setup.c +++ b/base/system/winlogon/setup.c @@ -141,7 +141,7 @@ RunSetupThreadProc( CloseHandle(ProcessInformation.hThread); CloseHandle(ProcessInformation.hProcess); - SwitchDesktop(WLSession->WinlogonDesktop); + // SwitchDesktop(WLSession->WinlogonDesktop); TRACE ("RunSetup() done\n");

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs