Jacek Caban : mshtml: Use get_nsinterface in set_ns_editmode and get_editor_controller.
Alexandre Julliard
julliard at winehq.org
Thu Sep 27 09:27:26 CDT 2007
Module: wine
Branch: master
Commit: e65e53488e154bb56b344424a42156be7e953727
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e65e53488e154bb56b344424a42156be7e953727
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Sep 26 20:47:02 2007 +0200
mshtml: Use get_nsinterface in set_ns_editmode and get_editor_controller.
---
dlls/mshtml/nsembed.c | 26 ++++----------------------
1 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c
index 4fcaf7c..19bf85c 100644
--- a/dlls/mshtml/nsembed.c
+++ b/dlls/mshtml/nsembed.c
@@ -647,7 +647,6 @@ void nsnode_to_nsstring(nsIDOMNode *nsdoc, nsAString *str)
void get_editor_controller(NSContainer *This)
{
nsIEditingSession *editing_session = NULL;
- nsIInterfaceRequestor *iface_req;
nsIControllerContext *ctrlctx;
nsresult nsres;
@@ -661,16 +660,8 @@ void get_editor_controller(NSContainer *This)
This->editor_controller = NULL;
}
- nsres = nsIWebBrowser_QueryInterface(This->webbrowser,
- &IID_nsIInterfaceRequestor, (void**)&iface_req);
- if(NS_FAILED(nsres)) {
- ERR("Could not get nsIInterfaceRequestor: %08x\n", nsres);
- return;
- }
-
- nsres = nsIInterfaceRequestor_GetInterface(iface_req, &IID_nsIEditingSession,
- (void**)&editing_session);
- nsIInterfaceRequestor_Release(iface_req);
+ nsres = get_nsinterface((nsISupports*)This->webbrowser, &IID_nsIEditingSession,
+ (void**)&editing_session);
if(NS_FAILED(nsres)) {
ERR("Could not get nsIEditingSession: %08x\n", nsres);
return;
@@ -702,22 +693,13 @@ void get_editor_controller(NSContainer *This)
void set_ns_editmode(NSContainer *This)
{
- nsIInterfaceRequestor *iface_req;
nsIEditingSession *editing_session = NULL;
nsIURIContentListener *listener = NULL;
nsIDOMWindow *dom_window = NULL;
nsresult nsres;
- nsres = nsIWebBrowser_QueryInterface(This->webbrowser,
- &IID_nsIInterfaceRequestor, (void**)&iface_req);
- if(NS_FAILED(nsres)) {
- ERR("Could not get nsIInterfaceRequestor: %08x\n", nsres);
- return;
- }
-
- nsres = nsIInterfaceRequestor_GetInterface(iface_req, &IID_nsIEditingSession,
- (void**)&editing_session);
- nsIInterfaceRequestor_Release(iface_req);
+ nsres = get_nsinterface((nsISupports*)This->webbrowser, &IID_nsIEditingSession,
+ (void**)&editing_session);
if(NS_FAILED(nsres)) {
ERR("Could not get nsIEditingSession: %08x\n", nsres);
return;
More information about the wine-cvs
mailing list