fix(core): Fix s2binlib call

Author: samyycX

src/core/bridge/metamod.cpp

@@ -68,8 +68,12 @@ bool SwiftlyMMBridge::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxle
 
     META_CONVAR_REGISTER(FCVAR_RELEASE | FCVAR_SERVER_CAN_EXECUTE | FCVAR_CLIENT_CAN_EXECUTE | FCVAR_GAMEDLL);
 
+    s2binlib_initialize(Plat_GetGameDirectory(), "csgo");
+    s2binlib_set_module_base_from_pointer("server", g_ifaceService.FetchInterface<IServerGameDLL>(INTERFACEVERSION_SERVERGAMEDLL));
+    s2binlib_set_module_base_from_pointer("engine2", g_ifaceService.FetchInterface<IVEngineServer2>(INTERFACEVERSION_VENGINESERVER));
+
     void* serverSideClientVTable;
-    s2binlib_find_vtable("server", "CServerSideClient", &serverSideClientVTable);
+    s2binlib_find_vtable("engine2", "CServerSideClient", &serverSideClientVTable);
     OnConVarQueryID = SH_ADD_DVPHOOK(CServerSideClientBase, ProcessRespondCvarValue, (CServerSideClientBase*)serverSideClientVTable, SH_MEMBER(this, &SwiftlyMMBridge::OnConvarQuery), false);
 
     auto server = g_ifaceService.FetchInterface<IServerGameDLL>(INTERFACEVERSION_SERVERGAMEDLL);

src/core/entrypoint.cpp

@@ -47,9 +47,8 @@ bool SwiftlyCore::Load(BridgeKind_t kind)
     m_iKind = kind;
     SetupConsoleColors();
 
-    s2binlib_initialize(Plat_GetGameDirectory(), "csgo");
-    s2binlib_set_module_base_from_pointer("server", g_ifaceService.FetchInterface<IServerGameDLL>(INTERFACEVERSION_SERVERGAMEDLL));
-    s2binlib_set_module_base_from_pointer("engine2", g_ifaceService.FetchInterface<IVEngineServer2>(INTERFACEVERSION_VENGINESERVER));
+
+    // s2binlib_pattern
 
     auto logger = g_ifaceService.FetchInterface<ILogger>(LOGGER_INTERFACE_VERSION);
 

src/memory/gamedata/manager.cpp

@@ -73,7 +73,7 @@ std::map<std::string, int> m_binariesSize;
 
 void* FindSignature(std::string library, std::string pattern)
 {
-    void* result;
+    void* result = 0;
     s2binlib_pattern_scan(library.c_str(), pattern.c_str(), &result);
     return result;
 

vendor/s2binlib/libs2binlib.a

@@ -82,6 +82,95 @@ int s2binlib_pattern_scan(const char* binary_name, const char* pattern, void** r
  */
 int s2binlib_pattern_scan_va(const char* binary_name, const char* pattern, void** result);
 
+/**
+ * Callback function type for pattern_scan_all functions
+ * 
+ * @param index The index of the current match (0-based)
+ * @param address The found address (VA or memory address depending on the function)
+ * @param user_data User-provided data pointer
+ * @return true to stop searching (found what you need), false to continue searching
+ */
+typedef bool (*s2binlib_pattern_scan_callback)(size_t index, void* address, void* user_data);
+
+/**
+ * Find all occurrences of a pattern in a binary and return their virtual addresses
+ * 
+ * Scans the binary for all occurrences of the specified byte pattern and calls
+ * the callback function for each match found. The callback receives virtual addresses (VA).
+ * 
+ * If the binary is not yet loaded, it will be loaded automatically.
+ * 
+ * @param binary_name Name of the binary to scan
+ * @param pattern Byte pattern with wildcards (e.g., "48 89 5C 24 ? 48 89 74")
+ * @param callback Function pointer that will be called for each match
+ * @param user_data User-provided pointer passed to each callback invocation
+ * 
+ * @return 0 on success (at least one match found)
+ *         -1 if S2BinLib not initialized
+ *         -2 if invalid parameters
+ *         -3 if failed to load binary
+ *         -4 if pattern not found
+ *         -5 if internal error
+ * 
+ * @note The callback should return true to stop searching, false to continue
+ * 
+ * @example
+ *     bool my_callback(size_t index, void* address, void* user_data) {
+ *         printf("Match #%zu found at VA: %p\n", index, address);
+ *         int* count = (int*)user_data;
+ *         (*count)++;
+ *         return false; // Continue searching
+ *     }
+ * 
+ *     int count = 0;
+ *     int result = s2binlib_pattern_scan_all_va("server", "48 89 5C 24 ?", my_callback, &count);
+ *     if (result == 0) {
+ *         printf("Found %d matches\n", count);
+ *     }
+ */
+int s2binlib_pattern_scan_all_va(const char* binary_name, const char* pattern, 
+                                  s2binlib_pattern_scan_callback callback, void* user_data);
+
+/**
+ * Find all occurrences of a pattern in a binary and return their memory addresses
+ * 
+ * Scans the binary for all occurrences of the specified byte pattern and calls
+ * the callback function for each match found. The callback receives memory addresses
+ * (adjusted with module base address).
+ * 
+ * If the binary is not yet loaded, it will be loaded automatically.
+ * 
+ * @param binary_name Name of the binary to scan
+ * @param pattern Byte pattern with wildcards (e.g., "48 89 5C 24 ? 48 89 74")
+ * @param callback Function pointer that will be called for each match
+ * @param user_data User-provided pointer passed to each callback invocation
+ * 
+ * @return 0 on success (at least one match found)
+ *         -1 if S2BinLib not initialized
+ *         -2 if invalid parameters
+ *         -3 if failed to load binary
+ *         -4 if pattern not found
+ *         -5 if internal error
+ * 
+ * @note The callback should return true to stop searching, false to continue
+ * 
+ * @example
+ *     bool my_callback(size_t index, void* address, void* user_data) {
+ *         printf("Match #%zu found at memory address: %p\n", index, address);
+ *         int* count = (int*)user_data;
+ *         (*count)++;
+ *         return false; // Continue searching
+ *     }
+ * 
+ *     int count = 0;
+ *     int result = s2binlib_pattern_scan_all("server", "48 89 5C 24 ?", my_callback, &count);
+ *     if (result == 0) {
+ *         printf("Found %d matches\n", count);
+ *     }
+ */
+int s2binlib_pattern_scan_all(const char* binary_name, const char* pattern, 
+                               s2binlib_pattern_scan_callback callback, void* user_data);
+
 /**
  * Find a vtable by class name in the specified binary
  *