Add debug traces

Author: spmn

sa-mp_masterlist_fix/Config.cpp

@@ -62,11 +62,13 @@ bool Configuration::Load()
     // Populate any invalid setting with the equivalent from the default config
     if (!m_internetEndpoint.IsValid())
     {
+        ::OutputDebugStringW(L"[SA-MP Masterlist Fix] Invalid internet endpoint; falling back to the default");
         defaultConfig["endpoints"]["internet"].get_to(m_internetEndpoint);
     }
 
     if (!m_hostedEndpoint.IsValid())
     {
+        ::OutputDebugStringW(L"[SA-MP Masterlist Fix] Invalid hosted endpoint; falling back to the default");
         defaultConfig["endpoints"]["hosted"].get_to(m_hostedEndpoint);
     }
 

sa-mp_masterlist_fix/dllmain.cpp

@@ -62,7 +62,8 @@ BOOL WINAPI DllMain(HINSTANCE, DWORD dwReason, LPVOID)
 {
 	if (dwReason == DLL_PROCESS_ATTACH)
 	{	
-        OutputDebugStringA("Loaded");
+        ::OutputDebugStringW(L"[SA-MP Masterlist Fix] Injected");
+
 		if (InitializeWrapper())
 		{
 			Fix::GetInstance().EarlyInitialize();

sa-mp_masterlist_fix/fix.cpp

@@ -54,9 +54,13 @@ int WINAPI Fix::connect(SOCKET s, const sockaddr* name, int namelen)
     {
         if (int newPort = self.GetEndpointForCurrentTab().m_port)
         {
-            nameIpv4->sin_port = ::htons(static_cast<short>(newPort));
+            if (self.m_socket != INVALID_SOCKET)
+            {
+                ::OutputDebugStringW(L"[SA-MP Masterlist Fix] New socket opened without closing the previous one (must never happen; report it on GitHub pls)");
+                assert(false);
+            }
 
-            assert(self.m_socket == INVALID_SOCKET && "New socket opened without closing the previous one");
+            nameIpv4->sin_port = ::htons(static_cast<short>(newPort));
             self.m_socket = s;
         }
     }
@@ -108,6 +112,9 @@ MasterlistEndpoint Fix::GetEndpointForCurrentTab() const
         return m_config.GetHostedEndpoint();
     }
 
+    ::OutputDebugStringW(L"[SA-MP Masterlist Fix] Invalid tab (should never happen; report it on GitHub pls)");
+    assert(false);
+
     return MasterlistEndpoint{};
 }
 
@@ -163,6 +170,7 @@ void Fix::EarlyInitialize()
 
     if (!m_config.Load())
     {
+        ::OutputDebugStringW(L"[SA-MP Masterlist Fix] Invalid configuration (must never happen; report it on GitHub pls)");
         assert(false && "Invalid configuration");
         return;
     }
@@ -184,9 +192,12 @@ bool Fix::Initialize()
     {
         // We're injected into a random process or in an unsupported SA-MP server browser version
         // Either way, we should not try to mess with the current process any longer
+        ::OutputDebugStringW(L"[SA-MP Masterlist Fix] Signature scanning failed");
         return false;
     }
 
+    ::OutputDebugStringW(L"[SA-MP Masterlist Fix] Fully initialized");
+
     m_fullyInit = true;
     return true;
 }