Changeset 55531 in webkit

Timestamp:

Mar 4, 2010 10:00:12 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-04 Fridrich Strba <​fridrich.strba@bluewin.ch>

Reviewed by Holger Freyther.

Make paths relocatable on runtime on Windows
​https://bugs.webkit.org/show_bug.cgi?id=32711

• platform/graphics/gtk/ImageGtk.cpp: (get_webkit_datadir): (WebCore::Image::loadPlatformResource):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gtk/ImageGtk.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-04  Fridrich Strba  <fridrich.strba@bluewin.ch>
+
+        Reviewed by Holger Freyther.
+
+        Make paths relocatable on runtime on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=32711
+
+        * platform/graphics/gtk/ImageGtk.cpp:
+        (get_webkit_datadir):
+        (WebCore::Image::loadPlatformResource):
+
 2010-03-04  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/platform/graphics/gtk/ImageGtk.cpp

@@ -33 +33 @@
 #include <gtk/gtk.h>
 
+#ifdef _WIN32
+#  include <mbstring.h>
+#  include <shlobj.h>
+/* search for data relative to where we are installed */
+
+static HMODULE hmodule;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+BOOL WINAPI
+DllMain(HINSTANCE hinstDLL,
+    DWORD     fdwReason,
+    LPVOID    lpvReserved)
+{
+    switch (fdwReason) {
+    case DLL_PROCESS_ATTACH:
+        hmodule = hinstDLL;
+        break;
+    }
+
+    return TRUE;
+}
+#ifdef __cplusplus
+}
+#endif
+
+static char *
+get_webkit_datadir(void)
+{
+    static char retval[1000];
+    static int beenhere = 0;
+
+    unsigned char *p;
+
+    if (beenhere)
+        return retval;
+
+    if (!GetModuleFileName (hmodule, (CHAR *) retval, sizeof(retval) - 10))
+        return DATA_DIR;
+
+    p = _mbsrchr((const unsigned char *) retval, '\\');
+    *p = '\0';
+    p = _mbsrchr((const unsigned char *) retval, '\\');
+    if (p) {
+        if (!stricmp((const char *) (p+1), "bin"))
+            *p = '\0';
+    }
+    strcat(retval, "\\share");
+
+    beenhere = 1;
+
+    return retval;
+}
+
+#undef DATA_DIR
+#define DATA_DIR get_webkit_datadir ()
+#endif
+
+
 namespace WTF {
 
@@ -97 +157 @@
     if (!strcmp("missingImage", name))
         fileName = getThemeIconFileName(GTK_STOCK_MISSING_IMAGE, 16);
-    if (fileName.isNull())
-        fileName = String::format("%s/webkit-1.0/images/%s.png", DATA_DIR, name).utf8();
+    if (fileName.isNull()) {
+        gchar* imagename = g_strdup_printf("%s.png", name);
+        gchar* glibFileName = g_build_filename(DATA_DIR, "webkit-1.0", "images", imagename, 0);
+        fileName = glib_file_name;
+        g_free(imagename);
+        g_free(glibFileName);
+    }
 
     return loadImageFromFile(fileName);