Add conditional acquisition parameter to RAII guard classes

xtoskrnl/includes/ke/guard.hh

@@ -19,18 +19,27 @@ namespace KE
     {
         private:
             KSPIN_LOCK_QUEUE_LEVEL QueuedLockLevel;
+            BOOLEAN Owned;
 
         public:
-            QueuedSpinLockGuard(IN OUT KSPIN_LOCK_QUEUE_LEVEL LockLevel)
+            QueuedSpinLockGuard(IN OUT KSPIN_LOCK_QUEUE_LEVEL LockLevel,
+                                IN BOOLEAN Acquire = TRUE)
             {
                 QueuedLockLevel = LockLevel;
+                Owned = Acquire;
+                if(Owned)
+                {
                     KE::SpinLock::AcquireQueuedSpinLock(QueuedLockLevel);
                 }
+            }
 
             ~QueuedSpinLockGuard()
+            {
+                if(Owned)
                 {
                     KE::SpinLock::ReleaseQueuedSpinLock(QueuedLockLevel);
                 }
+            }
 
             QueuedSpinLockGuard(const QueuedSpinLockGuard&) = delete;
             QueuedSpinLockGuard& operator=(const QueuedSpinLockGuard&) = delete;
@@ -40,18 +49,27 @@ namespace KE
     {
         private:
             PKSPIN_LOCK Lock;
+            BOOLEAN Owned;
 
         public:
-            SpinLockGuard(IN OUT PKSPIN_LOCK SpinLock)
+            SpinLockGuard(IN OUT PKSPIN_LOCK SpinLock,
+                          IN BOOLEAN Acquire = TRUE)
             {
                 Lock = SpinLock;
+                Owned = Acquire;
+                if(Owned)
+                {
                     KE::SpinLock::AcquireSpinLock(Lock);
                 }
+            }
 
             ~SpinLockGuard()
+            {
+                if(Owned)
                 {
                     KE::SpinLock::ReleaseSpinLock(Lock);
                 }
+            }
 
             SpinLockGuard(const SpinLockGuard&) = delete;
             SpinLockGuard& operator=(const SpinLockGuard&) = delete;

xtoskrnl/includes/ke/runlevel.hh

@@ -27,18 +27,27 @@ namespace KE
     {
         private:
             KRUNLEVEL PreviousRunLevel;
+            BOOLEAN Switched;
 
         public:
-            LowerRunLevel(KRUNLEVEL RunLevel)
+            LowerRunLevel(IN KRUNLEVEL RunLevel,
+                          IN BOOLEAN ChangeLevel = TRUE)
             {
                 PreviousRunLevel = KE::RunLevel::GetCurrentRunLevel();
+                Switched = ChangeLevel;
+                if(Switched)
+                {
                     KE::RunLevel::LowerRunLevel(RunLevel);
                 }
+            }
 
             ~LowerRunLevel()
+            {
+                if(Switched)
                 {
                     KE::RunLevel::RaiseRunLevel(PreviousRunLevel);
                 }
+            }
 
             LowerRunLevel(const LowerRunLevel&) = delete;
             LowerRunLevel& operator=(const LowerRunLevel&) = delete;
@@ -48,18 +57,27 @@ namespace KE
     {
         private:
             KRUNLEVEL PreviousRunLevel;
+            BOOLEAN Switched;
 
         public:
-            RaiseRunLevel(KRUNLEVEL RunLevel)
+            RaiseRunLevel(IN KRUNLEVEL RunLevel,
+                          IN BOOLEAN ChangeLevel = TRUE)
             {
                 PreviousRunLevel = KE::RunLevel::GetCurrentRunLevel();
+                Switched = ChangeLevel;
+                if(Switched)
+                {
                     KE::RunLevel::RaiseRunLevel(RunLevel);
                 }
+            }
 
             ~RaiseRunLevel()
+            {
+                if(Switched)
                 {
                     KE::RunLevel::LowerRunLevel(PreviousRunLevel);
                 }
+            }
 
             RaiseRunLevel(const RaiseRunLevel&) = delete;
             RaiseRunLevel& operator=(const RaiseRunLevel&) = delete;