missing changes after refactoring

Author: DarthTon

src/BlackBone/PE/PEImage.cpp

@@ -498,7 +498,7 @@ NTSTATUS PEImage::PrepareACTX( const wchar_t* filepath /*= nullptr*/ )
             return STATUS_SXS_CANT_GEN_ACTCTX;
 
         auto hTmpFile = Handle( CreateFileW( tempPath, FILE_GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, 0, NULL ) );
-        if (hTmpFile != INVALID_HANDLE_VALUE)
+        if (hTmpFile)
         {
             DWORD bytes = 0;
             WriteFile( hTmpFile, pManifest, manifestSize, &bytes, NULL );
@@ -521,8 +521,7 @@ NTSTATUS PEImage::PrepareACTX( const wchar_t* filepath /*= nullptr*/ )
 
     // Create ACTX
     _hctx = CreateActCtxW( &act );
-
-    if (_hctx != INVALID_HANDLE_VALUE)
+    if (_hctx)
         return STATUS_SUCCESS;
 
     // Return success if current process is protected

src/BlackBone/Process/Process.cpp

@@ -224,7 +224,7 @@ call_result_t<std::vector<HandleInfo>> Process::EnumHandles()
     for (ULONG i = 0; i < handleInfo->HandleCount; i++)
     {
         HandleInfo info;
-        Handle hLocal;
+        ProcessHandle hLocal;
         OBJECT_TYPE_INFORMATION_T* pTypeInfo = nullptr;
         PVOID pNameInfo = nullptr;
         UNICODE_STRING objectName = { 0 };

src/BlackBone/Process/ProcessCore.h

@@ -109,10 +109,10 @@ class ProcessCore
     void Close();
 
 private:
-    Handle    _hProcess;        // Process handle
-    DWORD     _pid = 0;         // Process ID
-    ptrNative _native;          // Api wrapper
-    bool      _dep = true;      // DEP state for process
+    ProcessHandle _hProcess;        // Process handle
+    DWORD         _pid = 0;         // Process ID
+    ptrNative     _native;          // Api wrapper
+    bool          _dep = true;      // DEP state for process
 };
 
 }

src/BlackBone/Process/Threads/Thread.h

@@ -268,7 +268,7 @@ class Thread
     class ProcessCore* _core;       // Core routines
 
     DWORD _id = 0;                  // Thread ID
-    Handle _handle;                 // Thread handle
+    ProcessHandle _handle;          // Thread handle
 };
 
 using ThreadPtr = std::shared_ptr<Thread>;

src/BlackBoneTest/TestAsmJit.cpp

@@ -78,7 +78,7 @@ namespace Testing
             AssertEx::IsTrue( b );
 
             // Check locally
-            FileHandle hFile = FileHandle( CreateFileW( filePath, GENERIC_READ, 0x7, nullptr, OPEN_EXISTING, FILE_DELETE_ON_CLOSE, nullptr ) );
+            auto hFile = Handle( CreateFileW( filePath, GENERIC_READ, 0x7, nullptr, OPEN_EXISTING, FILE_DELETE_ON_CLOSE, nullptr ) );
             AssertEx::IsTrue( hFile );
 
             uint8_t readBuf[sizeof( writeBuf )] = { };

src/BlackBoneTest/TestManualMap.cpp

@@ -131,7 +131,7 @@ namespace Testing
 
         std::pair<std::unique_ptr<uint8_t[]>, uint32_t> GetFileData( const std::wstring& path )
         {
-            auto hFile = FileHandle( CreateFileW( path.c_str(), FILE_GENERIC_READ, 0x7, nullptr, OPEN_EXISTING, 0, nullptr ) );
+            auto hFile = Handle( CreateFileW( path.c_str(), FILE_GENERIC_READ, 0x7, nullptr, OPEN_EXISTING, 0, nullptr ) );
             if (hFile)
             {
                 uint32_t size = GetFileSize( hFile, nullptr );