diff --git a/TitanEngine/3rdparty-definitions.h b/TitanEngine/3rdparty-definitions.h index 5d912f8..7f47454 100644 --- a/TitanEngine/3rdparty-definitions.h +++ b/TitanEngine/3rdparty-definitions.h @@ -16,6 +16,8 @@ bool scylla_importsValid(); bool scylla_cutImport(DWORD_PTR apiAddr); int scylla_fixDump(WCHAR* dumpFile, WCHAR* iatFixFile, WCHAR* sectionName = L".scy"); int scylla_fixMappedDump(DWORD_PTR iatVA, DWORD_PTR FileMapVA, HANDLE hFileMap); +int scylla_getModuleCount(); +int scylla_getImportCount(); #ifdef __cplusplus } #endif /*__cplusplus*/ diff --git a/TitanEngine/TitanEngine.cpp b/TitanEngine/TitanEngine.cpp index f259ce8..f3625dc 100644 --- a/TitanEngine/TitanEngine.cpp +++ b/TitanEngine/TitanEngine.cpp @@ -18676,32 +18676,11 @@ __declspec(dllexport) void TITCALL ImporterAddNewOrdinalAPI(ULONG_PTR OrdinalNum } __declspec(dllexport) long TITCALL ImporterGetAddedDllCount() { - //TODO scylla enable - return 0; - /* - return(impDLLNumber + 1); - */ + return scylla_getModuleCount(); } __declspec(dllexport) long TITCALL ImporterGetAddedAPICount() { - //TODO scylla enable - return 0; - /* - int i = 0; - int CopyDummy = NULL; - DWORD DLLNumber = NULL; - long APINumber = NULL; - - DLLNumber = impDLLNumber + 1; - while(DLLNumber > NULL) - { - RtlMoveMemory(&CopyDummy, (LPVOID)(impDLLDataList[i][0] + 2 * sizeof ULONG_PTR), 4); - APINumber = APINumber + CopyDummy - 1; - DLLNumber--; - i++; - } - return(APINumber); - */ + return scylla_getImportCount(); } __declspec(dllexport) void* TITCALL ImporterGetLastAddedDLLName() { diff --git a/TitanEngine/scylla_wrapper_x64.lib b/TitanEngine/scylla_wrapper_x64.lib index c25b9e0..6e84e18 100644 Binary files a/TitanEngine/scylla_wrapper_x64.lib and b/TitanEngine/scylla_wrapper_x64.lib differ diff --git a/TitanEngine/scylla_wrapper_x86.lib b/TitanEngine/scylla_wrapper_x86.lib index 8f511b9..83ca559 100644 Binary files a/TitanEngine/scylla_wrapper_x86.lib and b/TitanEngine/scylla_wrapper_x86.lib differ diff --git a/TitanEngine/scylla_wrapperd_x64.lib b/TitanEngine/scylla_wrapperd_x64.lib index 95230ab..37c1d2b 100644 Binary files a/TitanEngine/scylla_wrapperd_x64.lib and b/TitanEngine/scylla_wrapperd_x64.lib differ diff --git a/TitanEngine/scylla_wrapperd_x86.lib b/TitanEngine/scylla_wrapperd_x86.lib index 6ba4ae8..72a9854 100644 Binary files a/TitanEngine/scylla_wrapperd_x86.lib and b/TitanEngine/scylla_wrapperd_x86.lib differ diff --git a/scylla_integration.txt b/scylla_integration.txt index 4d4238b..9972bff 100644 --- a/scylla_integration.txt +++ b/scylla_integration.txt @@ -17,8 +17,6 @@ AddNewDLL AddNewAPI AddNewOrdinal GetLastAddedDLLName -GetAddedDllCount -GetAddedAPICount EnumAddedData //useful for investigating complete iat moduleList EstimatedSize GetDLLIndexEx