ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Use IUri in use_gecko_script.

This commit is contained in:
Jacek Caban 2011-11-10 14:35:50 +01:00 committed by Alexandre Julliard
parent d7f7f33e7d
commit 1190c8cbd6
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/mshtml/persist.c
View File

@ -32,6 +32,9 @@
#include "shlguid.h"
#include "idispids.h"
#define NO_SHLWAPI_REG
#include "shlwapi.h"
#include "wine/debug.h"
#include "mshtml_private.h"
@ -50,11 +53,9 @@ typedef struct {
static BOOL use_gecko_script(HTMLWindow *window)
{
DWORD zone;
DWORD zone, scheme;
HRESULT hres;
static const WCHAR aboutW[] = {'a','b','o','u','t',':'};
hres = IInternetSecurityManager_MapUrlToZone(window->secmgr, window->url, &zone, 0);
if(FAILED(hres)) {
WARN("Could not map %s to zone: %08x\n", debugstr_w(window->url), hres);
@ -62,8 +63,11 @@ static BOOL use_gecko_script(HTMLWindow *window)
}
TRACE("zone %d\n", zone);
return zone != URLZONE_LOCAL_MACHINE && zone != URLZONE_TRUSTED
&& strncmpiW(aboutW, window->url, sizeof(aboutW)/sizeof(WCHAR));
if(zone == URLZONE_LOCAL_MACHINE || zone == URLZONE_TRUSTED || !window->uri)
return FALSE;
hres = IUri_GetScheme(window->uri, &scheme);
return FAILED(hres) || scheme != URL_SCHEME_ABOUT;
}
void set_current_mon(HTMLWindow *This, IMoniker *mon)