Merge branch 'winsiderss:master' into master

DartVanya · Aug 10, 2024 · 3f72445 · 3f72445
2 parents 2d7e303 + abb21b9
commit 3f72445
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 13 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/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>