winetest: skip gecko check for non-i386 builds
Austin English
austinenglish at gmail.com
Mon Mar 30 20:38:49 CDT 2009
On Mon, Mar 30, 2009 at 8:37 PM, Austin English <austinenglish at gmail.com> wrote:
> Currently running winetest triggers gecko, which is great, except if
> you're testing on 64-bit, since it's useless. It then installs 32-bit
> gecko, which for some reason make wine segfault after running the
> ddraw:visual tests o.0.
>
> --
> -Austin
>
Typo in that last one.
--
-Austin
-------------- next part --------------
diff --git a/programs/winetest/main.c b/programs/winetest/main.c
index a07e3d9..d65fd4d 100644
--- a/programs/winetest/main.c
+++ b/programs/winetest/main.c
@@ -156,6 +156,7 @@ static int running_on_visible_desktop (void)
}
/* check if Gecko is present, trying to trigger the install if not */
+#ifdef __i386__
static BOOL gecko_check(void)
{
IHTMLDocument2 *doc;
@@ -169,6 +170,9 @@ static BOOL gecko_check(void)
IHTMLDocument_Release( doc );
return ret;
}
+#else
+# warning "Gecko is not yet implemented for your architechture."
+#endif
static void print_version (void)
{
@@ -590,12 +594,16 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType,
xprintf (" %s=dll is missing\n", dllname);
return TRUE;
}
+#ifdef __i386__
if (!strcmp( dllname, "mshtml" ) && running_under_wine() && !gecko_check())
{
FreeLibrary(dll);
xprintf (" %s=load error Gecko is not installed\n", dllname);
return TRUE;
}
+#else
+# warning "Not triggering gecko install."
+#endif
FreeLibrary(dll);
if (!(err = get_subtests( tempdir, &wine_tests[nr_of_files], lpszName )))
More information about the wine-patches
mailing list