fixed test and code after PR merge

Flame0920 · Jun 5, 2020 · e5747ef · e5747ef
1 parent ed951df
commit e5747ef
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/BlackBone/Process/ProcessModules.cpp b/src/BlackBone/Process/ProcessModules.cpp
@@ -135,7 +135,7 @@ ModuleDataPtr ProcessModules::GetModule(
 /// <returns>Module data. nullptr if not found</returns>
 ModuleDataPtr ProcessModules::GetMainModule()
 {
-    if (_proc.barrier().TargetWow64)
+    if (_proc.barrier().targetWow64)
     {
         _PEB32 peb = { 0 };
         if (_proc.core().peb32( &peb ) == 0)

diff --git a/src/BlackBoneTest/TestBasic.cpp b/src/BlackBoneTest/TestBasic.cpp
@@ -59,21 +59,22 @@ namespace Testing
 
         TEST_METHOD( InvalidHandles )
         {
-            Process proc;
+            Process baseProc;
+            baseProc.CreateAndAttach( GetTestHelperHost32() );
 
-            HANDLE hProc = OpenProcess( PROCESS_ALL_ACCESS & ~PROCESS_CREATE_THREAD, FALSE, GetCurrentProcessId() );
+            Process proc1;
+            AssertEx::NtSuccess( proc1.Attach( baseProc.pid(), PROCESS_ALL_ACCESS & ~PROCESS_CREATE_THREAD ) );
+            AssertEx::AreEqual( STATUS_ACCESS_DENIED, proc1.threads().CreateNew( reinterpret_cast<ptr_t>(&VoidFn), 0 ).status );
 
-            AssertEx::NtSuccess( proc.Attach( hProc ) );
-            AssertEx::AreEqual( STATUS_ACCESS_DENIED, proc.threads().CreateNew( reinterpret_cast<ptr_t>(&VoidFn), 0 ).status );
-            proc.Detach();
-
-            hProc = OpenProcess( PROCESS_ALL_ACCESS & ~PROCESS_VM_READ, FALSE, GetCurrentProcessId() );
-            AssertEx::NtSuccess( proc.Attach( hProc ) );
+            Process proc2;
+            AssertEx::NtSuccess( proc2.Attach( baseProc.pid(), PROCESS_ALL_ACCESS & ~PROCESS_VM_READ ) );
 
             PEB_T peb = { };
-            AssertEx::IsNotZero( proc.core().peb( &peb ) );
+            AssertEx::IsNotZero( proc2.core().peb( &peb ) );
             AssertEx::IsZero( peb.ImageBaseAddress );
             AssertEx::AreEqual( STATUS_ACCESS_DENIED, LastNtStatus() );
+
+            baseProc.Terminate();
         }
 
     private: