Ros-diffs December 2021

ros-diffs@reactos.org

33 participants
155 discussions

[reactos] 01/01: [MSPAINT] Add const to some PaletteModel methods
by Katayama Hirofumi MZ 28 Dec '21

28 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4331b47c505eb4431c888… commit 4331b47c505eb4431c888fbfee9bd9d876893d63 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 28 09:47:13 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 28 09:47:13 2021 +0900 [MSPAINT] Add const to some PaletteModel methods CORE-17931 --- base/applications/mspaint/palettemodel.cpp | 6 +++--- base/applications/mspaint/palettemodel.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/applications/mspaint/palettemodel.cpp b/base/applications/mspaint/palettemodel.cpp index 2236b06d6f0..021a9e0af7f 100644 --- a/base/applications/mspaint/palettemodel.cpp +++ b/base/applications/mspaint/palettemodel.cpp @@ -48,7 +48,7 @@ void PaletteModel::SelectPalette(int nPalette) NotifyPaletteChanged(); } -int PaletteModel::GetColor(int nIndex) +int PaletteModel::GetColor(int nIndex) const { if (nIndex < 28) return m_colors[nIndex]; @@ -65,7 +65,7 @@ void PaletteModel::SetColor(int nIndex, int newColor) } } -int PaletteModel::GetFgColor() +int PaletteModel::GetFgColor() const { return m_fgColor; } @@ -76,7 +76,7 @@ void PaletteModel::SetFgColor(int newColor) NotifyColorChanged(); } -int PaletteModel::GetBgColor() +int PaletteModel::GetBgColor() const { return m_bgColor; } diff --git a/base/applications/mspaint/palettemodel.h b/base/applications/mspaint/palettemodel.h index 04c86dbc664..2dccc2aa405 100644 --- a/base/applications/mspaint/palettemodel.h +++ b/base/applications/mspaint/palettemodel.h @@ -25,10 +25,10 @@ public: PaletteModel(); int SelectedPalette(); void SelectPalette(int nPalette); - int GetColor(int nIndex); + int GetColor(int nIndex) const; void SetColor(int nIndex, int newColor); - int GetFgColor(); + int GetFgColor() const; void SetFgColor(int newColor); - int GetBgColor(); + int GetBgColor() const; void SetBgColor(int newColor); };

1 0

[reactos] 01/01: [KMTESTS:IO] Avoid crashing in IoCreateFile test when pool allocations are failed
by Victor Perevertkin 27 Dec '21

