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

mshtml: Wine Gecko 2.47 release.

Browse Source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2016-06-13 17:40:51 +02:00 committed by Alexandre Julliard
parent 7fbf0deede
commit 3a16c8bbca
14 changed files with 320 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/appwiz.cpl/addons.c
View File

@ -51,14 +51,14 @@
WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl);
#define GECKO_VERSION "2.44" #define GECKO_VERSION "2.47"
#ifdef __i386__ #ifdef __i386__
#define ARCH_STRING "x86" #define ARCH_STRING "x86"
#define GECKO_SHA "7930300c531d975ad63ee20d5e9b3974e339e43e" #define GECKO_SHA "f9a937e9a46d47fda701d257e60601f22e7a4510"
#elif defined(__x86_64__) #elif defined(__x86_64__)
#define ARCH_STRING "x86_64" #define ARCH_STRING "x86_64"
#define GECKO_SHA "ed473f584938ebe8da1f6e660610e616104567b3" #define GECKO_SHA "8efa810b1ac83d59e0171d4347d21730560926da"
#else #else
#define ARCH_STRING "" #define ARCH_STRING ""
#define GECKO_SHA "???" #define GECKO_SHA "???"

24
dlls/mshtml/editor.c
View File

@ -136,7 +136,7 @@ static nsresult get_ns_command_state(NSContainer *This, const char *cmd, nsIComm
return nsres; return nsres;
} }
nsres = nsICommandManager_GetCommandState(cmdmgr, cmd, This->doc->basedoc.window->nswindow, nsparam); nsres = nsICommandManager_GetCommandState(cmdmgr, cmd, This->doc->basedoc.window->window_proxy, nsparam);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("GetCommandState(%s) failed: %08x\n", debugstr_a(cmd), nsres); ERR("GetCommandState(%s) failed: %08x\n", debugstr_a(cmd), nsres);
@ -379,23 +379,23 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size)
set_dirty(This, VARIANT_TRUE); set_dirty(This, VARIANT_TRUE);
} }
static void handle_arrow_key(HTMLDocument *This, nsIDOMKeyEvent *event, const char * const cmds[4]) static void handle_arrow_key(HTMLDocument *This, nsIDOMEvent *event, nsIDOMKeyEvent *key_event, const char * const cmds[4])
{ {
int i=0; int i=0;
cpp_bool b; cpp_bool b;
nsIDOMKeyEvent_GetCtrlKey(event, &b); nsIDOMKeyEvent_GetCtrlKey(key_event, &b);
if(b) if(b)
i |= 1; i |= 1;
nsIDOMKeyEvent_GetShiftKey(event, &b); nsIDOMKeyEvent_GetShiftKey(key_event, &b);
if(b) if(b)
i |= 2; i |= 2;
if(cmds[i]) if(cmds[i])
do_ns_editor_command(This->doc_obj->nscontainer, cmds[i]); do_ns_editor_command(This->doc_obj->nscontainer, cmds[i]);
nsIDOMKeyEvent_PreventDefault(event); nsIDOMEvent_PreventDefault(event);
} }
void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event)
@ -417,7 +417,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event)
}; };
TRACE("left\n"); TRACE("left\n");
handle_arrow_key(This, key_event, cmds); handle_arrow_key(This, event, key_event, cmds);
break; break;
} }
case DOM_VK_RIGHT: { case DOM_VK_RIGHT: {
@ -429,7 +429,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event)
}; };
TRACE("right\n"); TRACE("right\n");
handle_arrow_key(This, key_event, cmds); handle_arrow_key(This, event, key_event, cmds);
break; break;
} }
case DOM_VK_UP: { case DOM_VK_UP: {
@ -441,7 +441,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event)
}; };
TRACE("up\n"); TRACE("up\n");
handle_arrow_key(This, key_event, cmds); handle_arrow_key(This, event, key_event, cmds);
break; break;
} }
case DOM_VK_DOWN: { case DOM_VK_DOWN: {
@ -453,7 +453,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event)
}; };
TRACE("down\n"); TRACE("down\n");
handle_arrow_key(This, key_event, cmds); handle_arrow_key(This, event, key_event, cmds);
break; break;
} }
case DOM_VK_DELETE: { case DOM_VK_DELETE: {
@ -464,7 +464,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event)
}; };
TRACE("delete\n"); TRACE("delete\n");
handle_arrow_key(This, key_event, cmds); handle_arrow_key(This, event, key_event, cmds);
break; break;
} }
case DOM_VK_HOME: { case DOM_VK_HOME: {
@ -476,7 +476,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event)
}; };
TRACE("home\n"); TRACE("home\n");
handle_arrow_key(This, key_event, cmds); handle_arrow_key(This, event, key_event, cmds);
break; break;
} }
case DOM_VK_END: { case DOM_VK_END: {
@ -488,7 +488,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event)
}; };
TRACE("end\n"); TRACE("end\n");
handle_arrow_key(This, key_event, cmds); handle_arrow_key(This, event, key_event, cmds);
break; break;
} }
} }

12
dlls/mshtml/htmlcurstyle.c
View File

@ -17,6 +17,7 @@
*/ */
#include <stdarg.h> #include <stdarg.h>
#include <assert.h>
#define COBJMACROS #define COBJMACROS
@ -1323,7 +1324,8 @@ static dispex_static_data_t HTMLCurrentStyle_dispex = {
HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p) HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p)
{ {
nsIDOMCSSStyleDeclaration *nsstyle; nsIDOMCSSStyleDeclaration *nsstyle;
nsIDOMWindow *nsview; mozIDOMWindowProxy *nsview;
nsIDOMWindow *nswindow;
nsAString nsempty_str; nsAString nsempty_str;
HTMLCurrentStyle *ret; HTMLCurrentStyle *ret;
nsresult nsres; nsresult nsres;
@ -1339,10 +1341,14 @@ HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p)
return E_FAIL; return E_FAIL;
} }
nsres = mozIDOMWindowProxy_QueryInterface(nsview, &IID_nsIDOMWindow, (void**)&nswindow);
mozIDOMWindowProxy_Release(nsview);
assert(nsres == NS_OK);
nsAString_Init(&nsempty_str, NULL); nsAString_Init(&nsempty_str, NULL);
nsres = nsIDOMWindow_GetComputedStyle(nsview, (nsIDOMElement*)elem->nselem, &nsempty_str, &nsstyle); nsres = nsIDOMWindow_GetComputedStyle(nswindow, (nsIDOMElement*)elem->nselem, &nsempty_str, &nsstyle);
nsAString_Finish(&nsempty_str); nsAString_Finish(&nsempty_str);
nsIDOMWindow_Release(nsview); nsIDOMWindow_Release(nswindow);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("GetComputedStyle failed: %08x\n", nsres); ERR("GetComputedStyle failed: %08x\n", nsres);
return E_FAIL; return E_FAIL;

7
dlls/mshtml/htmldoc.c
View File

@ -4884,6 +4884,7 @@ static dispex_static_data_t HTMLDocumentObj_dispex = {
HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject)
{ {
mozIDOMWindowProxy *mozwindow;
HTMLDocumentObj *doc; HTMLDocumentObj *doc;
nsIDOMWindow *nswindow = NULL; nsIDOMWindow *nswindow = NULL;
nsresult nsres; nsresult nsres;
@ -4919,10 +4920,14 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject)
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
nsres = nsIWebBrowser_GetContentDOMWindow(doc->nscontainer->webbrowser, &nswindow); nsres = nsIWebBrowser_GetContentDOMWindow(doc->nscontainer->webbrowser, &mozwindow);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("GetContentDOMWindow failed: %08x\n", nsres); ERR("GetContentDOMWindow failed: %08x\n", nsres);
nsres = mozIDOMWindowProxy_QueryInterface(mozwindow, &IID_nsIDOMWindow, (void**)&nswindow);
mozIDOMWindowProxy_Release(mozwindow);
assert(nsres == NS_OK);
hres = HTMLOuterWindow_Create(doc, nswindow, NULL /* FIXME */, &doc->basedoc.window); hres = HTMLOuterWindow_Create(doc, nswindow, NULL /* FIXME */, &doc->basedoc.window);
if(nswindow) if(nswindow)
nsIDOMWindow_Release(nswindow); nsIDOMWindow_Release(nswindow);

18
dlls/mshtml/htmlframebase.c
View File

@ -41,7 +41,7 @@ static const WCHAR pxW[] = {'p','x',0};
HRESULT set_frame_doc(HTMLFrameBase *frame, nsIDOMDocument *nsdoc) HRESULT set_frame_doc(HTMLFrameBase *frame, nsIDOMDocument *nsdoc)
{ {
nsIDOMWindow *nswindow; mozIDOMWindowProxy *mozwindow;
HTMLOuterWindow *window; HTMLOuterWindow *window;
nsresult nsres; nsresult nsres;
HRESULT hres = S_OK; HRESULT hres = S_OK;
@ -49,15 +49,21 @@ HRESULT set_frame_doc(HTMLFrameBase *frame, nsIDOMDocument *nsdoc)
if(frame->content_window) if(frame->content_window)
return S_OK; return S_OK;
nsres = nsIDOMDocument_GetDefaultView(nsdoc, &nswindow); nsres = nsIDOMDocument_GetDefaultView(nsdoc, &mozwindow);
if(NS_FAILED(nsres) || !nswindow) if(NS_FAILED(nsres) || !mozwindow)
return E_FAIL; return E_FAIL;
window = nswindow_to_window(nswindow); window = mozwindow_to_window(mozwindow);
if(!window) if(!window) {
nsIDOMWindow *nswindow;
nsres = mozIDOMWindowProxy_QueryInterface(mozwindow, &IID_nsIDOMWindow, (void**)&nswindow);
assert(nsres == NS_OK);
hres = HTMLOuterWindow_Create(frame->element.node.doc->basedoc.doc_obj, nswindow, hres = HTMLOuterWindow_Create(frame->element.node.doc->basedoc.doc_obj, nswindow,
frame->element.node.doc->basedoc.window, &window); frame->element.node.doc->basedoc.window, &window);
nsIDOMWindow_Release(nswindow); nsIDOMWindow_Release(nswindow);
}
mozIDOMWindowProxy_Release(mozwindow);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;

43
dlls/mshtml/htmlwindow.c
View File

@ -217,6 +217,8 @@ static void release_outer_window(HTMLOuterWindow *This)
if(This->nswindow) if(This->nswindow)
nsIDOMWindow_Release(This->nswindow); nsIDOMWindow_Release(This->nswindow);
if(This->window_proxy)
mozIDOMWindowProxy_Release(This->window_proxy);
list_remove(&This->entry); list_remove(&This->entry);
heap_free(This); heap_free(This);
@ -333,7 +335,7 @@ static HRESULT WINAPI HTMLWindow2_Invoke(IHTMLWindow2 *iface, DISPID dispIdMembe
static HRESULT get_frame_by_index(HTMLOuterWindow *This, UINT32 index, HTMLOuterWindow **ret) static HRESULT get_frame_by_index(HTMLOuterWindow *This, UINT32 index, HTMLOuterWindow **ret)
{ {
nsIDOMWindowCollection *nsframes; nsIDOMWindowCollection *nsframes;
nsIDOMWindow *nswindow; mozIDOMWindowProxy *mozwindow;
UINT32 length; UINT32 length;
nsresult nsres; nsresult nsres;
@ -351,16 +353,16 @@ static HRESULT get_frame_by_index(HTMLOuterWindow *This, UINT32 index, HTMLOuter
return DISP_E_MEMBERNOTFOUND; return DISP_E_MEMBERNOTFOUND;
} }
nsres = nsIDOMWindowCollection_Item(nsframes, index, &nswindow); nsres = nsIDOMWindowCollection_Item(nsframes, index, &mozwindow);
nsIDOMWindowCollection_Release(nsframes); nsIDOMWindowCollection_Release(nsframes);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
FIXME("nsIDOMWindowCollection_Item failed: 0x%08x\n", nsres); FIXME("nsIDOMWindowCollection_Item failed: 0x%08x\n", nsres);
return E_FAIL; return E_FAIL;
} }
*ret = nswindow_to_window(nswindow); *ret = mozwindow_to_window(mozwindow);
nsIDOMWindow_Release(nswindow); mozIDOMWindowProxy_Release(mozwindow);
return S_OK; return S_OK;
} }
@ -368,7 +370,7 @@ HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, BOOL deep, H
{ {
nsIDOMWindowCollection *nsframes; nsIDOMWindowCollection *nsframes;
HTMLOuterWindow *window = NULL; HTMLOuterWindow *window = NULL;
nsIDOMWindow *nswindow; mozIDOMWindowProxy *mozwindow;
nsAString name_str; nsAString name_str;
UINT32 length, i; UINT32 length, i;
nsresult nsres; nsresult nsres;
@ -386,15 +388,15 @@ HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, BOOL deep, H
} }
nsAString_InitDepend(&name_str, name); nsAString_InitDepend(&name_str, name);
nsres = nsIDOMWindowCollection_NamedItem(nsframes, &name_str, &nswindow); nsres = nsIDOMWindowCollection_NamedItem(nsframes, &name_str, &mozwindow);
nsAString_Finish(&name_str); nsAString_Finish(&name_str);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
nsIDOMWindowCollection_Release(nsframes); nsIDOMWindowCollection_Release(nsframes);
return E_FAIL; return E_FAIL;
} }
if(nswindow) { if(mozwindow) {
*ret = nswindow_to_window(nswindow); *ret = mozwindow_to_window(mozwindow);
return S_OK; return S_OK;
} }
@ -405,19 +407,19 @@ HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, BOOL deep, H
HTMLOuterWindow *window_iter; HTMLOuterWindow *window_iter;
BSTR id; BSTR id;
nsres = nsIDOMWindowCollection_Item(nsframes, i, &nswindow); nsres = nsIDOMWindowCollection_Item(nsframes, i, &mozwindow);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
FIXME("nsIDOMWindowCollection_Item failed: 0x%08x\n", nsres); FIXME("nsIDOMWindowCollection_Item failed: 0x%08x\n", nsres);
hres = E_FAIL; hres = E_FAIL;
break; break;
} }
window_iter = nswindow_to_window(nswindow); window_iter = mozwindow_to_window(mozwindow);
nsIDOMWindow_Release(nswindow); mozIDOMWindowProxy_Release(mozwindow);
if(!window_iter) { if(!window_iter) {
WARN("nsIDOMWindow without HTMLOuterWindow: %p\n", nswindow); WARN("nsIDOMWindow without HTMLOuterWindow: %p\n", mozwindow);
continue; continue;
} }
@ -3035,8 +3037,13 @@ HRESULT HTMLOuterWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow,
window->window_ref->ref = 1; window->window_ref->ref = 1;
if(nswindow) { if(nswindow) {
nsresult nsres;
nsIDOMWindow_AddRef(nswindow); nsIDOMWindow_AddRef(nswindow);
window->nswindow = nswindow; window->nswindow = nswindow;
nsres = nsIDOMWindow_QueryInterface(nswindow, &IID_mozIDOMWindowProxy, (void**)&window->window_proxy);
assert(nsres == NS_OK);
} }
window->scriptmode = parent ? parent->scriptmode : SCRIPTMODE_GECKO; window->scriptmode = parent ? parent->scriptmode : SCRIPTMODE_GECKO;
@ -3175,3 +3182,15 @@ HTMLOuterWindow *nswindow_to_window(const nsIDOMWindow *nswindow)
return NULL; return NULL;
} }
HTMLOuterWindow *mozwindow_to_window(const mozIDOMWindowProxy *mozwindow)
{
HTMLOuterWindow *iter;
LIST_FOR_EACH_ENTRY(iter, &window_list, HTMLOuterWindow, entry) {
if(iter->window_proxy == mozwindow)
return iter;
}
return NULL;
}

