Update stub scripts and output files.

jonsimantov · jonsimantov · commit e171c8a8df56 · 2025-06-11T22:27:08.000-07:00
diff --git a/analytics/generate_windows_stubs.py b/analytics/generate_windows_stubs.py
@@ -74,6 +74,7 @@ def generate_function_pointers(header_file_path, output_h_path, output_c_path):
     matches = function_pattern.finditer(header_content)
 
     extern_declarations = []
+    macro_definitions = []
     stub_functions = []
     pointer_initializations = []
     function_details_for_loader = []
@@ -90,9 +91,9 @@ def generate_function_pointers(header_file_path, output_h_path, output_c_path):
         if "void" in return_type:
             return_statement = "    // No return value."
         elif "*" in return_type:
-            return_statement = "    return NULL;"
+            return_statement = f'    return ({return_type})(&g_stub_memory);'
         else: # bool, int64_t, etc.
-            return_statement = "    return 0;"
+            return_statement = "    return 1;"
             
         stub_function = (
             f"// Stub for {function_name}\n"
@@ -105,6 +106,9 @@ def generate_function_pointers(header_file_path, output_h_path, output_c_path):
         declaration = f"extern {return_type} (*ptr_{function_name})({cleaned_params_for_decl});"
         extern_declarations.append(declaration)
 
+        macro = f'#define {function_name} ptr_{function_name}'
+        macro_definitions.append(macro)
+
         pointer_init = f"{return_type} (*ptr_{function_name})({cleaned_params_for_decl}) = &{stub_name};"
         pointer_initializations.append(pointer_init)
         
@@ -119,7 +123,8 @@ def generate_function_pointers(header_file_path, output_h_path, output_c_path):
         f.write(f"// Generated from {os.path.basename(header_file_path)} by {os.path.basename(sys.argv[0])}\n\n")
         f.write(f"#ifndef {header_guard}\n")
         f.write(f"#define {header_guard}\n\n")
-
+        f.write("#include <stdbool.h>  // needed for bool type in pure C\n\n")
+        
         f.write("// --- Copied from original header ---\n")
         f.write("\n".join(includes) + "\n\n")
         f.write("".join(typedefs))
@@ -131,6 +136,8 @@ def generate_function_pointers(header_file_path, output_h_path, output_c_path):
         f.write("// --- Function Pointer Declarations ---\n")
         f.write("// clang-format off\n")
         f.write("\n".join(extern_declarations))
+        f.write("\n\n")
+        f.write("\n".join(macro_definitions))
         f.write("\n// clang-format on\n")
         f.write("\n\n// --- Dynamic Loader Declaration for Windows ---\n")
         f.write("#if defined(_WIN32)\n")
@@ -155,6 +162,7 @@ def generate_function_pointers(header_file_path, output_h_path, output_c_path):
         f.write(f'#include "{INCLUDE_PREFIX}{os.path.basename(output_h_path)}"\n')
         f.write('#include <stddef.h>\n\n')
         f.write("// clang-format off\n\n")
+        f.write("static void* g_stub_memory = NULL;\n\n")
         f.write("// --- Stub Function Definitions ---\n")
         f.write("\n\n".join(stub_functions))
         f.write("\n\n\n// --- Function Pointer Initializations ---\n")
diff --git a/analytics/src/windows/analytics_dynamic.c b/analytics/src/windows/analytics_dynamic.c
@@ -15,15 +15,16 @@
 // Generated from analytics.h by generate_windows_stubs.py
 
 #include "analytics/src/windows/analytics_dynamic.h"
-
 #include <stddef.h>
 
 // clang-format off
 
+static void* g_stub_memory = NULL;
+
 // --- Stub Function Definitions ---
 // Stub for GoogleAnalytics_Item_Create
 static GoogleAnalytics_Item* Stub_GoogleAnalytics_Item_Create() {
-    return NULL;
+    return (GoogleAnalytics_Item*)(&g_stub_memory);
 }
 
 // Stub for GoogleAnalytics_Item_InsertInt
@@ -54,7 +55,7 @@ static void Stub_GoogleAnalytics_Item_Destroy(GoogleAnalytics_Item* item) {
 
 // Stub for GoogleAnalytics_ItemVector_Create
 static GoogleAnalytics_ItemVector* Stub_GoogleAnalytics_ItemVector_Create() {
-    return NULL;
+    return (GoogleAnalytics_ItemVector*)(&g_stub_memory);
 }
 
 // Stub for GoogleAnalytics_ItemVector_InsertItem
@@ -69,7 +70,7 @@ static void Stub_GoogleAnalytics_ItemVector_Destroy(GoogleAnalytics_ItemVector*
 
 // Stub for GoogleAnalytics_EventParameters_Create
 static GoogleAnalytics_EventParameters* Stub_GoogleAnalytics_EventParameters_Create() {
-    return NULL;
+    return (GoogleAnalytics_EventParameters*)(&g_stub_memory);
 }
 
 // Stub for GoogleAnalytics_EventParameters_InsertInt
diff --git a/analytics/src/windows/analytics_dynamic.h b/analytics/src/windows/analytics_dynamic.h
@@ -17,6 +17,8 @@
 #ifndef FIREBASE_ANALYTICS_SRC_WINDOWS_ANALYTICS_DYNAMIC_H_
 #define FIREBASE_ANALYTICS_SRC_WINDOWS_ANALYTICS_DYNAMIC_H_
 
+#include <stdbool.h>  // needed for bool type in pure C
+
 // --- Copied from original header ---
 #include <stdint.h>
 
@@ -88,19 +90,40 @@ extern void (*ptr_GoogleAnalytics_SetUserProperty)(const char* name, const char*
 extern void (*ptr_GoogleAnalytics_SetUserId)(const char* user_id);
 extern void (*ptr_GoogleAnalytics_ResetAnalyticsData)();
 extern void (*ptr_GoogleAnalytics_SetAnalyticsCollectionEnabled)(bool enabled);
+
+#define GoogleAnalytics_Item_Create ptr_GoogleAnalytics_Item_Create
+#define GoogleAnalytics_Item_InsertInt ptr_GoogleAnalytics_Item_InsertInt
+#define GoogleAnalytics_Item_InsertDouble ptr_GoogleAnalytics_Item_InsertDouble
+#define GoogleAnalytics_Item_InsertString ptr_GoogleAnalytics_Item_InsertString
+#define GoogleAnalytics_Item_Destroy ptr_GoogleAnalytics_Item_Destroy
+#define GoogleAnalytics_ItemVector_Create ptr_GoogleAnalytics_ItemVector_Create
+#define GoogleAnalytics_ItemVector_InsertItem ptr_GoogleAnalytics_ItemVector_InsertItem
+#define GoogleAnalytics_ItemVector_Destroy ptr_GoogleAnalytics_ItemVector_Destroy
+#define GoogleAnalytics_EventParameters_Create ptr_GoogleAnalytics_EventParameters_Create
+#define GoogleAnalytics_EventParameters_InsertInt ptr_GoogleAnalytics_EventParameters_InsertInt
+#define GoogleAnalytics_EventParameters_InsertDouble ptr_GoogleAnalytics_EventParameters_InsertDouble
+#define GoogleAnalytics_EventParameters_InsertString ptr_GoogleAnalytics_EventParameters_InsertString
+#define GoogleAnalytics_EventParameters_InsertItemVector ptr_GoogleAnalytics_EventParameters_InsertItemVector
+#define GoogleAnalytics_EventParameters_Destroy ptr_GoogleAnalytics_EventParameters_Destroy
+#define GoogleAnalytics_LogEvent ptr_GoogleAnalytics_LogEvent
+#define GoogleAnalytics_SetUserProperty ptr_GoogleAnalytics_SetUserProperty
+#define GoogleAnalytics_SetUserId ptr_GoogleAnalytics_SetUserId
+#define GoogleAnalytics_ResetAnalyticsData ptr_GoogleAnalytics_ResetAnalyticsData
+#define GoogleAnalytics_SetAnalyticsCollectionEnabled ptr_GoogleAnalytics_SetAnalyticsCollectionEnabled
 // clang-format on
 
+
 // --- Dynamic Loader Declaration for Windows ---
 #if defined(_WIN32)
-#include <windows.h>  // For HMODULE
-// Load Google Analytics functions from the given DLL handle into function
-// pointers. Returns the number of functions successfully loaded (out of 19).
+#include <windows.h> // For HMODULE
+// Load Google Analytics functions from the given DLL handle into function pointers.
+// Returns the number of functions successfully loaded (out of 19).
 int FirebaseAnalytics_LoadAnalyticsFunctions(HMODULE dll_handle);
 
 // Reset all function pointers back to stubs.
 void FirebaseAnalytics_UnloadAnalyticsFunctions(void);
 
-#endif  // defined(_WIN32)
+#endif // defined(_WIN32)
 
 #ifdef __cplusplus
 }
