fixed jp + recreated nulled debug function

Author: makipl

ff8_demaster/coreHeader.h

@@ -7,6 +7,7 @@
 #include <string>
 #include <vector>
 #include <Windows.h>
+#include <Psapi.h>
 #include <StackWalker.h>
 #include <INIReader.h>
 #include "renderer.h"
@@ -75,7 +76,7 @@ extern DWORD* langIdent_ESI;
 
 extern int currentStage;
 
-extern std::unique_ptr<FILE,decltype(&fclose)> logFile;
+extern std::unique_ptr<FILE, decltype(&fclose)> logFile;
 void OutputDebug(const char* fmt, ...);
 bool DDSorPNG(char* buffer, size_t size, const char* fmt, ...);
 
@@ -87,15 +88,15 @@ void RenderCompressedTexture(bimg::ImageContainer* img, TextureFormatInfo& texIn
 class DemasteredStackWalker : public StackWalker
 {
 public:
-	DemasteredStackWalker() : StackWalker() {}
+   DemasteredStackWalker() : StackWalker() {}
 protected:
-	virtual void OnDbgHelpErr(LPCSTR szFuncName, DWORD gle, DWORD64 addr)
-	{
-		// Silence is golden.
-	}
-
-	virtual void OnOutput(LPCSTR szText)
-	{
-		OutputDebug(szText);
-	}
+   virtual void OnDbgHelpErr(LPCSTR szFuncName, DWORD gle, DWORD64 addr)
+   {
+      // Silence is golden.
+   }
+
+   virtual void OnOutput(LPCSTR szText)
+   {
+      OutputDebug(szText);
+   }
 };

ff8_demaster/dllmain.cpp

@@ -5,14 +5,30 @@
 /*
 KURSE ALL SEEDS!
 Fushururu
-Do you know demaster is going to be reborn?
+Are you with the Garden Master or Cid?
+>be non-human
+>pay a lot of money to build BalambGarden
+>after that some useless guy is the boss
+>no one knows about you
+>you are living in the basement
+>alone
+
+Yeah... So looks like money can't buy
+umm... well.. life? Hey, you are student
+in the garden built from my money
+and you were trained to be missionary
+and then you just walk in and kill me
+NICE JOB
 */
 
 /*
 *
 *
 */
 DWORD IMAGE_BASE = 0;
+DWORD IMAGE_SIZE = 0;
+DWORD THIS_BASE = 0;
+DWORD THIS_SIZE = 0;
 DWORD OPENGL_HANDLE = 0;
 const char* DIRECT_IO_EXPORT_DIR = "DEMASTER_EXP\\";
 std::unique_ptr<FILE, decltype(&fclose)> logFile{ nullptr, fclose };
@@ -34,21 +50,37 @@ BOOL BATTLE_STAGE_FORCE_RELOAD;
 
 void OutputDebug(const char* fmt, ...)
 {
-#if _DEBUG
-   va_list args;
-   char tmp_str[1024];
+    
+#if _DEBUG && !JAPANESE_PATCH
+      //DWORD fmtPtr = (DWORD)fmt;
+      //if (
+      //   IMAGE_BASE <= fmtPtr && fmtPtr <= IMAGE_BASE + IMAGE_SIZE
+      //   ||
+      //   THIS_BASE <= fmtPtr && fmtPtr <= THIS_BASE + THIS_SIZE
+      //   )
+      //{
+      //   return;
+      //}
+    //static StackWalker sw;
+   // sw.ShowCallstack();
+    if (IsBadReadPtr(fmt, 4)) return;
+      std::string fmtString = std::string(fmt);
+      if (fmtString.substr(0, 7) == std::string("GLERROR"))
+         return;
+      va_list args;
+      char tmp_str[1024];
 
-   va_start(args, fmt);
-   vsnprintf(tmp_str, sizeof(tmp_str), fmt, args);
-   va_end(args);
+      va_start(args, fmt);
+      vsnprintf(tmp_str, sizeof(tmp_str), fmt, args);
+      va_end(args);
 
-   printf(tmp_str);
+      printf(tmp_str);
 
-   if (logFile)
-   {
-      fwrite(tmp_str, sizeof(char), strlen(tmp_str), logFile.get());
-      fflush(logFile.get());
-   }
+      if (logFile)
+      {
+	      fwrite(tmp_str, sizeof(char), strlen(tmp_str), logFile.get());
+	      fflush(logFile.get());
+      }
 #endif
 }
 
@@ -149,6 +181,7 @@ void ReadConfigFile()
    WORLD_TEXTURES = conf.GetInteger("", "WORLD_TEXTURES", 0);
    TEXTURE_PATCH = conf.GetInteger("", "TEXTURE_PATCH", 1); //this one lacks actual demaster.conf so default to 1
    LINEAR_PATCH = conf.GetInteger("", "LINEAR_PATCH", 1);
+   DEBUG_PATCH = conf.GetInteger("", "DEBUG_PATCH", 0);
    OPENGL_HOOK = conf.GetInteger("", "OPENGL_HOOK", 0);
    BATTLE_STAGE_ANIMATION_DELAY = conf.GetInteger("", "BATTLE_STAGE_ANIMATION_DELAY", 100);
    BATTLE_STAGE_FORCE_RELOAD = conf.GetInteger("", "BATTLE_STAGE_FORCE_RELOAD", 0);
@@ -327,9 +360,16 @@ BOOL WINAPI DllMain(
    HMODULE IMG_BASE = GetModuleHandleA("FFVIII_EFIGS");
 #endif
    IMAGE_BASE = (long long)IMG_BASE;
-   OPENGL_HANDLE = (long long)GetModuleHandleA("OPENGL32");
-   OutputDebug("IMAGE_BASE at: %lX; OPENGL at: %lX\n", IMAGE_BASE, OPENGL_HANDLE);
 
+   MODULEINFO modinfo = {};
+   K32GetModuleInformation(GetCurrentProcess(), IMG_BASE, &modinfo, sizeof(MODULEINFO));
+   IMAGE_SIZE = modinfo.SizeOfImage;
+
+   THIS_BASE = (DWORD)hinstDLL;
+   K32GetModuleInformation(GetCurrentProcess(), hinstDLL, &modinfo, sizeof(MODULEINFO));
+   THIS_SIZE = modinfo.SizeOfImage;
+
+   OutputDebug("IMAGE_BASE at: %lX; OPENGL at: %lX\n", IMAGE_BASE, OPENGL_HANDLE);
    GetWindow();
 
    //LET'S GET THE HACKING DONE
@@ -339,13 +379,14 @@ BOOL WINAPI DllMain(
       ApplyUVPatch();
    if (TEXTURE_PATCH && DIRECT_IO)
       ReplaceTextureFunction();
-   //if (DEBUG_PATCH) //it's just one func ;-;
-   //	ApplyDebugOutputPatchV2();
+   if (DEBUG_PATCH) //it's just one func ;-;
+       InjectJMP(IMAGE_BASE + GetAddress(NULLSUB_DEBUG), (DWORD)OutputDebug);
    if (LINEAR_PATCH)
       ApplyFilteringPatch();
    if (OPENGL_HOOK)
       HookOpenGL();
 
+
    return 1; //all success
 }
 #undef CRASHLOG

ff8_demaster/ff8_demaster.vcxproj

@@ -53,7 +53,7 @@
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>vendor\include\;vendor\include\compat\msvc;$(IncludePath)</IncludePath>
     <LibraryPath>vendor\lib\;vendor\lib\bgfx;$(LibraryPath)</LibraryPath>
-    <OutDir>$(SolutionDir).dist\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir).dist\debug\</OutDir>
     <IntDir>$(SolutionDir).build\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

ff8_demaster/mymemory.h

@@ -14,7 +14,7 @@ enum ADDRESS_NAME
    BGFILENAME1, BGFILENAME2, CHECKTEXREPAVAIL, _ASM_FIELDBGRETADDR3, DISABLETPAGELIMIT, _ASM_FIELDBGRETADDR2, DS_FREE, DS_TEXIMG,
    _BSPBACKADD1, _BSPBACKADD2, BATTLEJMPPATCH1, BATTLEJMPPATCH2, BTLMON0, BTLMON1, BTLMON2, BTLMON3, BTLMON4, BTLMON5, BTLMON6, BHP,
    _BHPBACKADD1, _BHPBACKADD2, NEWGLTEX_CHARA, BCPBACKADD1, BCPBACKADD2, BCPBACKADD3, CLTBACKADD1, CLTBACKADD2, UPLOADVRAM, IOFUNC1,
-   IOFUNC2, IOFUNC3, IOFUNC4, IOFUNC5, IOFUNC6, FILTERPATCH1, FILTERPATCH2, FILTERPATCH3, FILTERPATCH4, WINDOWTITLE
+   IOFUNC2, IOFUNC3, IOFUNC4, IOFUNC5, IOFUNC6, FILTERPATCH1, FILTERPATCH2, FILTERPATCH3, FILTERPATCH4, WINDOWTITLE, NULLSUB_DEBUG
 };
 
 void InitTable();
