Ros-diffs October 2023

ros-diffs@reactos.org

21 participants
140 discussions

[reactos] 01/01: [MSPAINT] Update scroll info on loading file (#5761)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a90009bb9651d3c52777… commit 1a90009bb9651d3c52777a8d356bb4392937be81 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 5 20:01:41 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 5 20:01:41 2023 +0900 [MSPAINT] Update scroll info on loading file (#5761) The scroll info was not updated when the file is loading. - Rename CCanvasWindow::Update as CCanvasWindow::updateScrollInfo. - Update scroll info on ImageModel::NotifyImageChanged. - Improve ImageModel::ClearHistory. CORE-19094 --- base/applications/mspaint/canvas.cpp | 8 ++++---- base/applications/mspaint/canvas.h | 2 +- base/applications/mspaint/dib.cpp | 6 ++++++ base/applications/mspaint/history.cpp | 17 +++++++++++++++-- 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index d62779f39a6..a4eeead446b 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -180,7 +180,7 @@ VOID CCanvasWindow::DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint) ::DeleteDC(hdcMem0); } -VOID CCanvasWindow::Update(HWND hwndFrom) +VOID CCanvasWindow::updateScrollInfo() { CRect rcClient; GetClientRect(&rcClient); @@ -214,7 +214,7 @@ VOID CCanvasWindow::Update(HWND hwndFrom) LRESULT CCanvasWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (m_hWnd) - Update(m_hWnd); + updateScrollInfo(); return 0; } @@ -245,7 +245,7 @@ VOID CCanvasWindow::OnHVScroll(WPARAM wParam, INT fnBar) break; } SetScrollInfo(fnBar, &si); - Update(m_hWnd); + updateScrollInfo(); Invalidate(FALSE); // FIXME: Flicker } @@ -627,7 +627,7 @@ LRESULT CCanvasWindow::OnLRButtonUp(BOOL bLeftButton, UINT nMsg, WPARAM wParam, m_hitCanvasSizeBox = HIT_NONE; toolsModel.resetTool(); // resets the point-buffer of the polygon and bezier functions - Update(NULL); + updateScrollInfo(); Invalidate(TRUE); return 0; } diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index db0e549837b..dc26707be24 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -42,7 +42,7 @@ public: VOID cancelDrawing(); VOID finishDrawing(); - VOID Update(HWND hwndFrom); + VOID updateScrollInfo(); VOID ImageToCanvas(POINT& pt); VOID ImageToCanvas(RECT& rc); diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index cd069c9ef6f..9e7080e3da4 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -274,8 +274,14 @@ HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile) CImageDx img; float xDpi = 0, yDpi = 0; HRESULT hr = img.LoadDx(name, &xDpi, &yDpi); + if (FAILED(hr) && fIsMainFile) + { + imageModel.ClearHistory(); + hr = img.LoadDx(name, &xDpi, &yDpi); + } if (FAILED(hr)) { + ATLTRACE("hr: 0x%08lX\n", hr); ShowError(IDS_LOADERRORTEXT, name); return NULL; } diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 9e924b9e3db..05990df42b8 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -15,9 +15,13 @@ ImageModel imageModel; void ImageModel::NotifyImageChanged() { if (canvasWindow.IsWindow()) - canvasWindow.Invalidate(FALSE); + { + canvasWindow.updateScrollInfo(); + canvasWindow.Invalidate(); + } + if (miniature.IsWindow()) - miniature.Invalidate(FALSE); + miniature.Invalidate(); } ImageModel::ImageModel() @@ -99,6 +103,15 @@ void ImageModel::ResetToPrevious() void ImageModel::ClearHistory() { + for (int i = 0; i < HISTORYSIZE; ++i) + { + if (m_hBms[i] && i != m_currInd) + { + ::DeleteObject(m_hBms[i]); + m_hBms[i] = NULL; + } + } + m_undoSteps = 0; m_redoSteps = 0; }

11 months, 2 weeks

[reactos] 01/01: [MSPAINT] Fix assertion failure on text tool (#5762)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3579ea78889b664b3b977… commit 3579ea78889b664b3b977f5d0a725cabf7f92109 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 5 19:51:36 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 5 19:51:36 2023 +0900 [MSPAINT] Fix assertion failure on text tool (#5762) Kill the assertion failure on choosing text tool. Check whether textEditWindow is not null by using IsWindowVisible. CORE-19094 --- base/applications/mspaint/mouse.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 793efedf3ec..8412cc027c0 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -762,7 +762,8 @@ struct TextTool : ToolBase void OnFinishDraw() override { - if (textEditWindow.GetWindowTextLength() > 0) + if (::IsWindowVisible(textEditWindow) && + textEditWindow.GetWindowTextLength() > 0) { imageModel.PushImageForUndo(); draw(m_hdc);

11 months, 2 weeks

[reactos] 05/05: [NTOS:SE] Mute the access denied DPRINTs

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d72025649b769061b5f9f… commit d72025649b769061b5f9f38aa57742ef17ae7c9e Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Oct 1 15:02:48 2023 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Wed Oct 4 18:04:30 2023 +0200 [NTOS:SE] Mute the access denied DPRINTs They can be spammy. Also clarify these debug prints, because some people think that "failed to grant access rights" means there's something wrong in the core access check functions. --- ntoskrnl/se/accesschk.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ntoskrnl/se/accesschk.c b/ntoskrnl/se/accesschk.c index 858bfeef994..ad931da38fb 100644 --- a/ntoskrnl/se/accesschk.c +++ b/ntoskrnl/se/accesschk.c @@ -1174,7 +1174,7 @@ SepAccessCheckWorker( RemainingAccess &= ~(MAXIMUM_ALLOWED | AccessCheckRights.GrantedAccessRights); if (RemainingAccess != 0) { - DPRINT1("Failed to grant access rights. RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n", RemainingAccess, DesiredAccess); + DPRINT("Failed to grant access rights, access denied. RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n", RemainingAccess, DesiredAccess); PreviouslyGrantedAccess = 0; Status = STATUS_ACCESS_DENIED; goto ReturnCommonStatus; @@ -1188,7 +1188,7 @@ SepAccessCheckWorker( } else { - DPRINT1("Failed to grant access rights. PreviouslyGrantedAccess == 0 DesiredAccess = %08lx\n", DesiredAccess); + DPRINT("Failed to grant access rights, access denied. PreviouslyGrantedAccess == 0 DesiredAccess = %08lx\n", DesiredAccess); Status = STATUS_ACCESS_DENIED; } @@ -1217,7 +1217,7 @@ SepAccessCheckWorker( RemainingAccess &= ~(MAXIMUM_ALLOWED | GrantedRights); if (RemainingAccess != 0) { - DPRINT1("Failed to grant access rights to the whole object hierarchy list. RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n", + DPRINT("Failed to grant access rights to the whole object hierarchy list, access denied. RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n", RemainingAccess, DesiredAccess); PreviouslyGrantedAccess = 0; Status = STATUS_ACCESS_DENIED; @@ -1232,7 +1232,7 @@ SepAccessCheckWorker( } else { - DPRINT1("Failed to grant access rights to the whole object hierarchy list. PreviouslyGrantedAccess == 0 DesiredAccess = %08lx\n", + DPRINT("Failed to grant access rights to the whole object hierarchy list, access denied. PreviouslyGrantedAccess == 0 DesiredAccess = %08lx\n", DesiredAccess); Status = STATUS_ACCESS_DENIED; } @@ -1262,7 +1262,7 @@ SepAccessCheckWorker( RemainingAccess = (~GrantedRights & WantedRights); if (RemainingAccess != 0) { - DPRINT1("Failed to grant access rights at specific object at index %lu. RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n", + DPRINT("Failed to grant access rights at specific object at index %lu, access denied. RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n", ObjectTypeIndex, RemainingAccess, DesiredAccess); AccessStatusList[ObjectTypeIndex] = STATUS_ACCESS_DENIED; } @@ -1274,7 +1274,7 @@ SepAccessCheckWorker( else { /* No access is given */ - DPRINT1("Failed to grant access rights at specific object at index %lu. No access is given\n", ObjectTypeIndex); + DPRINT("Failed to grant access rights at specific object at index %lu. No access is given\n", ObjectTypeIndex); AccessStatusList[ObjectTypeIndex] = STATUS_ACCESS_DENIED; } @@ -1324,7 +1324,7 @@ SepAccessCheckWorker( /* Fail if some rights have not been granted */ if (AccessCheckRights.RemainingAccessRights != 0) { - DPRINT1("Failed to grant access rights. RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n", AccessCheckRights.RemainingAccessRights, DesiredAccess); + DPRINT("Failed to grant access rights, access denied. RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n", AccessCheckRights.RemainingAccessRights, DesiredAccess); PreviouslyGrantedAccess = 0; Status = STATUS_ACCESS_DENIED; goto ReturnCommonStatus; @@ -1349,7 +1349,7 @@ SepAccessCheckWorker( if (!AccessIsGranted) { - DPRINT1("Failed to grant access rights to the whole object hierarchy list. DesiredAccess = 0x%08lx\n", DesiredAccess); + DPRINT("Failed to grant access rights to the whole object hierarchy list, access denied. DesiredAccess = 0x%08lx\n", DesiredAccess); PreviouslyGrantedAccess = 0; Status = STATUS_ACCESS_DENIED; goto ReturnCommonStatus; @@ -1381,7 +1381,7 @@ SepAccessCheckWorker( /* Fail if some rights have not been granted */ if (AccessCheckRights.RemainingAccessRights != 0) { - DPRINT1("Failed to grant access rights. RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n", AccessCheckRights.RemainingAccessRights, DesiredAccess); + DPRINT("Failed to grant access rights, access denied. RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n", AccessCheckRights.RemainingAccessRights, DesiredAccess); PreviouslyGrantedAccess = 0; Status = STATUS_ACCESS_DENIED; goto ReturnCommonStatus; @@ -1410,7 +1410,7 @@ SepAccessCheckWorker( if (!AccessIsGranted) { - DPRINT1("Failed to grant access rights to the whole object hierarchy list. DesiredAccess = 0x%08lx\n", DesiredAccess); + DPRINT("Failed to grant access rights to the whole object hierarchy list, access denied. DesiredAccess = 0x%08lx\n", DesiredAccess); PreviouslyGrantedAccess = 0; Status = STATUS_ACCESS_DENIED; goto ReturnCommonStatus; @@ -1424,7 +1424,7 @@ SepAccessCheckWorker( /* Fail if no rights have been granted */ if (PreviouslyGrantedAccess == 0) { - DPRINT1("Failed to grant access rights. PreviouslyGrantedAccess == 0 DesiredAccess = %08lx\n", DesiredAccess); + DPRINT("Failed to grant access rights, access denied. PreviouslyGrantedAccess == 0 DesiredAccess = %08lx\n", DesiredAccess); Status = STATUS_ACCESS_DENIED; goto ReturnCommonStatus; }

11 months, 2 weeks

[reactos] 04/05: [NTOS:SE] HACK: Temporarily add the Local group SID to the system token

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=09bfd96f3bdb8a190ddf5… commit 09bfd96f3bdb8a190ddf51100204be19cbbc0b8c Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Oct 1 14:01:22 2023 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Wed Oct 4 18:04:30 2023 +0200 [NTOS:SE] HACK: Temporarily add the Local group SID to the system token Temporarily add the local group to the system token so that Virtualbox GA services can properly set up network drives for shared folders. What happens is that a security descriptor has a DACL with only one ACE that grants access to Local SID (presumably coming from Vbox?) but the client token is that of the service which is a SYSTEM token. Perhaps we are not impersonating the right user or whatever else. This is only a temporary placebo, until a proper solution is found. CORE-18250 --- ntoskrnl/se/token.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index dae5a411dff..83335415669 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -1784,12 +1784,14 @@ SepCreateSystemProcessToken(VOID) { {SeAliasAdminsSid, OwnerAttributes}, {SeWorldSid, GroupAttributes}, - {SeAuthenticatedUsersSid, GroupAttributes} + {SeAuthenticatedUsersSid, GroupAttributes}, + {SeLocalSid, SE_GROUP_ENABLED} // HACK: Temporarily add the local group. See CORE-18250. }; GroupsLength = sizeof(SID_AND_ATTRIBUTES) + SeLengthSid(Groups[0].Sid) + SeLengthSid(Groups[1].Sid) + - SeLengthSid(Groups[2].Sid); + SeLengthSid(Groups[2].Sid) + + SeLengthSid(Groups[3].Sid); // HACK ASSERT(GroupsLength <= (sizeof(Groups) * sizeof(ULONG))); /* Setup the privileges */

11 months, 2 weeks

[reactos] 03/05: [NTDLL_APITEST] Write NtAccessCheck testcase that tests for empty generic mapping scenario

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fefb1b77458f05ecdc4e0… commit fefb1b77458f05ecdc4e0956c1b69c109f51142e Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Sep 30 21:05:18 2023 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Wed Oct 4 18:04:29 2023 +0200 [NTDLL_APITEST] Write NtAccessCheck testcase that tests for empty generic mapping scenario See b79aadd50bb7d5d6f08532284941c0334514c477 for further information. --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + modules/rostests/apitests/ntdll/NtAccessCheck.c | 188 ++++++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + 3 files changed, 191 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 85515a2efaf..b6ce3a1cf4d 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -10,6 +10,7 @@ list(APPEND SOURCE load_notifications.c locale.c NtAcceptConnectPort.c + NtAccessCheck.c NtAccessCheckByType.c NtAccessCheckByTypeResultList.c NtAdjustGroupsToken.c diff --git a/modules/rostests/apitests/ntdll/NtAccessCheck.c b/modules/rostests/apitests/ntdll/NtAccessCheck.c new file mode 100644 index 00000000000..c987a445b13 --- /dev/null +++ b/modules/rostests/apitests/ntdll/NtAccessCheck.c @@ -0,0 +1,188 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for the NtAccessCheck API + * COPYRIGHT: Copyright 2023 George Bișoc <george.bisoc(a)reactos.org> + */ + +#include "precomp.h" + +static +HANDLE +GetToken(VOID) +{ + NTSTATUS Status; + HANDLE Token; + HANDLE DuplicatedToken; + OBJECT_ATTRIBUTES ObjectAttributes; + SECURITY_QUALITY_OF_SERVICE Sqos; + + Status = NtOpenProcessToken(NtCurrentProcess(), + TOKEN_QUERY | TOKEN_DUPLICATE, + &Token); + if (!NT_SUCCESS(Status)) + { + trace("Failed to get current process token (Status 0x%08lx)\n", Status); + return NULL; + } + + Sqos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); + Sqos.ImpersonationLevel = SecurityImpersonation; + Sqos.ContextTrackingMode = 0; + Sqos.EffectiveOnly = FALSE; + + InitializeObjectAttributes(&ObjectAttributes, + NULL, + 0, + NULL, + NULL); + ObjectAttributes.SecurityQualityOfService = &Sqos; + + Status = NtDuplicateToken(Token, + TOKEN_QUERY | TOKEN_DUPLICATE, + &ObjectAttributes, + FALSE, + TokenImpersonation, + &DuplicatedToken); + if (!NT_SUCCESS(Status)) + { + trace("Failed to duplicate token (Status 0x%08lx)\n", Status); + NtClose(Token); + return NULL; + } + + return DuplicatedToken; +} + +static +VOID +AccessCheckEmptyMappingTest(VOID) +{ + NTSTATUS Status; + NTSTATUS AccessStatus; + ACCESS_MASK GrantedAccess; + PPRIVILEGE_SET PrivilegeSet = NULL; + ULONG PrivilegeSetLength; + HANDLE Token = NULL; + PACL Dacl = NULL; + ULONG DaclSize; + SECURITY_DESCRIPTOR Sd; + PSID WorldSid = NULL; + static SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY}; + static GENERIC_MAPPING EmptyMapping = {0, 0, 0, 0}; + + /* Allocate all the stuff we need */ + PrivilegeSetLength = FIELD_OFFSET(PRIVILEGE_SET, Privilege[16]); + PrivilegeSet = RtlAllocateHeap(RtlGetProcessHeap(), 0, PrivilegeSetLength); + if (PrivilegeSet == NULL) + { + skip("Failed to allocate PrivilegeSet, skipping tests\n"); + return; + } + + Status = RtlAllocateAndInitializeSid(&WorldAuthority, + 1, + SECURITY_WORLD_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &WorldSid); + if (!NT_SUCCESS(Status)) + { + skip("Failed to create World SID, skipping tests\n"); + goto Quit; + } + + Token = GetToken(); + if (Token == NULL) + { + skip("Failed to get token, skipping tests\n"); + goto Quit; + } + + Status = RtlCreateSecurityDescriptor(&Sd, SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) + { + skip("Failed to create a security descriptor, skipping tests\n"); + goto Quit; + } + + DaclSize = sizeof(ACL) + + sizeof(ACCESS_ALLOWED_OBJECT_ACE) + RtlLengthSid(WorldSid); + Dacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Dacl == NULL) + { + skip("Failed to allocate memory for DACL, skipping tests\n"); + goto Quit; + } + + /* Setup a ACL and give full access to everyone */ + Status = RtlCreateAcl(Dacl, + DaclSize, + ACL_REVISION); + if (!NT_SUCCESS(Status)) + { + skip("Failed to create DACL, skipping tests\n"); + goto Quit; + } + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_ALL, + WorldSid); + if (!NT_SUCCESS(Status)) + { + skip("Failed to add allowed ACE for World SID, skipping tests\n"); + goto Quit; + } + + /* Setup the descriptor */ + RtlSetGroupSecurityDescriptor(&Sd, WorldSid, FALSE); + RtlSetOwnerSecurityDescriptor(&Sd, WorldSid, FALSE); + RtlSetDaclSecurityDescriptor(&Sd, TRUE, Dacl, FALSE); + + /* Do an access check with empty mapping */ + Status = NtAccessCheck(&Sd, + Token, + MAXIMUM_ALLOWED, + &EmptyMapping, + PrivilegeSet, + &PrivilegeSetLength, + &GrantedAccess, + &AccessStatus); + ok_hex(Status, STATUS_SUCCESS); + ok(AccessStatus == STATUS_SUCCESS, "Expected a success status but got 0x%08lx\n", AccessStatus); + trace("GrantedAccess == 0x%08lx\n", GrantedAccess); + +Quit: + if (Dacl) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl); + } + + if (Token) + { + NtClose(Token); + } + + if (WorldSid) + { + RtlFreeSid(WorldSid); + } + + if (PrivilegeSet) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, PrivilegeSet); + } +} + +START_TEST(NtAccessCheck) +{ + AccessCheckEmptyMappingTest(); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index 2be58938238..438cc56a172 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -6,6 +6,7 @@ extern void func_LdrEnumResources(void); extern void func_load_notifications(void); extern void func_NtAcceptConnectPort(void); +extern void func_NtAccessCheck(void); extern void func_NtAccessCheckByType(void); extern void func_NtAccessCheckByTypeResultList(void); extern void func_NtAdjustGroupsToken(void); @@ -102,6 +103,7 @@ const struct test winetest_testlist[] = { "LdrEnumResources", func_LdrEnumResources }, { "load_notifications", func_load_notifications }, { "NtAcceptConnectPort", func_NtAcceptConnectPort }, + { "NtAccessCheck", func_NtAccessCheck }, { "NtAccessCheckByType", func_NtAccessCheckByType }, { "NtAccessCheckByTypeResultList", func_NtAccessCheckByTypeResultList }, { "NtAdjustGroupsToken", func_NtAdjustGroupsToken },

11 months, 2 weeks

[reactos] 02/05: [NTOS:SE] HACK: Temporarily grant access to the client if empty generic mapping was passed

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b4638dc5599d5061a01a… commit 4b4638dc5599d5061a01a21ed04a1ce9b68e732d Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Sep 30 20:51:12 2023 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Wed Oct 4 18:04:29 2023 +0200 [NTOS:SE] HACK: Temporarily grant access to the client if empty generic mapping was passed Certain apps such as AIM installer passes an empty generic mapping (this can be understood with their generic masks set to 0) and our code tries to map the access right from an ACE with the mapping provided by AccessCheck. This can lead to a bug where we would not be able to decode the generic right from an ACE as we need a proper generic mapping in order to do so. A mask right that is not decoded it cannot be used to mask out the remaining rights, further resulting into a denied access right. What Windows does instead is they are mapping the ACE's rights in another place, presumably when setting security data to an object, and they are using the generic mapping passed by the kernel. What we can do for the time being is to temporarily grant access to the client, but only if they are an administrator. CORE-18576 --- ntoskrnl/se/accesschk.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/ntoskrnl/se/accesschk.c b/ntoskrnl/se/accesschk.c index eaf159f8ce1..858bfeef994 100644 --- a/ntoskrnl/se/accesschk.c +++ b/ntoskrnl/se/accesschk.c @@ -1058,6 +1058,34 @@ SepAccessCheckWorker( goto ReturnCommonStatus; } + /* + * HACK: Temporary hack that checks if the caller passed an empty + * generic mapping. In such cases we cannot mask out the remaining + * access rights without a proper mapping so the only option we + * can do is to check if the client is an administrator, + * since they are powerful users. + * + * See CORE-18576 for information. + */ + if (GenericMapping->GenericRead == 0 && + GenericMapping->GenericWrite == 0 && + GenericMapping->GenericExecute == 0 && + GenericMapping->GenericAll == 0) + { + if (SeTokenIsAdmin(Token)) + { + /* Grant him access */ + PreviouslyGrantedAccess |= RemainingAccess; + Status = STATUS_SUCCESS; + goto ReturnCommonStatus; + } + + /* It's not an admin so bail out */ + PreviouslyGrantedAccess = 0; + Status = STATUS_ACCESS_DENIED; + goto ReturnCommonStatus; + } + /* Get the DACL */ Status = RtlGetDaclSecurityDescriptor(SecurityDescriptor, &Present,

11 months, 2 weeks

[reactos] 01/05: [TCPIP] Setup a security descriptor for the IP and TCP device objects

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95c104f29a45f4d959de9… commit 95c104f29a45f4d959de9342dcc63c0e8f3b5ae0 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Mon Sep 25 20:18:11 2023 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Wed Oct 4 18:04:17 2023 +0200 [TCPIP] Setup a security descriptor for the IP and TCP device objects Grant access to such objects to system, admins and network services. --- drivers/network/tcpip/include/tags.h | 1 + drivers/network/tcpip/tcpip/main.c | 218 +++++++++++++++++++++++++++++++++++ 2 files changed, 219 insertions(+) diff --git a/drivers/network/tcpip/include/tags.h b/drivers/network/tcpip/include/tags.h index 15c0b905dc2..8449afda7e0 100644 --- a/drivers/network/tcpip/include/tags.h +++ b/drivers/network/tcpip/include/tags.h @@ -44,3 +44,4 @@ #define KEY_VALUE_TAG 'vkCT' #define HEADER_TAG 'rhCT' #define REG_STR_TAG 'srCT' +#define DEVICE_OBJ_SECURITY_TAG 'eSeD' diff --git a/drivers/network/tcpip/tcpip/main.c b/drivers/network/tcpip/tcpip/main.c index b99a66f1092..543ffced94d 100644 --- a/drivers/network/tcpip/tcpip/main.c +++ b/drivers/network/tcpip/tcpip/main.c @@ -10,6 +10,10 @@ #include "precomp.h" +#include <ntifs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/obfuncs.h> + #include <dispatch.h> #include <fileobjs.h> @@ -556,6 +560,212 @@ TiDispatch( return IRPFinish(Irp, Status); } +static +NTSTATUS TiCreateSecurityDescriptor( + _Out_ PSECURITY_DESCRIPTOR *SecurityDescriptor) +{ + NTSTATUS Status; + SECURITY_DESCRIPTOR AbsSD; + ULONG DaclSize, RelSDSize = 0; + PSECURITY_DESCRIPTOR RelSD = NULL; + PACL Dacl = NULL; + + /* Setup a SD */ + Status = RtlCreateSecurityDescriptor(&AbsSD, + SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) + { + TI_DbgPrint(MIN_TRACE, ("Failed to create the absolute SD (0x%X)\n", Status)); + goto Quit; + } + + /* Setup a DACL */ + DaclSize = sizeof(ACL) + + sizeof(ACCESS_ALLOWED_ACE) + RtlLengthSid(SeExports->SeLocalSystemSid) + + sizeof(ACCESS_ALLOWED_ACE) + RtlLengthSid(SeExports->SeAliasAdminsSid) + + sizeof(ACCESS_ALLOWED_ACE) + RtlLengthSid(SeExports->SeNetworkServiceSid); + Dacl = ExAllocatePoolWithTag(PagedPool, + DaclSize, + DEVICE_OBJ_SECURITY_TAG); + if (Dacl == NULL) + { + TI_DbgPrint(MIN_TRACE, ("Failed to allocate buffer heap for a DACL\n")); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quit; + } + + Status = RtlCreateAcl(Dacl, + DaclSize, + ACL_REVISION); + if (!NT_SUCCESS(Status)) + { + TI_DbgPrint(MIN_TRACE, ("Failed to create a DACL (0x%X)\n", Status)); + goto Quit; + } + + /* Setup access */ + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_ALL, + SeExports->SeLocalSystemSid); + if (!NT_SUCCESS(Status)) + { + TI_DbgPrint(MIN_TRACE, ("Failed to add access allowed ACE for System SID (0x%X)\n", Status)); + goto Quit; + } + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_ALL, + SeExports->SeAliasAdminsSid); + if (!NT_SUCCESS(Status)) + { + TI_DbgPrint(MIN_TRACE, ("Failed to add access allowed ACE for Admins SID (0x%X)\n", Status)); + goto Quit; + } + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_ALL, + SeExports->SeNetworkServiceSid); + if (!NT_SUCCESS(Status)) + { + TI_DbgPrint(MIN_TRACE, ("Failed to add access allowed ACE for Network Service SID (0x%X)\n", Status)); + goto Quit; + } + + /* Assign security data to SD */ + Status = RtlSetDaclSecurityDescriptor(&AbsSD, + TRUE, + Dacl, + FALSE); + if (!NT_SUCCESS(Status)) + { + TI_DbgPrint(MIN_TRACE, ("Failed to set DACL to security descriptor (0x%X)\n", Status)); + goto Quit; + } + + Status = RtlSetGroupSecurityDescriptor(&AbsSD, + SeExports->SeLocalSystemSid, + FALSE); + if (!NT_SUCCESS(Status)) + { + TI_DbgPrint(MIN_TRACE, ("Failed to set group to security descriptor (0x%X)\n", Status)); + goto Quit; + } + + Status = RtlSetOwnerSecurityDescriptor(&AbsSD, + SeExports->SeAliasAdminsSid, + FALSE); + if (!NT_SUCCESS(Status)) + { + TI_DbgPrint(MIN_TRACE, ("Failed to set owner to security descriptor (0x%X)\n", Status)); + goto Quit; + } + + /* Get the required buffer size for the self-relative SD */ + Status = RtlAbsoluteToSelfRelativeSD(&AbsSD, + NULL, + &RelSDSize); + if (Status != STATUS_BUFFER_TOO_SMALL) + { + TI_DbgPrint(MIN_TRACE, ("Expected STATUS_BUFFER_TOO_SMALL but got something else (0x%X)\n", Status)); + goto Quit; + } + + RelSD = ExAllocatePoolWithTag(PagedPool, + RelSDSize, + DEVICE_OBJ_SECURITY_TAG); + if (RelSD == NULL) + { + TI_DbgPrint(MIN_TRACE, ("Failed to allocate buffer heap for relative SD\n")); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quit; + } + + /* Convert it now */ + Status = RtlAbsoluteToSelfRelativeSD(&AbsSD, + RelSD, + &RelSDSize); + if (!NT_SUCCESS(Status)) + { + TI_DbgPrint(MIN_TRACE, ("Failed to convert absolute SD into a relative SD (0x%X)\n", Status)); + goto Quit; + } + + /* Give the buffer to caller */ + *SecurityDescriptor = RelSD; + +Quit: + if (!NT_SUCCESS(Status)) + { + if (RelSD != NULL) + { + ExFreePoolWithTag(RelSD, DEVICE_OBJ_SECURITY_TAG); + } + } + + if (Dacl != NULL) + { + ExFreePoolWithTag(Dacl, DEVICE_OBJ_SECURITY_TAG); + } + + return Status; +} + +static +NTSTATUS TiSetupTcpDeviceSD( + _In_ PDEVICE_OBJECT DeviceObject) +{ + NTSTATUS Status; + PSECURITY_DESCRIPTOR Sd; + SECURITY_INFORMATION Info = OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION; + + /* Obtain a security descriptor */ + Status = TiCreateSecurityDescriptor(&Sd); + if (!NT_SUCCESS(Status)) + { + TI_DbgPrint(MIN_TRACE, ("Failed to create a security descriptor for the device object\n")); + return Status; + } + + /* Whack the new descriptor into the TCP device object */ + Status = ObSetSecurityObjectByPointer(DeviceObject, + Info, + Sd); + if (!NT_SUCCESS(Status)) + { + TI_DbgPrint(MIN_TRACE, ("Failed to set new security information to the device object\n")); + } + + ExFreePoolWithTag(Sd, DEVICE_OBJ_SECURITY_TAG); + return Status; +} + +static +NTSTATUS TiSecurityStartup( + VOID) +{ + NTSTATUS Status; + + /* Set security data for the TCP and IP device objects */ + Status = TiSetupTcpDeviceSD(TCPDeviceObject); + if (!NT_SUCCESS(Status)) + { + TI_DbgPrint(MIN_TRACE, ("Failed to set security data for TCP device object\n")); + return Status; + } + + Status = TiSetupTcpDeviceSD(IPDeviceObject); + if (!NT_SUCCESS(Status)) + { + TI_DbgPrint(MIN_TRACE, ("Failed to set security data for IP device object\n")); + return Status; + } + + return STATUS_SUCCESS; +} + VOID NTAPI TiUnload( PDRIVER_OBJECT DriverObject) @@ -761,6 +971,14 @@ DriverEntry( return Status; } + /* Initialize security */ + Status = TiSecurityStartup(); + if (!NT_SUCCESS(Status)) + { + TiUnload(DriverObject); + return Status; + } + /* Use direct I/O */ IPDeviceObject->Flags |= DO_DIRECT_IO; RawIPDeviceObject->Flags |= DO_DIRECT_IO;

11 months, 2 weeks

[reactos] 01/01: [NTDLL:LDR] SAL improvements and fixes

by Ratin Gao

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be5c889cdf73080228f6f… commit be5c889cdf73080228f6f41c8bbb2fdac4dfb31c Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Tue Oct 3 18:28:05 2023 +0800 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Oct 4 12:26:18 2023 +0300 [NTDLL:LDR] SAL improvements and fixes - Convert some notations to SAL2 - "Name" parameter in LdrGetProcedureAddress/LdrpGetProcedureAddress should be optional - "DllCharacteristics" parameter in LdrGetDllHandle should be optional --- dll/ntdll/include/ntdllp.h | 14 +++++++------ dll/ntdll/ldr/ldrapi.c | 46 ++++++++++++++++++++++++------------------- dll/ntdll/ldr/ldrutils.c | 11 ++++++----- dll/win32/verifier/verifier.c | 21 +++++++++++++++++--- sdk/include/ndk/ldrfuncs.h | 4 ++-- sdk/include/ndk/umfuncs.h | 6 +++--- 6 files changed, 63 insertions(+), 39 deletions(-) diff --git a/dll/ntdll/include/ntdllp.h b/dll/ntdll/include/ntdllp.h index 418e4a394d2..42a164514b0 100644 --- a/dll/ntdll/include/ntdllp.h +++ b/dll/ntdll/include/ntdllp.h @@ -98,12 +98,14 @@ LdrpWalkImportDescriptor(IN LPWSTR DllPath OPTIONAL, /* ldrutils.c */ -NTSTATUS NTAPI -LdrpGetProcedureAddress(IN PVOID BaseAddress, - IN PANSI_STRING Name, - IN ULONG Ordinal, - OUT PVOID *ProcedureAddress, - IN BOOLEAN ExecuteInit); +NTSTATUS +NTAPI +LdrpGetProcedureAddress( + _In_ PVOID BaseAddress, + _In_opt_ _When_(Ordinal == 0, _Notnull_) PANSI_STRING Name, + _In_opt_ _When_(Name == NULL, _In_range_(>, 0)) ULONG Ordinal, + _Out_ PVOID *ProcedureAddress, + _In_ BOOLEAN ExecuteInit); PLDR_DATA_TABLE_ENTRY NTAPI LdrpAllocateDataTableEntry(IN PVOID BaseAddress); diff --git a/dll/ntdll/ldr/ldrapi.c b/dll/ntdll/ldr/ldrapi.c index de7c68d8053..f850ce6ddca 100644 --- a/dll/ntdll/ldr/ldrapi.c +++ b/dll/ntdll/ldr/ldrapi.c @@ -98,8 +98,9 @@ LdrpMakeCookie(VOID) */ NTSTATUS NTAPI -LdrUnlockLoaderLock(IN ULONG Flags, - IN ULONG Cookie OPTIONAL) +LdrUnlockLoaderLock( + _In_ ULONG Flags, + _In_opt_ ULONG Cookie) { NTSTATUS Status = STATUS_SUCCESS; @@ -170,9 +171,10 @@ LdrUnlockLoaderLock(IN ULONG Flags, */ NTSTATUS NTAPI -LdrLockLoaderLock(IN ULONG Flags, - OUT PULONG Disposition OPTIONAL, - OUT PULONG_PTR Cookie OPTIONAL) +LdrLockLoaderLock( + _In_ ULONG Flags, + _Out_opt_ PULONG Disposition, + _Out_opt_ PULONG_PTR Cookie) { NTSTATUS Status = STATUS_SUCCESS; BOOLEAN InInit = LdrpInLdrInit; @@ -440,8 +442,9 @@ LdrLoadDll(IN PWSTR SearchPath OPTIONAL, */ NTSTATUS NTAPI -LdrFindEntryForAddress(PVOID Address, - PLDR_DATA_TABLE_ENTRY *Module) +LdrFindEntryForAddress( + _In_ PVOID Address, + _Out_ PLDR_DATA_TABLE_ENTRY *Module) { PLIST_ENTRY ListHead, NextEntry; PLDR_DATA_TABLE_ENTRY LdrEntry; @@ -519,11 +522,12 @@ LdrFindEntryForAddress(PVOID Address, */ NTSTATUS NTAPI -LdrGetDllHandleEx(IN ULONG Flags, - IN PWSTR DllPath OPTIONAL, - IN PULONG DllCharacteristics OPTIONAL, - IN PUNICODE_STRING DllName, - OUT PVOID *DllHandle OPTIONAL) +LdrGetDllHandleEx( + _In_ ULONG Flags, + _In_opt_ PWSTR DllPath, + _In_opt_ PULONG DllCharacteristics, + _In_ PUNICODE_STRING DllName, + _Out_opt_ PVOID *DllHandle) { NTSTATUS Status; PLDR_DATA_TABLE_ENTRY LdrEntry; @@ -802,10 +806,11 @@ Quickie: */ NTSTATUS NTAPI -LdrGetDllHandle(IN PWSTR DllPath OPTIONAL, - IN PULONG DllCharacteristics OPTIONAL, - IN PUNICODE_STRING DllName, - OUT PVOID *DllHandle) +LdrGetDllHandle( + _In_opt_ PWSTR DllPath, + _In_opt_ PULONG DllCharacteristics, + _In_ PUNICODE_STRING DllName, + _Out_ PVOID *DllHandle) { /* Call the newer API */ return LdrGetDllHandleEx(LDR_GET_DLL_HANDLE_EX_UNCHANGED_REFCOUNT, @@ -820,10 +825,11 @@ LdrGetDllHandle(IN PWSTR DllPath OPTIONAL, */ NTSTATUS NTAPI -LdrGetProcedureAddress(IN PVOID BaseAddress, - IN PANSI_STRING Name, - IN ULONG Ordinal, - OUT PVOID *ProcedureAddress) +LdrGetProcedureAddress( + _In_ PVOID BaseAddress, + _In_opt_ _When_(Ordinal == 0, _Notnull_) PANSI_STRING Name, + _In_opt_ _When_(Name == NULL, _In_range_(>, 0)) ULONG Ordinal, + _Out_ PVOID *ProcedureAddress) { /* Call the internal routine and tell it to execute DllInit */ return LdrpGetProcedureAddress(BaseAddress, Name, Ordinal, ProcedureAddress, TRUE); diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index 37b2ecf44d2..632aa83df04 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -2249,11 +2249,12 @@ lookinhash: NTSTATUS NTAPI -LdrpGetProcedureAddress(IN PVOID BaseAddress, - IN PANSI_STRING Name, - IN ULONG Ordinal, - OUT PVOID *ProcedureAddress, - IN BOOLEAN ExecuteInit) +LdrpGetProcedureAddress( + _In_ PVOID BaseAddress, + _In_opt_ _When_(Ordinal == 0, _Notnull_) PANSI_STRING Name, + _In_opt_ _When_(Name == NULL, _In_range_(>, 0)) ULONG Ordinal, + _Out_ PVOID *ProcedureAddress, + _In_ BOOLEAN ExecuteInit) { NTSTATUS Status = STATUS_SUCCESS; UCHAR ImportBuffer[64]; diff --git a/dll/win32/verifier/verifier.c b/dll/win32/verifier/verifier.c index 5c24bd51048..e27f7846103 100644 --- a/dll/win32/verifier/verifier.c +++ b/dll/win32/verifier/verifier.c @@ -22,7 +22,13 @@ VOID NTAPI AVrfpNtdllHeapFreeCallback(PVOID AllocationBase, SIZE_T AllocationSiz // DPFLTR_VERIFIER_ID -NTSTATUS NTAPI AVrfpLdrGetProcedureAddress(IN PVOID BaseAddress, IN PANSI_STRING Name, IN ULONG Ordinal, OUT PVOID *ProcedureAddress); +NTSTATUS +NTAPI +AVrfpLdrGetProcedureAddress( + _In_ PVOID BaseAddress, + _In_opt_ _When_(Ordinal == 0, _Notnull_) PANSI_STRING Name, + _In_opt_ _When_(Name == NULL, _In_range_(>, 0)) ULONG Ordinal, + _Out_ PVOID *ProcedureAddress); static RTL_VERIFIER_THUNK_DESCRIPTOR AVrfpNtdllThunks[] = { @@ -116,9 +122,18 @@ PVOID AVrfpFindReplacementThunk(PVOID Proc) } -NTSTATUS NTAPI AVrfpLdrGetProcedureAddress(IN PVOID BaseAddress, IN PANSI_STRING Name, IN ULONG Ordinal, OUT PVOID *ProcedureAddress) +NTSTATUS NTAPI +AVrfpLdrGetProcedureAddress( + _In_ PVOID BaseAddress, + _In_opt_ _When_(Ordinal == 0, _Notnull_) PANSI_STRING Name, + _In_opt_ _When_(Name == NULL, _In_range_(>, 0)) ULONG Ordinal, + _Out_ PVOID *ProcedureAddress) { - NTSTATUS (NTAPI *oLdrGetProcedureAddress)(IN PVOID BaseAddress, IN PANSI_STRING Name, IN ULONG Ordinal, OUT PVOID *ProcedureAddress); + NTSTATUS(NTAPI *oLdrGetProcedureAddress)( + _In_ PVOID BaseAddress, + _In_opt_ _When_(Ordinal == 0, _Notnull_) PANSI_STRING Name, + _In_opt_ _When_(Name == NULL, _In_range_(>, 0)) ULONG Ordinal, + _Out_ PVOID *ProcedureAddress); NTSTATUS Status; PVOID Replacement; diff --git a/sdk/include/ndk/ldrfuncs.h b/sdk/include/ndk/ldrfuncs.h index 58859bcb351..9eb891928ca 100644 --- a/sdk/include/ndk/ldrfuncs.h +++ b/sdk/include/ndk/ldrfuncs.h @@ -89,8 +89,8 @@ NTSTATUS NTAPI LdrGetProcedureAddress( _In_ PVOID BaseAddress, - _In_ PANSI_STRING Name, - _In_ ULONG Ordinal, + _In_opt_ _When_(Ordinal == 0, _Notnull_) PANSI_STRING Name, + _In_opt_ _When_(Name == NULL, _In_range_(>, 0)) ULONG Ordinal, _Out_ PVOID *ProcedureAddress ); diff --git a/sdk/include/ndk/umfuncs.h b/sdk/include/ndk/umfuncs.h index 5a94eae4417..5fa85a1e978 100644 --- a/sdk/include/ndk/umfuncs.h +++ b/sdk/include/ndk/umfuncs.h @@ -115,7 +115,7 @@ NTSTATUS NTAPI LdrGetDllHandle( _In_opt_ PWSTR DllPath, - _In_ PULONG DllCharacteristics, + _In_opt_ PULONG DllCharacteristics, _In_ PUNICODE_STRING DllName, _Out_ PVOID *DllHandle ); @@ -140,8 +140,8 @@ NTSTATUS NTAPI LdrGetProcedureAddress( _In_ PVOID BaseAddress, - _In_ PANSI_STRING Name, - _In_ ULONG Ordinal, + _In_opt_ _When_(Ordinal == 0, _Notnull_) PANSI_STRING Name, + _In_opt_ _When_(Name == NULL, _In_range_(>, 0)) ULONG Ordinal, _Out_ PVOID *ProcedureAddress );

11 months, 2 weeks

[reactos] 01/01: [TASKMGR] Favor _countof(), no functional change intended (#5757)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46b4b5581d1fc4c1b50cf… commit 46b4b5581d1fc4c1b50cfc0ee8b82b77be182dc6 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Tue Oct 3 21:00:10 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 3 21:00:10 2023 +0200 [TASKMGR] Favor _countof(), no functional change intended (#5757) Taskmgr used a mixture: Sometimes _countof(), sometimes ARRAYSIZE() and sometimes it calculated the count plain by sizeof(var)/sizeof(TYPE). Harmonize everywhere to _countof() as it is the shortest solution. Fix some formatting sins, like placing comments before else-statement. Shorten the length of some very long line intentionally *without introducing additional linebreaks* ! Shorten vertical length of some functions to increase their chance to fit on the screen without scrolling. Fix wrong indentation level in TaskManagerWndProc(). *.rc: Remove superfluous and redundant comment in all langs No functional change intended. --- base/applications/taskmgr/about.c | 2 +- base/applications/taskmgr/applpage.c | 74 ++++++--------------------------- base/applications/taskmgr/applpage.h | 13 +++--- base/applications/taskmgr/column.c | 16 ++++--- base/applications/taskmgr/column.h | 2 +- base/applications/taskmgr/debug.c | 26 ++++++------ base/applications/taskmgr/graph.c | 28 +++++-------- base/applications/taskmgr/graph.h | 14 +++---- base/applications/taskmgr/lang/bg-BG.rc | 1 - base/applications/taskmgr/lang/cs-CZ.rc | 1 - base/applications/taskmgr/lang/da-DK.rc | 1 - base/applications/taskmgr/lang/de-DE.rc | 1 - base/applications/taskmgr/lang/el-GR.rc | 1 - base/applications/taskmgr/lang/en-US.rc | 1 - base/applications/taskmgr/lang/es-ES.rc | 1 - base/applications/taskmgr/lang/et-EE.rc | 1 - base/applications/taskmgr/lang/fr-FR.rc | 1 - base/applications/taskmgr/lang/he-IL.rc | 1 - base/applications/taskmgr/lang/hu-HU.rc | 1 - base/applications/taskmgr/lang/id-ID.rc | 1 - base/applications/taskmgr/lang/it-IT.rc | 1 - base/applications/taskmgr/lang/ja-JP.rc | 1 - base/applications/taskmgr/lang/ko-KR.rc | 1 - base/applications/taskmgr/lang/nl-NL.rc | 1 - base/applications/taskmgr/lang/no-NO.rc | 1 - base/applications/taskmgr/lang/pl-PL.rc | 1 - base/applications/taskmgr/lang/pt-BR.rc | 1 - base/applications/taskmgr/lang/pt-PT.rc | 1 - base/applications/taskmgr/lang/ro-RO.rc | 1 - base/applications/taskmgr/lang/ru-RU.rc | 1 - base/applications/taskmgr/lang/sk-SK.rc | 1 - base/applications/taskmgr/lang/sq-AL.rc | 1 - base/applications/taskmgr/lang/sv-SE.rc | 1 - base/applications/taskmgr/lang/tr-TR.rc | 1 - base/applications/taskmgr/lang/uk-UA.rc | 1 - base/applications/taskmgr/lang/zh-CN.rc | 1 - base/applications/taskmgr/lang/zh-HK.rc | 1 - base/applications/taskmgr/lang/zh-TW.rc | 1 - base/applications/taskmgr/perfdata.c | 10 ++--- base/applications/taskmgr/perfpage.c | 12 +++--- base/applications/taskmgr/procpage.c | 14 +++---- base/applications/taskmgr/run.c | 6 +-- base/applications/taskmgr/taskmgr.c | 38 ++++++----------- 43 files changed, 91 insertions(+), 194 deletions(-) diff --git a/base/applications/taskmgr/about.c b/base/applications/taskmgr/about.c index f97f6588550..46bc60e4d76 100644 --- a/base/applications/taskmgr/about.c +++ b/base/applications/taskmgr/about.c @@ -11,7 +11,7 @@ void OnAbout(void) { WCHAR szTaskmgr[128]; - LoadStringW(hInst, IDS_APP_TITLE, szTaskmgr, sizeof(szTaskmgr)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_APP_TITLE, szTaskmgr, _countof(szTaskmgr)); ShellAboutW(hMainWnd, szTaskmgr, NULL, LoadIconW(hInst, MAKEINTRESOURCEW(IDI_TASKMANAGER))); } diff --git a/base/applications/taskmgr/applpage.c b/base/applications/taskmgr/applpage.c index 7db38c09c90..600592c10f8 100644 --- a/base/applications/taskmgr/applpage.c +++ b/base/applications/taskmgr/applpage.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Applications Page. + * PURPOSE: Applications Page * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> * Copyright 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> @@ -97,7 +97,6 @@ ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) switch (message) { case WM_INITDIALOG: - /* Save the width and height */ GetClientRect(hDlg, &rc); nApplicationPageWidth = rc.right; @@ -151,7 +150,6 @@ ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) break; case WM_COMMAND: - /* Handle the button clicks */ switch (LOWORD(wParam)) { @@ -217,17 +215,16 @@ ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) if (wParam == VK_DELETE) ProcessPage_OnEndProcess(); break; - } - return 0; + return 0; } void RefreshApplicationPage(void) { #ifdef RUN_APPS_PAGE - /* Signal the event so that our refresh thread */ - /* will wake up and refresh the application page */ + /* Signal the event so that our refresh thread + * will wake up and refresh the application page */ PostThreadMessage(dwApplicationThread, WM_TIMER, 0, 0); #endif } @@ -267,11 +264,7 @@ DWORD WINAPI ApplicationPageRefreshThread(void *lpParameter) if (msg.message == WM_TIMER) { - /* - * FIXME: - * - * Should this be EnumDesktopWindows() instead? - */ + // FIXME: Should this be EnumDesktopWindows() instead? noApps = TRUE; EnumWindows(EnumWindowsProc, 0); if (noApps) @@ -450,9 +443,8 @@ void AddOrUpdateHwnd(HWND hWnd, WCHAR *szTitle, HICON hIcon, BOOL bHung) InvalidateRect(hApplicationPageListCtrl, NULL, 0); } } - /* It is not already in the list so add it */ else - { + { // It is not already in the list so add it pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)HeapAlloc(GetProcessHeap(), 0, sizeof(APPLICATION_PAGE_LIST_ITEM)); pAPLI->hWnd = hWnd; @@ -478,25 +470,16 @@ void AddOrUpdateHwnd(HWND hWnd, WCHAR *szTitle, HICON hIcon, BOOL bHung) ListView_SetItemState(hApplicationPageListCtrl, 0, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED); bApplicationPageSelectionMade = TRUE; } - /* - else - { - bApplicationPageSelectionMade = FALSE; - } - */ } void ApplicationPageUpdate(void) { /* Enable or disable the "End Task" & "Switch To" buttons */ if (ListView_GetSelectedCount(hApplicationPageListCtrl)) - { EnableWindow(hApplicationPageEndTaskButton, TRUE); - } else - { EnableWindow(hApplicationPageEndTaskButton, FALSE); - } + /* Enable "Switch To" button only if only one app is selected */ EnableWindow(hApplicationPageSwitchToButton, (ListView_GetSelectedCount(hApplicationPageListCtrl) == 1)); @@ -510,9 +493,8 @@ void ApplicationPageUpdate(void) hMenu = GetMenu(hMainWnd); hWindowsMenu = GetSubMenu(hMenu, 3); - /* Only one item selected */ if (ListView_GetSelectedCount(hApplicationPageListCtrl) == 1) - { + { // Only one item selected EnableMenuItem(hWindowsMenu, ID_WINDOWS_TILEHORIZONTALLY, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED); EnableMenuItem(hWindowsMenu, ID_WINDOWS_TILEVERTICALLY, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED); EnableMenuItem(hWindowsMenu, ID_WINDOWS_MINIMIZE, MF_BYCOMMAND|MF_ENABLED); @@ -520,9 +502,8 @@ void ApplicationPageUpdate(void) EnableMenuItem(hWindowsMenu, ID_WINDOWS_CASCADE, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED); EnableMenuItem(hWindowsMenu, ID_WINDOWS_BRINGTOFRONT, MF_BYCOMMAND|MF_ENABLED); } - /* More than one item selected */ else if (ListView_GetSelectedCount(hApplicationPageListCtrl) > 1) - { + { // More than one item selected EnableMenuItem(hWindowsMenu, ID_WINDOWS_TILEHORIZONTALLY, MF_BYCOMMAND|MF_ENABLED); EnableMenuItem(hWindowsMenu, ID_WINDOWS_TILEVERTICALLY, MF_BYCOMMAND|MF_ENABLED); EnableMenuItem(hWindowsMenu, ID_WINDOWS_MINIMIZE, MF_BYCOMMAND|MF_ENABLED); @@ -530,9 +511,8 @@ void ApplicationPageUpdate(void) EnableMenuItem(hWindowsMenu, ID_WINDOWS_CASCADE, MF_BYCOMMAND|MF_ENABLED); EnableMenuItem(hWindowsMenu, ID_WINDOWS_BRINGTOFRONT, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED); } - /* No items selected */ else - { + { // No items selected EnableMenuItem(hWindowsMenu, ID_WINDOWS_TILEHORIZONTALLY, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED); EnableMenuItem(hWindowsMenu, ID_WINDOWS_TILEVERTICALLY, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED); EnableMenuItem(hWindowsMenu, ID_WINDOWS_MINIMIZE, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED); @@ -564,52 +544,35 @@ void ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam) /* Update the item text */ if (pnmdi->item.iSubItem == 0) - { wcsncpy(pnmdi->item.pszText, pAPLI->szTitle, pnmdi->item.cchTextMax); - } /* Update the item status */ else if (pnmdi->item.iSubItem == 1) { if (pAPLI->bHung) - { - LoadStringW( GetModuleHandleW(NULL), IDS_NOT_RESPONDING , szMsg, sizeof(szMsg) / sizeof(szMsg[0])); - } + LoadStringW(GetModuleHandleW(NULL), IDS_NOT_RESPONDING , szMsg, _countof(szMsg)); else - { - LoadStringW( GetModuleHandleW(NULL), IDS_RUNNING, (LPWSTR) szMsg, sizeof(szMsg) / sizeof(szMsg[0])); - } + LoadStringW(GetModuleHandleW(NULL), IDS_RUNNING, (LPWSTR) szMsg, _countof(szMsg)); wcsncpy(pnmdi->item.pszText, szMsg, pnmdi->item.cchTextMax); } break; case NM_RCLICK: - if (ListView_GetSelectedCount(hApplicationPageListCtrl) < 1) - { ApplicationPageShowContextMenu1(); - } else - { ApplicationPageShowContextMenu2(); - } - break; case NM_DBLCLK: - ApplicationPage_OnSwitchTo(); - break; case LVN_KEYDOWN: - if (((LPNMLVKEYDOWN)lParam)->wVKey == VK_DELETE) ApplicationPage_OnEndTask(); - break; - } } else if (pnmh->hwndFrom == ListView_GetHeader(hApplicationPageListCtrl)) @@ -617,27 +580,18 @@ void ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam) switch (pnmh->code) { case NM_RCLICK: - if (ListView_GetSelectedCount(hApplicationPageListCtrl) < 1) - { ApplicationPageShowContextMenu1(); - } else - { ApplicationPageShowContextMenu2(); - } - break; case HDN_ITEMCLICK: - (void)ListView_SortItems(hApplicationPageListCtrl, ApplicationPageCompareFunc, 0); bSortAscending = !bSortAscending; - break; } } - } void ApplicationPageShowContextMenu1(void) @@ -929,9 +883,7 @@ void ApplicationPage_OnGotoProcess(void) i, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED); - (void)ListView_EnsureVisible(hProcessPageListCtrl, - i, - FALSE); + (void)ListView_EnsureVisible(hProcessPageListCtrl, i, FALSE); } } } diff --git a/base/applications/taskmgr/applpage.h b/base/applications/taskmgr/applpage.h index e6bf69c21a1..04a57ffb0c5 100644 --- a/base/applications/taskmgr/applpage.h +++ b/base/applications/taskmgr/applpage.h @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Applications Page. + * PURPOSE: Applications Page * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> * Copyright 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> @@ -9,12 +9,11 @@ #pragma once -extern HWND hApplicationPage; /* Application List Property Page */ - -extern HWND hApplicationPageListCtrl; /* Application ListCtrl Window */ -extern HWND hApplicationPageEndTaskButton; /* Application End Task button */ -extern HWND hApplicationPageSwitchToButton; /* Application Switch To button */ -extern HWND hApplicationPageNewTaskButton; /* Application New Task button */ +extern HWND hApplicationPage; /* Application List Property Page */ +extern HWND hApplicationPageListCtrl; /* Application ListCtrl Window */ +extern HWND hApplicationPageEndTaskButton; /* Application End Task button */ +extern HWND hApplicationPageSwitchToButton; /* Application Switch To button */ +extern HWND hApplicationPageNewTaskButton; /* Application New Task button */ INT_PTR CALLBACK ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); void RefreshApplicationPage(void); diff --git a/base/applications/taskmgr/column.c b/base/applications/taskmgr/column.c index 089e4044854..b6eec0f5ec8 100644 --- a/base/applications/taskmgr/column.c +++ b/base/applications/taskmgr/column.c @@ -42,8 +42,8 @@ const PresetColumnEntry ColumnPresets[COLUMN_NMAX] = { DECLARE_COLUMN_PRESET(COMMANDLINE, 450, FALSE) }; -static int InsertColumn(int nCol, LPCWSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem); -INT_PTR CALLBACK ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +static int InsertColumn(int nCol, LPCWSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem); +INT_PTR CALLBACK ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); void AddColumns(void) { @@ -53,13 +53,13 @@ void AddColumns(void) for (n=0; n<COLUMN_NMAX; n++) { if (TaskManagerSettings.Columns[n]) { - LoadStringW(hInst, ColumnPresets[n].dwIdsName, szTemp, sizeof(szTemp)/sizeof(WCHAR)); + LoadStringW(hInst, ColumnPresets[n].dwIdsName, szTemp, _countof(szTemp)); InsertColumn(n, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[n], -1); } } size = SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); - SendMessageW(hProcessPageHeaderCtrl, HDM_SETORDERARRAY, (WPARAM) size, (LPARAM) &TaskManagerSettings.ColumnOrderArray); + SendMessageW(hProcessPageHeaderCtrl, HDM_SETORDERARRAY, (WPARAM)size, (LPARAM)&TaskManagerSettings.ColumnOrderArray); UpdateColumnDataHints(); } @@ -104,7 +104,7 @@ void SaveColumnSettings(void) /* Get header order */ size = SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); - SendMessageW(hProcessPageHeaderCtrl, HDM_GETORDERARRAY, (WPARAM) size, (LPARAM) &TaskManagerSettings.ColumnOrderArray); + SendMessageW(hProcessPageHeaderCtrl, HDM_GETORDERARRAY, (WPARAM)size, (LPARAM)&TaskManagerSettings.ColumnOrderArray); /* Get visible columns */ for (i = 0; i < SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); i++) { @@ -117,7 +117,7 @@ void SaveColumnSettings(void) SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEM, i, (LPARAM) &hditem); for (n = 0; n < COLUMN_NMAX; n++) { - LoadStringW(hInst, ColumnPresets[n].dwIdsName, szTemp, sizeof(szTemp)/sizeof(WCHAR)); + LoadStringW(hInst, ColumnPresets[n].dwIdsName, szTemp, _countof(szTemp)); if (_wcsicmp(text, szTemp) == 0) { TaskManagerSettings.Columns[n] = TRUE; @@ -155,7 +155,6 @@ ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) switch (message) { case WM_INITDIALOG: - for (i=0; i<COLUMN_NMAX; i++) { if (TaskManagerSettings.Columns[i]) CheckDlgButton(hDlg, ColumnPresets[i].dwIdcCtrl, BST_CHECKED); @@ -163,7 +162,6 @@ ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) return TRUE; case WM_COMMAND: - if (LOWORD(wParam) == IDCANCEL) { EndDialog(hDlg, LOWORD(wParam)); @@ -207,7 +205,7 @@ void UpdateColumnDataHints(void) SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEM, Index, (LPARAM) &hditem); for (i=0; i<COLUMN_NMAX; i++) { - LoadStringW(hInst, ColumnPresets[i].dwIdsName, szTemp, sizeof(szTemp)/sizeof(WCHAR)); + LoadStringW(hInst, ColumnPresets[i].dwIdsName, szTemp, _countof(szTemp)); if (_wcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = i; } diff --git a/base/applications/taskmgr/column.h b/base/applications/taskmgr/column.h index 615067104ad..4ccdf36d593 100644 --- a/base/applications/taskmgr/column.h +++ b/base/applications/taskmgr/column.h @@ -63,7 +63,7 @@ typedef struct { } PresetColumnEntry; -extern UINT ColumnDataHints[COLUMN_NMAX]; +extern UINT ColumnDataHints[COLUMN_NMAX]; extern const PresetColumnEntry ColumnPresets[COLUMN_NMAX]; #define Column_ImageName Columns[COLUMN_IMAGENAME] diff --git a/base/applications/taskmgr/debug.c b/base/applications/taskmgr/debug.c index 7e3e11f283e..678597a350c 100644 --- a/base/applications/taskmgr/debug.c +++ b/base/applications/taskmgr/debug.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Process Debugging. + * PURPOSE: Process Debugging * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> */ @@ -27,21 +27,21 @@ void ProcessPage_OnDebug(void) if (dwProcessId == 0) return; - LoadStringW(hInst, IDS_MSG_WARNINGDEBUG, szTemp, ARRAYSIZE(szTemp)); - LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, ARRAYSIZE(szTempA)); + LoadStringW(hInst, IDS_MSG_WARNINGDEBUG, szTemp, _countof(szTemp)); + LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, _countof(szTempA)); if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO | MB_ICONWARNING) != IDYES) { - GetLastErrorText(strErrorText, ARRAYSIZE(strErrorText)); - LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, ARRAYSIZE(szTemp)); + GetLastErrorText(strErrorText, _countof(strErrorText)); + LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, _countof(szTemp)); MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK | MB_ICONSTOP); return; } if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug", 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) { - GetLastErrorText(strErrorText, ARRAYSIZE(strErrorText)); - LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, ARRAYSIZE(szTemp)); + GetLastErrorText(strErrorText, _countof(strErrorText)); + LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, _countof(szTemp)); MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK | MB_ICONSTOP); return; } @@ -49,8 +49,8 @@ void ProcessPage_OnDebug(void) dwDebuggerSize = sizeof(strDebugger); if (RegQueryValueExW(hKey, L"Debugger", NULL, NULL, (LPBYTE)strDebugger, &dwDebuggerSize) != ERROR_SUCCESS) { - GetLastErrorText(strErrorText, ARRAYSIZE(strErrorText)); - LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, ARRAYSIZE(szTemp)); + GetLastErrorText(strErrorText, _countof(strErrorText)); + LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, _countof(szTemp)); MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK | MB_ICONSTOP); RegCloseKey(hKey); return; @@ -61,8 +61,8 @@ void ProcessPage_OnDebug(void) hDebugEvent = CreateEventW(NULL, FALSE, FALSE, NULL); if (!hDebugEvent) { - GetLastErrorText(strErrorText, ARRAYSIZE(strErrorText)); - LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, ARRAYSIZE(szTemp)); + GetLastErrorText(strErrorText, _countof(strErrorText)); + LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, _countof(szTemp)); MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK | MB_ICONSTOP); return; } @@ -74,8 +74,8 @@ void ProcessPage_OnDebug(void) si.cb = sizeof(si); if (!CreateProcessW(NULL, strDebugPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { - GetLastErrorText(strErrorText, ARRAYSIZE(strErrorText)); - LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, ARRAYSIZE(szTemp)); + GetLastErrorText(strErrorText, _countof(strErrorText)); + LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, _countof(szTemp)); MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK | MB_ICONSTOP); } else diff --git a/base/applications/taskmgr/graph.c b/base/applications/taskmgr/graph.c index aea347c47b6..f431bce46c9 100644 --- a/base/applications/taskmgr/graph.c +++ b/base/applications/taskmgr/graph.c @@ -28,7 +28,7 @@ Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) return TRUE; /* - * Filter out mouse & keyboard messages + * Filter out mouse & keyboard messages */ /* case WM_APPCOMMAND: */ case WM_CAPTURECHANGED: @@ -84,7 +84,6 @@ Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) return 0; case WM_PAINT: - hdc = BeginPaint(hWnd, &ps); WindowId = GetWindowLongPtrW(hWnd, GWLP_ID); @@ -103,13 +102,11 @@ Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } EndPaint(hWnd, &ps); - return 0; - } /* - * We pass on all non-handled messages + * Pass on all non-handled messages */ return CallWindowProcW(OldGraphWndProc, hWnd, message, wParam, lParam); } @@ -163,8 +160,7 @@ void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) SetTextColor(hDC, crPrevForeground); /* - * Now we have to draw the graph - * So first find out how many bars we can fit + * Draw the graph. So first find out how many bars we can fit */ nBars = ((rcClient.bottom - rcClient.top) - 25) / 3; nBarsUsed = (nBars * CpuUsage) / 100; @@ -185,7 +181,7 @@ void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) } /* - * Now draw the bar graph + * Draw the bar graph */ rcBarLeft.left = ((rcClient.right - rcClient.left) - 33) / 2; rcBarLeft.right = rcBarLeft.left + 16; @@ -266,7 +262,6 @@ void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) for (i=0; i<nBarsUsedKernel; i++) { - FillSolidRect(hDC, &rcBarLeft, RED); FillSolidRect(hDC, &rcBarRight, RED); @@ -275,7 +270,6 @@ void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) rcBarRight.top -=3; rcBarRight.bottom -=3; - } SelectObject(hDC, hOldFont); @@ -331,8 +325,7 @@ void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) SetTextColor(hDC, crPrevForeground); /* - * Now we have to draw the graph - * So first find out how many bars we can fit + * Draw the graph. So first find out how many bars we can fit */ nBars = ((rcClient.bottom - rcClient.top) - 25) / 3; if (CommitChargeLimit) @@ -346,7 +339,7 @@ void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) if (nBarsFree > nBars) nBarsFree = nBars; /* - * Now draw the bar graph + * Draw the bar graph */ rcBarLeft.left = ((rcClient.right - rcClient.left) - 33) / 2; rcBarLeft.right = rcBarLeft.left + 16; @@ -414,17 +407,16 @@ void Graph_DrawMemUsageHistoryGraph(HDC hDC, HWND hWnd) //CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); /* - * Draw the graph background - * - * Draw the horizontal bars + * Draw the graph background and horizontal bars */ for (i=0; i<rcClient.bottom; i++) { if ((i % 11) == 0) { - /* FillSolidRect2(hDC, 0, i, rcClient.right, 1, DARK_GREEN); */ + //FillSolidRect2(hDC, 0, i, rcClient.right, 1, DARK_GREEN); } } + /* * Draw the vertical bars */ @@ -432,7 +424,7 @@ void Graph_DrawMemUsageHistoryGraph(HDC hDC, HWND hWnd) { if ((i % 11) == 0) { - /* FillSolidRect2(hDC, i - offset, 0, 1, rcClient.bottom, DARK_GREEN); */ + //FillSolidRect2(hDC, i - offset, 0, 1, rcClient.bottom, DARK_GREEN); } } diff --git a/base/applications/taskmgr/graph.h b/base/applications/taskmgr/graph.h index 27682b41c05..d2ada309b01 100644 --- a/base/applications/taskmgr/graph.h +++ b/base/applications/taskmgr/graph.h @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Performance Graph Meters. + * PURPOSE: Performance Graph Meters * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ @@ -12,14 +12,14 @@ extern "C" { #endif -#define BRIGHT_GREEN RGB(0, 255, 0) -#define MEDIUM_GREEN RGB(0, 190, 0) -#define DARK_GREEN RGB(0, 130, 0) -#define RED RGB(255, 0, 0) +#define BRIGHT_GREEN RGB(0, 255, 0) +#define MEDIUM_GREEN RGB(0, 190, 0) +#define DARK_GREEN RGB(0, 130, 0) +#define RED RGB(255, 0, 0) -extern WNDPROC OldGraphWndProc; +extern WNDPROC OldGraphWndProc; -INT_PTR CALLBACK Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); #ifdef __cplusplus diff --git a/base/applications/taskmgr/lang/bg-BG.rc b/base/applications/taskmgr/lang/bg-BG.rc index 7f523d3833c..e8505c05b0e 100644 --- a/base/applications/taskmgr/lang/bg-BG.rc +++ b/base/applications/taskmgr/lang/bg-BG.rc @@ -177,7 +177,6 @@ BEGIN PUSHBUTTON "&Прекратяване на задачата", IDC_ENDPROCESS, 144, 203, 100, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/cs-CZ.rc b/base/applications/taskmgr/lang/cs-CZ.rc index 423155a957b..f15c3b3b7f5 100644 --- a/base/applications/taskmgr/lang/cs-CZ.rc +++ b/base/applications/taskmgr/lang/cs-CZ.rc @@ -177,7 +177,6 @@ BEGIN PUSHBUTTON "&Ukončit proces", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/da-DK.rc b/base/applications/taskmgr/lang/da-DK.rc index 27ea5d0f36c..42162b6c048 100644 --- a/base/applications/taskmgr/lang/da-DK.rc +++ b/base/applications/taskmgr/lang/da-DK.rc @@ -177,7 +177,6 @@ BEGIN PUSHBUTTON "&Afslut Proces", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/de-DE.rc b/base/applications/taskmgr/lang/de-DE.rc index aea8376cf63..519d3097edb 100644 --- a/base/applications/taskmgr/lang/de-DE.rc +++ b/base/applications/taskmgr/lang/de-DE.rc @@ -179,7 +179,6 @@ BEGIN PUSHBUTTON "&Prozess beenden", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/el-GR.rc b/base/applications/taskmgr/lang/el-GR.rc index 616f0de9115..f5a3a34598b 100644 --- a/base/applications/taskmgr/lang/el-GR.rc +++ b/base/applications/taskmgr/lang/el-GR.rc @@ -179,7 +179,6 @@ BEGIN PUSHBUTTON "&End Process", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/en-US.rc b/base/applications/taskmgr/lang/en-US.rc index 90b73950e6a..d6d45afc0e6 100644 --- a/base/applications/taskmgr/lang/en-US.rc +++ b/base/applications/taskmgr/lang/en-US.rc @@ -175,7 +175,6 @@ BEGIN PUSHBUTTON "&End Process", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/es-ES.rc b/base/applications/taskmgr/lang/es-ES.rc index 9a99ddebc89..6a0f4780a53 100644 --- a/base/applications/taskmgr/lang/es-ES.rc +++ b/base/applications/taskmgr/lang/es-ES.rc @@ -179,7 +179,6 @@ BEGIN PUSHBUTTON "&Finalizar proceso", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/et-EE.rc b/base/applications/taskmgr/lang/et-EE.rc index 4aba1b254f9..ed6eef05a74 100644 --- a/base/applications/taskmgr/lang/et-EE.rc +++ b/base/applications/taskmgr/lang/et-EE.rc @@ -181,7 +181,6 @@ BEGIN PUSHBUTTON "&Lõpeta protsess", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/fr-FR.rc b/base/applications/taskmgr/lang/fr-FR.rc index 204caaef666..d86362f1fec 100644 --- a/base/applications/taskmgr/lang/fr-FR.rc +++ b/base/applications/taskmgr/lang/fr-FR.rc @@ -179,7 +179,6 @@ BEGIN PUSHBUTTON "&Terminer le processus", IDC_ENDPROCESS, 165, 189, 75, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/he-IL.rc b/base/applications/taskmgr/lang/he-IL.rc index c9855c5ff30..dea754e3d91 100644 --- a/base/applications/taskmgr/lang/he-IL.rc +++ b/base/applications/taskmgr/lang/he-IL.rc @@ -179,7 +179,6 @@ BEGIN PUSHBUTTON "&סיים תהליך", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/hu-HU.rc b/base/applications/taskmgr/lang/hu-HU.rc index 51fa95242a6..99a18e3eba4 100644 --- a/base/applications/taskmgr/lang/hu-HU.rc +++ b/base/applications/taskmgr/lang/hu-HU.rc @@ -179,7 +179,6 @@ BEGIN PUSHBUTTON "&Folyamat befejezése", IDC_ENDPROCESS, 165, 189, 75, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/id-ID.rc b/base/applications/taskmgr/lang/id-ID.rc index 28427216fa3..2052bdd0891 100644 --- a/base/applications/taskmgr/lang/id-ID.rc +++ b/base/applications/taskmgr/lang/id-ID.rc @@ -179,7 +179,6 @@ BEGIN PUSHBUTTON "&Akhiri Proses", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/it-IT.rc b/base/applications/taskmgr/lang/it-IT.rc index ff44c4e27a8..2785ef8715d 100644 --- a/base/applications/taskmgr/lang/it-IT.rc +++ b/base/applications/taskmgr/lang/it-IT.rc @@ -177,7 +177,6 @@ BEGIN PUSHBUTTON "&Termina Processo", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/ja-JP.rc b/base/applications/taskmgr/lang/ja-JP.rc index bec1d437eaf..4565f6cc044 100644 --- a/base/applications/taskmgr/lang/ja-JP.rc +++ b/base/applications/taskmgr/lang/ja-JP.rc @@ -177,7 +177,6 @@ BEGIN PUSHBUTTON "プロセスの終了(&E)", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS UI Gothic" diff --git a/base/applications/taskmgr/lang/ko-KR.rc b/base/applications/taskmgr/lang/ko-KR.rc index 1dc9dcb30b3..d3dd75b0c40 100644 --- a/base/applications/taskmgr/lang/ko-KR.rc +++ b/base/applications/taskmgr/lang/ko-KR.rc @@ -179,7 +179,6 @@ BEGIN PUSHBUTTON "작업 끝내기(&E)", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "굴림" diff --git a/base/applications/taskmgr/lang/nl-NL.rc b/base/applications/taskmgr/lang/nl-NL.rc index 64f70a7d0df..06702663f7c 100644 --- a/base/applications/taskmgr/lang/nl-NL.rc +++ b/base/applications/taskmgr/lang/nl-NL.rc @@ -177,7 +177,6 @@ BEGIN PUSHBUTTON "&Proces beëindigen", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/no-NO.rc b/base/applications/taskmgr/lang/no-NO.rc index 86063df9bbf..7b1a2715f53 100644 --- a/base/applications/taskmgr/lang/no-NO.rc +++ b/base/applications/taskmgr/lang/no-NO.rc @@ -177,7 +177,6 @@ BEGIN PUSHBUTTON "&Avslutt prosess", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/pl-PL.rc b/base/applications/taskmgr/lang/pl-PL.rc index 160755b4e75..ab60fa53be0 100644 --- a/base/applications/taskmgr/lang/pl-PL.rc +++ b/base/applications/taskmgr/lang/pl-PL.rc @@ -184,7 +184,6 @@ BEGIN PUSHBUTTON "&Zakończ proces", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/pt-BR.rc b/base/applications/taskmgr/lang/pt-BR.rc index f2581fe758d..a63fd2319d1 100644 --- a/base/applications/taskmgr/lang/pt-BR.rc +++ b/base/applications/taskmgr/lang/pt-BR.rc @@ -177,7 +177,6 @@ BEGIN PUSHBUTTON "&Finalizar processo", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/pt-PT.rc b/base/applications/taskmgr/lang/pt-PT.rc index 1d6568e2d6d..0fe5288defd 100644 --- a/base/applications/taskmgr/lang/pt-PT.rc +++ b/base/applications/taskmgr/lang/pt-PT.rc @@ -179,7 +179,6 @@ BEGIN PUSHBUTTON "&Terminar processo", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/ro-RO.rc b/base/applications/taskmgr/lang/ro-RO.rc index 1b0d7df8a74..9cba5a635f4 100644 --- a/base/applications/taskmgr/lang/ro-RO.rc +++ b/base/applications/taskmgr/lang/ro-RO.rc @@ -182,7 +182,6 @@ BEGIN PUSHBUTTON "Opr&ește procesul", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/ru-RU.rc b/base/applications/taskmgr/lang/ru-RU.rc index da28e3bc231..989dec8a6c1 100644 --- a/base/applications/taskmgr/lang/ru-RU.rc +++ b/base/applications/taskmgr/lang/ru-RU.rc @@ -179,7 +179,6 @@ BEGIN PUSHBUTTON "&Завершить процесс", IDC_ENDPROCESS, 167, 189, 74, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/sk-SK.rc b/base/applications/taskmgr/lang/sk-SK.rc index 45567224455..75982e1f7f4 100644 --- a/base/applications/taskmgr/lang/sk-SK.rc +++ b/base/applications/taskmgr/lang/sk-SK.rc @@ -179,7 +179,6 @@ BEGIN PUSHBUTTON "&Ukončiť proces", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/sq-AL.rc b/base/applications/taskmgr/lang/sq-AL.rc index 06c4254a6e2..d0753d2889b 100644 --- a/base/applications/taskmgr/lang/sq-AL.rc +++ b/base/applications/taskmgr/lang/sq-AL.rc @@ -178,7 +178,6 @@ BEGIN PUSHBUTTON "Mbyll Procesin", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/sv-SE.rc b/base/applications/taskmgr/lang/sv-SE.rc index 5186e05c3ff..9e5315c58c1 100644 --- a/base/applications/taskmgr/lang/sv-SE.rc +++ b/base/applications/taskmgr/lang/sv-SE.rc @@ -179,7 +179,6 @@ BEGIN PUSHBUTTON "&Avsluta process", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/tr-TR.rc b/base/applications/taskmgr/lang/tr-TR.rc index 27a1272cd9e..201bc7c4498 100644 --- a/base/applications/taskmgr/lang/tr-TR.rc +++ b/base/applications/taskmgr/lang/tr-TR.rc @@ -177,7 +177,6 @@ BEGIN PUSHBUTTON "&İşlemi Sonlandır", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/uk-UA.rc b/base/applications/taskmgr/lang/uk-UA.rc index b7d630af65b..59372ae4607 100644 --- a/base/applications/taskmgr/lang/uk-UA.rc +++ b/base/applications/taskmgr/lang/uk-UA.rc @@ -177,7 +177,6 @@ BEGIN PUSHBUTTON "Зн&яти процес", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/base/applications/taskmgr/lang/zh-CN.rc b/base/applications/taskmgr/lang/zh-CN.rc index 5afc17c975f..d81a7ce540f 100644 --- a/base/applications/taskmgr/lang/zh-CN.rc +++ b/base/applications/taskmgr/lang/zh-CN.rc @@ -184,7 +184,6 @@ BEGIN PUSHBUTTON "结束进程(&E)", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "宋体" diff --git a/base/applications/taskmgr/lang/zh-HK.rc b/base/applications/taskmgr/lang/zh-HK.rc index d6abcc2aea5..e50b521c256 100644 --- a/base/applications/taskmgr/lang/zh-HK.rc +++ b/base/applications/taskmgr/lang/zh-HK.rc @@ -185,7 +185,6 @@ BEGIN PUSHBUTTON "結束處理程序(&E)", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "新細明體" diff --git a/base/applications/taskmgr/lang/zh-TW.rc b/base/applications/taskmgr/lang/zh-TW.rc index c83bfea34ee..0c10bb3afd7 100644 --- a/base/applications/taskmgr/lang/zh-TW.rc +++ b/base/applications/taskmgr/lang/zh-TW.rc @@ -185,7 +185,6 @@ BEGIN PUSHBUTTON "結束處理程序(&E)", IDC_ENDPROCESS, 171, 189, 69, 14 END -/* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "新細明體" diff --git a/base/applications/taskmgr/perfdata.c b/base/applications/taskmgr/perfdata.c index 0126285c98b..7f0869a5752 100644 --- a/base/applications/taskmgr/perfdata.c +++ b/base/applications/taskmgr/perfdata.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Performance Counters. + * PURPOSE: Performance Counters * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2014 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> */ @@ -100,7 +100,7 @@ void PerfDataUninitialize(void) static void SidToUserName(PSID Sid, LPWSTR szBuffer, DWORD BufferSize) { static WCHAR szDomainNameUnused[255]; - DWORD DomainNameLen = sizeof(szDomainNameUnused) / sizeof(szDomainNameUnused[0]); + DWORD DomainNameLen = _countof(szDomainNameUnused); SID_NAME_USE Use; if (Sid != NULL) @@ -153,8 +153,6 @@ CachedGetUserFromSid( pEntry->List.Blink = SidToUserNameHead.Blink; SidToUserNameHead.Blink->Flink = &pEntry->List; SidToUserNameHead.Blink = &pEntry->List; - - return; } void PerfDataRefresh(void) @@ -324,7 +322,7 @@ void PerfDataRefresh(void) wcsncpy(pPerfData[Idx].ImageName, pSPI->ImageName.Buffer, len); } else { LoadStringW(hInst, IDS_IDLE_PROCESS, pPerfData[Idx].ImageName, - sizeof(pPerfData[Idx].ImageName) / sizeof(pPerfData[Idx].ImageName[0])); + _countof(pPerfData[Idx].ImageName)); } pPerfData[Idx].ProcessId = pSPI->UniqueProcessId; @@ -402,7 +400,7 @@ ClearInfo: ZeroMemory(&pPerfData[Idx].IOCounters, sizeof(IO_COUNTERS)); } - cwcUserName = sizeof(pPerfData[0].UserName) / sizeof(pPerfData[0].UserName[0]); + cwcUserName = _countof(pPerfData[0].UserName); CachedGetUserFromSid(ProcessUser, pPerfData[Idx].UserName, &cwcUserName); if (ProcessSD != NULL) diff --git a/base/applications/taskmgr/perfpage.c b/base/applications/taskmgr/perfpage.c index c9abb74cd15..005bc6e2e40 100644 --- a/base/applications/taskmgr/perfpage.c +++ b/base/applications/taskmgr/perfpage.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Performance Page. + * PURPOSE: Performance Page * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ @@ -320,9 +320,9 @@ DWORD WINAPI PerformancePageRefreshThread(PVOID Parameter) WCHAR Text[260]; WCHAR szMemUsage[256], szCpuUsage[256], szProcesses[256]; - LoadStringW(hInst, IDS_STATUS_CPUUSAGE, szCpuUsage, ARRAYSIZE(szCpuUsage)); - LoadStringW(hInst, IDS_STATUS_MEMUSAGE, szMemUsage, ARRAYSIZE(szMemUsage)); - LoadStringW(hInst, IDS_STATUS_PROCESSES, szProcesses, ARRAYSIZE(szProcesses)); + LoadStringW(hInst, IDS_STATUS_CPUUSAGE, szCpuUsage, _countof(szCpuUsage)); + LoadStringW(hInst, IDS_STATUS_MEMUSAGE, szMemUsage, _countof(szMemUsage)); + LoadStringW(hInst, IDS_STATUS_PROCESSES, szProcesses, _countof(szProcesses)); while (1) { @@ -355,11 +355,11 @@ DWORD WINAPI PerformancePageRefreshThread(PVOID Parameter) StrFormatByteSizeW(CommitChargeTotal * 1024, szChargeTotalFormat, - ARRAYSIZE(szChargeTotalFormat)); + _countof(szChargeTotalFormat)); StrFormatByteSizeW(CommitChargeLimit * 1024, szChargeLimitFormat, - ARRAYSIZE(szChargeLimitFormat)); + _countof(szChargeLimitFormat)); if (!bTrackMenu) { diff --git a/base/applications/taskmgr/procpage.c b/base/applications/taskmgr/procpage.c index e3e791b6182..27b34947153 100644 --- a/base/applications/taskmgr/procpage.c +++ b/base/applications/taskmgr/procpage.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Processes Page. + * PURPOSE: Processes Page * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2009 Maxime Vernier <maxime.vernier(a)gmail.com> * Copyright 2022 Thamatip Chitpong <tangaming123456(a)outlook.com> @@ -797,8 +797,8 @@ int CALLBACK ProcessPageCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lPara if (TaskManagerSettings.SortColumn == COLUMN_IMAGENAME) { - PerfDataGetImageName(IndexParam1, text1, sizeof (text1) / sizeof (*text1)); - PerfDataGetImageName(IndexParam2, text2, sizeof (text2) / sizeof (*text2)); + PerfDataGetImageName(IndexParam1, text1, _countof(text1)); + PerfDataGetImageName(IndexParam2, text2, _countof(text2)); ret = _wcsicmp(text1, text2); } else if (TaskManagerSettings.SortColumn == COLUMN_PID) @@ -809,14 +809,14 @@ int CALLBACK ProcessPageCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lPara } else if (TaskManagerSettings.SortColumn == COLUMN_USERNAME) { - PerfDataGetUserName(IndexParam1, text1, sizeof (text1) / sizeof (*text1)); - PerfDataGetUserName(IndexParam2, text2, sizeof (text2) / sizeof (*text2)); + PerfDataGetUserName(IndexParam1, text1, _countof(text1)); + PerfDataGetUserName(IndexParam2, text2, _countof(text2)); ret = _wcsicmp(text1, text2); } else if (TaskManagerSettings.SortColumn == COLUMN_COMMANDLINE) { - PerfDataGetCommandLine(IndexParam1, text1, sizeof (text1) / sizeof (*text1)); - PerfDataGetCommandLine(IndexParam2, text2, sizeof (text2) / sizeof (*text2)); + PerfDataGetCommandLine(IndexParam1, text1, _countof(text1)); + PerfDataGetCommandLine(IndexParam2, text2, _countof(text2)); ret = _wcsicmp(text1, text2); } else if (TaskManagerSettings.SortColumn == COLUMN_SESSIONID) diff --git a/base/applications/taskmgr/run.c b/base/applications/taskmgr/run.c index 3e210f04415..621858a1e11 100644 --- a/base/applications/taskmgr/run.c +++ b/base/applications/taskmgr/run.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Run Task. + * PURPOSE: Run Task * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> */ @@ -16,8 +16,8 @@ void TaskManager_OnFileNew(void) WCHAR szText[256]; /* Load language strings from resource file */ - LoadStringW(hInst, IDS_CREATENEWTASK, szTitle, sizeof(szTitle) / sizeof(szTitle[0])); - LoadStringW(hInst, IDS_CREATENEWTASK_DESC, szText, sizeof(szText) / sizeof(szText[0])); + LoadStringW(hInst, IDS_CREATENEWTASK, szTitle, _countof(szTitle)); + LoadStringW(hInst, IDS_CREATENEWTASK_DESC, szText, _countof(szText)); hShell32 = LoadLibraryW(L"SHELL32.DLL"); RunFileDlg = (RUNFILEDLG)(FARPROC)GetProcAddress(hShell32, (LPCSTR)61); diff --git a/base/applications/taskmgr/taskmgr.c b/base/applications/taskmgr/taskmgr.c index bf24eef8b39..9dedb5e1093 100644 --- a/base/applications/taskmgr/taskmgr.c +++ b/base/applications/taskmgr/taskmgr.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Application Entry-point. + * PURPOSE: Application Entry-point * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> */ @@ -110,7 +110,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HWND hTaskMgr; TCHAR szTaskmgr[128]; - LoadString(hInst, IDS_APP_TITLE, szTaskmgr, sizeof(szTaskmgr)/sizeof(TCHAR)); + LoadString(hInst, IDS_APP_TITLE, szTaskmgr, _countof(szTaskmgr)); hTaskMgr = FindWindow(NULL, szTaskmgr); if (hTaskMgr != NULL) @@ -139,10 +139,10 @@ int APIENTRY wWinMain(HINSTANCE hInstance, * so that we can debug processes */ - /* Get a token for this process. */ + /* Get a token for this process. */ if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken)) { - /* Get the LUID for the debug privilege. */ + /* Get the LUID for the debug privilege. */ if (LookupPrivilegeValueW(NULL, SE_DEBUG_NAME, &tkp.Privileges[0].Luid)) { tkp.PrivilegeCount = 1; /* one privilege to set */ @@ -159,9 +159,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, /* Initialize perf data */ if (!PerfDataInitialize()) - { return -1; - } /* * Set our shutdown parameters: we want to shutdown the very last, @@ -371,21 +369,14 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) hPopupMenu = GetSubMenu(hMenu, 0); if(IsWindowVisible(hMainWnd)) - { - DeleteMenu(hPopupMenu, ID_RESTORE, MF_BYCOMMAND); - } + DeleteMenu(hPopupMenu, ID_RESTORE, MF_BYCOMMAND); else - { - SetMenuDefaultItem(hPopupMenu, ID_RESTORE, FALSE); - } + SetMenuDefaultItem(hPopupMenu, ID_RESTORE, FALSE); if(OnTop) - { - CheckMenuItem(hPopupMenu, ID_OPTIONS_ALWAYSONTOP, MF_BYCOMMAND | MF_CHECKED); - } else - { - CheckMenuItem(hPopupMenu, ID_OPTIONS_ALWAYSONTOP, MF_BYCOMMAND | MF_UNCHECKED); - } + CheckMenuItem(hPopupMenu, ID_OPTIONS_ALWAYSONTOP, MF_BYCOMMAND | MF_CHECKED); + else + CheckMenuItem(hPopupMenu, ID_OPTIONS_ALWAYSONTOP, MF_BYCOMMAND | MF_UNCHECKED); SetForegroundWindow(hMainWnd); TrackPopupMenuEx(hPopupMenu, 0, pt.x, pt.y, hMainWnd, NULL); @@ -680,19 +671,19 @@ BOOL OnCreate(HWND hWnd) lpUserName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); if (lpUserName && GetUserNameW(lpUserName, &len)) { - _snwprintf(szLogOffItem, sizeof(szLogOffItem)/sizeof(szLogOffItem[0]), szTemp, lpUserName); - szLogOffItem[sizeof(szLogOffItem)/sizeof(szLogOffItem[0]) - 1] = UNICODE_NULL; + _snwprintf(szLogOffItem, _countof(szLogOffItem), szTemp, lpUserName); + szLogOffItem[_countof(szLogOffItem) - 1] = UNICODE_NULL; } else { - _snwprintf(szLogOffItem, sizeof(szLogOffItem)/sizeof(szLogOffItem[0]), szTemp, L"n/a"); + _snwprintf(szLogOffItem, _countof(szLogOffItem), szTemp, L"n/a"); } if (lpUserName) HeapFree(GetProcessHeap(), 0, lpUserName); } else { - _snwprintf(szLogOffItem, sizeof(szLogOffItem)/sizeof(szLogOffItem[0]), szTemp, L"n/a"); + _snwprintf(szLogOffItem, _countof(szLogOffItem), szTemp, L"n/a"); } /* 3- Set the menu item text to its formatted counterpart */ @@ -868,11 +859,8 @@ void SaveSettings(void) void TaskManager_OnRestoreMainWindow(void) { - //HMENU hMenu, hOptionsMenu; BOOL OnTop; - //hMenu = GetMenu(hMainWnd); - //hOptionsMenu = GetSubMenu(hMenu, OPTIONS_MENU_INDEX); OnTop = ((GetWindowLongPtrW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0); OpenIcon(hMainWnd);

11 months, 3 weeks

[reactos] 06/06: [NTOS:KE/x64] Implement detection of more KF_* feature flags

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=410b1030c02240e0a711b… commit 410b1030c02240e0a711b0006023451fdd46a6d1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Aug 27 15:07:30 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Oct 3 19:45:44 2023 +0300 [NTOS:KE/x64] Implement detection of more KF_* feature flags - Detect KF_SSSE3, KF_SSE4_1, KF_SSE4_2, KF_RDRAND, KF_BRANCH, KF_SLAT, KF_GENUINE_INTEL, KF_AUTHENTICAMD, KF_ACNT2, KF_SMEP, KF_SMAP, KF_RDWRFSGSBASE, KF_XSAVEOPT, KF_XSAVES, KF_HUGEPAGE, KF_RDTSCP --- ntoskrnl/ke/amd64/cpu.c | 159 +++++++++++++++++++++++++++++++++---- sdk/include/ndk/amd64/ketypes.h | 2 +- sdk/include/reactos/x86x64/Cpuid.h | 11 ++- sdk/include/reactos/x86x64/Msr.h | 6 ++ 4 files changed, 156 insertions(+), 22 deletions(-) diff --git a/ntoskrnl/ke/amd64/cpu.c b/ntoskrnl/ke/amd64/cpu.c index f01784f5b07..b2b40b0bf62 100644 --- a/ntoskrnl/ke/amd64/cpu.c +++ b/ntoskrnl/ke/amd64/cpu.c @@ -11,6 +11,7 @@ #include <ntoskrnl.h> #include <x86x64/Cpuid.h> +#include <x86x64/Msr.h> #define NDEBUG #include <debug.h> @@ -146,6 +147,19 @@ KiSetProcessorType(VOID) KeGetCurrentPrcb()->CpuStep = (USHORT)Stepping; } +/*! + \brief Evaluates the KeFeatureFlag bits for the current CPU. + + \return The feature flags for this CPU. + + \see https://www.geoffchappell.com/studies/windows/km/ntoskrnl/structs/kprcb/fea… + + \todo + - KF_VIRT_FIRMWARE_ENABLED 0x08000000 (see notes from Geoff Chappell) + - KF_FPU_LEAKAGE 0x0000020000000000ULL + - KF_CAT 0x0000100000000000ULL + - KF_CET_SS 0x0000400000000000ULL +*/ ULONG64 NTAPI KiGetFeatureBits(VOID) @@ -153,6 +167,7 @@ KiGetFeatureBits(VOID) PKPRCB Prcb = KeGetCurrentPrcb(); ULONG Vendor; ULONG64 FeatureBits = 0; + CPUID_SIGNATURE_REGS signature; CPUID_VERSION_INFO_REGS VersionInfo; CPUID_EXTENDED_FUNCTION_REGS extendedFunction; @@ -160,7 +175,10 @@ KiGetFeatureBits(VOID) Vendor = Prcb->CpuVendor; /* Make sure we got a valid vendor ID at least. */ - if (!Vendor) return FeatureBits; + if (Vendor == CPU_UNKNOWN) return FeatureBits; + + /* Get signature CPUID for the maximum function */ + __cpuid(signature.AsInt32, CPUID_SIGNATURE); /* Get the CPUID Info. */ __cpuid(VersionInfo.AsInt32, CPUID_VERSION_INFO); @@ -189,6 +207,7 @@ KiGetFeatureBits(VOID) if (VersionInfo.Ecx.Bits.CMPXCHG16B) FeatureBits |= KF_CMPXCHG16B; if (VersionInfo.Ecx.Bits.SSE4_1) FeatureBits |= KF_SSE4_1; if (VersionInfo.Ecx.Bits.XSAVE) FeatureBits |= KF_XSTATE; + if (VersionInfo.Ecx.Bits.RDRAND) FeatureBits |= KF_RDRAND; /* Check if the CPU has hyper-threading */ if (VersionInfo.Edx.Bits.HTT) @@ -208,27 +227,115 @@ KiGetFeatureBits(VOID) Prcb->LogicalProcessorsPerPhysicalProcessor = 1; } + /* Check if CPUID_THERMAL_POWER_MANAGEMENT (0x06) is supported */ + if (signature.MaxLeaf >= CPUID_THERMAL_POWER_MANAGEMENT) + { + /* Read CPUID_THERMAL_POWER_MANAGEMENT */ + CPUID_THERMAL_POWER_MANAGEMENT_REGS PowerInfo; + __cpuid(PowerInfo.AsInt32, CPUID_THERMAL_POWER_MANAGEMENT); + + if (PowerInfo.Undoc.Ecx.ACNT2) FeatureBits |= KF_ACNT2; + } + + /* Check if CPUID_STRUCTURED_EXTENDED_FEATURE_FLAGS (0x07) is supported */ + if (signature.MaxLeaf >= CPUID_STRUCTURED_EXTENDED_FEATURE_FLAGS) + { + /* Read CPUID_STRUCTURED_EXTENDED_FEATURE_FLAGS */ + CPUID_STRUCTURED_EXTENDED_FEATURE_FLAGS_REGS ExtFlags; + __cpuidex(ExtFlags.AsInt32, + CPUID_STRUCTURED_EXTENDED_FEATURE_FLAGS, + CPUID_STRUCTURED_EXTENDED_FEATURE_FLAGS_SUB_LEAF_INFO); + + if (ExtFlags.Ebx.Bits.SMEP) FeatureBits |= KF_SMEP; + if (ExtFlags.Ebx.Bits.FSGSBASE) FeatureBits |= KF_RDWRFSGSBASE; + if (ExtFlags.Ebx.Bits.SMAP) FeatureBits |= KF_SMAP; + } + + /* Check if CPUID_EXTENDED_STATE (0x0D) is supported */ + if (signature.MaxLeaf >= CPUID_EXTENDED_STATE) + { + /* Read CPUID_EXTENDED_STATE */ + CPUID_EXTENDED_STATE_SUB_LEAF_EAX_REGS ExtStateSub; + __cpuidex(ExtStateSub.AsInt32, + CPUID_EXTENDED_STATE, + CPUID_EXTENDED_STATE_SUB_LEAF); + + if (ExtStateSub.Eax.Bits.XSAVEOPT) FeatureBits |= KF_XSAVEOPT; + if (ExtStateSub.Eax.Bits.XSAVES) FeatureBits |= KF_XSAVES; + } + /* Check extended cpuid features */ __cpuid(extendedFunction.AsInt32, CPUID_EXTENDED_FUNCTION); if ((extendedFunction.MaxLeaf & 0xffffff00) == 0x80000000) { - /* Check if CPUID 0x80000001 is supported */ - if (extendedFunction.MaxLeaf >= 0x80000001) + /* Check if CPUID_EXTENDED_CPU_SIG (0x80000001) is supported */ + if (extendedFunction.MaxLeaf >= CPUID_EXTENDED_CPU_SIG) { - CPUID_EXTENDED_CPU_SIG_REGS extSig; - - /* Check which extended features are available. */ - __cpuid(extSig.AsInt32, CPUID_EXTENDED_CPU_SIG); + /* Read CPUID_EXTENDED_CPU_SIG */ + CPUID_EXTENDED_CPU_SIG_REGS ExtSig; + __cpuid(ExtSig.AsInt32, CPUID_EXTENDED_CPU_SIG); /* Check if NX-bit is supported */ - if (extSig.Intel.Edx.Bits.NX) FeatureBits |= KF_NX_BIT; + if (ExtSig.Intel.Edx.Bits.NX) FeatureBits |= KF_NX_BIT; + if (ExtSig.Intel.Edx.Bits.Page1GB) FeatureBits |= KF_HUGEPAGE; + if (ExtSig.Intel.Edx.Bits.RDTSCP) FeatureBits |= KF_RDTSCP; - /* Now handle each features for each CPU Vendor */ - switch (Vendor) + /* AMD specific */ + if (Vendor == CPU_AMD) { - case CPU_AMD: - if (extSig.Amd.Edx.Bits.ThreeDNow) FeatureBits |= KF_3DNOW; - break; + if (ExtSig.Amd.Edx.Bits.ThreeDNow) FeatureBits |= KF_3DNOW; + } + } + } + + /* Vendor specific */ + if (Vendor == CPU_INTEL) + { + FeatureBits |= KF_GENUINE_INTEL; + + /* Check for models that support LBR */ + if (VersionInfo.Eax.Bits.FamilyId == 6) + { + if ((VersionInfo.Eax.Bits.Model == 15) || + (VersionInfo.Eax.Bits.Model == 22) || + (VersionInfo.Eax.Bits.Model == 23) || + (VersionInfo.Eax.Bits.Model == 26)) + { + FeatureBits |= KF_BRANCH; + } + } + + /* Check if VMX is available */ + if (VersionInfo.Ecx.Bits.VMX) + { + /* Read PROCBASED ctls and check if secondary are allowed */ + MSR_IA32_VMX_PROCBASED_CTLS_REGISTER ProcBasedCtls; + ProcBasedCtls.Uint64 = __readmsr(MSR_IA32_VMX_PROCBASED_CTLS); + if (ProcBasedCtls.Bits.Allowed1.ActivateSecondaryControls) + { + /* Read secondary controls and check if EPT is allowed */ + MSR_IA32_VMX_PROCBASED_CTLS2_REGISTER ProcBasedCtls2; + ProcBasedCtls2.Uint64 = __readmsr(MSR_IA32_VMX_PROCBASED_CTLS2); + if (ProcBasedCtls2.Bits.Allowed1.EPT) + FeatureBits |= KF_SLAT; + } + } + } + else if (Vendor == CPU_AMD) + { + FeatureBits |= KF_AUTHENTICAMD; + FeatureBits |= KF_BRANCH; + + /* Check extended cpuid features */ + if ((extendedFunction.MaxLeaf & 0xffffff00) == 0x80000000) + { + /* Check if CPUID_AMD_SVM_FEATURES (0x8000000A) is supported */ + if (extendedFunction.MaxLeaf >= CPUID_AMD_SVM_FEATURES) + { + /* Read CPUID_AMD_SVM_FEATURES and check if Nested Paging is available */ + CPUID_AMD_SVM_FEATURES_REGS SvmFeatures; + __cpuid(SvmFeatures.AsInt32, CPUID_AMD_SVM_FEATURES); + if (SvmFeatures.Edx.Bits.NP) FeatureBits |= KF_SLAT; } } } @@ -261,22 +368,40 @@ KiReportCpuFeatures(IN PKPRCB Prcb) print_kf_bit(KF_LARGE_PAGE); print_kf_bit(KF_MTRR); print_kf_bit(KF_CMPXCHG8B); - print_kf_bit(KF_CMPXCHG16B); print_kf_bit(KF_MMX); + print_kf_bit(KF_DTS); print_kf_bit(KF_PAT); print_kf_bit(KF_FXSR); print_kf_bit(KF_FAST_SYSCALL); print_kf_bit(KF_XMMI); print_kf_bit(KF_3DNOW); + print_kf_bit(KF_XSAVEOPT); print_kf_bit(KF_XMMI64); - print_kf_bit(KF_DTS); + print_kf_bit(KF_BRANCH); + print_kf_bit(KF_00040000); + print_kf_bit(KF_SSE3); + print_kf_bit(KF_CMPXCHG16B); + print_kf_bit(KF_AUTHENTICAMD); + print_kf_bit(KF_ACNT2); + print_kf_bit(KF_XSTATE); + print_kf_bit(KF_GENUINE_INTEL); + print_kf_bit(KF_SLAT); + print_kf_bit(KF_VIRT_FIRMWARE_ENABLED); + print_kf_bit(KF_RDWRFSGSBASE); print_kf_bit(KF_NX_BIT); print_kf_bit(KF_NX_DISABLED); print_kf_bit(KF_NX_ENABLED); - print_kf_bit(KF_SSE3); + print_kf_bit(KF_RDRAND); + print_kf_bit(KF_SMAP); + print_kf_bit(KF_RDTSCP); + print_kf_bit(KF_HUGEPAGE); + print_kf_bit(KF_XSAVES); + print_kf_bit(KF_FPU_LEAKAGE); + print_kf_bit(KF_CAT); + print_kf_bit(KF_CET_SS); print_kf_bit(KF_SSSE3); print_kf_bit(KF_SSE4_1); - print_kf_bit(KF_XSTATE); + print_kf_bit(KF_SSE4_2); #undef print_kf_bit #define print_cf(cpu_flag) if (CpuFeatures & cpu_flag) DbgPrint(#cpu_flag " ") diff --git a/sdk/include/ndk/amd64/ketypes.h b/sdk/include/ndk/amd64/ketypes.h index 1f306de1d2c..81219a73f82 100644 --- a/sdk/include/ndk/amd64/ketypes.h +++ b/sdk/include/ndk/amd64/ketypes.h @@ -249,7 +249,7 @@ typedef enum #define MSR_GS_SWAP 0xC0000102 #define MSR_MCG_STATUS 0x017A #define MSR_AMD_ACCESS 0x9C5A203A -#define MSR_IA32_MISC_ENABLE 0x01A0 +#define MSR_IA32_MISC_ENABLE 0x000001A0 #define MSR_LAST_BRANCH_FROM 0x01DB #define MSR_LAST_BRANCH_TO 0x01DC #define MSR_LAST_EXCEPTION_FROM 0x01DD diff --git a/sdk/include/reactos/x86x64/Cpuid.h b/sdk/include/reactos/x86x64/Cpuid.h index 0a27d581e17..39ece442c99 100644 --- a/sdk/include/reactos/x86x64/Cpuid.h +++ b/sdk/include/reactos/x86x64/Cpuid.h @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS SDK + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Provides CPUID structure definitions + * COPYRIGHT: Copyright 2023 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ #define CHAR8 char @@ -104,10 +110,7 @@ typedef union UINT32 XSaveAreaSize; // The size in bytes of the XSAVE area containing all states enabled by XCRO | IA32_XSS. } Ebx; CPUID_EXTENDED_STATE_SUB_LEAF_ECX Ecx; - struct - { - UINT32 Edx; // Reports the supported bits of the upper 32 bits of the IA32_XSS MSR.IA32_XSS[n + 32] can be set to 1 only if EDX[n] is 1. - } Edx; + UINT32 Edx; // Reports the supported bits of the upper 32 bits of the IA32_XSS MSR. IA32_XSS[n + 32] can be set to 1 only if EDX[n] is 1. }; } CPUID_EXTENDED_STATE_SUB_LEAF_EAX_REGS; diff --git a/sdk/include/reactos/x86x64/Msr.h b/sdk/include/reactos/x86x64/Msr.h index 21e2a4df6ec..98b3e4d9ae1 100644 --- a/sdk/include/reactos/x86x64/Msr.h +++ b/sdk/include/reactos/x86x64/Msr.h @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS SDK + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Provides CPUID structure definitions + * COPYRIGHT: Copyright 2023 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ #define SIZE_2KB 2048

11 months, 3 weeks

← Newer
1
...
8
9
10
11
12
13
14
Older →

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 October 2023