Jacek Caban : mshtml: Added support for installing Gecko from build dir.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 84098e54a00e4b407feaba2c720fa2a1da67fe31
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=84098e54a00e4b407feaba2c72...

Author: Jacek Caban 
Date:   Thu Oct 18 15:06:54 2007 +0200

mshtml: Added support for installing Gecko from build dir.

---

dlls/mshtml/install.c |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c
index 3890ac2..4acef19 100644
--- a/dlls/mshtml/install.c
+++ b/dlls/mshtml/install.c
@@ -251,22 +251,25 @@ static BOOL install_from_registered_dir(void)

static BOOL install_from_default_dir(void)
 {
-    const char *data_dir;
+    const char *data_dir, *subdir;
     char *file_name;
-    int len;
+    int len, len2;
     BOOL ret;

-    static const char gecko_dir[] = "/gecko/";
-
-    data_dir = wine_get_data_dir();
-    if(!data_dir) return FALSE;
+    if((data_dir = wine_get_data_dir()))
+        subdir = "/gecko/";
+    else if((data_dir = wine_get_build_dir()))
+        subdir = "/../gecko/";
+    else
+        return FALSE;

len = strlen(data_dir);
+    len2 = strlen(subdir);

-    file_name = mshtml_alloc(len+sizeof(gecko_dir)+sizeof(GECKO_FILE_NAME));
+    file_name = mshtml_alloc(len+len2+sizeof(GECKO_FILE_NAME));
     memcpy(file_name, data_dir, len);
-    memcpy(file_name+len, gecko_dir, sizeof(gecko_dir));
-    memcpy(file_name+len+sizeof(gecko_dir)-1, GECKO_FILE_NAME, sizeof(GECKO_FILE_NAME));
+    memcpy(file_name+len, subdir, len2);
+    memcpy(file_name+len+len2, GECKO_FILE_NAME, sizeof(GECKO_FILE_NAME));

ret = install_from_unix_file(file_name);