Update some nomenclature.

Author: jonsimantov

analytics/generate_windows_stubs.py

@@ -142,11 +142,13 @@ def generate_function_pointers(header_file_path, output_h_path, output_c_path):
         f.write("\n\n// --- Dynamic Loader Declaration for Windows ---\n")
         f.write("#if defined(_WIN32)\n")
         f.write('#include <windows.h> // For HMODULE\n')
+        f.write(f'\n// Number of Google Analytics functions expected to be loaded from the DLL.')
+        f.write(f'\n#define FIREBASE_ANALYTICS_DYNAMIC_FUNCTION_COUNT {len(function_details_for_loader)}\n\n')
         f.write('// Load Google Analytics functions from the given DLL handle into function pointers.\n')
-        f.write(f'// Returns the number of functions successfully loaded (out of {len(function_details_for_loader)}).\n')
-        f.write("int FirebaseAnalytics_LoadAnalyticsFunctions(HMODULE dll_handle);\n\n")
+        f.write(f'// Returns the number of functions successfully loaded (out of FIREBASE_ANALYTICS_DYNAMIC_FUNCTION_COUNT).\n')
+        f.write("int FirebaseAnalytics_LoadDynamicFunctions(HMODULE dll_handle);\n\n")
         f.write('// Reset all function pointers back to stubs.\n')
-        f.write("void FirebaseAnalytics_UnloadAnalyticsFunctions(void);\n\n")
+        f.write("void FirebaseAnalytics_UnloadDynamicFunctions(void);\n\n")
         f.write("#endif // defined(_WIN32)\n")
         f.write("\n#ifdef __cplusplus\n")
         f.write("}\n")
@@ -170,7 +172,7 @@ def generate_function_pointers(header_file_path, output_h_path, output_c_path):
         f.write("\n\n// --- Dynamic Loader Function for Windows ---\n")
         loader_lines = [
             '#if defined(_WIN32)',
-            'int FirebaseAnalytics_LoadAnalyticsFunctions(HMODULE dll_handle) {',
+            'int FirebaseAnalytics_LoadDynamicFunctions(HMODULE dll_handle) {',
             '    int count = 0;\n',
             '    if (!dll_handle) {',
             '        return count;',
@@ -188,7 +190,7 @@ def generate_function_pointers(header_file_path, output_h_path, output_c_path):
             loader_lines.extend(proc_check)
         loader_lines.append('\n    return count;')
         loader_lines.append('}\n')
-        loader_lines.append('void FirebaseAnalytics_UnloadAnalyticsFunctions(void) {')
+        loader_lines.append('void FirebaseAnalytics_UnloadDynamicFunctions(void) {')
         for name, ret_type, params in function_details_for_loader:
             loader_lines.append(f'    ptr_{name} = &Stub_{name};');
         loader_lines.append('}\n')

analytics/src/analytics_desktop.cc

@@ -131,7 +131,11 @@ void Initialize(const App& app) {
     g_analytics_dll = LoadLibraryW(g_analytics_dll_filename.c_str());
     if (g_analytics_dll) {
       LogInfo("Loaded Google Analytics DLL");
-      FirebaseAnalytics_LoadAnalyticsFunctions(g_analytics_dll);
+      int num_loaded = FirebaseAnalytics_LoadDynamicFunctions(g_analytics_dll);
+      if (num_loaded < FIREBASE_ANALYTICS_DYNAMIC_FUNCTION_COUNT) {
+        LogWarning("Only loaded %d out of %d expected functions from DLL.",
+                   num_loaded, FIREBASE_ANALYTICS_DYNAMIC_FUNCTION_COUNT);
+      }
     } else {
       // Silently fail and continue in stub mode.
     }
@@ -150,7 +154,7 @@ bool IsInitialized() { return g_initialized; }
 // Call this function when Analytics is no longer needed to free up resources.
 void Terminate() {
 #if defined(_WIN32)
-  FirebaseAnalytics_UnloadAnalyticsFunctions();
+  FirebaseAnalytics_UnloadDynamicFunctions();
   if (g_analytics_dll) {
     FreeLibrary(g_analytics_dll);
     g_analytics_dll = 0;

analytics/src/analytics_desktop_dynamic.c

@@ -15,6 +15,7 @@
 // Generated from analytics.h by generate_windows_stubs.py
 
 #include "analytics/src/analytics_desktop_dynamic.h"
+
 #include <stddef.h>
 
 // clang-format off
@@ -152,7 +153,7 @@ void (*ptr_GoogleAnalytics_SetAnalyticsCollectionEnabled)(bool enabled) = &Stub_
 
 // --- Dynamic Loader Function for Windows ---
 #if defined(_WIN32)
-int FirebaseAnalytics_LoadAnalyticsFunctions(HMODULE dll_handle) {
+int FirebaseAnalytics_LoadDynamicFunctions(HMODULE dll_handle) {
     int count = 0;
 
     if (!dll_handle) {
@@ -258,7 +259,7 @@ int FirebaseAnalytics_LoadAnalyticsFunctions(HMODULE dll_handle) {
     return count;
 }
 
-void FirebaseAnalytics_UnloadAnalyticsFunctions(void) {
+void FirebaseAnalytics_UnloadDynamicFunctions(void) {
     ptr_GoogleAnalytics_Item_Create = &Stub_GoogleAnalytics_Item_Create;
     ptr_GoogleAnalytics_Item_InsertInt = &Stub_GoogleAnalytics_Item_InsertInt;
     ptr_GoogleAnalytics_Item_InsertDouble = &Stub_GoogleAnalytics_Item_InsertDouble;

analytics/src/analytics_desktop_dynamic.h

@@ -112,18 +112,22 @@ extern void (*ptr_GoogleAnalytics_SetAnalyticsCollectionEnabled)(bool enabled);
 #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).
-int FirebaseAnalytics_LoadAnalyticsFunctions(HMODULE dll_handle);
+#include <windows.h>  // For HMODULE
+
+// Number of Google Analytics functions expected to be loaded from the DLL.
+#define FIREBASE_ANALYTICS_DYNAMIC_FUNCTION_COUNT 19
+
+// Load Google Analytics functions from the given DLL handle into function
+// pointers. Returns the number of functions successfully loaded (out of
+// FIREBASE_ANALYTICS_DYNAMIC_FUNCTION_COUNT).
+int FirebaseAnalytics_LoadDynamicFunctions(HMODULE dll_handle);
 
 // Reset all function pointers back to stubs.
-void FirebaseAnalytics_UnloadAnalyticsFunctions(void);
+void FirebaseAnalytics_UnloadDynamicFunctions(void);
 
-#endif // defined(_WIN32)
+#endif  // defined(_WIN32)
 
 #ifdef __cplusplus
 }