Ros-diffs November 2023

ros-diffs@reactos.org

20 participants
274 discussions

[reactos] 01/01: [ACLUI] Let image list be automatically deleted (#5890)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=43d6fdf2be32b676156fe… commit 43d6fdf2be32b676156feef1760d5662376d9776 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 5 21:36:05 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 5 21:36:05 2023 +0900 [ACLUI] Let image list be automatically deleted (#5890) Based on KRosUser's aclui.patch. The list view will automatically delete the image list. Don't delete the image list in DestroySecurityPage function. CORE-19187 --- dll/win32/aclui/aclui.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dll/win32/aclui/aclui.c b/dll/win32/aclui/aclui.c index 5a3f7b6d091..0ec2d8255e7 100644 --- a/dll/win32/aclui/aclui.c +++ b/dll/win32/aclui/aclui.c @@ -87,11 +87,6 @@ AceHeaderToSID(IN PACE_HEADER AceHeader) static VOID DestroySecurityPage(IN PSECURITY_PAGE sp) { - if(sp->hiPrincipals != NULL) - { - ImageList_Destroy(sp->hiPrincipals); - } - DestroySidCacheMgr(sp->SidCacheMgr); if (sp->OwnerSid != NULL)

10 months, 2 weeks

[reactos] 01/01: [CMLIB] Revert previous commit to avoid future merges of other devs

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f80d5ee79562ae8a7c78… commit 7f80d5ee79562ae8a7c78f0d0acf32581e69facf Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Nov 5 09:55:03 2023 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Nov 5 09:55:03 2023 +0100 [CMLIB] Revert previous commit to avoid future merges of other devs because George is having an open Draft PR since July 2022, which might also touch this file on master in some years. And it ofc is easier for me to revert my work now, then for him to go through the great lengths of merging his work then. --- sdk/lib/cmlib/hivewrt.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sdk/lib/cmlib/hivewrt.c b/sdk/lib/cmlib/hivewrt.c index 46800c21741..76bf72b1b45 100644 --- a/sdk/lib/cmlib/hivewrt.c +++ b/sdk/lib/cmlib/hivewrt.c @@ -13,8 +13,6 @@ static BOOLEAN CMAPI HvpWriteLog( PHHIVE RegistryHive) { - UNIMPLEMENTED_ONCE; -#if 0 // UNIMPLEMENTED ULONG FileOffset; UINT32 BufferSize; UINT32 BitmapSize; @@ -24,6 +22,13 @@ HvpWriteLog( ULONG LastIndex; PVOID BlockPtr; BOOLEAN Success; + static ULONG PrintCount = 0; + + if (PrintCount++ == 0) + { + UNIMPLEMENTED; + } + return TRUE; ASSERT(RegistryHive->ReadOnly == FALSE); ASSERT(RegistryHive->BaseBlock->Length == @@ -134,7 +139,7 @@ HvpWriteLog( { DPRINT("FileFlush failed\n"); } -#endif // UNIMPLEMENTED + return TRUE; }

10 months, 2 weeks

[reactos] 01/01: [CALC] Use <winuser.rh> instead of <winuser.h> in resource.rc

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ae6cb7a96b250919d288… commit 1ae6cb7a96b250919d288d5dc62a433276356e36 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 5 17:21:33 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 5 17:21:33 2023 +0900 [CALC] Use <winuser.rh> instead of <winuser.h> in resource.rc --- base/applications/calc/resource.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/calc/resource.rc b/base/applications/calc/resource.rc index 9c65e1aa512..d756a6687fc 100644 --- a/base/applications/calc/resource.rc +++ b/base/applications/calc/resource.rc @@ -19,7 +19,7 @@ */ #include <windef.h> -#include <winuser.h> +#include <winuser.rh> #include "resource.h"

10 months, 2 weeks

[reactos] 01/01: [REGEDIT] Use <winuser.rh> instead of <winuser.h> in regedit.rc

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6691cbe8895bb76b69dff… commit 6691cbe8895bb76b69dff7f994b02660e8b9c7d1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 5 17:17:09 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 5 17:18:07 2023 +0900 [REGEDIT] Use <winuser.rh> instead of <winuser.h> in regedit.rc CORE-18876 --- base/applications/regedit/regedit.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/regedit/regedit.rc b/base/applications/regedit/regedit.rc index 18568e40aff..92d85406224 100644 --- a/base/applications/regedit/regedit.rc +++ b/base/applications/regedit/regedit.rc @@ -19,7 +19,7 @@ */ #include <windef.h> -#include <winuser.h> +#include <winuser.rh> #include <commctrl.h> #include "resource.h"

10 months, 2 weeks

[reactos] 01/01: [CMLIB] UNIMPLEMENTED_ONCE less hand-knitted (#5889)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6de3881ca8418005be1a… commit f6de3881ca8418005be1a9335dc27a554380987d Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Nov 5 09:12:49 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 5 09:12:49 2023 +0100 [CMLIB] UNIMPLEMENTED_ONCE less hand-knitted (#5889) allows to get rid of static var PrintCount, at least visually in the code --- sdk/lib/cmlib/hivewrt.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/sdk/lib/cmlib/hivewrt.c b/sdk/lib/cmlib/hivewrt.c index 76bf72b1b45..46800c21741 100644 --- a/sdk/lib/cmlib/hivewrt.c +++ b/sdk/lib/cmlib/hivewrt.c @@ -13,6 +13,8 @@ static BOOLEAN CMAPI HvpWriteLog( PHHIVE RegistryHive) { + UNIMPLEMENTED_ONCE; +#if 0 // UNIMPLEMENTED ULONG FileOffset; UINT32 BufferSize; UINT32 BitmapSize; @@ -22,13 +24,6 @@ HvpWriteLog( ULONG LastIndex; PVOID BlockPtr; BOOLEAN Success; - static ULONG PrintCount = 0; - - if (PrintCount++ == 0) - { - UNIMPLEMENTED; - } - return TRUE; ASSERT(RegistryHive->ReadOnly == FALSE); ASSERT(RegistryHive->BaseBlock->Length == @@ -139,7 +134,7 @@ HvpWriteLog( { DPRINT("FileFlush failed\n"); } - +#endif // UNIMPLEMENTED return TRUE; }

10 months, 2 weeks

[reactos] 01/01: [NOTEPAD] Use <winuser.rh> instead of <winuser.h> in rsrc.rc

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=efb9128c2455c3ae61b41… commit efb9128c2455c3ae61b41dd2a0eb08e71aa02f49 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 5 17:11:06 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 5 17:11:06 2023 +0900 [NOTEPAD] Use <winuser.rh> instead of <winuser.h> in rsrc.rc CORE-18837 --- base/applications/notepad/rsrc.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/notepad/rsrc.rc b/base/applications/notepad/rsrc.rc index 00b65b0889b..e0e9cea007a 100644 --- a/base/applications/notepad/rsrc.rc +++ b/base/applications/notepad/rsrc.rc @@ -7,7 +7,7 @@ */ #include <windef.h> -#include <winuser.h> +#include <winuser.rh> #include <dlgs.h> #include "notepad_res.h"

10 months, 2 weeks

[reactos] 01/01: [HOTPLUG] Trivial fixes (#5887)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81ba804b55b7edea31a95… commit 81ba804b55b7edea31a95b6b808cb3613563db9a Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Sun Nov 5 07:02:22 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 5 07:02:22 2023 +0700 [HOTPLUG] Trivial fixes (#5887) - Update files header and copyright information - Minor code formatting --- dll/cpl/hotplug/enum.c | 2 +- dll/cpl/hotplug/hotplug.c | 22 ++++++---------------- dll/cpl/hotplug/hotplug.rc | 9 ++++----- 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/dll/cpl/hotplug/enum.c b/dll/cpl/hotplug/enum.c index 698e94b0cb3..8f9dbc5e42a 100644 --- a/dll/cpl/hotplug/enum.c +++ b/dll/cpl/hotplug/enum.c @@ -2,7 +2,7 @@ * PROJECT: Safely Remove Hardware Applet * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Device enumeration - * COPYRIGHT: Copyright 2013 Johannes Anderwald <johannes.anderwald(a)reactos.org> + * COPYRIGHT: Copyright 2020 Eric Kohl <eric.kohl(a)reactos.org> * Copyright 2023 Thamatip Chitpong <thamatip.chitpong(a)reactos.org> */ diff --git a/dll/cpl/hotplug/hotplug.c b/dll/cpl/hotplug/hotplug.c index 1c50fc62fb1..2b59f8d43c9 100644 --- a/dll/cpl/hotplug/hotplug.c +++ b/dll/cpl/hotplug/hotplug.c @@ -1,10 +1,10 @@ /* -* PROJECT: Safely Remove Hardware Applet -* LICENSE: GPL - See COPYING in the top level directory -* FILE: dll/cpl/hotplug/hotplug.c -* PURPOSE: applet initialization -* PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) -*/ + * PROJECT: Safely Remove Hardware Applet + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Applet initialization + * COPYRIGHT: Copyright 2013 Johannes Anderwald <johannes.anderwald(a)reactos.org> + * Copyright 2020 Eric Kohl <eric.kohl(a)reactos.org> + */ #include "hotplug.h" @@ -53,7 +53,6 @@ done: return dwFlags; } - static DWORD SetHotPlugFlags( @@ -106,7 +105,6 @@ UpdateDialog( EnableWindow(GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_STOP), bHasItem); } - static VOID ShowContextMenu( @@ -136,7 +134,6 @@ ShowContextMenu( NULL); } - static DEVINST GetSelectedDeviceInst( @@ -364,14 +361,10 @@ SafeRemovalDlgProc( SetupDiDestroyClassImageList(&pHotplugData->ImageListData); if (pHotplugData->hIconSm) - { DestroyIcon(pHotplugData->hIconSm); - } if (pHotplugData->hIcon) - { DestroyIcon(pHotplugData->hIcon); - } HeapFree(GetProcessHeap(), 0, pHotplugData); SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)NULL); @@ -382,7 +375,6 @@ SafeRemovalDlgProc( return FALSE; } - LONG APIENTRY InitApplet( @@ -402,7 +394,6 @@ InitApplet( return TRUE; } - LONG CALLBACK CPlApplet( @@ -451,7 +442,6 @@ CPlApplet( return FALSE; } - INT WINAPI DllMain( diff --git a/dll/cpl/hotplug/hotplug.rc b/dll/cpl/hotplug/hotplug.rc index 8979476f923..75dbb9b1f50 100644 --- a/dll/cpl/hotplug/hotplug.rc +++ b/dll/cpl/hotplug/hotplug.rc @@ -1,9 +1,8 @@ /* - * PROJECT: ReactOS Safely Remove Hardware Applet - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/cpl/hotplug/hotplug.rc - * PURPOSE: main resource file - * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) + * PROJECT: Safely Remove Hardware Applet + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Main resource file + * COPYRIGHT: Copyright 2013 Johannes Anderwald <johannes.anderwald(a)reactos.org> */ #include <windef.h>

10 months, 2 weeks

[reactos] 01/01: [RAPPS] Improve LicenseType handling (#5809)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b0398184677dcd19a7e9… commit 4b0398184677dcd19a7e9609f9d4eb8c42e00672 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Nov 4 22:08:10 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 4 22:08:10 2023 +0100 [RAPPS] Improve LicenseType handling (#5809) Tries now to map the "License" text set to "Freeware" to the LICENSE_FREEWARE "LicenseType" so it is translated correctly (LoadString). Fixes the following: - If only the "License" field is set in the DB, nothing will change (this applies to 99% of the current entries in the DB). - If both "LicenseType" and "License" are set, both will be used (no observable change in behavior): "Open Source (GPL v2)" etc. - If only "LicenseType" is set, it will now display just the type "Freeware" instead of "Freeware ()". This is done only for "Freeware", because the others (the open source ones) have many variations. "OpenSource", "Open Source", "Open Source (GPL)" etc. --- base/applications/rapps/appinfo.cpp | 11 +++++++++-- base/applications/rapps/include/appinfo.h | 10 +++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/base/applications/rapps/appinfo.cpp b/base/applications/rapps/appinfo.cpp index 765f02016bb..7e00c4224e8 100644 --- a/base/applications/rapps/appinfo.cpp +++ b/base/applications/rapps/appinfo.cpp @@ -159,13 +159,18 @@ CAvailableApplicationInfo::LicenseString() m_Parser->GetString(L"License", szLicenseString); LicenseType licenseType; - if (IsLicenseType(IntBuffer)) + if (IsKnownLicenseType(IntBuffer)) { licenseType = static_cast<LicenseType>(IntBuffer); } else { licenseType = LICENSE_NONE; + if (szLicenseString.CompareNoCase(L"Freeware") == 0) + { + licenseType = LICENSE_FREEWARE; + szLicenseString = L""; + } } CStringW szLicense; @@ -184,7 +189,9 @@ CAvailableApplicationInfo::LicenseString() return szLicenseString; } - return szLicense + L" (" + szLicenseString + L")"; + if (!szLicenseString.IsEmpty()) + szLicense += L" (" + szLicenseString + L")"; + return szLicense; } VOID diff --git a/base/applications/rapps/include/appinfo.h b/base/applications/rapps/include/appinfo.h index 7ea0c65e537..639d3fc8182 100644 --- a/base/applications/rapps/include/appinfo.h +++ b/base/applications/rapps/include/appinfo.h @@ -8,17 +8,17 @@ enum LicenseType { LICENSE_NONE, - LICENSE_OPENSOURCE, - LICENSE_FREEWARE, - LICENSE_TRIAL, + LICENSE_OPENSOURCE = 1, + LICENSE_FREEWARE = 2, + LICENSE_TRIAL = 3, LICENSE_MIN = LICENSE_NONE, LICENSE_MAX = LICENSE_TRIAL }; inline BOOL -IsLicenseType(INT x) +IsKnownLicenseType(INT x) { - return (x >= LICENSE_MIN && x <= LICENSE_MAX); + return (x > LICENSE_NONE && x <= LICENSE_MAX); } enum AppsCategories

10 months, 2 weeks

[reactos] 01/01: [NETSHELL] Register folder attributes as SFGAO_FOLDER, not SFGAO_CANDELETE (#5880)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3c1f652ecab59d1d55f9… commit b3c1f652ecab59d1d55f9162ab0602ae0017fd2a Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Nov 4 15:40:22 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 4 17:40:22 2023 +0300 [NETSHELL] Register folder attributes as SFGAO_FOLDER, not SFGAO_CANDELETE (#5880) On Windows the Network connections folder uses a binary value and someone forgot about Little Endian when converting it to a DWORD. Addendum to 7eb3fcf1d (r66485). CORE-9276 This issue has not been very visible because of bugs in CRegFolderEnum. --- dll/shellext/netshell/res/netshell.rgs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/shellext/netshell/res/netshell.rgs b/dll/shellext/netshell/res/netshell.rgs index c5b57b659ae..103005a3e6a 100644 --- a/dll/shellext/netshell/res/netshell.rgs +++ b/dll/shellext/netshell/res/netshell.rgs @@ -11,7 +11,7 @@ HKCR DefaultIcon = s '%MODULE%' ShellFolder { - val Attributes = d '0x00000020' + val Attributes = d '0x20000000' } val LocalizedString = s '@%MODULE%,-10000' }

10 months, 2 weeks

[reactos] 01/01: [NETSHELL] Call ReleaseWriteLock. Fixes CORE-18349 (#5881)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6c838299c7014f8674e6… commit a6c838299c7014f8674e6623856179514f9eedb3 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Nov 4 15:19:10 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 4 15:19:10 2023 +0100 [NETSHELL] Call ReleaseWriteLock. Fixes CORE-18349 (#5881) --- dll/shellext/netshell/lanconnectui.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dll/shellext/netshell/lanconnectui.cpp b/dll/shellext/netshell/lanconnectui.cpp index 3d9e0f48a50..d0c5b0b2e28 100644 --- a/dll/shellext/netshell/lanconnectui.cpp +++ b/dll/shellext/netshell/lanconnectui.cpp @@ -17,6 +17,10 @@ CNetConnectionPropertyUi::~CNetConnectionPropertyUi() if (m_pNCfg) m_pNCfg->Uninitialize(); + // Note: MSDN says we can only unlock after INetCfg::Uninitialize + if (m_NCfgLock) + m_NCfgLock->ReleaseWriteLock(); + if (m_pProperties) NcFreeNetconProperties(m_pProperties); } @@ -181,7 +185,10 @@ CNetConnectionPropertyUi::InitializeLANPropertiesUIDlg(HWND hwndDlg) hr = pNCfg->Initialize(NULL); if (FAILED_UNEXPECTEDLY(hr)) + { + pNCfgLock->ReleaseWriteLock(); return; + } m_pNCfg = pNCfg; m_NCfgLock = pNCfgLock;

10 months, 2 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2023