Merge branch 'master' of https://github.com/DartVanya/systeminformer

DartVanya · Aug 13, 2024 · c8299cb · c8299cb
2 parents 4e34a21 + bf8ec2c
commit c8299cb
Show file tree

Hide file tree

Showing 11 changed files with 112 additions and 29 deletions.
diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
@@ -16,18 +16,19 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v4
+    - name: Install Nuget Packages
+      run: nuget restore .\packages.config -PackagesDirectory .\packages\
     - name: Build Solution
       shell: cmd
       working-directory: ${{github.workspace}}
       run: build\build_verbose.cmd
-  # temporarily disabled pending resolution of:
-  # https://github.com/winsiderss/systeminformer/issues/2109
-  # https://github.com/actions/runner-images/issues/10012
-  #build_driver:
-  #  runs-on: windows-latest
-  #  steps:
-  #  - uses: actions/checkout@v4
-  #  - name: Build Driver
-  #    shell: cmd
-  #    working-directory: ${{github.workspace}}
-  #    run: build\build_zdriver.cmd prefast
+  build_driver:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Nuget Packages
+      run: nuget restore .\packages.config -PackagesDirectory .\packages\
+    - name: Build Driver
+      shell: cmd
+      working-directory: ${{github.workspace}}
+      run: build\build_zdriver.cmd prefast
diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
@@ -0,0 +1,47 @@
+name: "CodeQL Analysis"
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '00 16 * * 1'
+
+permissions:
+  actions: read
+  contents: read
+  security-events: write
+
+jobs:
+  analyze_driver:
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Nuget Packages
+        run: nuget restore .\packages.config -PackagesDirectory .\packages\
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: cpp
+          packs: microsoft/windows-drivers
+      - name: Build Driver
+        shell: cmd
+        working-directory: ${{github.workspace}}
+        run: build\build_zdriver.cmd
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:cpp"
+          output: sarif-results
+          upload: failure-only
+      - name: Filter CodeQL Results
+        uses: advanced-security/filter-sarif@v1
+        with:
+          # Exclude Microsoft and third party sources
+          patterns: -packages/**/*
+          input: sarif-results/cpp.sarif
+          output: sarif-results/cpp.sarif
+      - name: Upload CodeQL Results
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: sarif-results/cpp.sarif
diff --git a/.gitignore b/.gitignore
@@ -45,7 +45,7 @@
 # Visual C++ cache folders
 ipch/
 .vs/
-*/packages/
+**/packages/
 
 # Visual Studio profiler
 *.psess

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,4 +4,10 @@
       <AdditionalOptions>/d1trimfile:"$(MSBuildThisFileDirectory)\" %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
   </ItemDefinitionGroup>
+  <Import Project="packages\Microsoft.Windows.SDK.CPP.10.0.26100.1\build\native\Microsoft.Windows.SDK.cpp.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.10.0.26100.1\build\native\Microsoft.Windows.SDK.cpp.props')"/>
+  <Import Project="packages\Microsoft.Windows.SDK.CPP.x86.10.0.26100.1\build\native\Microsoft.Windows.SDK.cpp.x86.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.x86.10.0.26100.1\build\native\Microsoft.Windows.SDK.cpp.x86.props') and '$(Platform)' == 'Win32'"/>
+  <Import Project="packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.1\build\native\Microsoft.Windows.SDK.cpp.x64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.1\build\native\Microsoft.Windows.SDK.cpp.x64.props') and '$(Platform)' == 'x64'"/>
+  <Import Project="packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.1\build\native\Microsoft.Windows.SDK.cpp.arm64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.1\build\native\Microsoft.Windows.SDK.cpp.arm64.props') and '$(Platform)' == 'ARM64'"/>
+  <Import Project="packages\Microsoft.Windows.WDK.x64.10.0.26100.1\build\native\Microsoft.Windows.WDK.x64.props" Condition="Exists('packages\Microsoft.Windows.WDK.x64.10.0.26100.1\build\native\Microsoft.Windows.WDK.x64.props') and '$(Platform)' == 'x64'"/>
+  <Import Project="packages\Microsoft.Windows.WDK.arm64.10.0.26100.1\build\native\Microsoft.Windows.WDK.arm64.props" Condition="Exists('packages\Microsoft.Windows.WDK.arm64.10.0.26100.1\build\native\Microsoft.Windows.WDK.arm64.props') and '$(Platform)' == 'ARM64'"/>
 </Project>
