Significant re-engineering of try/catch to generate more reliable min…

…idumps.
Nekura · May 5, 2016 · 6d096f3 · 6d096f3
1 parent 8ccae87
commit 6d096f3
Show file tree

Hide file tree

Showing 35 changed files with 146 additions and 130 deletions.
diff --git a/bin-vc14/FLHook.dll b/bin-vc14/FLHook.dll
diff --git a/bin-vc14/FLHook.pdb b/bin-vc14/FLHook.pdb
diff --git a/bin-vc14/flhook_plugins/ahookext.dll b/bin-vc14/flhook_plugins/ahookext.dll
diff --git a/bin-vc14/flhook_plugins/ahookext.pdb b/bin-vc14/flhook_plugins/ahookext.pdb
diff --git a/bin-vc14/flhook_plugins/base.dll b/bin-vc14/flhook_plugins/base.dll
diff --git a/bin-vc14/flhook_plugins/base.pdb b/bin-vc14/flhook_plugins/base.pdb
diff --git a/bin-vc14/flhook_plugins/cloak.dll b/bin-vc14/flhook_plugins/cloak.dll
diff --git a/bin-vc14/flhook_plugins/cloak.pdb b/bin-vc14/flhook_plugins/cloak.pdb
diff --git a/bin-vc14/flhook_plugins/condata.dll b/bin-vc14/flhook_plugins/condata.dll
diff --git a/bin-vc14/flhook_plugins/condata.pdb b/bin-vc14/flhook_plugins/condata.pdb
diff --git a/bin-vc14/flhook_plugins/conn.dll b/bin-vc14/flhook_plugins/conn.dll
diff --git a/bin-vc14/flhook_plugins/conn.pdb b/bin-vc14/flhook_plugins/conn.pdb
diff --git a/bin-vc14/flhook_plugins/event.dll b/bin-vc14/flhook_plugins/event.dll
diff --git a/bin-vc14/flhook_plugins/event.pdb b/bin-vc14/flhook_plugins/event.pdb
diff --git a/bin-vc14/flhook_plugins/minecontrol.dll b/bin-vc14/flhook_plugins/minecontrol.dll
diff --git a/bin-vc14/flhook_plugins/minecontrol.pdb b/bin-vc14/flhook_plugins/minecontrol.pdb
diff --git a/bin-vc14/flhook_plugins/mobiledock.dll b/bin-vc14/flhook_plugins/mobiledock.dll
diff --git a/bin-vc14/flhook_plugins/mobiledock.pdb b/bin-vc14/flhook_plugins/mobiledock.pdb
diff --git a/bin-vc14/flhook_plugins/playercntl.dll b/bin-vc14/flhook_plugins/playercntl.dll
diff --git a/bin-vc14/flhook_plugins/playercntl.pdb b/bin-vc14/flhook_plugins/playercntl.pdb
diff --git a/bin-vc14/flhook_plugins/tempban.dll b/bin-vc14/flhook_plugins/tempban.dll
diff --git a/bin-vc14/flhook_plugins/tempban.pdb b/bin-vc14/flhook_plugins/tempban.pdb
diff --git a/plugins/flhookplugin_sdk/libs/FLHook-vc14.lib b/plugins/flhookplugin_sdk/libs/FLHook-vc14.lib
diff --git a/plugins/playercntl_plugin/src/PluginUtilities.h b/plugins/playercntl_plugin/src/PluginUtilities.h
@@ -77,7 +77,7 @@ void HkLoadStringDLLs();
 void HkUnloadStringDLLs();
 wstring HkGetWStringFromIDS(uint iIDS);
 
-void AddExceptionInfoLog(LPEXCEPTION_POINTERS pep);
+void AddExceptionInfoLog(struct SEHException* pep);
 #define LOG_EXCEPTION { AddLog("ERROR Exception in %s", __FUNCTION__); AddExceptionInfoLog(0); }
 
 CAccount* HkGetAccountByClientID(uint iClientID);