27 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=188f5dc50aa14e89360e3… commit 188f5dc50aa14e89360e3ac5c962417efd53f9b1 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Jun 14 05:05:07 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Dec 28 02:51:52 2021 +0300 [KMTESTS:IO] Avoid crashing in IoCreateFile test when pool allocations are failed --- .../rostests/kmtests/ntos_io/IoCreateFile_drv.c | 52 ++++++++++++++-------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/modules/rostests/kmtests/ntos_io/IoCreateFile_drv.c b/modules/rostests/kmtests/ntos_io/IoCreateFile_drv.c index 33c295a53f4..241dd7b2a99 100644 --- a/modules/rostests/kmtests/ntos_io/IoCreateFile_drv.c +++ b/modules/rostests/kmtests/ntos_io/IoCreateFile_drv.c @@ -94,10 +94,15 @@ TestIrpHandler( { PREPARSE_DATA_BUFFER Reparse; - Irp->Tail.Overlay.AuxiliaryBuffer = ExAllocatePoolWithTag(NonPagedPool, MAXIMUM_REPARSE_DATA_BUFFER_SIZE, 'FwrI'); + Irp->Tail.Overlay.AuxiliaryBuffer = ExAllocatePoolZero(NonPagedPool, MAXIMUM_REPARSE_DATA_BUFFER_SIZE, 'FwrI'); Reparse = (PREPARSE_DATA_BUFFER)Irp->Tail.Overlay.AuxiliaryBuffer; - RtlZeroMemory(Reparse, MAXIMUM_REPARSE_DATA_BUFFER_SIZE); + if (!Reparse) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Finish; + } + Reparse->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT; Reparse->ReparseDataLength = 12 + sizeof(L"\\??\\C:\\Documents and Settings"); Reparse->MountPointReparseBuffer.SubstituteNameLength = sizeof(L"\\??\\C:\\Documents and Settings") - sizeof(UNICODE_NULL); @@ -109,31 +114,41 @@ TestIrpHandler( else if (IoStack->FileObject->FileName.Length >= 2 * sizeof(WCHAR) && IoStack->FileObject->FileName.Buffer[1] == 'S') { + PREPARSE_DATA_BUFFER Reparse; + if (IoStack->Flags & SL_STOP_ON_SYMLINK) { Status = STATUS_STOPPED_ON_SYMLINK; + goto Finish; } - else + + Irp->Tail.Overlay.AuxiliaryBuffer = ExAllocatePoolZero(NonPagedPool, MAXIMUM_REPARSE_DATA_BUFFER_SIZE, 'FwrI'); + Reparse = (PREPARSE_DATA_BUFFER)Irp->Tail.Overlay.AuxiliaryBuffer; + + if (!Reparse) { - PREPARSE_DATA_BUFFER Reparse; - - Irp->Tail.Overlay.AuxiliaryBuffer = ExAllocatePoolWithTag(NonPagedPool, MAXIMUM_REPARSE_DATA_BUFFER_SIZE, 'FwrI'); - Reparse = (PREPARSE_DATA_BUFFER)Irp->Tail.Overlay.AuxiliaryBuffer; - - RtlZeroMemory(Reparse, MAXIMUM_REPARSE_DATA_BUFFER_SIZE); - Reparse->ReparseTag = IO_REPARSE_TAG_SYMLINK; - Reparse->ReparseDataLength = 12 + sizeof(L"\\??\\C:\\Documents and Settings"); - Reparse->SymbolicLinkReparseBuffer.SubstituteNameLength = sizeof(L"\\??\\C:\\Documents and Settings") - sizeof(UNICODE_NULL); - Reparse->SymbolicLinkReparseBuffer.PrintNameOffset = sizeof(L"\\??\\C:\\Documents and Settings"); - RtlCopyMemory(Reparse->SymbolicLinkReparseBuffer.PathBuffer, L"\\??\\C:\\Documents and Settings", sizeof(L"\\??\\C:\\Documents and Settings")); - Irp->IoStatus.Information = IO_REPARSE_TAG_SYMLINK; - Status = STATUS_REPARSE; + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Finish; } + + Reparse->ReparseTag = IO_REPARSE_TAG_SYMLINK; + Reparse->ReparseDataLength = 12 + sizeof(L"\\??\\C:\\Documents and Settings"); + Reparse->SymbolicLinkReparseBuffer.SubstituteNameLength = sizeof(L"\\??\\C:\\Documents and Settings") - sizeof(UNICODE_NULL); + Reparse->SymbolicLinkReparseBuffer.PrintNameOffset = sizeof(L"\\??\\C:\\Documents and Settings"); + RtlCopyMemory(Reparse->SymbolicLinkReparseBuffer.PathBuffer, L"\\??\\C:\\Documents and Settings", sizeof(L"\\??\\C:\\Documents and Settings")); + Irp->IoStatus.Information = IO_REPARSE_TAG_SYMLINK; + Status = STATUS_REPARSE; } else { - Fcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Fcb), 'FwrI'); - RtlZeroMemory(Fcb, sizeof(*Fcb)); + Fcb = ExAllocatePoolZero(NonPagedPool, sizeof(*Fcb), 'FwrI'); + + if (!Fcb) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Finish; + } + ExInitializeFastMutex(&Fcb->HeaderMutex); FsRtlSetupAdvancedHeader(&Fcb->Header, &Fcb->HeaderMutex); Fcb->Header.AllocationSize.QuadPart = 0; @@ -157,6 +172,7 @@ TestIrpHandler( Status = STATUS_SUCCESS; } +Finish: Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT);

1 0

[reactos] 01/01: [FLTMGR] CreateClientPort(): Fix ObInsertObject() error handling
by Serge Gautherie 27 Dec '21

27 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ba5051f7960b8e2275d0… commit 5ba5051f7960b8e2275d0018d1656438a68cf3a0 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon May 24 08:56:17 2021 +0200 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Dec 28 02:27:50 2021 +0300 [FLTMGR] CreateClientPort(): Fix ObInsertObject() error handling Avoid extra ObDereferenceObject(). CORE-17904 --- drivers/filters/fltmgr/Messaging.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/filters/fltmgr/Messaging.c b/drivers/filters/fltmgr/Messaging.c index f4ed276eb4d..713e8fd1770 100644 --- a/drivers/filters/fltmgr/Messaging.c +++ b/drivers/filters/fltmgr/Messaging.c @@ -699,10 +699,12 @@ CreateClientPort(_In_ PFILE_OBJECT FileObject, goto Quit; } - /* Now insert the new client port into the object manager*/ - Status = ObInsertObject(ClientPortObject, 0, FLT_PORT_ALL_ACCESS, 1, 0, (PHANDLE)&PortHandle); + /* Now insert the new client port into the object manager */ + Status = ObInsertObject(ClientPortObject, NULL, FLT_PORT_ALL_ACCESS, 1, NULL, (PHANDLE)&PortHandle); if (!NT_SUCCESS(Status)) { + /* ObInsertObject() failed and already dereferenced ClientPortObject */ + ClientPortObject = NULL; goto Quit; }

