Update stub generation.

Author: jonsimantov

analytics/generate_windows_stubs.py

@@ -100,7 +100,7 @@ def generate_function_pointers(dll_file_path, header_file_path, output_h_path, o
     includes = re.findall(r"#include\s+<.*?>", header_content)
 
     # Find all typedefs, including their documentation comments
-    typedefs = re.findall(r"/\*\*(?:[\s\S]*?)\*/\s*typedef[\s\S]*?;\s*", header_content)
+    typedefs = re.findall(r"(?:/\*\*(?:[\s\S]*?)\*/\s*)?typedef[\s\S]*?;\s*", header_content)
 
     # --- Extract function prototypes ---
     function_pattern = re.compile(
@@ -127,7 +127,7 @@ def generate_function_pointers(dll_file_path, header_file_path, output_h_path, o
         if "void" in return_type:
             return_statement = "    // No return value."
         elif "*" in return_type:
-            return_statement = f'    return ({return_type})(&g_stub_memory);'
+            return_statement = f'    return ({return_type})(&g_stub_memory[0]);'
         else: # bool, int64_t, etc.
             return_statement = "    return 1;"
 
@@ -203,7 +203,8 @@ def generate_function_pointers(dll_file_path, header_file_path, output_h_path, o
         f.write(f"// Generated from {os.path.basename(header_file_path)} by {os.path.basename(sys.argv[0])}\n\n")
         f.write(f'#include "{INCLUDE_PREFIX}{os.path.basename(output_h_path)}"\n\n')
         f.write('#include <stddef.h>\n\n')
-        f.write("static void* g_stub_memory = NULL;\n\n")
+        f.write("// A nice big chunk of stub memory that can be returned by stubbed Create methods.\n")
+        f.write("static char g_stub_memory[256] = {0};\n\n")
         f.write("// clang-format off\n")
         f.write(f'\n// Number of Google Analytics functions expected to be loaded from the DLL.')
         f.write(f'\nconst int FirebaseAnalytics_DynamicFunctionCount = {len(function_details_for_loader)};\n\n');

analytics/src/analytics_desktop_dynamic.c

@@ -18,7 +18,8 @@
 
 #include <stddef.h>
 
-static void* g_stub_memory = NULL;
+// A nice big chunk of stub memory that can be returned by stubbed Create methods.
+static char g_stub_memory[256] = {0};
 
 // clang-format off
 
@@ -38,7 +39,7 @@ const int FirebaseAnalytics_KnownWindowsDllHashCount = 1;
 // --- Stub Function Definitions ---
 // Stub for GoogleAnalytics_Options_Create
 static GoogleAnalytics_Options* Stub_GoogleAnalytics_Options_Create() {
-    return (GoogleAnalytics_Options*)(&g_stub_memory);
+    return (GoogleAnalytics_Options*)(&g_stub_memory[0]);
 }
 
 // Stub for GoogleAnalytics_Options_Destroy
@@ -48,7 +49,7 @@ static void Stub_GoogleAnalytics_Options_Destroy(GoogleAnalytics_Options* option
 
 // Stub for GoogleAnalytics_Item_Create
 static GoogleAnalytics_Item* Stub_GoogleAnalytics_Item_Create() {
-    return (GoogleAnalytics_Item*)(&g_stub_memory);
+    return (GoogleAnalytics_Item*)(&g_stub_memory[0]);
 }
 
 // Stub for GoogleAnalytics_Item_InsertInt
@@ -79,7 +80,7 @@ static void Stub_GoogleAnalytics_Item_Destroy(GoogleAnalytics_Item* item) {
 
 // Stub for GoogleAnalytics_ItemVector_Create
 static GoogleAnalytics_ItemVector* Stub_GoogleAnalytics_ItemVector_Create() {
-    return (GoogleAnalytics_ItemVector*)(&g_stub_memory);
+    return (GoogleAnalytics_ItemVector*)(&g_stub_memory[0]);
 }
 
 // Stub for GoogleAnalytics_ItemVector_InsertItem
@@ -94,7 +95,7 @@ static void Stub_GoogleAnalytics_ItemVector_Destroy(GoogleAnalytics_ItemVector*
 
 // Stub for GoogleAnalytics_EventParameters_Create
 static GoogleAnalytics_EventParameters* Stub_GoogleAnalytics_EventParameters_Create() {
-    return (GoogleAnalytics_EventParameters*)(&g_stub_memory);
+    return (GoogleAnalytics_EventParameters*)(&g_stub_memory[0]);
 }
 
 // Stub for GoogleAnalytics_EventParameters_InsertInt

analytics/src/analytics_desktop_dynamic.h

@@ -23,6 +23,8 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+typedef struct GoogleAnalytics_Reserved_Opaque GoogleAnalytics_Reserved;
+
 /**
  * @brief GoogleAnalytics_Options for initializing the Analytics SDK.
  * GoogleAnalytics_Options_Create() must be used to create an instance of this