diff --git a/project-vc14/FLHook.vcxproj b/project-vc14/FLHook.vcxproj
@@ -116,7 +116,7 @@ copy /Y  $(OutDir)$(TargetName).lib  ..\plugins\flhookplugin_sdk\libs\$(TargetNa
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>Ws2_32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Ws2_32.lib;psapi.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -127,7 +127,8 @@ copy /Y  $(OutDir)$(TargetName).lib  ..\plugins\flhookplugin_sdk\libs\$(TargetNa
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command />
+      <Command>copy /Y  $(OutDir)$(TargetName).dll  C:\FWDev\Freeworlds-public\exe\
+copy /Y  $(OutDir)$(TargetName).pdb C:\FWDev\Freeworlds-public\exe\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/source/FLHook.cpp b/source/FLHook.cpp
@@ -113,7 +113,8 @@ BYTE oldSetUnhandledExceptionFilter[5];
 LONG WINAPI FLHookTopLevelFilter(struct _EXCEPTION_POINTERS *pExceptionInfo)
 {
 	AddLog("!!TOP LEVEL EXCEPTION!!");
-	WriteMiniDump(pExceptionInfo);
+	SEHException ex(0, pExceptionInfo);
+	WriteMiniDump(&ex);
 	return EXCEPTION_EXECUTE_HANDLER; 	// EXCEPTION_CONTINUE_SEARCH;
 }
 
@@ -643,7 +644,7 @@ struct timeval tv = {0, 0};
 
 void ProcessPendingCommands()
 {
-	try {
+	TRY_HOOK {
 		// check for new console commands
 		EnterCriticalSection(&cs);
 		while(lstConsoleCmds.size())
@@ -852,8 +853,5 @@ void ProcessPendingCommands()
 		}
 
 		lstDelete.clear();
-	} catch(...) { 
-		LOG_EXCEPTION
-		throw "exception"; 
-	}
+	} CATCH_HOOK({})
 }
diff --git a/source/HkCbChat.cpp b/source/HkCbChat.cpp
@@ -12,7 +12,7 @@ void __stdcall HkCb_SendChat(uint iClientID, uint iTo, uint iSize, void *pRDL)
 	CALL_PLUGINS_V(PLUGIN_HkCb_SendChat,__stdcall,(uint,uint,uint,void*),(iClientID,iTo,iSize,pRDL));
 
 
-	try {
+	TRY_HOOK {
 		if(HkIServerImpl::g_bInSubmitChat && (iTo != 0x10004)) {
 			wchar_t wszBuf[1024] = L"";
 			// extract text from rdlReader
@@ -120,5 +120,5 @@ void __stdcall HkCb_SendChat(uint iClientID, uint iTo, uint iSize, void *pRDL)
 				popad
 			}
 		}
-	}  catch(...) { LOG_EXCEPTION }
+	}  CATCH_HOOK({})
 }
diff --git a/source/HkCbDamage.cpp b/source/HkCbDamage.cpp
@@ -20,7 +20,7 @@ int __stdcall HkCB_MissileTorpHit(char *ECX, char *p1, DamageList *dmg)
 
 	CALL_PLUGINS(PLUGIN_HkCB_MissileTorpHit,int,__stdcall,(char*,char*,DamageList*),(ECX,p1,dmg));
 
-	try {
+	TRY_HOOK {
 		// get client id
 		char *szP;
 		memcpy(&szP, ECX + 0x10, 4);
@@ -48,7 +48,7 @@ int __stdcall HkCB_MissileTorpHit(char *ECX, char *p1, DamageList *dmg)
 					dmg->set_cause((enum DamageCause)0xC0); // change to sth else, so client won't recognize it as a disruptor
 			}
 		}
-	} catch(...) { LOG_EXCEPTION }
+	} CATCH_HOOK({})
 	return 0;
 }
 
