add support for v8.3 ida pro plugin

x64dbg · Feb 11, 2024 · 22bc7eb · 22bc7eb
1 parent baa5c8e
commit 22bc7eb
Show file tree

Hide file tree

Showing 8 changed files with 1,231 additions and 1,113 deletions.
diff --git a/PluginGeneric/AttachDialog.cpp b/PluginGeneric/AttachDialog.cpp
@@ -1,6 +1,7 @@
 #include "AttachDialog.h"
 #include <Psapi.h>
 #include <string>
+#include <ScyllaHideIDAProPlugin/IdaHwndHelper.h>
 
 #ifdef OLLY1
 #include "..\ScyllaHideOlly1Plugin\resource.h"
@@ -27,7 +28,7 @@ extern HWND hwmain; // Handle of main OllyDbg window
 #elif OLLY2
 HWND hwmain = hwollymain;
 #elif __IDP__
-HWND hwmain = (HWND)callui(ui_get_hwnd).vptr;
+HWND hwmain = getIdaHwnd();
 #elif X64DBG
 extern HWND hwndDlg;
 HWND hwmain;

diff --git a/PluginGeneric/OptionsDialog.cpp b/PluginGeneric/OptionsDialog.cpp
diff --git a/ScyllaHide.sln b/ScyllaHide.sln
@@ -107,9 +107,9 @@ Global
 		{9EEA6D78-4E74-47B9-8746-B8754B15525D}.Release|Win32.Build.0 = Release|Win32
 		{9EEA6D78-4E74-47B9-8746-B8754B15525D}.Release|x64.ActiveCfg = Release|Win32
 		{A94B6222-ABEF-41A0-BE48-06801157AAA5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A94B6222-ABEF-41A0-BE48-06801157AAA5}.Debug|x64.ActiveCfg = Debug|Win32
+		{A94B6222-ABEF-41A0-BE48-06801157AAA5}.Debug|x64.ActiveCfg = Debug|x64
 		{A94B6222-ABEF-41A0-BE48-06801157AAA5}.Release|Win32.ActiveCfg = Release|Win32
-		{A94B6222-ABEF-41A0-BE48-06801157AAA5}.Release|x64.ActiveCfg = Release|Win32
+		{A94B6222-ABEF-41A0-BE48-06801157AAA5}.Release|x64.ActiveCfg = Release|x64
 		{4506D672-19C3-439B-8E1B-F1BA8BE28844}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4506D672-19C3-439B-8E1B-F1BA8BE28844}.Debug|x64.ActiveCfg = Debug|x64
 		{4506D672-19C3-439B-8E1B-F1BA8BE28844}.Release|Win32.ActiveCfg = Release|Win32

diff --git a/ScyllaHideIDAProPlugin/IdaHwndHelper.cpp b/ScyllaHideIDAProPlugin/IdaHwndHelper.cpp
@@ -0,0 +1,15 @@
+// IdaHwndHelper.cpp
+
+//for 64bit - p64
+#pragma comment(lib, "x64_win_qt/Qt5Core.lib")
+#pragma comment(lib, "x64_win_qt/Qt5Gui.lib")
+#pragma comment(lib, "x64_win_qt/Qt5Widgets.lib")
+
+#include <ScyllaHideIDAProPlugin/IdaHwndHelper.h>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QWidget>
+
+HWND WINAPI getIdaHwnd() {
+    QWidget* topWidget = QApplication::topLevelAt(QCursor::pos()); // Assuming get_current_widget() is defined elsewhere
+    return (HWND)topWidget->winId();
+}
diff --git a/ScyllaHideIDAProPlugin/IdaHwndHelper.h b/ScyllaHideIDAProPlugin/IdaHwndHelper.h
@@ -0,0 +1,20 @@
+#pragma once
+
+// IdaHwndHelper.h
+
+#ifndef IDA_HWND_HELPER_H
+#define IDA_HWND_HELPER_H
+
+#include <windows.h> // Make sure to include Windows.h for HWND
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    HWND WINAPI getIdaHwnd();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // IDA_HWND_HELPER_H
diff --git a/ScyllaHideIDAProPlugin/ScyllaHideIDAProPlugin.cpp b/ScyllaHideIDAProPlugin/ScyllaHideIDAProPlugin.cpp
@@ -1,14 +1,13 @@
 #define USE_STANDARD_FILE_FUNCTIONS
 #pragma warning(disable : 4996 4512 4127 4201)
 
-
 //for 64bit - p64
 #ifdef BUILD_IDA_64BIT
 #define __EA64__
-#pragma comment(lib, "x86_win_vc_64/ida.lib")
+#pragma comment(lib, "x64_win_vc_64_pro/ida.lib")
 #else
 //for 32bit - plw
-#pragma comment(lib, "x86_win_vc_32/ida.lib")
+#pragma comment(lib, "x64_win_vc_32_pro/ida.lib")
 #endif
 
 #include <Windows.h>
@@ -22,6 +21,7 @@
 #include <Scylla/Version.h>
 #include <Scylla/Util.h>
 #include <Scylla/OsInfo.h>
+#include <ScyllaHideIDAProPlugin/IdaHwndHelper.h>
 
 #include "..\PluginGeneric\Injector.h"
 #include "..\PluginGeneric\OptionsDialog.h"