@@ -91,7 +91,8 @@ const std::map<ADDRESS_NAME, std::vector<unsigned int>> PATCHADDRESS =
 {FILTERPATCH2         , std::vector<unsigned int>{ 0x0       , 0x1569409 , 0x1569899 }},
 {FILTERPATCH3         , std::vector<unsigned int>{ 0x0       , 0x156A348 , 0x156a7d8 }},
 {FILTERPATCH4         , std::vector<unsigned int>{ 0x0       , 0x156A359 , 0x156a7e9 }},
-{WINDOWTITLE          , std::vector<unsigned int>{ 0x0       , 0x1601065 , 0x1601935 }}
+{WINDOWTITLE          , std::vector<unsigned int>{ 0x0       , 0x1601065 , 0x1601935 }},
+{NULLSUB_DEBUG        , std::vector<unsigned int>{ 0x0       , 0x0       , 0x33DC0 }}
 #else
 {IOFUNC1              , std::vector<unsigned int>{ 0x0 , 0x0 , 0x3649C   }},
 {IOFUNC6              , std::vector<unsigned int>{ 0x0 , 0x0 , 0x3653A   }},
@@ -154,5 +155,6 @@ const std::map<ADDRESS_NAME, std::vector<unsigned int>> PATCHADDRESS =
 {CHECKTEXREPAVAIL     , std::vector<unsigned int>{ 0x0 , 0x0 , 0x1793BA8 }},
 {BGFILENAME1          , std::vector<unsigned int>{ 0x0 , 0x0 , 0x1793C94 }},
 {BGFILENAME2          , std::vector<unsigned int>{ 0x0 , 0x0 , 0x18A85A4 }},
+{NULLSUB_DEBUG        , std::vector<unsigned int>{ 0x0 , 0x0 , 0x33E50   }},
 #endif
 };