1 0

[reactos] 01/01: [GITPOD] change extract directory to automatically extract to RosBE, and set tar to verbose mode
by Lucas Puntillo 27 Dec '21

27 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a23249e13740ea83a4358… commit a23249e13740ea83a43586d5ca11ca5fd753620e Author: Lucas Puntillo <62703475+puntillol59(a)users.noreply.github.com> AuthorDate: Mon May 17 10:13:10 2021 -0400 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Dec 28 02:14:47 2021 +0300 [GITPOD] change extract directory to automatically extract to RosBE, and set tar to verbose mode change extract directory to automatically extract to RosBE, and set tar to verbose mode shorting the waiting time for the user and have verbose mode activated to show if there were any issues with the file itself. therefore helping the user and developer. --- .gitpod.Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 1fda5743294..d1dee8961b3 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -14,8 +14,7 @@ RUN sudo apt-get -q update && \ sudo rm -rf /var/lib/apt/lists/* RUN wget https://svn.reactos.org/amine/RosBEBinFull.tar.gz && \ - sudo tar -xzf RosBEBinFull.tar.gz -C /usr/local && \ - sudo mv /usr/local/RosBEBinFull /usr/local/RosBE && \ + sudo tar -xzvf RosBEBinFull.tar.gz -C /usr/local --one-top-level=RosBE --strip-components 1 && \ rm -f RosBEBinFull.tar.gz RUN echo 'export PATH=/usr/local/RosBE/i386/bin:$PATH' >> /home/gitpod/.profile

1 0

[reactos] 01/01: [CMAKE] msvc.cmake: Remove add_definitions(/D__arm__) (#3710)
by Serge Gautherie 27 Dec '21

27 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=665dac03b86ce0f7d7e9a… commit 665dac03b86ce0f7d7e9aa062fee5a3d08099682 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Dec 28 00:12:25 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 28 02:12:25 2021 +0300 [CMAKE] msvc.cmake: Remove add_definitions(/D__arm__) (#3710) --- sdk/cmake/msvc.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 5645f83dc31..77de6955619 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -363,7 +363,6 @@ if(ARCH STREQUAL "amd64") add_definitions(/D__x86_64) set(SPEC2DEF_ARCH x86_64) elseif(ARCH STREQUAL "arm") - add_definitions(/D__arm__) set(SPEC2DEF_ARCH arm) elseif(ARCH STREQUAL "arm64") add_definitions(/D__arm64__)

1 0

[reactos] 01/01: [SYSSETUP] Enable sound events for Workstation (#3733)
by Oleg Dubinskiy 27 Dec '21

27 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cbf8b367f5873f8ed9bc5… commit cbf8b367f5873f8ed9bc558326e8270717d58f45 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Tue Dec 28 01:08:13 2021 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 28 02:08:13 2021 +0300 [SYSSETUP] Enable sound events for Workstation (#3733) Write sound events values in registry in case user selected Workstation setup during 2nd setup stage. CORE-13951 --- dll/win32/syssetup/wizard.c | 129 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 6d7d5861061..efddcfd6b1d 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -7,6 +7,7 @@ * Pierre Schweitzer <heis_spiter(a)hotmail.com> * Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> * Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> */ /* INCLUDES *****************************************************************/ @@ -395,6 +396,8 @@ static const WCHAR s_szProductOptions[] = L"SYSTEM\\CurrentControlSet\\Control\\ static const WCHAR s_szRosVersion[] = L"SYSTEM\\CurrentControlSet\\Control\\ReactOS\\Settings\\Version"; static const WCHAR s_szControlWindows[] = L"SYSTEM\\CurrentControlSet\\Control\\Windows"; static const WCHAR s_szWinlogon[] = L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon"; +static const WCHAR s_szDefaultSoundEvents[] = L"AppEvents\\Schemes\\Apps\\.Default"; +static const WCHAR s_szExplorerSoundEvents[] = L"AppEvents\\Schemes\\Apps\\Explorer"; typedef struct _PRODUCT_OPTION_DATA { @@ -411,6 +414,125 @@ static const PRODUCT_OPTION_DATA s_ProductOptionData[] = { L"\0", L"WinNT", 1, 0x300, 1 } }; +static const WCHAR* s_DefaultSoundEvents[][2] = +{ + { L".Default", L"%SystemRoot%\\Media\\ReactOS_Default.wav" }, + { L"AppGPFault", L"" }, + { L"Close", L"" }, + { L"CriticalBatteryAlarm", L"%SystemRoot%\\Media\\ReactOS_Battery_Critical.wav" }, + { L"DeviceConnect", L"%SystemRoot%\\Media\\ReactOS_Hardware_Insert.wav" }, + { L"DeviceDisconnect", L"%SystemRoot%\\Media\\ReactOS_Hardware_Remove.wav" }, + { L"DeviceFail", L"%SystemRoot%\\Media\\ReactOS_Hardware_Fail.wav" }, + { L"LowBatteryAlarm", L"%SystemRoot%\\Media\\ReactOS_Battery_Low.wav" }, + { L"MailBeep", L"%SystemRoot%\\Media\\ReactOS_Notify.wav" }, + { L"Maximize", L"%SystemRoot%\\Media\\ReactOS_Restore.wav" }, + { L"MenuCommand", L"%SystemRoot%\\Media\\ReactOS_Menu_Command.wav" }, + { L"MenuPopup", L"" }, + { L"Minimize", L"%SystemRoot%\\Media\\ReactOS_Minimize.wav" }, + { L"Open", L"" }, + { L"PrintComplete", L"%SystemRoot%\\Media\\ReactOS_Print_Complete.wav" }, + { L"RestoreDown", L"" }, + { L"RestoreUp", L"" }, + { L"SystemAsterisk", L"%SystemRoot%\\Media\\ReactOS_Ding.wav" }, + { L"SystemExclamation", L"%SystemRoot%\\Media\\ReactOS_Exclamation.wav" }, + { L"SystemExit", L"%SystemRoot%\\Media\\ReactOS_Shutdown.wav" }, + { L"SystemHand", L"%SystemRoot%\\Media\\ReactOS_Critical_Stop.wav" }, + { L"SystemNotification", L"%SystemRoot%\\Media\\ReactOS_Balloon.wav" }, + { L"SystemQuestion", L"%SystemRoot%\\Media\\ReactOS_Ding.wav" }, + { L"SystemStart", L"%SystemRoot%\\Media\\ReactOS_Startup.wav" }, + { L"WindowsLogoff", L"%SystemRoot%\\Media\\ReactOS_LogOff.wav" } +/* Logon sound is already set by default for both Server and Workstation */ +}; + +static const WCHAR* s_ExplorerSoundEvents[][2] = +{ + { L"EmptyRecycleBin", L"%SystemRoot%\\Media\\ReactOS_Recycle.wav" }, + { L"Navigating", L"%SystemRoot%\\Media\\ReactOS_Start.wav" } +}; + +static BOOL +DoWriteSoundEvents(HKEY hKey, + LPCWSTR lpSubkey, + LPCWSTR lpEventsArray[][2], + DWORD dwSize) +{ + HKEY hRootKey, hEventKey, hDefaultKey; + LONG error; + ULONG i; + WCHAR szDest[MAX_PATH]; + DWORD dwAttribs; + DWORD cbData; + + /* Open the sound events key */ + error = RegOpenKeyExW(hKey, lpSubkey, 0, KEY_READ, &hRootKey); + if (error) + { + DPRINT1("RegOpenKeyExW failed\n"); + goto Error; + } + + /* Set each sound event */ + for (i = 0; i < dwSize; i++) + { + /* + * Verify that the sound file exists and is an actual file. + */ + + /* Expand the sound file path */ + if (!ExpandEnvironmentStringsW(lpEventsArray[i][1], szDest, _countof(szDest))) + { + /* Failed to expand, continue with the next sound event */ + continue; + } + + /* Check if the sound file exists and isn't a directory */ + dwAttribs = GetFileAttributesW(szDest); + if ((dwAttribs == INVALID_FILE_ATTRIBUTES) || + (dwAttribs & FILE_ATTRIBUTE_DIRECTORY)) + { + /* It does not, just continue with the next sound event */ + continue; + } + + /* + * Create the sound event entry. + */ + + /* Open the sound event subkey */ + error = RegOpenKeyExW(hRootKey, lpEventsArray[i][0], 0, KEY_READ, &hEventKey); + if (error) + { + /* Failed to open, continue with next sound event */ + continue; + } + + /* Open .Default subkey */ + error = RegOpenKeyExW(hEventKey, L".Default", 0, KEY_WRITE, &hDefaultKey); + RegCloseKey(hEventKey); + if (error) + { + /* Failed to open, continue with next sound event */ + continue; + } + + /* Associate the sound file to this sound event */ + cbData = (lstrlenW(lpEventsArray[i][1]) + 1) * sizeof(WCHAR); + error = RegSetValueExW(hDefaultKey, NULL, 0, REG_EXPAND_SZ, (const BYTE *)lpEventsArray[i][1], cbData); + RegCloseKey(hDefaultKey); + if (error) + { + /* Failed to set the value, continue with next sound event */ + continue; + } + } + +Error: + if (hRootKey) + RegCloseKey(hRootKey); + + return error == ERROR_SUCCESS; +} + static BOOL DoWriteProductOption(PRODUCT_OPTION nOption) { @@ -509,6 +631,13 @@ DoWriteProductOption(PRODUCT_OPTION nOption) goto Error; } + if (nOption == PRODUCT_OPTION_WORKSTATION) + { + /* Write system sound events values for Workstation */ + DoWriteSoundEvents(HKEY_CURRENT_USER, s_szDefaultSoundEvents, s_DefaultSoundEvents, _countof(s_DefaultSoundEvents)); + DoWriteSoundEvents(HKEY_CURRENT_USER, s_szExplorerSoundEvents, s_ExplorerSoundEvents, _countof(s_ExplorerSoundEvents)); + } + Error: if (hKey) RegCloseKey(hKey);

