diff --git a/Mod Sources/Watchdog/Watchdog/Watchdog.vcxproj b/Mod Sources/Watchdog/Watchdog/Watchdog.vcxproj
index 232e908..5c07069 100644
--- a/Mod Sources/Watchdog/Watchdog/Watchdog.vcxproj
+++ b/Mod Sources/Watchdog/Watchdog/Watchdog.vcxproj
@@ -43,12 +43,12 @@
false
- include;$(IncludePath)
+ include;..\..\..\CommonAPI\Common\include;$(IncludePath)
$(SolutionDir)\Mods
false
- include;$(IncludePath)
+ include;..\..\..\CommonAPI\Common\include;$(IncludePath)
$(SolutionDir)\Mods
@@ -61,7 +61,7 @@
Windows
true
- ws2_32.lib;Dnsapi.lib;%(AdditionalDependencies)
+ ws2_32.lib;Dnsapi.lib;$(SolutionDir)\Common.lib;%(AdditionalDependencies)
@@ -78,7 +78,7 @@
true
true
true
- ws2_32.lib;Dnsapi.lib;%(AdditionalDependencies)
+ ws2_32.lib;Dnsapi.lib;$(SolutionDir)\Common.lib;%(AdditionalDependencies)
diff --git a/Mod Sources/Watchdog/Watchdog/source/dllmain.cpp b/Mod Sources/Watchdog/Watchdog/source/dllmain.cpp
index 2c71d33..c92a2db 100644
--- a/Mod Sources/Watchdog/Watchdog/source/dllmain.cpp
+++ b/Mod Sources/Watchdog/Watchdog/source/dllmain.cpp
@@ -4,6 +4,9 @@
#include
#include
#include
+
+#include
+
BOOL APIENTRY DllMain( HMODULE hModule,
DWORD ul_reason_for_call,
LPVOID lpReserved
@@ -22,9 +25,6 @@ BOOL APIENTRY DllMain( HMODULE hModule,
static bool sDogPetted = false;
static DWORD mainthreadid=0;
-void (*Tprintf)(const char* fmt,...) =
- (void (__cdecl *)(const char* fmt,...))
- 0x425F30;
DWORD WINAPI WatchDogThread(LPVOID lpParam)
{
time_t lastPet = time(0);
@@ -43,14 +43,14 @@ DWORD WINAPI WatchDogThread(LPVOID lpParam)
SuspendThread(mainThread);
hamburger.ContextFlags=CONTEXT_FULL; // Make sure to select which parts of the context to dump
GetThreadContext(mainThread, &hamburger); // dog grabs hamburger;
- Tprintf ("Dog has grabbed the hamburger again\n");
- Tprintf ("Either grab Hamburger back and put dog back on leash, or let dog eat hamburger\n");
- Tprintf ("the following text is from the Processor State\n");
+ Con::printf ("Dog has grabbed the hamburger again\n");
+ Con::printf ("Either grab Hamburger back and put dog back on leash, or let dog eat hamburger\n");
+ Con::printf ("the following text is from the Processor State\n");
FILE * wlog = fopen ("watchdog.log","a");
fprintf (wlog,"EIP: %08X EAX: %08X EBX: %08X ECX: %08X \nEDX: %08X ESI: %08X EDI: %08X\nEBP:%08X ESP:%08X\n", hamburger.Eip, hamburger.Eax, hamburger.Ebx, hamburger.Ecx, hamburger.Edx, hamburger.Esi, hamburger.Edi, hamburger.Ebp, hamburger.Esp);
fclose (wlog);
- Tprintf ("EIP: %08X EAX: %08X EBX: %08X ECX: %08X \nEDX: %08X ESI: %08X EDI: %08X\nEBP:%08X ESP:%08X\n", hamburger.Eip, hamburger.Eax, hamburger.Ebx, hamburger.Ecx, hamburger.Edx, hamburger.Esi, hamburger.Edi, hamburger.Ebp, hamburger.Esp);
- Tprintf ("Please press enter to try to continue\n or wait for 30 more seconds to kill T2 and write log\n");
+ Con::printf ("EIP: %08X EAX: %08X EBX: %08X ECX: %08X \nEDX: %08X ESI: %08X EDI: %08X\nEBP:%08X ESP:%08X\n", hamburger.Eip, hamburger.Eax, hamburger.Ebx, hamburger.Ecx, hamburger.Edx, hamburger.Esi, hamburger.Edi, hamburger.Ebp, hamburger.Esp);
+ Con::printf ("Please press enter to try to continue\n or wait for 30 more seconds to kill T2 and write log\n");
Sleep(30000);
if (_kbhit()) {
sDogPetted=true;
@@ -83,7 +83,7 @@ extern "C"
HANDLE thread = CreateThread(NULL, 0, WatchDogThread, NULL, 0, &threadID);
if (thread==NULL) {
DWORD errorval = GetLastError();
- Tprintf ("Error %08X, watchdog is not running properly\n",errorval);
+ Con::printf ("Error %08X, watchdog is not running properly\n",errorval);
}
OpenProcessToken(GetCurrentProcess(),TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY,&token);
@@ -92,10 +92,10 @@ extern "C"
tokenpriv.Privileges[0].Luid = debugname;
tokenpriv.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
if(AdjustTokenPrivileges(token, FALSE, &tokenpriv, sizeof tokenpriv, NULL, NULL)) {
- Tprintf ("watchdog should work now\n");
+ Con::printf ("watchdog should work now\n");
CloseHandle(token);
} else {
- Tprintf ("Error, watchdog won't operate fully, WatchDog needs Admin Privileges for Debug\n");
+ Con::printf ("Error, watchdog won't operate fully, WatchDog needs Admin Privileges for Debug\n");
}
}