diff --git a/KSystemInformer/informer_debug.c b/KSystemInformer/informer_debug.c
@@ -102,6 +102,10 @@ VOID KphpDebugPrintFlush(
  * \param SystemArgument1 Unused
  * \param SystemArgument2 Unused
  */
+_Function_class_(KDEFERRED_ROUTINE)
+_IRQL_requires_max_(DISPATCH_LEVEL)
+_IRQL_requires_min_(DISPATCH_LEVEL)
+_IRQL_requires_(DISPATCH_LEVEL)
 _IRQL_requires_same_
 VOID KphpDebugPrintDpc(
     _In_ PKDPC Dpc,

diff --git a/SystemInformer.natvis b/SystemInformer.natvis
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright (c) 2022 Winsider Seminars & Solutions, Inc.  All rights reserved.
 
@@ -7,7 +8,6 @@ Authors:
 
     jxy-s   2024
 -->
-<?xml version="1.0" encoding="utf-8"?>
 
 <!-- Debugger Visualizers -->
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">

diff --git a/SystemInformer/actions.c b/SystemInformer/actions.c
@@ -5942,7 +5942,7 @@ BOOLEAN PhUiSetAttributesHandle(
 
     if (NT_SUCCESS(status = PhOpenProcess(
         &processHandle,
-        PROCESS_QUERY_LIMITED_INFORMATION,
+        PROCESS_SET_INFORMATION,
         ProcessId
         )))
     {

diff --git a/SystemInformer/prpghndl.c b/SystemInformer/prpghndl.c
@@ -81,7 +81,6 @@ VOID PhpInitializeHandleMenu(
     _Inout_ PPH_HANDLES_CONTEXT HandlesContext
     )
 {
-    PPH_EMENU_ITEM item;
     KPH_LEVEL level;
 
     if (NumberOfHandles == 0)
@@ -106,18 +105,8 @@ VOID PhpInitializeHandleMenu(
         PhEnableEMenuItem(Menu, ID_HANDLE_COPY, TRUE);
     }
 
-    // Remove irrelevant menu items.
-
     level = KsiLevel();
 
-    if (level >= KphLevelMed)
-    {
-        if (item = PhFindEMenuItem(Menu, 0, NULL, ID_HANDLE_PROTECTED))
-            PhDestroyEMenuItem(item);
-        if (item = PhFindEMenuItem(Menu, 0, NULL, ID_HANDLE_INHERIT))
-            PhDestroyEMenuItem(item);
-    }
-
     // Protected, Inherit
     if (NumberOfHandles == 1 && (level >= KphLevelMed))
     {

diff --git a/packages.config b/packages.config
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Windows.SDK.CPP" version="10.0.26100.1" targetFramework="native" />
+  <package id="Microsoft.Windows.SDK.CPP.x86" version="10.0.26100.1" targetFramework="native" />
+  <package id="Microsoft.Windows.SDK.CPP.x64" version="10.0.26100.1" targetFramework="native" />
+  <package id="Microsoft.Windows.SDK.CPP.arm64" version="10.0.26100.1" targetFramework="native" />
+  <package id="Microsoft.Windows.WDK.x64" version="10.0.26100.1" targetFramework="native" />
+  <package id="Microsoft.Windows.WDK.arm64" version="10.0.26100.1" targetFramework="native" />
+</packages>
diff --git a/phlib/theme.c b/phlib/theme.c
@@ -1884,6 +1884,8 @@ LRESULT CALLBACK PhThemeWindowDrawToolbar(
                 break;
             }
 
+            BOOLEAN isDropDown = !!(buttonInfo.fsStyle & BTNS_WHOLEDROPDOWN);
+
             //if (isMouseDown)
             //{
             //    SetTextColor(DrawInfo->nmcd.hdc, PhThemeWindowTextColor);
@@ -1951,9 +1953,15 @@ LRESULT CALLBACK PhThemeWindowDrawToolbar(
                 //    break;
                 //}
 
+                BOOLEAN isPressed = buttonInfo.fsState & TBSTATE_PRESSED;
                 SetTextColor(DrawInfo->nmcd.hdc, PhThemeWindowTextColor); // RGB(0x0, 0x0, 0x0));
                 //SetDCBrushColor(DrawInfo->nmcd.hdc, PhThemeWindowBackgroundColor); // GetSysColor(COLOR_3DFACE));// RGB(0xff, 0xff, 0xff));
-                FillRect(DrawInfo->nmcd.hdc, &DrawInfo->nmcd.rc, PhThemeWindowBackgroundBrush);
+                if (!isPressed)
+                    FillRect(DrawInfo->nmcd.hdc, &DrawInfo->nmcd.rc, PhThemeWindowBackgroundBrush);
+                else {
+                    SetDCBrushColor(DrawInfo->nmcd.hdc, RGB(0x60, 0x60, 0x60));
+                    FillRect(DrawInfo->nmcd.hdc, &DrawInfo->nmcd.rc, GetStockBrush(DC_BRUSH));
+                }
             }
 
             dpiValue = PhGetWindowDpi(DrawInfo->nmcd.hdr.hwndFrom);
@@ -1984,7 +1992,7 @@ LRESULT CALLBACK PhThemeWindowDrawToolbar(
                     }
                     else
                     {
-                        x = DrawInfo->nmcd.rc.left + ((DrawInfo->nmcd.rc.right - DrawInfo->nmcd.rc.left) - bitmapWidth) / 2;
+                        x = DrawInfo->nmcd.rc.left + ((DrawInfo->nmcd.rc.right - DrawInfo->nmcd.rc.left) - bitmapWidth) / 2 - (isDropDown * 4);
                         y = DrawInfo->nmcd.rc.top + ((DrawInfo->nmcd.rc.bottom - DrawInfo->nmcd.rc.top) - bitmapHeight) / 2;
                     }
 
@@ -1996,7 +2004,21 @@ LRESULT CALLBACK PhThemeWindowDrawToolbar(
                         y,
                         ILD_NORMAL,
                         !isEnabled
-                        );
+                    );
+
+                    if (isDropDown)
+                    {
+                        HDC hdc = DrawInfo->nmcd.hdc;
+                        LPRECT rc = &DrawInfo->nmcd.rc;
+                        int triangleLeft = rc->right - 11, triangleTop = (rc->bottom - rc->top) / 2 - 2;
+                        POINT vertices[] = { {triangleLeft, triangleTop}, {triangleLeft + 6, triangleTop}, {triangleLeft + 3, triangleTop + 3} };
+                        SetDCPenColor(hdc, RGB(0xDE, 0xDE, 0xDE));
+                        SetDCBrushColor(hdc, RGB(0xDE, 0xDE, 0xDE));
+                        SelectObject(hdc, GetStockObject(DC_PEN));
+                        SelectObject(hdc, GetStockObject(DC_BRUSH));
+                        Polygon(hdc, vertices, _countof(vertices));
+                    }
+                        //return CDRF_SKIPDEFAULT | CDRF_NOTIFYPOSTPAINT;
                 }
             }
             else
@@ -2016,7 +2038,7 @@ LRESULT CALLBACK PhThemeWindowDrawToolbar(
                     (LPARAM)buttonText
                     );
 
-                textRect.left += bitmapWidth; // PhGetDpi(10, dpiValue);
+                textRect.left += bitmapWidth - (isDropDown * 12); // PhGetDpi(10, dpiValue);
                 DrawText(
                     DrawInfo->nmcd.hdc,
                     buttonText,

diff --git a/plugins/ToolStatus/toolbar.c b/plugins/ToolStatus/toolbar.c
@@ -331,6 +331,11 @@ VOID RebarCreateOrUpdateWindow(
         if (StatusBarHandle && IsWindowVisible(StatusBarHandle))
             ShowWindow(StatusBarHandle, SW_HIDE);
     }
+    if (!!PhGetIntegerSetting(L"EnableThemeSupport")) {
+        HWND hTips = (HWND)SendMessage(ToolBarHandle, TB_GETTOOLTIPS, 0, 0);
+        if (hTips)
+            PhSetControlTheme(hTips, L"DarkMode_Explorer");
+    }
 
     ToolbarInitialized = TRUE;
 }