1 0

[reactos] 04/04: Update based on reviewer comments.
by Doug Lyons 27 Dec '21

27 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f68efe516e1c4b21337bf… commit f68efe516e1c4b21337bf53b80926065a8527414 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Feb 9 12:15:50 2020 -0600 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Dec 28 02:03:54 2021 +0300 Update based on reviewer comments. --- base/applications/cmdutils/attrib/attrib.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/base/applications/cmdutils/attrib/attrib.c b/base/applications/cmdutils/attrib/attrib.c index eb207eb7d80..6eaf053b95a 100644 --- a/base/applications/cmdutils/attrib/attrib.c +++ b/base/applications/cmdutils/attrib/attrib.c @@ -129,13 +129,13 @@ PrintAttribute( if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) continue; - if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) + if (!wcscmp(findData.cFileName, L".") || + !wcscmp(findData.cFileName, L"..")) continue; wcscpy(pszFileName, findData.cFileName); wcscat(pszFileName, L"\\"); - bFound = PrintAttribute(szFullName, pszFile, bRecurse, - bDirectories) || bFound; + bFound != PrintAttribute(szFullName, pszFile, bRecurse, bDirectories); } while (FindNextFileW(hFind, &findData)); FindClose(hFind); @@ -159,7 +159,8 @@ PrintAttribute( if (bIsDir && !bDirectories && !bExactMatch) continue; - if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) + if (!wcscmp(findData.cFileName, L".") || + !wcscmp(findData.cFileName, L"..")) continue; wcscpy(pszFileName, findData.cFileName); @@ -226,13 +227,14 @@ ChangeAttribute( if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) continue; - if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) + if (!wcscmp(findData.cFileName, L".") || + !wcscmp(findData.cFileName, L"..")) continue; wcscpy(pszFileName, findData.cFileName); wcscat(pszFileName, L"\\"); - bFound = ChangeAttribute(szFullName, pszFile, bRecurse, bDirectories, - dwMask, dwAttrib) || bFound; + bFound != ChangeAttribute(szFullName, pszFile, bRecurse, bDirectories, + dwMask, dwAttrib); } while (FindNextFileW(hFind, &findData)); FindClose(hFind); @@ -256,7 +258,8 @@ ChangeAttribute( if (bIsDir && !bDirectories && !bExactMatch) continue; - if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) + if (!wcscmp(findData.cFileName, L".") || + !wcscmp(findData.cFileName, L"..")) continue; if (bRecurse && bIsDir && !bDirectories)

