Commit 0ae458cc authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

mshtml: Wine Gecko 1.8 release.

parent d1846508
......@@ -53,14 +53,14 @@
WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl);
#define GECKO_VERSION "1.7"
#define GECKO_VERSION "1.8"
#ifdef __i386__
#define ARCH_STRING "x86"
#define GECKO_SHA "efebc4ed7a86708e2dc8581033a3c5d6effe0b0b"
#define GECKO_SHA "a8622ff749cc2a2cb311f902b7e99664ecc2f8d6"
#elif defined(__x86_64__)
#define ARCH_STRING "x86_64"
#define GECKO_SHA "2253e7ce3a699ddd110c6c9ce4c7ca7e6f7c02f5"
#define GECKO_SHA "ea8bb450c6b41f71cc0ef23c490dfebdaccf789d"
#else
#define ARCH_STRING ""
#define GECKO_SHA "???"
......
......@@ -234,7 +234,7 @@ typedef struct {
} nsCycleCollectingAutoRefCnt;
typedef struct {
void *x[3];
void *x[9];
} nsXPCOMCycleCollectionParticipant;
typedef struct nsCycleCollectionTraversalCallback nsCycleCollectionTraversalCallback;
......
......@@ -1295,6 +1295,10 @@ void set_script_mode(HTMLOuterWindow *window, SCRIPTMODE mode)
if(NS_SUCCEEDED(nsres)) {
nsres = nsIWebBrowserSetup_SetProperty(setup, SETUP_ALLOW_JAVASCRIPT,
window->scriptmode == SCRIPTMODE_GECKO);
if(NS_SUCCEEDED(nsres))
nsres = nsIWebBrowserSetup_SetProperty(setup, SETUP_DISABLE_NOSCRIPT, TRUE);
nsIWebBrowserSetup_Release(setup);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment