[[ SB Inclusions ]] Work around problems linking to MCU_ functions from CEF

runrevali · runrevali · commit af784cee2974 · 2015-02-17T10:20:10.000Z
diff --git a/revbrowser/src/cefbrowser_w32.cpp b/revbrowser/src/cefbrowser_w32.cpp
@@ -513,3 +513,25 @@ bool MCCefWin32Browser::PlatformGetAuthCredentials(bool p_is_proxy, const CefStr
 
 	return t_success;
 }
+
+////////////////////////////////////////////////////////////////////////////////
+
+// AL-2015-02-17: [[ SB Inclusions ]] Work around problems linking to MCU_ functions from CEF
+#include <stdlib.h>
+#include <stdio.h>
+#include <cstring>
+
+void *MCU_loadmodule(const char *p_source)
+{
+    return LoadLibraryA(p_source);
+}
+
+void MCU_unloadmodule(void *p_module)
+{
+    
+}
+
+void *MCU_resolvemodulesymbol(void *p_module, const char *p_name)
+{
+    return GetProcAddress(p_module, p_name);
+}
diff --git a/revbrowser/src/cefshared.h b/revbrowser/src/cefshared.h
@@ -21,4 +21,9 @@ const char *MCCefPlatformGetCefLibraryPath(void);
 const char *MCCefPlatformGetResourcesDirPath(void);
 const char *MCCefPlatformGetLocalePath(void);
 
+// AL-2015-02-17: [[ SB Inclusions ]] Work around problems linking to MCU_ functions from CEF
+extern "C" void *MCU_loadmodule(const char *p_source);
+extern "C" void MCU_unloadmodule(void *p_module);
+extern "C" void *MCU_resolvemodulesymbol(void *p_module, const char *p_symbol);
+
 #endif // __MCCEF_SHARED_H__
diff --git a/revbrowser/src/cefshared_osx.cpp b/revbrowser/src/cefshared_osx.cpp
@@ -48,3 +48,60 @@ const char *MCCefPlatformGetResourcesDirPath(void)
 {
 	return nil;
 }
+
+////////////////////////////////////////////////////////////////////////////////
+
+// AL-2015-02-17: [[ SB Inclusions ]] Work around problems linking to MCU_ functions from CEF
+#include <stdlib.h>
+#include <stdio.h>
+#include <cstring>
+#include <mach-o/dyld.h>
+
+void *MCU_loadmodule(const char *p_source)
+{
+    const struct mach_header *t_module;
+    t_module = NSAddImage(p_source, NSADDIMAGE_OPTION_RETURN_ON_ERROR | NSADDIMAGE_OPTION_WITH_SEARCHING);
+    if (t_module == NULL)
+    {
+        uint32_t t_buffer_size;
+        t_buffer_size = 0;
+        _NSGetExecutablePath(NULL, &t_buffer_size);
+        char *t_module_path;
+        t_module_path = (char *) malloc(t_buffer_size + strlen(p_source) + 1);
+        if (t_module_path != NULL)
+        {
+            if (_NSGetExecutablePath(t_module_path, &t_buffer_size) == 0)
+            {
+                char *t_last_slash;
+                t_last_slash = t_module_path + t_buffer_size;
+                for (uint32_t i = 0; i < t_buffer_size; i++)
+                {
+                    if (*t_last_slash == '/')
+                    {
+                        *(t_last_slash + 1) = '\0';
+                        break;
+                    }
+                    t_last_slash--;
+                }
+                strcat(t_module_path, p_source);
+                t_module = NSAddImage(t_module_path, NSADDIMAGE_OPTION_RETURN_ON_ERROR | NSADDIMAGE_OPTION_WITH_SEARCHING);
+            }
+            free(t_module_path);
+        }
+    }
+}
+
+void MCU_unloadmodule(void *p_module)
+{
+    
+}
+
+void *MCU_resolvemodulesymbol(void *p_module, const char *p_name)
+{
+    NSSymbol t_symbol;
+    t_symbol = NSLookupSymbolInImage((mach_header *)p_module, p_name, NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW);
+    if (t_symbol != NULL)
+        return NSAddressOfSymbol(t_symbol);
+    
+    return NULL;
+}