1 0

[reactos] 03/04: Fewer GetLastError() function calls.
by Doug Lyons 27 Dec '21

27 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e1d0128ffce745d4c1b22… commit e1d0128ffce745d4c1b22f28a394d90f14df5dbc Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Tue Dec 10 22:24:03 2019 -0600 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Dec 28 02:03:54 2021 +0300 Fewer GetLastError() function calls. --- base/applications/cmdutils/attrib/attrib.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/base/applications/cmdutils/attrib/attrib.c b/base/applications/cmdutils/attrib/attrib.c index fd5b5e8372a..eb207eb7d80 100644 --- a/base/applications/cmdutils/attrib/attrib.c +++ b/base/applications/cmdutils/attrib/attrib.c @@ -86,14 +86,14 @@ ErrorMessage( ConPrintf(StdOut, L"%s\n", szMsg); } -/* Returns TRUE if anything found and listed, FALSE otherwise */ +/* Returns TRUE if anything is printed, FALSE otherwise */ static BOOL PrintAttribute( LPWSTR pszPath, LPWSTR pszFile, - BOOL bRecurse, - BOOL bDirectories) + BOOL bRecurse, + BOOL bDirectories) { WIN32_FIND_DATAW findData; HANDLE hFind; @@ -102,6 +102,7 @@ PrintAttribute( BOOL bFound = FALSE; BOOL bIsDir; BOOL bExactMatch; + DWORD Error; /* prepare full file name buffer */ wcscpy(szFullName, pszPath); @@ -116,9 +117,10 @@ PrintAttribute( hFind = FindFirstFileW(szFullName, &findData); if (hFind == INVALID_HANDLE_VALUE) { - if ((GetLastError() != ERROR_DIRECTORY) && (GetLastError() != ERROR_SHARING_VIOLATION) - && (GetLastError() != ERROR_FILE_NOT_FOUND)) - ErrorMessage(GetLastError(), pszFile); + Error = GetLastError(); + if ((Error != ERROR_DIRECTORY) && (Error != ERROR_SHARING_VIOLATION) + && (Error != ERROR_FILE_NOT_FOUND)) + ErrorMessage(Error, pszFile); return FALSE; } @@ -197,6 +199,7 @@ ChangeAttribute( BOOL bIsDir; BOOL bExactMatch; DWORD dwAttribute; + DWORD Error; /* prepare full file name buffer */ wcscpy(szFullName, pszPath); @@ -211,9 +214,10 @@ ChangeAttribute( hFind = FindFirstFileW(szFullName, &findData); if (hFind == INVALID_HANDLE_VALUE) { - if ((GetLastError() != ERROR_DIRECTORY) && (GetLastError() != ERROR_SHARING_VIOLATION) - && (GetLastError() != ERROR_FILE_NOT_FOUND)) - ErrorMessage(GetLastError(), pszFile); + Error = GetLastError(); + if ((Error != ERROR_DIRECTORY) && (Error != ERROR_SHARING_VIOLATION) + && (Error != ERROR_FILE_NOT_FOUND)) + ErrorMessage(Error, pszFile); return FALSE; }

1 0

[reactos] 02/04: Indentation fixes.
by Doug Lyons 27 Dec '21

27 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c8a86b4ccea62546e2a7… commit 9c8a86b4ccea62546e2a7c7736b79ec4d0419da4 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Tue Dec 10 20:15:54 2019 -0600 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Dec 28 02:03:54 2021 +0300 Indentation fixes. --- base/applications/cmdutils/attrib/attrib.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/base/applications/cmdutils/attrib/attrib.c b/base/applications/cmdutils/attrib/attrib.c index 0b226898185..fd5b5e8372a 100644 --- a/base/applications/cmdutils/attrib/attrib.c +++ b/base/applications/cmdutils/attrib/attrib.c @@ -417,19 +417,19 @@ int wmain(int argc, WCHAR *argv[]) // Code below handles the special case of 'attrib +h /s' and similar if (bRecurse && dwMask && (wcscmp(szPath, L"") == 0)) - { - DWORD len; + { + DWORD len; - len = GetCurrentDirectory(MAX_PATH, szPath); - if (szPath[len-1] != L'\\') - { - szPath[len] = L'\\'; - szPath[len + 1] = UNICODE_NULL; - } - wcscpy(szFileName, L"*.*"); - if (!ChangeAttribute(szPath, szFileName, bRecurse, bDirectories, dwMask, dwAttrib)) - ConResPrintf(StdOut, STRING_FILE_NOT_FOUND, szFileName); + len = GetCurrentDirectory(MAX_PATH, szPath); + if (szPath[len-1] != L'\\') + { + szPath[len] = L'\\'; + szPath[len + 1] = UNICODE_NULL; } + wcscpy(szFileName, L"*.*"); + if (!ChangeAttribute(szPath, szFileName, bRecurse, bDirectories, dwMask, dwAttrib)) + ConResPrintf(StdOut, STRING_FILE_NOT_FOUND, szFileName); + } return 0; }

1 0

[reactos] 01/04: attrib command improvements
by Doug Lyons 27 Dec '21

27 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f83f650dd695cf6dbb849… commit f83f650dd695cf6dbb8490588e9d63c4fe9cfafa Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Dec 8 09:24:28 2019 -0600 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Dec 28 02:03:54 2021 +0300 attrib command improvements --- base/applications/cmdutils/attrib/attrib.c | 217 ++++++++++++++++------------- 1 file changed, 117 insertions(+), 100 deletions(-) diff --git a/base/applications/cmdutils/attrib/attrib.c b/base/applications/cmdutils/attrib/attrib.c index 4691821c3c6..0b226898185 100644 --- a/base/applications/cmdutils/attrib/attrib.c +++ b/base/applications/cmdutils/attrib/attrib.c @@ -86,17 +86,22 @@ ErrorMessage( ConPrintf(StdOut, L"%s\n", szMsg); } +/* Returns TRUE if anything found and listed, FALSE otherwise */ static -INT +BOOL PrintAttribute( LPWSTR pszPath, LPWSTR pszFile, - BOOL bRecurse) + BOOL bRecurse, + BOOL bDirectories) { WIN32_FIND_DATAW findData; HANDLE hFind; WCHAR szFullName[MAX_PATH]; LPWSTR pszFileName; + BOOL bFound = FALSE; + BOOL bIsDir; + BOOL bExactMatch; /* prepare full file name buffer */ wcscpy(szFullName, pszPath); @@ -105,14 +110,16 @@ PrintAttribute( /* display all subdirectories */ if (bRecurse) { - /* append file name */ - wcscpy(pszFileName, pszFile); + /* append *.* */ + wcscpy(pszFileName, L"*.*"); hFind = FindFirstFileW(szFullName, &findData); if (hFind == INVALID_HANDLE_VALUE) { - ErrorMessage(GetLastError(), pszFile); - return 1; + if ((GetLastError() != ERROR_DIRECTORY) && (GetLastError() != ERROR_SHARING_VIOLATION) + && (GetLastError() != ERROR_FILE_NOT_FOUND)) + ErrorMessage(GetLastError(), pszFile); + return FALSE; } do @@ -120,31 +127,39 @@ PrintAttribute( if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) continue; - if (!wcscmp(findData.cFileName, L".") || - !wcscmp(findData.cFileName, L"..")) + if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) continue; wcscpy(pszFileName, findData.cFileName); wcscat(pszFileName, L"\\"); - PrintAttribute(szFullName, pszFile, bRecurse); + bFound = PrintAttribute(szFullName, pszFile, bRecurse, + bDirectories) || bFound; } - while(FindNextFileW(hFind, &findData)); + while (FindNextFileW(hFind, &findData)); FindClose(hFind); } /* append file name */ wcscpy(pszFileName, pszFile); - /* display current directory */ + /* search current directory */ hFind = FindFirstFileW(szFullName, &findData); if (hFind == INVALID_HANDLE_VALUE) { - ErrorMessage(GetLastError(), pszFile); - return 1; + return bFound; } do { + bIsDir = findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY; + bExactMatch = wcsicmp(findData.cFileName, pszFile) == 0; + + if (bIsDir && !bDirectories && !bExactMatch) + continue; + + if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) + continue; + wcscpy(pszFileName, findData.cFileName); ConPrintf(StdOut, @@ -154,129 +169,112 @@ PrintAttribute( (findData.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) ? L'H' : L' ', (findData.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? L'R' : L' ', szFullName); + bFound = TRUE; } while(FindNextFileW(hFind, &findData)); FindClose(hFind); - return 0; + return bFound; } +/* Returns TRUE if anything changed, FALSE otherwise */ static BOOL ChangeAttribute( LPWSTR pszPath, LPWSTR pszFile, + BOOL bRecurse, + BOOL bDirectories, DWORD dwMask, - DWORD dwAttrib, - BOOL bRecurse, - BOOL bDirectories) + DWORD dwAttrib) { WIN32_FIND_DATAW findData; HANDLE hFind; - DWORD dwAttribute; WCHAR szFullName[MAX_PATH]; LPWSTR pszFileName; - BOOL bWildcard = (wcschr(pszFile, L'*') || wcschr(pszFile, L'?')); + BOOL bFound = FALSE; + BOOL bIsDir; + BOOL bExactMatch; + DWORD dwAttribute; /* prepare full file name buffer */ wcscpy(szFullName, pszPath); pszFileName = szFullName + wcslen(szFullName); + /* display all subdirectories */ + if (bRecurse) + { + /* append *.* */ + wcscpy(pszFileName, L"*.*"); + + hFind = FindFirstFileW(szFullName, &findData); + if (hFind == INVALID_HANDLE_VALUE) + { + if ((GetLastError() != ERROR_DIRECTORY) && (GetLastError() != ERROR_SHARING_VIOLATION) + && (GetLastError() != ERROR_FILE_NOT_FOUND)) + ErrorMessage(GetLastError(), pszFile); + return FALSE; + } + + do + { + if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + continue; + + if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) + continue; + + wcscpy(pszFileName, findData.cFileName); + wcscat(pszFileName, L"\\"); + bFound = ChangeAttribute(szFullName, pszFile, bRecurse, bDirectories, + dwMask, dwAttrib) || bFound; + } + while (FindNextFileW(hFind, &findData)); + FindClose(hFind); + } + /* append file name */ wcscpy(pszFileName, pszFile); + /* search current directory */ hFind = FindFirstFileW(szFullName, &findData); if (hFind == INVALID_HANDLE_VALUE) - return FALSE; - - dwAttribute = findData.dwFileAttributes; - - if (!bWildcard) { - FindClose(hFind); - if (dwAttribute & FILE_ATTRIBUTE_DIRECTORY) - { - dwAttribute = (dwAttribute & ~dwMask) | dwAttrib; - SetFileAttributes(szFullName, dwAttribute); - if (bRecurse) - { - if (bDirectories) - { - ChangeAttribute(szFullName, L"*", dwMask, dwAttrib, - bRecurse, bDirectories); - } - else - { - if (!ChangeAttribute(szFullName, L"*", dwMask, dwAttrib, - bRecurse, FALSE)) - { - return FALSE; - } - } - } - else - { - if (!bDirectories) - { - ChangeAttribute(szFullName, L"*", dwMask, dwAttrib, - bRecurse, FALSE); - } - } - return TRUE; - } - else - { - dwAttribute = (dwAttribute & ~dwMask) | dwAttrib; - SetFileAttributes(szFullName, dwAttribute); - return TRUE; - } + return bFound; } - else + + do { - if ((dwAttribute & FILE_ATTRIBUTE_DIRECTORY) && (!bRecurse || !bDirectories)) - return FALSE; + bIsDir = findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY; + bExactMatch = wcsicmp(findData.cFileName, pszFile) == 0; - do - { - dwAttribute = findData.dwFileAttributes; - if (dwAttribute & FILE_ATTRIBUTE_DIRECTORY) - { - if (!bDirectories) - continue; - - if (!wcscmp(findData.cFileName, L".") || - !wcscmp(findData.cFileName, L"..")) - continue; - - wcscpy(pszFileName, findData.cFileName); - dwAttribute = (dwAttribute & ~dwMask) | dwAttrib; - SetFileAttributes(szFullName, dwAttribute); - - if (bRecurse) - { - ChangeAttribute(szFullName, findData.cFileName, dwMask, - dwAttrib, bRecurse, FALSE); - } - } - else - { - wcscpy(pszFileName, findData.cFileName); - dwAttribute = (dwAttribute & ~dwMask) | dwAttrib; - SetFileAttributes(szFullName, dwAttribute); - } - } while (FindNextFileW(hFind, &findData)); + if (bIsDir && !bDirectories && !bExactMatch) + continue; - FindClose(hFind); + if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) + continue; + + if (bRecurse && bIsDir && !bDirectories) + continue; + + wcscpy(pszFileName, findData.cFileName); + + dwAttribute = (findData.dwFileAttributes & ~dwMask) | dwAttrib; + + SetFileAttributes(szFullName, dwAttribute); + bFound = TRUE; } + while(FindNextFileW(hFind, &findData)); + FindClose(hFind); - return TRUE; + return bFound; } int wmain(int argc, WCHAR *argv[]) { INT i; - WCHAR szPath[MAX_PATH]; + WCHAR szPath[MAX_PATH] = L""; // For case we only use 'attrib +h /s' there is no szPath WCHAR szFileName [MAX_PATH]; BOOL bRecurse = FALSE; BOOL bDirectories = FALSE; @@ -389,7 +387,7 @@ int wmain(int argc, WCHAR *argv[]) szPath[len + 1] = UNICODE_NULL; } wcscpy(szFileName, L"*.*"); - PrintAttribute(szPath, szFileName, bRecurse); + PrintAttribute(szPath, szFileName, bRecurse, bDirectories); return 0; } @@ -405,14 +403,33 @@ int wmain(int argc, WCHAR *argv[]) if (dwMask == 0) { - PrintAttribute(szPath, szFileName, bRecurse); + if (!PrintAttribute(szPath, szFileName, bRecurse, bDirectories)) + { + ConResPrintf(StdOut, STRING_FILE_NOT_FOUND, argv[i]); + } } - else if (!ChangeAttribute(szPath, szFileName, dwMask, - dwAttrib, bRecurse, bDirectories)) + else if (!ChangeAttribute(szPath, szFileName, bRecurse, bDirectories, dwMask, dwAttrib)) { ConResPrintf(StdOut, STRING_FILE_NOT_FOUND, argv[i]); } } +// Code below handles the special case of 'attrib +h /s' and similar + + if (bRecurse && dwMask && (wcscmp(szPath, L"") == 0)) + { + DWORD len; + + len = GetCurrentDirectory(MAX_PATH, szPath); + if (szPath[len-1] != L'\\') + { + szPath[len] = L'\\'; + szPath[len + 1] = UNICODE_NULL; + } + wcscpy(szFileName, L"*.*"); + if (!ChangeAttribute(szPath, szFileName, bRecurse, bDirectories, dwMask, dwAttrib)) + ConResPrintf(StdOut, STRING_FILE_NOT_FOUND, szFileName); + } + return 0; }

1 0

← Newer
1
2
3
4
5
6
7
8
...
16
Older →

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 December 2021