2
dlls/mshtml/mshtml_private.h
View File

@ -422,6 +422,7 @@ struct HTMLOuterWindow {
HTMLDocumentObj *doc_obj; HTMLDocumentObj *doc_obj;
nsIDOMWindow *nswindow; nsIDOMWindow *nswindow;
mozIDOMWindowProxy *window_proxy;
HTMLOuterWindow *parent; HTMLOuterWindow *parent;
HTMLFrameBase *frame_element; HTMLFrameBase *frame_element;
@ -800,6 +801,7 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument*,HTMLDocumentObj*,HTMLInnerWind
HRESULT HTMLOuterWindow_Create(HTMLDocumentObj*,nsIDOMWindow*,HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT HTMLOuterWindow_Create(HTMLDocumentObj*,nsIDOMWindow*,HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN;
HRESULT update_window_doc(HTMLInnerWindow*) DECLSPEC_HIDDEN; HRESULT update_window_doc(HTMLInnerWindow*) DECLSPEC_HIDDEN;
HTMLOuterWindow *nswindow_to_window(const nsIDOMWindow*) DECLSPEC_HIDDEN; HTMLOuterWindow *nswindow_to_window(const nsIDOMWindow*) DECLSPEC_HIDDEN;
HTMLOuterWindow *mozwindow_to_window(const mozIDOMWindowProxy*) DECLSPEC_HIDDEN;
void get_top_window(HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; void get_top_window(HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN;
HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow*,HTMLOptionElementFactory**) DECLSPEC_HIDDEN; HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow*,HTMLOptionElementFactory**) DECLSPEC_HIDDEN;
HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow*,HTMLImageElementFactory**) DECLSPEC_HIDDEN; HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow*,HTMLImageElementFactory**) DECLSPEC_HIDDEN;

19
dlls/mshtml/mutation.c
View File

@ -606,33 +606,30 @@ static void NSAPI nsDocumentObserver_DocumentStatesChanged(nsIDocumentObserver *
{ {
} }
static void NSAPI nsDocumentObserver_StyleSheetAdded(nsIDocumentObserver *iface, nsIDocument *aDocument, static void NSAPI nsDocumentObserver_StyleSheetAdded(nsIDocumentObserver *iface, mozilla_StyleSheetHandle aStyleSheet,
nsIStyleSheet *aStyleSheet, cpp_bool aDocumentSheet) cpp_bool aDocumentSheet)
{ {
} }
static void NSAPI nsDocumentObserver_StyleSheetRemoved(nsIDocumentObserver *iface, nsIDocument *aDocument, static void NSAPI nsDocumentObserver_StyleSheetRemoved(nsIDocumentObserver *iface, mozilla_StyleSheetHandle aStyleSheet,
nsIStyleSheet *aStyleSheet, cpp_bool aDocumentSheet) cpp_bool aDocumentSheet)
{ {
} }
static void NSAPI nsDocumentObserver_StyleSheetApplicableStateChanged(nsIDocumentObserver *iface, static void NSAPI nsDocumentObserver_StyleSheetApplicableStateChanged(nsIDocumentObserver *iface,
nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, cpp_bool aApplicable) mozilla_StyleSheetHandle aStyleSheet)
{ {
} }
static void NSAPI nsDocumentObserver_StyleRuleChanged(nsIDocumentObserver *iface, nsIDocument *aDocument, static void NSAPI nsDocumentObserver_StyleRuleChanged(nsIDocumentObserver *iface, mozilla_StyleSheetHandle aStyleSheet)
nsIStyleSheet *aStyleSheet, nsIStyleRule *aOldStyleRule, nsIStyleSheet *aNewStyleRule)
{ {
} }
static void NSAPI nsDocumentObserver_StyleRuleAdded(nsIDocumentObserver *iface, nsIDocument *aDocument, static void NSAPI nsDocumentObserver_StyleRuleAdded(nsIDocumentObserver *iface, mozilla_StyleSheetHandle aStyleSheet)
nsIStyleSheet *aStyleSheet, nsIStyleRule *aStyleRule)
{ {
} }
static void NSAPI nsDocumentObserver_StyleRuleRemoved(nsIDocumentObserver *iface, nsIDocument *aDocument, static void NSAPI nsDocumentObserver_StyleRuleRemoved(nsIDocumentObserver *iface, mozilla_StyleSheetHandle aStyleSheet)
nsIStyleSheet *aStyleSheet, nsIStyleRule *aStyleRule)
{ {
} }

10
dlls/mshtml/npplugin.c
View File

@ -244,7 +244,7 @@ static nsIDOMHTMLElement *get_dom_element(NPP instance)
static HTMLInnerWindow *get_elem_window(nsIDOMHTMLElement *elem) static HTMLInnerWindow *get_elem_window(nsIDOMHTMLElement *elem)
{ {
nsIDOMWindow *nswindow; mozIDOMWindowProxy *mozwindow;
nsIDOMDocument *nsdoc; nsIDOMDocument *nsdoc;
HTMLOuterWindow *window; HTMLOuterWindow *window;
nsresult nsres; nsresult nsres;
@ -253,13 +253,13 @@ static HTMLInnerWindow *get_elem_window(nsIDOMHTMLElement *elem)
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
return NULL; return NULL;
nsres = nsIDOMDocument_GetDefaultView(nsdoc, &nswindow); nsres = nsIDOMDocument_GetDefaultView(nsdoc, &mozwindow);
nsIDOMDocument_Release(nsdoc); nsIDOMDocument_Release(nsdoc);
if(NS_FAILED(nsres) || !nswindow) if(NS_FAILED(nsres) || !mozwindow)
return NULL; return NULL;
window = nswindow_to_window(nswindow); window = mozwindow_to_window(mozwindow);
nsIDOMWindow_Release(nswindow); mozIDOMWindowProxy_Release(mozwindow);
return window->base.inner_window; return window->base.inner_window;
} }

17
dlls/mshtml/nsembed.c
View File

@ -1059,7 +1059,7 @@ void get_editor_controller(NSContainer *This)
} }
nsres = nsIEditingSession_GetEditorForWindow(editing_session, nsres = nsIEditingSession_GetEditorForWindow(editing_session,
This->doc->basedoc.window->nswindow, &This->editor); This->doc->basedoc.window->window_proxy, &This->editor);
nsIEditingSession_Release(editing_session); nsIEditingSession_Release(editing_session);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("Could not get editor: %08x\n", nsres); ERR("Could not get editor: %08x\n", nsres);
@ -1903,9 +1903,9 @@ static nsresult NSAPI nsInterfaceRequestor_GetInterface(nsIInterfaceRequestor *i
{ {
NSContainer *This = impl_from_nsIInterfaceRequestor(iface); NSContainer *This = impl_from_nsIInterfaceRequestor(iface);
if(IsEqualGUID(&IID_nsIDOMWindow, riid)) { if(IsEqualGUID(&IID_mozIDOMWindowProxy, riid)) {
TRACE("(%p)->(IID_nsIDOMWindow %p)\n", This, result); TRACE("(%p)->(IID_nsIDOMWindow %p)\n", This, result);
return nsIWebBrowser_GetContentDOMWindow(This->webbrowser, (nsIDOMWindow**)result); return nsIWebBrowser_GetContentDOMWindow(This->webbrowser, (mozIDOMWindowProxy**)result);
} }
return nsIWebBrowserChrome_QueryInterface(&This->nsIWebBrowserChrome_iface, riid, result); return nsIWebBrowserChrome_QueryInterface(&This->nsIWebBrowserChrome_iface, riid, result);
@ -2161,6 +2161,7 @@ void NSContainer_Release(NSContainer *This)
nsIXMLHttpRequest *create_nsxhr(nsIDOMWindow *nswindow) nsIXMLHttpRequest *create_nsxhr(nsIDOMWindow *nswindow)
{ {
mozIDOMWindow *inner_window;
nsIScriptSecurityManager *secman; nsIScriptSecurityManager *secman;
nsIPrincipal *nspri; nsIPrincipal *nspri;
nsIGlobalObject *nsglo; nsIGlobalObject *nsglo;
@ -2182,7 +2183,15 @@ nsIXMLHttpRequest *create_nsxhr(nsIDOMWindow *nswindow)
return NULL; return NULL;
} }
nsres = nsIDOMWindow_QueryInterface(nswindow, &IID_nsIGlobalObject, (void **)&nsglo); nsres = nsIDOMWindow_GetInnerWindow(nswindow, &inner_window);
if(NS_FAILED(nsres)) {
ERR("Could not get inner window: %08x\n", nsres);
nsISupports_Release(nspri);
return NULL;
}
nsres = mozIDOMWindow_QueryInterface(inner_window, &IID_nsIGlobalObject, (void **)&nsglo);
mozIDOMWindow_Release(inner_window);
assert(nsres == NS_OK); assert(nsres == NS_OK);
nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr,

249
dlls/mshtml/nsiface.idl
View File

@ -25,7 +25,7 @@
#pragma makedep header #pragma makedep header
cpp_quote("#define GECKO_VERSION \"2.44\"") cpp_quote("#define GECKO_VERSION \"2.47\"")
cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION") cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION")
import "wtypes.idl"; import "wtypes.idl";
@ -113,6 +113,7 @@ interface nsISelection;
interface nsIDOMHTMLSelectElement; interface nsIDOMHTMLSelectElement;
interface nsIFile; interface nsIFile;
interface nsIDocShell; interface nsIDocShell;
interface mozIDOMWindowProxy;
interface IMoniker; interface IMoniker;
@ -150,8 +151,6 @@ typedef nsISupports nsIDOMMediaList;
typedef nsISupports nsIDOMHTMLTableSectionElement; typedef nsISupports nsIDOMHTMLTableSectionElement;
typedef nsISupports nsIDOMClientRectList; typedef nsISupports nsIDOMClientRectList;
typedef nsISupports nsINode; typedef nsISupports nsINode;
typedef nsISupports nsIStyleSheet;
typedef nsISupports nsIStyleRule;
typedef nsISupports nsIDOMUserDataHandler; typedef nsISupports nsIDOMUserDataHandler;
typedef nsISupports nsISHEntry; typedef nsISupports nsISHEntry;
typedef nsISupports nsIPresShell; typedef nsISupports nsIPresShell;
@ -490,6 +489,7 @@ interface nsIMutable : nsISupports
interface nsIStandardURL : nsIMutable interface nsIStandardURL : nsIMutable
{ {
nsresult Init(uint32_t aUrlType, int32_t aDefaultPort, const nsACString *aSpec, const char *aOriginCharset, nsIURI *aBaseURI); nsresult Init(uint32_t aUrlType, int32_t aDefaultPort, const nsACString *aSpec, const char *aOriginCharset, nsIURI *aBaseURI);
nsresult SetDefaultPort(int32_t aNewDefaultPort);
} }
[ [
@ -553,6 +553,8 @@ interface nsILoadGroup : nsIRequest
nsresult GetSchedulingContextID(nsID *aSchedulingContextID); nsresult GetSchedulingContextID(nsID *aSchedulingContextID);
nsresult GetDefaultLoadFlags(nsLoadFlags *aDefaultLoadFlags); nsresult GetDefaultLoadFlags(nsLoadFlags *aDefaultLoadFlags);
nsresult SetDefaultLoadFlags(nsLoadFlags aDefaultLoadFlags); nsresult SetDefaultLoadFlags(nsLoadFlags aDefaultLoadFlags);
nsresult GetUserAgentOverrideCache(nsACString *aUserAgentOverrideCache);
nsresult SetUserAgentOverrideCache(const nsACString *aUserAgentOverrideCache);
} }
[ [
@ -612,7 +614,7 @@ interface nsIHttpHeaderVisitor : nsISupports
[ [
object, object,
uuid(e90acf2d-eaf2-41d8-97b2-c8d99f6437a1), uuid(b2596105-3d0d-4e6a-824f-0539713bb879),
local local
] ]
interface nsIHttpChannel : nsIChannel interface nsIHttpChannel : nsIChannel
@ -623,6 +625,10 @@ interface nsIHttpChannel : nsIChannel
nsresult SetReferrer(nsIURI *aReferrer); nsresult SetReferrer(nsIURI *aReferrer);
nsresult GetReferrerPolicy(uint32_t *aReferrerPolicy); nsresult GetReferrerPolicy(uint32_t *aReferrerPolicy);
nsresult SetReferrerWithPolicy(nsIURI *referrer, uint32_t referrerPolicy); nsresult SetReferrerWithPolicy(nsIURI *referrer, uint32_t referrerPolicy);
nsresult GetProtocolVersion(nsACString *aProtocolVersion);
nsresult GetTransferSize(uint64_t *aTransferSize);
nsresult GetDecodedBodySize(uint64_t *aDecodedBodySize);
nsresult GetEncodedBodySize(uint64_t *aEncodedBodySize);
nsresult GetRequestHeader(const nsACString *aHeader, nsACString *_retval); nsresult GetRequestHeader(const nsACString *aHeader, nsACString *_retval);
nsresult SetRequestHeader(const nsACString *aHeader, const nsACString *aValue, bool aMerge); nsresult SetRequestHeader(const nsACString *aHeader, const nsACString *aValue, bool aMerge);
nsresult SetEmptyRequestHeader(const nsACString *aHeader); nsresult SetEmptyRequestHeader(const nsACString *aHeader);
@ -645,14 +651,14 @@ interface nsIHttpChannel : nsIChannel
nsresult IsNoStoreResponse(bool *_retval); nsresult IsNoStoreResponse(bool *_retval);
nsresult IsNoCacheResponse(bool *_retval); nsresult IsNoCacheResponse(bool *_retval);
nsresult IsPrivateResponse(bool *_retval); nsresult IsPrivateResponse(bool *_retval);
nsresult RedirectTo(nsIURI *aNewURI); nsresult RedirectTo(nsIURI *aTargetURI);
nsresult GetSchedulingContextID(nsID *aSchedulingContextID); nsresult GetSchedulingContextID(nsID *aSchedulingContextID);
nsresult SetSchedulingContextID(const nsID aSchedulingContextID); nsresult SetSchedulingContextID(const nsID aSchedulingContextID);
} }
[ [
object, object,
uuid(9eabaac6-cc7c-4ca1-9430-65f2daaa578f), uuid(4e28263d-1e03-46f4-aa5c-9512f91957f9),
local local
] ]
interface nsIHttpChannelInternal : nsISupports interface nsIHttpChannelInternal : nsISupports
@ -699,8 +705,9 @@ interface nsIHttpChannelInternal : nsISupports
nsresult GetNetworkInterfaceId(nsACString *aNetworkInterfaceId); nsresult GetNetworkInterfaceId(nsACString *aNetworkInterfaceId);
nsresult SetNetworkInterfaceId(const nsACString *aNetworkInterfaceId); nsresult SetNetworkInterfaceId(const nsACString *aNetworkInterfaceId);
nsresult GetProxyURI(nsIURI **aProxyURI); nsresult GetProxyURI(nsIURI **aProxyURI);
nsresult SetCorsPreflightParameters(const void /*nsTArray<nsCString>*/ *unsafeHeaders, nsresult SetCorsPreflightParameters(const void /*nsTArray<nsCString>*/ *unsafeHeaders);
bool withCredentials, nsIPrincipal *preflightPrincipal); nsresult GetBlockAuthPrompt(bool *aBlockAuthPrompt) ;
nsresult SetBlockAuthPrompt(bool aBlockAuthPrompt);
} }
[ [
@ -1188,7 +1195,7 @@ interface nsIDOMDocumentFragment : nsIDOMNode
[ [
object, object,
uuid(35dc5030-dc83-4291-88a2-0906c549788e), uuid(b15fa0f4-97c1-4388-af62-2ceff7a89bdf),
local local
] ]
interface nsIDOMDocument : nsIDOMNode interface nsIDOMDocument : nsIDOMNode
@ -1220,7 +1227,7 @@ interface nsIDOMDocument : nsIDOMNode
nsIDOMTreeWalker **_retval); nsIDOMTreeWalker **_retval);
cpp_quote("#undef CreateEvent") cpp_quote("#undef CreateEvent")
nsresult CreateEvent(const nsAString *eventType, nsIDOMEvent **_retval); nsresult CreateEvent(const nsAString *eventType, nsIDOMEvent **_retval);
nsresult GetDefaultView(nsIDOMWindow **aDefaultView); nsresult GetDefaultView(mozIDOMWindowProxy **aDefaultView);
nsresult GetCharacterSet(nsAString *aCharacterSet); nsresult GetCharacterSet(nsAString *aCharacterSet);
nsresult GetDir(nsAString *aDir); nsresult GetDir(nsAString *aDir);
nsresult SetDir(const nsAString *aDir); nsresult SetDir(const nsAString *aDir);
@ -1264,7 +1271,7 @@ interface nsIDOMDocument : nsIDOMNode
[ [
object, object,
uuid(bd2a0a46-17e4-46ea-9e5d-6a97cf5e3b28), uuid(cd31e61f-cfc2-4b91-9385-17b6a2d0633d),
local local
] ]
interface nsIDOMHTMLDocument : nsIDOMDocument interface nsIDOMHTMLDocument : nsIDOMDocument
@ -1394,14 +1401,32 @@ interface nsISelection : nsISupports
[ [
object, object,
uuid(a6cf906f-15b3-11d2-932e-00805f8add32), uuid(8d64f457-fb8c-49ea-a359-cef30eed9774),
local local
] ]
interface nsIDOMWindowCollection : nsISupports interface nsIDOMWindowCollection : nsISupports
{ {
nsresult GetLength(uint32_t *aLength); nsresult GetLength(uint32_t *aLength);
nsresult Item(uint32_t index, nsIDOMWindow **_retval); nsresult Item(uint32_t index, mozIDOMWindowProxy **_retval);
nsresult NamedItem(const nsAString *name, nsIDOMWindow **_retval); nsresult NamedItem(const nsAString *name, mozIDOMWindowProxy **_retval);
}
[
object,
uuid(75fbabd6-7a2e-4787-aa33-449a33512135),
local
]
interface mozIDOMWindow : nsISupports
{
}
[
object,
uuid(53ca090c-e739-48b9-8911-208c72f9191e),
local
]
interface mozIDOMWindowProxy : nsISupports
{
} }
[ [
@ -1422,8 +1447,8 @@ interface nsIDOMWindow : nsISupports
nsresult GetLength(uint32_t *aLength); nsresult GetLength(uint32_t *aLength);
nsresult GetRealTop(nsIDOMWindow **aTop); nsresult GetRealTop(nsIDOMWindow **aTop);
nsresult GetRealParent(nsIDOMWindow **aParent); nsresult GetRealParent(nsIDOMWindow **aParent);
nsresult GetOpener(nsIDOMWindow **aOpenerWindow); nsresult GetOpener(mozIDOMWindowProxy **aOpenerWindow);
nsresult SetOpener(nsIDOMWindow *aOpenerWindow); nsresult SetOpener(mozIDOMWindowProxy *aOpenerWindow);
nsresult GetRealFrameElement(nsIDOMElement **aFrameElement); nsresult GetRealFrameElement(nsIDOMElement **aFrameElement);
nsresult GetNavigator(nsIDOMNavigator **aNavigator); nsresult GetNavigator(nsIDOMNavigator **aNavigator);
nsresult Print(); nsresult Print();
@ -1471,6 +1496,8 @@ interface nsIDOMWindow : nsISupports
nsresult Open(const nsAString *url, const nsAString *name, const nsAString *options, nsIDOMWindow **_retval); nsresult Open(const nsAString *url, const nsAString *name, const nsAString *options, nsIDOMWindow **_retval);
nsresult Find(const nsAString *str, bool caseSensitive, bool backwards, bool wrapAround, bool wholeWord, nsresult Find(const nsAString *str, bool caseSensitive, bool backwards, bool wrapAround, bool wholeWord,
bool searchInFrames, bool showDialog, bool *_retval); bool searchInFrames, bool showDialog, bool *_retval);
nsresult GetInnerWindow(mozIDOMWindow **aInnerWindow);
nsresult GetOuterWindow(mozIDOMWindowProxy **aOuterWindow);
} }
[ [
@ -2116,14 +2143,13 @@ interface nsIDOMHTMLIFrameElement : nsISupports
nsresult GetWidth(nsAString *aWidth); nsresult GetWidth(nsAString *aWidth);
nsresult SetWidth(const nsAString *aWidth); nsresult SetWidth(const nsAString *aWidth);
nsresult GetContentDocument(nsIDOMDocument **aContentDocument); nsresult GetContentDocument(nsIDOMDocument **aContentDocument);
nsresult GetContentWindow(nsIDOMWindow **aContentWindow);
nsresult GetAllowFullscreen(bool *aAllowFullscreen); nsresult GetAllowFullscreen(bool *aAllowFullscreen);
nsresult SetAllowFullscreen(bool aAllowFullscreen); nsresult SetAllowFullscreen(bool aAllowFullscreen);
} }
[ [
object, object,
uuid(60ab25b9-3246-4f50-b0d4-21e73ba88cd6), uuid(012a8982-c9d3-4614-91e2-18ee51c97c06),
local local
] ]
interface nsIDOMHTMLFrameElement : nsISupports interface nsIDOMHTMLFrameElement : nsISupports
@ -2145,7 +2171,6 @@ interface nsIDOMHTMLFrameElement : nsISupports
nsresult GetSrc(nsAString *aSrc); nsresult GetSrc(nsAString *aSrc);
nsresult SetSrc(const nsAString *aSrc); nsresult SetSrc(const nsAString *aSrc);
nsresult GetContentDocument(nsIDOMDocument **aContentDocument); nsresult GetContentDocument(nsIDOMDocument **aContentDocument);
nsresult GetContentWindow(nsIDOMWindow **aContentWindow);
} }
[ [
@ -2246,7 +2271,7 @@ interface nsITooltipListener : nsISupports
[ [
object, object,
uuid(33e9d001-caab-4ba9-8961-54902f197202), uuid(4052b6da-4faa-4646-b3a1-7e16a01c2dc2),
local local
] ]
interface nsIWebBrowser : nsISupports interface nsIWebBrowser : nsISupports
@ -2257,7 +2282,7 @@ interface nsIWebBrowser : nsISupports
nsresult SetContainerWindow(nsIWebBrowserChrome *aContainerWindow); nsresult SetContainerWindow(nsIWebBrowserChrome *aContainerWindow);
nsresult GetParentURIContentListener(nsIURIContentListener **aParentURIContentListener); nsresult GetParentURIContentListener(nsIURIContentListener **aParentURIContentListener);
nsresult SetParentURIContentListener(nsIURIContentListener *aParentURIContentListener); nsresult SetParentURIContentListener(nsIURIContentListener *aParentURIContentListener);
nsresult GetContentDOMWindow(nsIDOMWindow **aContentDOMWindow); nsresult GetContentDOMWindow(mozIDOMWindowProxy **aContentDOMWindow);
nsresult GetIsActive(bool *aIsActive); nsresult GetIsActive(bool *aIsActive);
nsresult SetIsActive(bool aIsActive); nsresult SetIsActive(bool aIsActive);
} }
@ -2280,7 +2305,7 @@ typedef void* nativeWindow;
[ [
object, object,
uuid(9da319f3-eee6-4504-81a5-6A19cf6215bf), uuid(ca635529-a977-4552-9b8a-66187e54d882),
local local
] ]
interface nsIBaseWindow : nsISupports interface nsIBaseWindow : nsISupports
@ -2290,6 +2315,7 @@ interface nsIBaseWindow : nsISupports
nsresult Create(); nsresult Create();
nsresult Destroy(); nsresult Destroy();
nsresult SetPosition(int32_t x, int32_t y); nsresult SetPosition(int32_t x, int32_t y);
nsresult SetPositionDesktopPix(int32_t x, int32_t y);
nsresult GetPosition(int32_t *x, int32_t *y); nsresult GetPosition(int32_t *x, int32_t *y);
nsresult SetSize(int32_t cx, int32_t cy, bool fRepaint); nsresult SetSize(int32_t cx, int32_t cy, bool fRepaint);
nsresult GetSize(int32_t *cx, int32_t *cy); nsresult GetSize(int32_t *cx, int32_t *cy);
@ -2307,6 +2333,7 @@ interface nsIBaseWindow : nsISupports
nsresult SetEnabled(bool aEnabled); nsresult SetEnabled(bool aEnabled);
nsresult GetMainWidget(nsIWidget **aMainWidget); nsresult GetMainWidget(nsIWidget **aMainWidget);
nsresult GetUnscaledDevicePixelsPerCSSPixel(double *aUnscaledDevicePixelsPerCSSPixel); nsresult GetUnscaledDevicePixelsPerCSSPixel(double *aUnscaledDevicePixelsPerCSSPixel);
nsresult GetDevicePixelsPerDesktopPixel(double *aDevicePixelsPerDesktopPixel);
nsresult SetFocus(); nsresult SetFocus();
nsresult GetTitle(PRUnichar **aTitle); nsresult GetTitle(PRUnichar **aTitle);
nsresult SetTitle(const PRUnichar *aTitle); nsresult SetTitle(const PRUnichar *aTitle);
@ -2358,14 +2385,14 @@ interface nsIWebNavigation : nsISupports
[ [
object, object,
uuid(bd0efb3b-1c81-4fb0-b16d-576a2be48a95), uuid(c4d64640-b332-4db6-a2a5-e08566000dc9),
local local
] ]
interface nsIWebProgress : nsISupports interface nsIWebProgress : nsISupports
{ {
nsresult AddProgressListener(nsIWebProgressListener *aListener, uint32_t aNotifyMask); nsresult AddProgressListener(nsIWebProgressListener *aListener, uint32_t aNotifyMask);
nsresult RemoveProgressListener(nsIWebProgressListener *aListener); nsresult RemoveProgressListener(nsIWebProgressListener *aListener);
nsresult GetDOMWindow(nsIDOMWindow **aDOMWindow); nsresult GetDOMWindow(mozIDOMWindowProxy **aDOMWindow);
nsresult GetDOMWindowID(uint64_t *aDOMWindowID); nsresult GetDOMWindowID(uint64_t *aDOMWindowID);
nsresult GetIsTopLevel(bool *aIsTopLevel); nsresult GetIsTopLevel(bool *aIsTopLevel);
nsresult GetIsLoadingDocument(bool *aIsLoadingDocument); nsresult GetIsLoadingDocument(bool *aIsLoadingDocument);
@ -2374,7 +2401,7 @@ interface nsIWebProgress : nsISupports
[ [
object, object,
uuid(04dd3a01-a74e-44aa-8d49-2c30478fd7b8), uuid(ecc5cbad-57fc-4731-b0bd-09e865bd62ad),
local local
] ]
interface nsIPrintSettings : nsISupports interface nsIPrintSettings : nsISupports
@ -2458,8 +2485,6 @@ interface nsIPrintSettings : nsISupports
nsresult SetShowPrintProgress(bool aShowPrintProgress); nsresult SetShowPrintProgress(bool aShowPrintProgress);
nsresult GetPaperName(PRUnichar **aPaperName); nsresult GetPaperName(PRUnichar **aPaperName);
nsresult SetPaperName(const PRUnichar *aPaperName); nsresult SetPaperName(const PRUnichar *aPaperName);
nsresult GetPaperSizeType(int16_t *aPaperSizeType);
nsresult SetPaperSizeType(int16_t aPaperSizeType);
nsresult GetPaperData(int16_t *aPaperData); nsresult GetPaperData(int16_t *aPaperData);
nsresult SetPaperData(int16_t aPaperData); nsresult SetPaperData(int16_t aPaperData);
nsresult GetPaperWidth(double *aPaperWidth); nsresult GetPaperWidth(double *aPaperWidth);
@ -2508,14 +2533,14 @@ interface nsIPrintSettings : nsISupports
[ [
object, object,
uuid(9a7ca4b0-fbba-11d4-a869-00105a183419), uuid(c9a934ed-fff1-4971-bfba-6c25ad70e1e6),
local local
] ]
interface nsIWebBrowserPrint : nsISupports interface nsIWebBrowserPrint : nsISupports
{ {
nsresult GetGlobalPrintSettings(nsIPrintSettings **aGlobalPrintSettings); nsresult GetGlobalPrintSettings(nsIPrintSettings **aGlobalPrintSettings);
nsresult GetCurrentPrintSettings(nsIPrintSettings **aCurrentPrintSettings); nsresult GetCurrentPrintSettings(nsIPrintSettings **aCurrentPrintSettings);
nsresult GetCurrentChildDOMWindow(nsIDOMWindow **aCurrentChildDOMWindow); nsresult GetCurrentChildDOMWindow(mozIDOMWindowProxy **aCurrentChildDOMWindow);
nsresult GetDoingPrint(bool *aDoingPrint); nsresult GetDoingPrint(bool *aDoingPrint);
nsresult GetDoingPrintPreview(bool *aDoingPrintPreview); nsresult GetDoingPrintPreview(bool *aDoingPrintPreview);
nsresult GetIsFramesetDocument(bool *aIsFramesetDocument); nsresult GetIsFramesetDocument(bool *aIsFramesetDocument);
@ -2524,7 +2549,7 @@ interface nsIWebBrowserPrint : nsISupports
nsresult GetIsRangeSelection(bool *aIsRangeSelection); nsresult GetIsRangeSelection(bool *aIsRangeSelection);
nsresult GetPrintPreviewNumPages(int32_t *aPrintPreviewNumPages); nsresult GetPrintPreviewNumPages(int32_t *aPrintPreviewNumPages);
nsresult Print(nsIPrintSettings *aThePrintSettings, nsIWebProgressListener *aWPListener); nsresult Print(nsIPrintSettings *aThePrintSettings, nsIWebProgressListener *aWPListener);
nsresult PrintPreview(nsIPrintSettings *aThePrintSettings, nsIDOMWindow *aChildDOMWin, nsresult PrintPreview(nsIPrintSettings *aThePrintSettings, mozIDOMWindowProxy *aChildDOMWin,
nsIWebProgressListener *aWPListener); nsIWebProgressListener *aWPListener);
nsresult PrintPreviewNavigate(int16_t aNavType, int32_t aPageNum); nsresult PrintPreviewNavigate(int16_t aNavType, int32_t aPageNum);
nsresult Cancel(); nsresult Cancel();
@ -2802,7 +2827,7 @@ interface nsIIOService : nsISupports
[ [
object, object,
uuid(9c5d3c58-1dd1-11b2-a1c9-f3699284657a), uuid(7f8c754e-5b36-44be-bc96-191b49f08ea6),
local local
] ]
interface nsIWebBrowserFocus : nsISupports interface nsIWebBrowserFocus : nsISupports
@ -2811,8 +2836,8 @@ interface nsIWebBrowserFocus : nsISupports
nsresult Deactivate(); nsresult Deactivate();
nsresult SetFocusAtFirstElement(); nsresult SetFocusAtFirstElement();
nsresult SetFocusAtLastElement(); nsresult SetFocusAtLastElement();
nsresult GetFocusedWindow(nsIDOMWindow **aFocusedWindow); nsresult GetFocusedWindow(mozIDOMWindowProxy **aFocusedWindow);
nsresult SetFocusedWindow(nsIDOMWindow *aFocusedWindow); nsresult SetFocusedWindow(mozIDOMWindowProxy *aFocusedWindow);
nsresult GetFocusedElement(nsIDOMElement **aFocusedElement); nsresult GetFocusedElement(nsIDOMElement **aFocusedElement);
nsresult SetFocusedElement(nsIDOMElement *aFocusedElement); nsresult SetFocusedElement(nsIDOMElement *aFocusedElement);
} }
@ -2864,7 +2889,7 @@ interface nsIDOMEventTarget : nsISupports
[ [
object, object,
uuid(63857daf-c084-4ea6-a8b9-6812e3176991), uuid(f58daacf-4d1a-4002-8fd7-06b614dfbcf6),
local local
] ]
interface nsIDOMEvent : nsISupports interface nsIDOMEvent : nsISupports
@ -2878,7 +2903,7 @@ interface nsIDOMEvent : nsISupports
nsresult GetTimeStamp(DOMTimeStamp *aTimeStamp); nsresult GetTimeStamp(DOMTimeStamp *aTimeStamp);
nsresult StopPropagation(); nsresult StopPropagation();
nsresult PreventDefault(); nsresult PreventDefault();
nsresult InitEvent(const nsAString *eventTypeArg, bool canBubbleArg, bool cancelableArg); void /* thiscall */ InitEvent(const nsAString *eventTypeArg, bool canBubbleArg, bool cancelableArg);
nsresult GetDefaultPrevented(bool *aDefaultPrevented); nsresult GetDefaultPrevented(bool *aDefaultPrevented);
nsresult StopImmediatePropagation(); nsresult StopImmediatePropagation();
nsresult GetOriginalTarget(nsIDOMEventTarget **aOriginalTarget); nsresult GetOriginalTarget(nsIDOMEventTarget **aOriginalTarget);
@ -2888,7 +2913,7 @@ interface nsIDOMEvent : nsISupports
nsresult DuplicatePrivateData(); nsresult DuplicatePrivateData();
nsresult SetTarget(nsIDOMEventTarget *aTarget); nsresult SetTarget(nsIDOMEventTarget *aTarget);
bool IsDispatchStopped(); bool IsDispatchStopped();
/*nsEvent*/ void *GetInternalNSEvent(); /*WidgedEvent*/ void *WidgetEventPtr();
void SetTrusted(bool aTrusted); void SetTrusted(bool aTrusted);
void Serialize(/*IPC::Message*/ void *aMsg, bool aSerializeInterfaceType); void Serialize(/*IPC::Message*/ void *aMsg, bool aSerializeInterfaceType);
bool Deserialize(const /*IPC::Message*/ void *aMsg, void **aIter); bool Deserialize(const /*IPC::Message*/ void *aMsg, void **aIter);
@ -2899,7 +2924,7 @@ interface nsIDOMEvent : nsISupports
[ [
object, object,
uuid(a30a95ac-3b95-4251-88dc-8efa89ba9f9c), uuid(46b44e33-13c2-4eb3-bf80-76a4e0857ccc),
local local
] ]
interface nsIDOMWindowUtils : nsISupports interface nsIDOMWindowUtils : nsISupports
@ -2952,6 +2977,7 @@ interface nsIDOMWindowUtils : nsISupports
const nsAString *aCharacters, const nsAString *aUnmodifiedCharacters, nsIObserver *aObserver); const nsAString *aCharacters, const nsAString *aUnmodifiedCharacters, nsIObserver *aObserver);
nsresult SendNativeMouseEvent(int32_t aScreenX, int32_t aScreenY, int32_t aNativeMessage, int32_t aModifierFlags, nsresult SendNativeMouseEvent(int32_t aScreenX, int32_t aScreenY, int32_t aNativeMessage, int32_t aModifierFlags,
nsIDOMElement *aElement, nsIObserver *aObserver); nsIDOMElement *aElement, nsIObserver *aObserver);
nsresult SendNativeMouseMove(int32_t aScreenX, int32_t aScreenY, nsIDOMElement *aElement, nsIObserver *aObserver);
nsresult SendNativeMouseScrollEvent(int32_t aScreenX, int32_t aScreenY, uint32_t aNativeMessage, double aDeltaX, nsresult SendNativeMouseScrollEvent(int32_t aScreenX, int32_t aScreenY, uint32_t aNativeMessage, double aDeltaX,
double aDeltaY, double aDeltaZ, uint32_t aModifierFlags, uint32_t aAdditionalFlags, nsIDOMElement *aElement, double aDeltaY, double aDeltaZ, uint32_t aModifierFlags, uint32_t aAdditionalFlags, nsIDOMElement *aElement,
nsIObserver *aObserver); nsIObserver *aObserver);
@ -3010,7 +3036,7 @@ interface nsIDOMWindowUtils : nsISupports
nsresult ResumeTimeouts(); nsresult ResumeTimeouts();
nsresult GetLayerManagerType(nsAString *aLayerManagerType); nsresult GetLayerManagerType(nsAString *aLayerManagerType);
nsresult GetLayerManagerRemote(bool *aLayerManagerRemote); nsresult GetLayerManagerRemote(bool *aLayerManagerRemote);
nsresult GetSupportsHardwareH264Decoding(nsAString *aSupportsHardwareH264Decoding); nsresult GetSupportsHardwareH264Decoding(void /* JS::MutableHandleValue */ *aSupportsHardwareH264Decoding);
nsresult StartFrameTimeRecording(uint32_t *startIndex); nsresult StartFrameTimeRecording(uint32_t *startIndex);
nsresult StopFrameTimeRecording(uint32_t startIndex, uint32_t *frameCount, float **frameIntervals); nsresult StopFrameTimeRecording(uint32_t startIndex, uint32_t *frameCount, float **frameIntervals);
nsresult BeginTabSwitch(); nsresult BeginTabSwitch();
@ -3023,14 +3049,14 @@ interface nsIDOMWindowUtils : nsISupports
nsresult RestoreNormalRefresh(); nsresult RestoreNormalRefresh();
nsresult GetIsTestControllingRefreshes(bool *aIsTestControllingRefreshes); nsresult GetIsTestControllingRefreshes(bool *aIsTestControllingRefreshes);
nsresult GetAsyncPanZoomEnabled(bool *aAsyncPanZoomEnabled); nsresult GetAsyncPanZoomEnabled(bool *aAsyncPanZoomEnabled);
nsresult SetAsyncScrollOffset(nsIDOMNode *aNode, int32_t aX, int32_t aY); nsresult SetAsyncScrollOffset(nsIDOMNode *aNode, float aX, float aY);
nsresult SetAsyncZoom(nsIDOMNode *aRootElement, float aValue); nsresult SetAsyncZoom(nsIDOMNode *aRootElement, float aValue);
nsresult FlushApzRepaints(bool *_retval); nsresult FlushApzRepaints(bool *_retval);
nsresult ZoomToFocusedInput();
nsresult ComputeAnimationDistance(nsIDOMElement *element, const nsAString *property, const nsAString *value1, nsresult ComputeAnimationDistance(nsIDOMElement *element, const nsAString *property, const nsAString *value1,
const nsAString *value2, double *_retval); const nsAString *value2, double *_retval);
nsresult WrapDOMFile(nsIFile *aFile, nsISupports **_retval); nsresult WrapDOMFile(nsIFile *aFile, nsISupports **_retval);
nsresult GetFocusedInputType(char **aFocusedInputType); nsresult GetFocusedInputType(char **aFocusedInputType);
nsresult FindElementWithViewId(long /*nsViewID*/ aId, nsIDOMElement **_retval);
nsresult GetViewId(nsIDOMElement *aElement, long /*nsViewID*/ *_retval); nsresult GetViewId(nsIDOMElement *aElement, long /*nsViewID*/ *_retval);
nsresult LeafLayersPartitionWindow(bool *_retval); nsresult LeafLayersPartitionWindow(bool *_retval);
nsresult CheckAndClearPaintedState(nsIDOMElement *aElement, bool *_retval); nsresult CheckAndClearPaintedState(nsIDOMElement *aElement, bool *_retval);
@ -3111,15 +3137,15 @@ interface nsIContextMenuListener : nsISupports
[ [
object, object,
uuid(d73852f8-7bd6-477d-8233-117dbf83860b), uuid(85ae52eb-37fa-4fd9-a2e6-c7d0f2a521b3),
local local
] ]
interface nsIDOMUIEvent : nsIDOMEvent interface nsIDOMUIEvent : nsISupports
{ {
nsresult GetView(nsIDOMWindow **aView); nsresult GetView(mozIDOMWindowProxy **aView);
nsresult GetDetail(int32_t *aDetail); nsresult GetDetail(int32_t *aDetail);
nsresult InitUIEvent(const nsAString *typeArg, bool canBubbleArg, bool cancelableArg, nsresult InitUIEvent(const nsAString *typeArg, bool canBubbleArg, bool cancelableArg,
nsIDOMWindow *viewArg, int32_t detailArg); mozIDOMWindowProxy *viewArg, int32_t detailArg);
nsresult GetLayerX(int32_t *aLayerX); nsresult GetLayerX(int32_t *aLayerX);
nsresult GetLayerY(int32_t *aLayerY); nsresult GetLayerY(int32_t *aLayerY);
nsresult GetPageX(int32_t *aPageX); nsresult GetPageX(int32_t *aPageX);
@ -3130,11 +3156,12 @@ interface nsIDOMUIEvent : nsIDOMEvent
nsresult GetCancelBubble(bool *aCancelBubble); nsresult GetCancelBubble(bool *aCancelBubble);
nsresult SetCancelBubble(bool aCancelBubble); nsresult SetCancelBubble(bool aCancelBubble);
nsresult GetIsChar(bool *aIsChar); nsresult GetIsChar(bool *aIsChar);
void* /* mozilla::dom::Event thiscall */ AsEvent();
} }
[ [
object, object,
uuid(df068636-9a5b-11e3-b71f-2c27d728e7f9), uuid(5bdab8d8-7933-4c5c-b6d1-ab34481237f7),
local local
] ]
interface nsIDOMMouseEvent : nsIDOMUIEvent interface nsIDOMMouseEvent : nsIDOMUIEvent
@ -3153,23 +3180,17 @@ interface nsIDOMMouseEvent : nsIDOMUIEvent
nsresult GetButtons(uint16_t *aButtons); nsresult GetButtons(uint16_t *aButtons);
nsresult GetRelatedTarget(nsIDOMEventTarget **aRelatedTarget); nsresult GetRelatedTarget(nsIDOMEventTarget **aRelatedTarget);
nsresult InitMouseEvent(const nsAString *typeArg, bool canBubbleArg, bool cancelableArg, nsresult InitMouseEvent(const nsAString *typeArg, bool canBubbleArg, bool cancelableArg,
nsIDOMWindow *viewArg, int32_t detailArg, int32_t screenXArg, int32_t screenYArg, mozIDOMWindow *viewArg, int32_t detailArg, int32_t screenXArg, int32_t screenYArg,
int32_t clientXArg, int32_t clientYArg, bool ctrlKeyArg, bool altKeyArg, int32_t clientXArg, int32_t clientYArg, bool ctrlKeyArg, bool altKeyArg, bool shiftKeyArg,
bool shiftKeyArg, bool metaKeyArg, uint16_t buttonArg, bool metaKeyArg, uint16_t buttonArg, nsIDOMEventTarget *relatedTargetArg);
nsIDOMEventTarget *relatedTargetArg);
nsresult GetMozPressure(float *aMozPressure); nsresult GetMozPressure(float *aMozPressure);
nsresult GetMozInputSource(uint16_t *aMozInputSource); nsresult GetMozInputSource(uint16_t *aMozInputSource);
nsresult InitNSMouseEvent(const nsAString *typeArg, bool canBubbleArg, bool cancelableArg,
nsIDOMWindow *viewArg, int32_t detailArg, int32_t screenXArg, int32_t screenYArg,
int32_t clientXArg, int32_t clientYArg, bool ctrlKeyArg, bool altKeyArg, bool shiftKeyArg,
bool metaKeyArg, uint16_t buttonArg, nsIDOMEventTarget *relatedTargetArg, float pressure,
uint16_t inputSourceArg);
nsresult GetModifierState(const nsAString *keyArg, bool *_retval); nsresult GetModifierState(const nsAString *keyArg, bool *_retval);
} }
[ [
object, object,
uuid(d2b3e35f-8627-4732-a92d-cda54c8f8054), uuid(2e52eb99-670d-469a-b51f-8efee2dd091d),
local local
] ]
interface nsIDOMKeyEvent : nsIDOMUIEvent interface nsIDOMKeyEvent : nsIDOMUIEvent
@ -3181,7 +3202,7 @@ interface nsIDOMKeyEvent : nsIDOMUIEvent
nsresult GetShiftKey(bool *aShiftKey); nsresult GetShiftKey(bool *aShiftKey);
nsresult GetMetaKey(bool *aMetaKey); nsresult GetMetaKey(bool *aMetaKey);
nsresult InitKeyEvent(const nsAString *typeArg, bool canBubbleArg, nsresult InitKeyEvent(const nsAString *typeArg, bool canBubbleArg,
bool cancelableArg, nsIDOMWindow *viewArg, bool ctrlKeyArg, bool cancelableArg, mozIDOMWindowProxy *viewArg, bool ctrlKeyArg,
bool altKeyArg, bool shiftKeyArg, bool metaKeyArg, uint32_t keyCodeArg, bool altKeyArg, bool shiftKeyArg, bool metaKeyArg, uint32_t keyCodeArg,
uint32_t charCodeArg); uint32_t charCodeArg);
nsresult GetModifierState(const nsAString *keyArg, bool *_retval); nsresult GetModifierState(const nsAString *keyArg, bool *_retval);
@ -3234,34 +3255,34 @@ interface nsIComponentRegistrar : nsISupports
[ [
object, object,
uuid(1630c61a-325e-49ca-8759-a31b16c47aa5), uuid(404ebfa2-d8f4-4c94-8416-e65a55f9df5a),
local local
] ]
interface nsIPromptService : nsISupports interface nsIPromptService : nsISupports
{ {
nsresult Alert(nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, nsresult Alert(mozIDOMWindowProxy *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText); const PRUnichar *aText);
nsresult AlertCheck(nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, nsresult AlertCheck(mozIDOMWindowProxy *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, const PRUnichar *aCheckMsg, bool *aCheckState); const PRUnichar *aText, const PRUnichar *aCheckMsg, bool *aCheckState);
nsresult Confirm(nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, nsresult Confirm(mozIDOMWindowProxy *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, bool *_retval); const PRUnichar *aText, bool *_retval);
nsresult ConfirmCheck(nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, nsresult ConfirmCheck(mozIDOMWindowProxy *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, const PRUnichar *aCheckMsg, bool *aCheckState, const PRUnichar *aText, const PRUnichar *aCheckMsg, bool *aCheckState,
bool *_retval); bool *_retval);
nsresult ConfirmEx(nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, nsresult ConfirmEx(mozIDOMWindowProxy *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, uint32_t aButtonFlags, const PRUnichar *aButton0Title, const PRUnichar *aText, uint32_t aButtonFlags, const PRUnichar *aButton0Title,
const PRUnichar *aButton1Title, const PRUnichar *aButton2Title, const PRUnichar *aButton1Title, const PRUnichar *aButton2Title,
const PRUnichar *aCheckMsg, bool *aCheckState, int32_t *_retval); const PRUnichar *aCheckMsg, bool *aCheckState, int32_t *_retval);
nsresult Prompt(nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, nsresult Prompt(mozIDOMWindowProxy *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, PRUnichar **aValue, const PRUnichar *aCheckMsg, const PRUnichar *aText, PRUnichar **aValue, const PRUnichar *aCheckMsg,
bool *aCheckState, bool *_retval); bool *aCheckState, bool *_retval);
nsresult PromptUsernameAndPassword(nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, nsresult PromptUsernameAndPassword(mozIDOMWindowProxy *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, PRUnichar **aUsername, PRUnichar **aPassword, const PRUnichar *aText, PRUnichar **aUsername, PRUnichar **aPassword,
const PRUnichar *aCheckMsg, bool *aCheckState, bool *_retval); const PRUnichar *aCheckMsg, bool *aCheckState, bool *_retval);
nsresult PromptPassword(nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, nsresult PromptPassword(mozIDOMWindowProxy *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, PRUnichar **aPassword, const PRUnichar *aCheckMsg, const PRUnichar *aText, PRUnichar **aPassword, const PRUnichar *aCheckMsg,
bool *aCheckState, bool *_retval); bool *aCheckState, bool *_retval);
nsresult Select(nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, nsresult Select(mozIDOMWindowProxy *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, uint32_t aCount, const PRUnichar **aSelectList, const PRUnichar *aText, uint32_t aCount, const PRUnichar **aSelectList,
int32_t *aOutSelection, bool *_retval); int32_t *aOutSelection, bool *_retval);
} }
@ -3278,23 +3299,23 @@ interface nsITooltipTextProvider : nsISupports
[ [
object, object,
uuid(24f3f4da-18a4-448d-876d-7360fefac029), uuid(24f963d1-e6fc-43ea-a206-99ac5fcc5265),
local local
] ]
interface nsIEditingSession : nsISupports interface nsIEditingSession : nsISupports
{ {
nsresult GetEditorStatus(uint32_t *aEditorStatus); nsresult GetEditorStatus(uint32_t *aEditorStatus);
nsresult MakeWindowEditable(nsIDOMWindow *window, const char *aEditorType, nsresult MakeWindowEditable(mozIDOMWindowProxy *window, const char *aEditorType,
bool doAfterUriLoad, bool aMakeWholeDocumentEditable, bool aInteractive); bool doAfterUriLoad, bool aMakeWholeDocumentEditable, bool aInteractive);
nsresult WindowIsEditable(nsIDOMWindow *window, bool *_retval); nsresult WindowIsEditable(mozIDOMWindowProxy *window, bool *_retval);
nsresult GetEditorForWindow(nsIDOMWindow *window, nsIEditor **_retval); nsresult GetEditorForWindow(mozIDOMWindowProxy *window, nsIEditor **_retval);
nsresult SetupEditorOnWindow(nsIDOMWindow *window); nsresult SetupEditorOnWindow(mozIDOMWindowProxy *window);
nsresult TearDownEditorOnWindow(nsIDOMWindow *window); nsresult TearDownEditorOnWindow(mozIDOMWindowProxy *window);
nsresult SetEditorOnControllers(nsIDOMWindow *aWindow, nsIEditor *aEditor); nsresult SetEditorOnControllers(mozIDOMWindowProxy *aWindow, nsIEditor *aEditor);
nsresult DisableJSAndPlugins(nsIDOMWindow *aWindow); nsresult DisableJSAndPlugins(mozIDOMWindowProxy *aWindow);
nsresult RestoreJSAndPlugins(nsIDOMWindow *aWindow); nsresult RestoreJSAndPlugins(mozIDOMWindowProxy *aWindow);
nsresult DetachFromWindow(nsIDOMWindow *aWindow); nsresult DetachFromWindow(mozIDOMWindowProxy *aWindow);
nsresult ReattachToWindow(nsIDOMWindow *aWindow); nsresult ReattachToWindow(mozIDOMWindowProxy *aWindow);
nsresult GetJsAndPluginsDisabled(bool *aJsAndPluginsDisabled); nsresult GetJsAndPluginsDisabled(bool *aJsAndPluginsDisabled);
} }
@ -3323,19 +3344,19 @@ interface nsICommandParams : nsISupports
[ [
object, object,
uuid(080d2001-f91e-11d4-a73c-f9242928207c), uuid(bb5a1730-d83b-4fa2-831b-35b9d5842e84),
local local
] ]
interface nsICommandManager : nsISupports interface nsICommandManager : nsISupports
{ {
nsresult AddCommandObserver(nsIObserver *aCommandObserver, const char *aCommandToObserve); nsresult AddCommandObserver(nsIObserver *aCommandObserver, const char *aCommandToObserve);
nsresult RemoveCommandObserver(nsIObserver *aCommandObserver, const char *aCommandObserved); nsresult RemoveCommandObserver(nsIObserver *aCommandObserver, const char *aCommandObserved);
nsresult IsCommandSupported(const char *aCommandName, nsIDOMWindow *aTargetWindow, bool *_retval); nsresult IsCommandSupported(const char *aCommandName, mozIDOMWindowProxy *aTargetWindow, bool *_retval);
nsresult IsCommandEnabled(const char *aCommandName, nsIDOMWindow *aTargetWindow, bool *_retval); nsresult IsCommandEnabled(const char *aCommandName, mozIDOMWindowProxy *aTargetWindow, bool *_retval);
nsresult GetCommandState(const char *aCommandName, nsIDOMWindow *aTargetWindow, nsresult GetCommandState(const char *aCommandName, mozIDOMWindowProxy *aTargetWindow,
nsICommandParams *aCommandParams); nsICommandParams *aCommandParams);
nsresult DoCommand(const char *aCommandName, nsICommandParams *aCommandParams, nsresult DoCommand(const char *aCommandName, nsICommandParams *aCommandParams,
nsIDOMWindow *aTargetWindow); mozIDOMWindowProxy *aTargetWindow);
} }
[ [
@ -3390,7 +3411,7 @@ interface nsIContent : nsISupports
[ [
object, object,
uuid(5f51e18c-9e0e-4dc0-9f08-7a326552ea11), uuid(ce1f7627-7109-4977-ba77-490ffde07aaa),
local local
] ]
interface nsIDocument : nsISupports interface nsIDocument : nsISupports
@ -3602,7 +3623,7 @@ interface nsIClipboardCommands : nsISupports
[ [
object, object,
uuid(edb99640-8378-4106-8673-e701a086eb1c), uuid(9b7c586f-9214-480c-a2c4-49b526fff1a6),
local local
] ]
interface nsIDocShellTreeItem : nsISupports interface nsIDocShellTreeItem : nsISupports
@ -3628,12 +3649,12 @@ interface nsIDocShellTreeItem : nsISupports
nsresult FindChildWithName(const PRUnichar *aName, bool aRecurse, bool aSameType, nsIDocShellTreeItem *aRequestor, nsresult FindChildWithName(const PRUnichar *aName, bool aRecurse, bool aSameType, nsIDocShellTreeItem *aRequestor,
nsIDocShellTreeItem *aOriginalRequestor, nsIDocShellTreeItem **_retval); nsIDocShellTreeItem *aOriginalRequestor, nsIDocShellTreeItem **_retval);
nsIDocument /* thiscall */ *GetDocument(); nsIDocument /* thiscall */ *GetDocument();
void /* thiscall nsPIDOMWindow */ *GetWindow(); void /* thiscall nsPIDOMWindowOuter */ *GetWindow();
} }
[ [
object, object,
uuid(702e0a92-7d63-490e-b5ee-d247e6bd4588), uuid(2da17016-7851-4a45-a7a8-00b360e01595),
local local
] ]
interface nsIContentViewer : nsISupports interface nsIContentViewer : nsISupports
@ -3643,11 +3664,10 @@ interface nsIContentViewer : nsISupports
nsresult SetContainer(nsIDocShell *aContainer); nsresult SetContainer(nsIDocShell *aContainer);
void /* thiscall */ LoadStart(nsIDocument *aDoc); void /* thiscall */ LoadStart(nsIDocument *aDoc);
nsresult LoadComplete(nsresult aStatus); nsresult LoadComplete(nsresult aStatus);
nsresult PermitUnload(bool aCallerClosesWindow, bool *_retval); nsresult PermitUnload(bool *_retval);
nsresult GetInPermitUnload(bool *aInPermitUnload); nsresult GetInPermitUnload(bool *aInPermitUnload);
nsresult /* thiscall */ PermitUnloadInternal(bool aCallerClosesWindow, bool *aShouldPrompt, bool *_retval); nsresult /* thiscall */ PermitUnloadInternal(bool *aShouldPrompt, bool *_retval);
nsresult GetBeforeUnloadFiring(bool *aBeforeUnloadFiring); nsresult GetBeforeUnloadFiring(bool *aBeforeUnloadFiring);
nsresult ResetCloseWindow();
nsresult PageHide(bool isUnload); nsresult PageHide(bool isUnload);
nsresult Close(nsISHEntry *historyEntry); nsresult Close(nsISHEntry *historyEntry);
nsresult Destroy(); nsresult Destroy();
@ -3694,7 +3714,6 @@ interface nsIContentViewer : nsISupports
nsresult GetMinFontSize(int32_t *aMinFontSize); nsresult GetMinFontSize(int32_t *aMinFontSize);
nsresult SetMinFontSize(int32_t aMinFontSize); nsresult SetMinFontSize(int32_t aMinFontSize);
nsresult AppendSubtree(void /*nsTArray<nsCOMPtr<nsIContentViewer> >*/ *array); nsresult AppendSubtree(void /*nsTArray<nsCOMPtr<nsIContentViewer> >*/ *array);
nsresult ChangeMaxLineBoxWidth(int32_t maxLineBoxWidth);
nsresult PausePainting(); nsresult PausePainting();
nsresult ResumePainting(); nsresult ResumePainting();
nsresult EmulateMedium(const nsAString *aMediaType); nsresult EmulateMedium(const nsAString *aMediaType);
@ -3748,7 +3767,7 @@ interface nsIDocShellLoadInfo : nsISupports
[ [
object, object,
uuid(44aca825-0080-49f1-8407-df62183e5ec1), uuid(049234fe-da10-478b-bc5d-bc6f9a1ba63d),
local local
] ]
interface nsIDocShell : nsIDocShellTreeItem interface nsIDocShell : nsIDocShellTreeItem
@ -3773,6 +3792,8 @@ interface nsIDocShell : nsIDocShellTreeItem
nsresult GetContentViewer(nsIContentViewer **aContentViewer); nsresult GetContentViewer(nsIContentViewer **aContentViewer);
nsresult GetChromeEventHandler(nsIDOMEventTarget **aChromeEventHandler); nsresult GetChromeEventHandler(nsIDOMEventTarget **aChromeEventHandler);
nsresult SetChromeEventHandler(nsIDOMEventTarget *aChromeEventHandler); nsresult SetChromeEventHandler(nsIDOMEventTarget *aChromeEventHandler);
nsresult GetCustomUserAgent(nsAString *aCustomUserAgent);
nsresult SetCustomUserAgent(const nsAString *aCustomUserAgent);
nsresult GetAllowPlugins(bool *aAllowPlugins); nsresult GetAllowPlugins(bool *aAllowPlugins);
nsresult SetAllowPlugins(bool aAllowPlugins); nsresult SetAllowPlugins(bool aAllowPlugins);
nsresult GetAllowJavascript(bool *aAllowJavascript); nsresult GetAllowJavascript(bool *aAllowJavascript);
@ -3826,7 +3847,7 @@ interface nsIDocShell : nsIDocShellTreeItem
nsresult GetRestoringDocument(bool *aRestoringDocument); nsresult GetRestoringDocument(bool *aRestoringDocument);
nsresult GetUseErrorPages(bool *aUseErrorPages); nsresult GetUseErrorPages(bool *aUseErrorPages);
nsresult SetUseErrorPages(bool aUseErrorPages); nsresult SetUseErrorPages(bool aUseErrorPages);
nsresult DisplayLoadError(nsresult aError, nsIURI *aURI, const PRUnichar *aURL, nsIChannel *aFailedChannel, bool *_retval); nsresult DisplayLoadError(nsresult aError, nsIURI *aURI, const char16_t *aURL, nsIChannel *aFailedChannel, bool *_retval);
nsresult GetFailedChannel(nsIChannel **aFailedChannel); nsresult GetFailedChannel(nsIChannel **aFailedChannel);
nsresult GetPreviousTransIndex(int32_t *aPreviousTransIndex); nsresult GetPreviousTransIndex(int32_t *aPreviousTransIndex);
nsresult GetLoadedTransIndex(int32_t *aLoadedTransIndex); nsresult GetLoadedTransIndex(int32_t *aLoadedTransIndex);
@ -3851,6 +3872,7 @@ interface nsIDocShell : nsIDocShellTreeItem
nsresult GetCanExecuteScripts(bool *aCanExecuteScripts); nsresult GetCanExecuteScripts(bool *aCanExecuteScripts);
nsresult GetIsActive(bool *aIsActive); nsresult GetIsActive(bool *aIsActive);
nsresult SetIsActive(bool aIsActive); nsresult SetIsActive(bool aIsActive);
nsresult SetIsActiveAndForeground(bool aIsActive);
nsresult SetIsPrerendered(bool prerendered); nsresult SetIsPrerendered(bool prerendered);
nsresult GetIsPrerendered(bool *aIsPrerendered); nsresult GetIsPrerendered(bool *aIsPrerendered);
nsresult GetHistoryID(uint64_t *aHistoryID); nsresult GetHistoryID(uint64_t *aHistoryID);
@ -3875,13 +3897,14 @@ interface nsIDocShell : nsIDocShellTreeItem
nsresult AddWeakScrollObserver(void /*nsIScrollObserver*/ *obs); nsresult AddWeakScrollObserver(void /*nsIScrollObserver*/ *obs);
nsresult RemoveWeakScrollObserver(void /*nsIScrollObserver*/ *obs); nsresult RemoveWeakScrollObserver(void /*nsIScrollObserver*/ *obs);
nsresult NotifyScrollObservers(); nsresult NotifyScrollObservers();
nsresult GetIsBrowserElement(bool *aIsBrowserElement);
nsresult GetIsApp(bool *aIsApp); nsresult GetIsApp(bool *aIsApp);
nsresult GetIsBrowserOrApp(bool *aIsBrowserOrApp); nsresult GetFrameType(uint32_t *aFrameType);
nsresult GetIsInBrowserElement(bool *aIsInBrowserElement); nsresult SetFrameType(uint32_t aFrameType);
nsresult GetIsInBrowserOrApp(bool *aIsInBrowserOrApp); nsresult GetIsMozBrowserOrApp(bool *aIsMozBrowserOrApp);
nsresult SetIsApp(uint32_t ownAppId); nsresult GetIsIsolatedMozBrowserElement(bool *aIsIsolatedMozBrowserElement);
nsresult SetIsBrowserInsideApp(uint32_t containingAppId); nsresult GetIsInIsolatedMozBrowserElement(bool *aIsInIsolatedMozBrowserElement);
nsresult SetIsInIsolatedMozBrowserElement(bool aIsInIsolatedMozBrowserElement);
nsresult GetIsInMozBrowserOrApp(bool *aIsInMozBrowserOrApp);
nsresult GetAppId(uint32_t *aAppId); nsresult GetAppId(uint32_t *aAppId);
nsresult GetAppManifestURL(nsAString *aAppManifestURL); nsresult GetAppManifestURL(nsAString *aAppManifestURL);
nsresult GetSameTypeParentIgnoreBrowserAndAppBoundaries(nsIDocShell **_retval); nsresult GetSameTypeParentIgnoreBrowserAndAppBoundaries(nsIDocShell **_retval);
@ -3920,7 +3943,7 @@ interface nsIDocShell : nsIDocShellTreeItem
nsresult DoCommand(const char *command); nsresult DoCommand(const char *command);
bool IsInvisible(); bool IsInvisible();
void SetInvisible(bool aIsInvisibleDochsell); void SetInvisible(bool aIsInvisibleDochsell);
void /*nsIScriptGlobalObject*/ *GetScriptGlobalObject(); void /* nsIScriptGlobalObject thiscall */ *GetScriptGlobalObject();
nsresult GetDeviceSizeIsPageSize(bool *aDeviceSizeIsPageSize); nsresult GetDeviceSizeIsPageSize(bool *aDeviceSizeIsPageSize);
nsresult SetDeviceSizeIsPageSize(bool aDeviceSizeIsPageSize); nsresult SetDeviceSizeIsPageSize(bool aDeviceSizeIsPageSize);
void /* thiscall */ SetOpener(void /*nsITabParent*/ *aOpener); void /* thiscall */ SetOpener(void /*nsITabParent*/ *aOpener);
@ -3933,6 +3956,10 @@ interface nsIDocShell : nsIDocShellTreeItem
nsresult SetPaymentRequestId(const nsAString *aPaymentRequestId); nsresult SetPaymentRequestId(const nsAString *aPaymentRequestId);
nsresult GetWindowDraggingAllowed(bool *aWindowDraggingAllowed); nsresult GetWindowDraggingAllowed(bool *aWindowDraggingAllowed);
nsresult SetWindowDraggingAllowed(bool aWindowDraggingAllowed); nsresult SetWindowDraggingAllowed(bool aWindowDraggingAllowed);
nsresult GetCurrentScrollRestorationIsManual(bool *aCurrentScrollRestorationIsManual);
nsresult SetCurrentScrollRestorationIsManual(bool aCurrentScrollRestorationIsManual);
nsresult GetOriginAttributes(JSContext* cx, void* /* JS::MutableHandleValue */ _retval);
nsresult SetOriginAttributes(int /* JS::HandleValue */ aAttrs, JSContext *cx);
} }
[ [
@ -4010,13 +4037,17 @@ interface nsIParser : nsISupports
[ [
object, object,
uuid(900bc4bc-8b6c-4cba-82fa-568a80fffd3e), uuid(71041fa3-6dd7-4cde-bb76-aecc69e17578),
local local
] ]
interface nsIDocumentObserver : nsIMutationObserver interface nsIDocumentObserver : nsIMutationObserver
{ {
typedef uint32_t nsUpdateType; typedef uint32_t nsUpdateType;
typedef struct {
void *dummy;
} mozilla_StyleSheetHandle;
typedef struct { typedef struct {
uint64_t mStates; uint64_t mStates;
} EventStates; } EventStates;
@ -4027,14 +4058,12 @@ interface nsIDocumentObserver : nsIMutationObserver
void EndLoad(nsIDocument *aDocument); void EndLoad(nsIDocument *aDocument);
void ContentStatesChanged(nsIDocument *aDocument, nsIContent *aContent, EventStates aStateMask); void ContentStatesChanged(nsIDocument *aDocument, nsIContent *aContent, EventStates aStateMask);
void DocumentStatesChanged(nsIDocument *aDocument, EventStates aStateMask); void DocumentStatesChanged(nsIDocument *aDocument, EventStates aStateMask);
void StyleSheetAdded(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, bool aDocumentSheet); void StyleSheetAdded(mozilla_StyleSheetHandle aStyleSheet, bool aDocumentSheet);
void StyleSheetRemoved(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, bool aDocumentSheet); void StyleSheetRemoved(mozilla_StyleSheetHandle aStyleSheet, bool aDocumentSheet);
void StyleSheetApplicableStateChanged(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, void StyleSheetApplicableStateChanged(mozilla_StyleSheetHandle aStyleSheet);
bool aApplicable); void StyleRuleChanged(mozilla_StyleSheetHandle aStyleSheet);
void StyleRuleChanged(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, nsIStyleRule *aOldStyleRule, void StyleRuleAdded(mozilla_StyleSheetHandle aStyleSheet);
nsIStyleRule *aNewStyleRule); void StyleRuleRemoved(mozilla_StyleSheetHandle aStyleSheet);
void StyleRuleAdded(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, nsIStyleRule *aStyleRule);
void StyleRuleRemoved(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, nsIStyleRule *aStyleRule);
void BindToDocument(nsIDocument *aDocument, nsIContent *aContent); void BindToDocument(nsIDocument *aDocument, nsIContent *aContent);
void AttemptToExecuteScript(nsIContent *aContent, nsIParser *aParser, bool *aBlock); void AttemptToExecuteScript(nsIContent *aContent, nsIParser *aParser, bool *aBlock);
} }
@ -4057,13 +4086,13 @@ interface nsIContentUtils : nsISupports
[ [
object, object,
uuid(5fe83b24-38b9-4901-a4a1-d1bd57d3fe18), uuid(15c05894-408e-4798-b527-a8c32d9c5f8c),
local local
] ]
interface nsIAudioChannelAgentCallback : nsISupports interface nsIAudioChannelAgentCallback : nsISupports
{ {
nsresult WindowVolumeChanged(float aVolume, bool aMuted); nsresult WindowVolumeChanged(float aVolume, bool aMuted);
nsresult WindowAudioCaptureChanged(); nsresult WindowAudioCaptureChanged(bool aCapture);
} }
[ [

80
dlls/mshtml/nsio.c
View File

@ -955,7 +955,7 @@ static HTMLOuterWindow *get_window_from_load_group(nsChannel *This)
static HTMLOuterWindow *get_channel_window(nsChannel *This) static HTMLOuterWindow *get_channel_window(nsChannel *This)
{ {
nsIWebProgress *web_progress; nsIWebProgress *web_progress;
nsIDOMWindow *nswindow; mozIDOMWindowProxy *mozwindow;
HTMLOuterWindow *window; HTMLOuterWindow *window;
nsresult nsres; nsresult nsres;
@ -985,20 +985,20 @@ static HTMLOuterWindow *get_channel_window(nsChannel *This)
return NULL; return NULL;
} }
nsres = nsIWebProgress_GetDOMWindow(web_progress, &nswindow); nsres = nsIWebProgress_GetDOMWindow(web_progress, &mozwindow);
nsIWebProgress_Release(web_progress); nsIWebProgress_Release(web_progress);
if(NS_FAILED(nsres) || !nswindow) { if(NS_FAILED(nsres) || !mozwindow) {
ERR("GetDOMWindow failed: %08x\n", nsres); ERR("GetDOMWindow failed: %08x\n", nsres);
return NULL; return NULL;
} }
window = nswindow_to_window(nswindow); window = mozwindow_to_window(mozwindow);
nsIDOMWindow_Release(nswindow); mozIDOMWindowProxy_Release(mozwindow);
if(window) if(window)
IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface);
else else
FIXME("NULL window for %p\n", nswindow); FIXME("NULL window for %p\n", mozwindow);
return window; return window;
} }
@ -1310,6 +1310,34 @@ static nsresult NSAPI nsChannel_SetReferrerWithPolicy(nsIHttpChannel *iface, nsI
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
static nsresult NSAPI nsHttpChannel_GetProtocolVersion(nsIHttpChannel *iface, nsACString *aProtocolVersion)
{
nsChannel *This = impl_from_nsIHttpChannel(iface);
FIXME("(%p)->(%p)\n", This, aProtocolVersion);
return NS_ERROR_NOT_IMPLEMENTED;
}
static nsresult NSAPI nsHttpChannel_GetTransferSize(nsIHttpChannel *iface, UINT64 *aTransferSize)
{
nsChannel *This = impl_from_nsIHttpChannel(iface);
FIXME("(%p)->(%p)\n", This, aTransferSize);
return NS_ERROR_NOT_IMPLEMENTED;
}
static nsresult NSAPI nsHttpChannel_GetDecodedBodySize(nsIHttpChannel *iface, UINT64 *aDecodedBodySize)
{
nsChannel *This = impl_from_nsIHttpChannel(iface);
FIXME("(%p)->(%p)\n", This, aDecodedBodySize);
return NS_ERROR_NOT_IMPLEMENTED;
}
static nsresult NSAPI nsHttpChannel_GetEncodedBodySize(nsIHttpChannel *iface, UINT64 *aEncodedBodySize)
{
nsChannel *This = impl_from_nsIHttpChannel(iface);
FIXME("(%p)->(%p)\n", This, aEncodedBodySize);
return NS_ERROR_NOT_IMPLEMENTED;
}
static nsresult NSAPI nsChannel_GetRequestHeader(nsIHttpChannel *iface, static nsresult NSAPI nsChannel_GetRequestHeader(nsIHttpChannel *iface,
const nsACString *aHeader, nsACString *_retval) const nsACString *aHeader, nsACString *_retval)
{ {
@ -1525,11 +1553,11 @@ static nsresult NSAPI nsChannel_IsPrivateResponse(nsIHttpChannel *iface, cpp_boo
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
static nsresult NSAPI nsChannel_RedirectTo(nsIHttpChannel *iface, nsIURI *aNewURI) static nsresult NSAPI nsChannel_RedirectTo(nsIHttpChannel *iface, nsIURI *aTargetURI)
{ {
nsChannel *This = impl_from_nsIHttpChannel(iface); nsChannel *This = impl_from_nsIHttpChannel(iface);
FIXME("(%p)->(%p)\n", This, aNewURI); FIXME("(%p)->(%p)\n", This, aTargetURI);
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -1597,6 +1625,10 @@ static const nsIHttpChannelVtbl nsChannelVtbl = {
nsChannel_SetReferrer, nsChannel_SetReferrer,
nsChannel_GetReferrerPolicy, nsChannel_GetReferrerPolicy,
nsChannel_SetReferrerWithPolicy, nsChannel_SetReferrerWithPolicy,
nsHttpChannel_GetProtocolVersion,
nsHttpChannel_GetTransferSize,
nsHttpChannel_GetDecodedBodySize,
nsHttpChannel_GetEncodedBodySize,
nsChannel_GetRequestHeader, nsChannel_GetRequestHeader,
nsChannel_SetRequestHeader, nsChannel_SetRequestHeader,
nsChannel_SetEmptyRequestHeader, nsChannel_SetEmptyRequestHeader,
@ -2074,10 +2106,24 @@ static nsresult NSAPI nsHttpChannelInternal_GetProxyURI(nsIHttpChannelInternal *
} }
static nsresult NSAPI nsHttpChannelInternal_SetCorsPreflightParameters(nsIHttpChannelInternal *iface, static nsresult NSAPI nsHttpChannelInternal_SetCorsPreflightParameters(nsIHttpChannelInternal *iface,
const void /*nsTArray<nsCString>*/ *unsafeHeaders, cpp_bool withCredentials, nsIPrincipal *preflightPrincipal) const void /*nsTArray<nsCString>*/ *unsafeHeaders)
{ {
nsChannel *This = impl_from_nsIHttpChannelInternal(iface); nsChannel *This = impl_from_nsIHttpChannelInternal(iface);
FIXME("(%p %p %x %p)\n", This, unsafeHeaders, withCredentials, preflightPrincipal); FIXME("(%p)->(%p)\n", This, unsafeHeaders);
return NS_ERROR_NOT_IMPLEMENTED;
}
static nsresult NSAPI nsHttpChannelInternal_GetBlockAuthPrompt(nsIHttpChannelInternal *iface, cpp_bool *aBlockAuthPrompt)
{
nsChannel *This = impl_from_nsIHttpChannelInternal(iface);
FIXME("(%p)->(%p)\n", This, aBlockAuthPrompt);
return NS_ERROR_NOT_IMPLEMENTED;
}
static nsresult NSAPI nsHttpChannelInternal_SetBlockAuthPrompt(nsIHttpChannelInternal *iface, cpp_bool aBlockAuthPrompt)
{
nsChannel *This = impl_from_nsIHttpChannelInternal(iface);
FIXME("(%p)->(%x)\n", This, aBlockAuthPrompt);
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -2127,7 +2173,9 @@ static const nsIHttpChannelInternalVtbl nsHttpChannelInternalVtbl = {
nsHttpChannelInternal_GetNetworkInterfaceId, nsHttpChannelInternal_GetNetworkInterfaceId,
nsHttpChannelInternal_SetNetworkInterfaceId, nsHttpChannelInternal_SetNetworkInterfaceId,
nsHttpChannelInternal_GetProxyURI, nsHttpChannelInternal_GetProxyURI,
nsHttpChannelInternal_SetCorsPreflightParameters nsHttpChannelInternal_SetCorsPreflightParameters,
nsHttpChannelInternal_GetBlockAuthPrompt,
nsHttpChannelInternal_SetBlockAuthPrompt
}; };
@ -3315,13 +3363,21 @@ static nsresult NSAPI nsStandardURL_Init(nsIStandardURL *iface, UINT32 aUrlType,
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
static nsresult NSAPI nsStandardURL_SetDefaultPort(nsIStandardURL *iface, LONG aNewDefaultPort)
{
nsWineURI *This = impl_from_nsIStandardURL(iface);
FIXME("(%p)->(%d)\n", This, aNewDefaultPort);
return NS_ERROR_NOT_IMPLEMENTED;
}
static const nsIStandardURLVtbl nsStandardURLVtbl = { static const nsIStandardURLVtbl nsStandardURLVtbl = {
nsStandardURL_QueryInterface, nsStandardURL_QueryInterface,
nsStandardURL_AddRef, nsStandardURL_AddRef,
nsStandardURL_Release, nsStandardURL_Release,
nsStandardURL_GetMutable, nsStandardURL_GetMutable,
nsStandardURL_SetMutable, nsStandardURL_SetMutable,
nsStandardURL_Init nsStandardURL_Init,
nsStandardURL_SetDefaultPort
}; };
static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *container, static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *container,

22
dlls/mshtml/nsservice.c
View File

@ -74,7 +74,7 @@ static nsrefcnt NSAPI nsPromptService_Release(nsIPromptService *iface)
return 1; return 1;
} }
static nsresult NSAPI nsPromptService_Alert(nsIPromptService *iface, nsIDOMWindow *aParent, static nsresult NSAPI nsPromptService_Alert(nsIPromptService *iface, mozIDOMWindowProxy *aParent,
const PRUnichar *aDialogTitle, const PRUnichar *aText) const PRUnichar *aDialogTitle, const PRUnichar *aText)
{ {
HTMLOuterWindow *window; HTMLOuterWindow *window;
@ -82,9 +82,9 @@ static nsresult NSAPI nsPromptService_Alert(nsIPromptService *iface, nsIDOMWindo
TRACE("(%p %s %s)\n", aParent, debugstr_w(aDialogTitle), debugstr_w(aText)); TRACE("(%p %s %s)\n", aParent, debugstr_w(aDialogTitle), debugstr_w(aText));
window = nswindow_to_window(aParent); window = mozwindow_to_window(aParent);
if(!window) { if(!window) {
WARN("Could not find HTMLWindow for nsIDOMWindow %p\n", aParent); WARN("Could not find HTMLWindow for mozIDOMWindowProxy %p\n", aParent);
return NS_ERROR_UNEXPECTED; return NS_ERROR_UNEXPECTED;
} }
@ -96,7 +96,7 @@ static nsresult NSAPI nsPromptService_Alert(nsIPromptService *iface, nsIDOMWindo
} }
static nsresult NSAPI nsPromptService_AlertCheck(nsIPromptService *iface, static nsresult NSAPI nsPromptService_AlertCheck(nsIPromptService *iface,
nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, mozIDOMWindowProxy *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, const PRUnichar *aCheckMsg, cpp_bool *aCheckState) const PRUnichar *aText, const PRUnichar *aCheckMsg, cpp_bool *aCheckState)
{ {
FIXME("(%p %s %s %s %p)\n", aParent, debugstr_w(aDialogTitle), debugstr_w(aText), FIXME("(%p %s %s %s %p)\n", aParent, debugstr_w(aDialogTitle), debugstr_w(aText),
@ -105,7 +105,7 @@ static nsresult NSAPI nsPromptService_AlertCheck(nsIPromptService *iface,
} }
static nsresult NSAPI nsPromptService_Confirm(nsIPromptService *iface, static nsresult NSAPI nsPromptService_Confirm(nsIPromptService *iface,
nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, const PRUnichar *aText, mozIDOMWindowProxy *aParent, const PRUnichar *aDialogTitle, const PRUnichar *aText,
cpp_bool *_retval) cpp_bool *_retval)
{ {
FIXME("(%p %s %s %p)\n", aParent, debugstr_w(aDialogTitle), debugstr_w(aText), _retval); FIXME("(%p %s %s %p)\n", aParent, debugstr_w(aDialogTitle), debugstr_w(aText), _retval);
@ -113,7 +113,7 @@ static nsresult NSAPI nsPromptService_Confirm(nsIPromptService *iface,
} }
static nsresult NSAPI nsPromptService_ConfirmCheck(nsIPromptService *iface, static nsresult NSAPI nsPromptService_ConfirmCheck(nsIPromptService *iface,
nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, mozIDOMWindowProxy *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, const PRUnichar *aCheckMsg, cpp_bool *aCheckState, const PRUnichar *aText, const PRUnichar *aCheckMsg, cpp_bool *aCheckState,
cpp_bool *_retval) cpp_bool *_retval)
{ {
@ -123,7 +123,7 @@ static nsresult NSAPI nsPromptService_ConfirmCheck(nsIPromptService *iface,
} }
static nsresult NSAPI nsPromptService_ConfirmEx(nsIPromptService *iface, static nsresult NSAPI nsPromptService_ConfirmEx(nsIPromptService *iface,
nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, mozIDOMWindowProxy *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, UINT32 aButtonFlags, const PRUnichar *aButton0Title, const PRUnichar *aText, UINT32 aButtonFlags, const PRUnichar *aButton0Title,
const PRUnichar *aButton1Title, const PRUnichar *aButton2Title, const PRUnichar *aButton1Title, const PRUnichar *aButton2Title,
const PRUnichar *aCheckMsg, cpp_bool *aCheckState, LONG *_retval) const PRUnichar *aCheckMsg, cpp_bool *aCheckState, LONG *_retval)
@ -153,7 +153,7 @@ static nsresult NSAPI nsPromptService_ConfirmEx(nsIPromptService *iface,
} }
static nsresult NSAPI nsPromptService_Prompt(nsIPromptService *iface, static nsresult NSAPI nsPromptService_Prompt(nsIPromptService *iface,
nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, mozIDOMWindowProxy *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, PRUnichar **aValue, const PRUnichar *aCheckMsg, const PRUnichar *aText, PRUnichar **aValue, const PRUnichar *aCheckMsg,
cpp_bool *aCheckState, cpp_bool *_retval) cpp_bool *aCheckState, cpp_bool *_retval)
{ {
@ -163,7 +163,7 @@ static nsresult NSAPI nsPromptService_Prompt(nsIPromptService *iface,
} }
static nsresult NSAPI nsPromptService_PromptUsernameAndPassword(nsIPromptService *iface, static nsresult NSAPI nsPromptService_PromptUsernameAndPassword(nsIPromptService *iface,
nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, mozIDOMWindowProxy *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, PRUnichar **aUsername, PRUnichar **aPassword, const PRUnichar *aText, PRUnichar **aUsername, PRUnichar **aPassword,
const PRUnichar *aCheckMsg, cpp_bool *aCheckState, cpp_bool *_retval) const PRUnichar *aCheckMsg, cpp_bool *aCheckState, cpp_bool *_retval)
{ {
@ -174,7 +174,7 @@ static nsresult NSAPI nsPromptService_PromptUsernameAndPassword(nsIPromptService
} }
static nsresult NSAPI nsPromptService_PromptPassword(nsIPromptService *iface, static nsresult NSAPI nsPromptService_PromptPassword(nsIPromptService *iface,
nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, mozIDOMWindowProxy *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, PRUnichar **aPassword, const PRUnichar *aCheckMsg, const PRUnichar *aText, PRUnichar **aPassword, const PRUnichar *aCheckMsg,
cpp_bool *aCheckState, cpp_bool *_retval) cpp_bool *aCheckState, cpp_bool *_retval)
{ {
@ -184,7 +184,7 @@ static nsresult NSAPI nsPromptService_PromptPassword(nsIPromptService *iface,
} }
static nsresult NSAPI nsPromptService_Select(nsIPromptService *iface, static nsresult NSAPI nsPromptService_Select(nsIPromptService *iface,
nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, mozIDOMWindowProxy *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, UINT32 aCount, const PRUnichar **aSelectList, const PRUnichar *aText, UINT32 aCount, const PRUnichar **aSelectList,
LONG *aOutSelection, cpp_bool *_retval) LONG *aOutSelection, cpp_bool *_retval)
{ {

2
dlls/mshtml/olecmd.c
View File

@ -56,7 +56,7 @@ void do_ns_command(HTMLDocument *This, const char *cmd, nsICommandParams *nspara
return; return;
} }
nsres = nsICommandManager_DoCommand(cmdmgr, cmd, nsparam, This->window->nswindow); nsres = nsICommandManager_DoCommand(cmdmgr, cmd, nsparam, This->window->window_proxy);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("DoCommand(%s) failed: %08x\n", debugstr_a(cmd), nsres); ERR("DoCommand(%s) failed: %08x\n", debugstr_a(cmd), nsres);