@@ -64,14 +64,14 @@ static void AttachProcess(DWORD dwPID)
     switch (res) {
     case -1:
     {
-        MessageBoxA((HWND)callui(ui_get_hwnd).vptr,
+        MessageBoxA(getIdaHwnd(),
             "Can't attach to that process !",
             "ScyllaHide Plugin", MB_OK | MB_ICONERROR);
         break;
     }
     case -2:
     {
-        MessageBoxA((HWND)callui(ui_get_hwnd).vptr,
+        MessageBoxA(getIdaHwnd(),
             "Can't find that PID !",
             "ScyllaHide Plugin", MB_OK | MB_ICONERROR);
         break;
@@ -102,7 +102,7 @@ static bool SetDebugPrivileges()
 }
 
 //callback for various debug events
-static int idaapi debug_mainloop(void *user_data, int notif_code, va_list va)
+static ssize_t idaapi debug_mainloop(void *user_data, int notif_code, va_list va)
 {
     switch (notif_code)
     {
@@ -295,13 +295,14 @@ static void idaapi IDAP_term(void)
 }
 
 //called when user clicks in plugin menu or presses hotkey
-static void idaapi IDAP_run(int arg)
+static bool idaapi IDAP_run(size_t arg)
 {
-    DialogBoxW(hinst, MAKEINTRESOURCE(IDD_OPTIONS), (HWND)callui(ui_get_hwnd).vptr, &OptionsDlgProc);
+    DialogBoxW(hinst, MAKEINTRESOURCE(IDD_OPTIONS), getIdaHwnd(), &OptionsDlgProc);
+    return true;
 }
 
 //init the plugin
-static int idaapi IDAP_init(void)
+static plugmod_t* idaapi IDAP_init(void)
 {
     //ensure target is PE executable
     if (inf.filetype != f_PE) return PLUGIN_SKIP;

diff --git a/ScyllaHideIDAProPlugin/ScyllaHideIDAProPlugin.vcxproj b/ScyllaHideIDAProPlugin/ScyllaHideIDAProPlugin.vcxproj
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -18,6 +26,25 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+    <SpectreMitigation>false</SpectreMitigation>
+    <VcpkgEnabled>false</VcpkgEnabled>
+    <VCToolsVersion Condition="'$(USE_XP_TOOLCHAIN)'!=''">14.27.29110</VCToolsVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+    <SpectreMitigation>false</SpectreMitigation>
+    <VcpkgEnabled>false</VcpkgEnabled>
+    <VCToolsVersion Condition="'$(USE_XP_TOOLCHAIN)'!=''">14.27.29110</VCToolsVersion>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -42,6 +69,16 @@
   </ImportGroup>
   <ImportGroup Label="Shared">
   </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)Scylla\scylla.props" />
+    <Import Project="$(SolutionDir)Scylla\scylla.debug.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)Scylla\scylla.props" />
+    <Import Project="$(SolutionDir)Scylla\scylla.release.props" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(SolutionDir)Scylla\scylla.props" />
@@ -53,25 +90,58 @@
     <Import Project="$(SolutionDir)Scylla\scylla.release.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetExt>.dll</TargetExt>
+    <TargetName>$(TargetName)x64</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetExt>.dll</TargetExt>
+    <TargetName>$(TargetName)x64</TargetName>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetExt>.plw</TargetExt>
+    <TargetExt>.dll</TargetExt>
+    <TargetName>$(TargetName)x86</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetExt>.plw</TargetExt>
+    <TargetExt>.dll</TargetExt>
+    <TargetName>$(TargetName)x86</TargetName>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN64;__X64__;_DEBUG;__VC__;_WINDOWS;__NT__;__IDP__;QT_NO_DEBUG;QT_NAMESPACE=QT;QT_NO_UNICODE_LITERAL;%(PreprocessorDefinitions);BUILD_IDA_64BIT;</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)3rdparty;$(SolutionDir)3rdparty\idasdk\include;$(QTDIR)include;</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN64;__X64__;NDEBUG;__VC__;_WINDOWS;__NT__;__IDP__;QT_NO_DEBUG;QT_NAMESPACE=QT;QT_NO_UNICODE_LITERAL;%(PreprocessorDefinitions);BUILD_IDA_64BIT;</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)3rdparty;$(SolutionDir)3rdparty\idasdk\include;$(QTDIR)include;</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;__NT__;__IDP__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;__X86__;_DEBUG;_WINDOWS;__NT__;__IDP__;%(PreprocessorDefinitions);</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;__NT__;__IDP__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;__X86__;NDEBUG;_WINDOWS;__NT__;__IDP__;%(PreprocessorDefinitions);</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -88,6 +158,7 @@
     <ClCompile Include="..\PluginGeneric\Injector.cpp" />
     <ClCompile Include="..\PluginGeneric\OptionsDialog.cpp" />
     <ClCompile Include="..\Scylla\VersionPatch.cpp" />
+    <ClCompile Include="IdaHwndHelper.cpp" />
     <ClCompile Include="IdaServerClient.cpp" />
     <ClCompile Include="ScyllaHideIDAProPlugin.cpp" />
   </ItemGroup>
@@ -102,6 +173,7 @@
     <ClInclude Include="..\PluginGeneric\Injector.h" />
     <ClInclude Include="..\PluginGeneric\OptionsDialog.h" />
     <ClInclude Include="..\Scylla\VersionPatch.h" />
+    <ClInclude Include="IdaHwndHelper.h" />
     <ClInclude Include="IdaServerClient.h" />
     <ClInclude Include="resource.h" />
   </ItemGroup>

diff --git a/ScyllaHideIDAProPlugin/ScyllaHideIDAProPlugin.vcxproj.filters b/ScyllaHideIDAProPlugin/ScyllaHideIDAProPlugin.vcxproj.filters
@@ -42,6 +42,9 @@
     <ClCompile Include="..\Scylla\VersionPatch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="IdaHwndHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ScyllaHideIDAProPlugin.rc">
@@ -76,6 +79,9 @@
     <ClInclude Include="..\Scylla\VersionPatch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="IdaHwndHelper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\PluginGeneric\findere.bmp">