@@ -119,7 +119,7 @@ void __stdcall HkCb_AddDmgEntry(DamageList *dmgList, unsigned short p1, float p2
 	else
 		dmgList->add_damage_entry(p1, p2, p3);
 
-	try {
+	TRY_HOOK {
 		LastDmgList = *dmgList; // save
 
 //		float fHealth,fMaxHealth;32 256
@@ -141,7 +141,7 @@ void __stdcall HkCb_AddDmgEntry(DamageList *dmgList, unsigned short p1, float p2
 		}
 
 
-	} catch(...) { LOG_EXCEPTION }
+	} CATCH_HOOK({})
 
 	CALL_PLUGINS_V(PLUGIN_HkCb_AddDmgEntry_AFTER,__stdcall,(DamageList *,unsigned short,float, DamageEntry::SubObjFate),(dmgList,p1,p2,p3));
 
@@ -175,7 +175,7 @@ void __stdcall HkCb_GeneralDmg(char *szECX)
 
 	CALL_PLUGINS_V(PLUGIN_HkCb_GeneralDmg,__stdcall,(char*),(szECX));
 
-	try {
+	TRY_HOOK {
 		char *szP;
 		memcpy(&szP, szECX + 0x10, 4);
 		uint iClientID;
@@ -185,8 +185,7 @@ void __stdcall HkCb_GeneralDmg(char *szECX)
 
 		iDmgTo = iClientID;
 		iDmgToSpaceID = iSpaceID;
-	}
-	catch (...) { LOG_EXCEPTION }
+	} CATCH_HOOK({})
 }
 
 __declspec(naked) void _HkCb_GeneralDmg()

diff --git a/source/HkCbDeath.cpp b/source/HkCbDeath.cpp
@@ -116,7 +116,7 @@ void __stdcall ShipDestroyed(DamageList *_dmg, DWORD *ecx, uint iKill)
 
 	CALL_PLUGINS_V(PLUGIN_ShipDestroyed,__stdcall,(DamageList *_dmg, DWORD *ecx, uint iKill),(_dmg,ecx,iKill));
 
-	try {
+	TRY_HOOK {
 		if(iKill==1)
 		{
 			CShip *cship = (CShip*)ecx[4];
@@ -252,7 +252,7 @@ void __stdcall ShipDestroyed(DamageList *_dmg, DWORD *ecx, uint iKill)
 			ClientInfo[iClientID].iShipOld = ClientInfo[iClientID].iShip;
 			ClientInfo[iClientID].iShip = 0;
 		}
-	} catch(...) { LOG_EXCEPTION }
+	} CATCH_HOOK({})
 }
 
 FARPROC fpOldShipDestroyed;

diff --git a/source/HkCbDisconnect.cpp b/source/HkCbDisconnect.cpp
@@ -4,15 +4,15 @@
 
 int __stdcall DisconnectPacketSent(uint iClientID)
 {
-	try {
+	TRY_HOOK {
 		uint iShip = 0;
 		pub::Player::GetShip(iClientID, iShip);
 		if(set_iDisconnectDelay && iShip)
 		{ // in space
 			ClientInfo[iClientID].tmF1TimeDisconnect = timeInMS() + set_iDisconnectDelay;
 			return 0; // don't pass on
 		}
-	} catch(...) { LOG_EXCEPTION }
+	} CATCH_HOOK({})
 	return 1; // pass on
 }
 

diff --git a/source/HkCbIEngine.cpp b/source/HkCbIEngine.cpp
@@ -132,9 +132,9 @@ int __cdecl Dock_Call(unsigned int const &uShipID,unsigned int const &uSpaceID,i
 
 	CALL_PLUGINS(PLUGIN_HkCb_Dock_Call,int,,(unsigned int const &,unsigned int const &,int,DOCK_HOST_RESPONSE),(uShipID,uSpaceID,p3,p4));
 
-	try {
+	TRY_HOOK {
 		return pub::SpaceObj::Dock(uShipID,uSpaceID,p3,p4);
-	} catch(...) { LOG_EXCEPTION }
+	} CATCH_HOOK({})
 
 	CALL_PLUGINS(PLUGIN_HkCb_Dock_Call_AFTER, int, , (unsigned int const &, unsigned int const &, int, DOCK_HOST_RESPONSE), (uShipID, uSpaceID, p3, p4));