mshtml: Rename NSContainer to GeckoBrowser.

dlls/mshtml/editor.c

@@ -113,7 +113,7 @@ void set_dirty(HTMLDocument *This, VARIANT_BOOL dirty)
     }
 }
 
-static void do_ns_editor_command(NSContainer *This, const char *cmd)
+static void do_ns_editor_command(GeckoBrowser *This, const char *cmd)
 {
     nsresult nsres;
 
@@ -125,7 +125,7 @@ static void do_ns_editor_command(NSContainer *This, const char *cmd)
         ERR("DoCommand(%s) failed: %08x\n", debugstr_a(cmd), nsres);
 }
 
-static nsresult get_ns_command_state(NSContainer *This, const char *cmd, nsICommandParams *nsparam)
+static nsresult get_ns_command_state(GeckoBrowser *This, const char *cmd, nsICommandParams *nsparam)
 {
     nsICommandManager *cmdmgr;
     nsresult nsres;

dlls/mshtml/htmldoc.c

@@ -5325,7 +5325,7 @@ static ULONG WINAPI HTMLDocumentObj_Release(IUnknown *iface)
         release_dispex(&This->dispex);
 
         if(This->nscontainer)
-            NSContainer_Release(This->nscontainer);
+            detach_gecko_browser(This->nscontainer);
         heap_free(This);
 
         /* Force cycle collection */
@@ -5456,7 +5456,7 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii
 
     HTMLDocument_View_Init(doc);
 
-    hres = create_nscontainer(doc, &doc->nscontainer);
+    hres = create_gecko_browser(doc, &doc->nscontainer);
     if(FAILED(hres)) {
         ERR("Failed to init Gecko, returning CLASS_E_CLASSNOTAVAILABLE\n");
         htmldoc_release(&doc->basedoc);

dlls/mshtml/mshtml_private.h

@@ -378,7 +378,7 @@ typedef struct HTMLOuterWindow HTMLOuterWindow;
 typedef struct HTMLDocumentNode HTMLDocumentNode;
 typedef struct HTMLDocumentObj HTMLDocumentObj;
 typedef struct HTMLFrameBase HTMLFrameBase;
-typedef struct NSContainer NSContainer;
+typedef struct GeckoBrowser GeckoBrowser;
 typedef struct HTMLAttributeCollection HTMLAttributeCollection;
 
 typedef enum {
@@ -654,7 +654,7 @@ struct HTMLDocumentObj {
 
     LONG ref;
 
-    NSContainer *nscontainer;
+    GeckoBrowser *nscontainer;
 
     IOleClientSite *client;
     IDocHostUIHandler *hostui;
@@ -698,7 +698,7 @@ struct HTMLDocumentObj {
 
 typedef struct nsWeakReference nsWeakReference;
 
-struct NSContainer {
+struct GeckoBrowser {
     nsIWebBrowserChrome      nsIWebBrowserChrome_iface;
     nsIContextMenuListener   nsIContextMenuListener_iface;
     nsIURIContentListener    nsIURIContentListener_iface;
@@ -895,8 +895,8 @@ HRESULT HTMLCurrentStyle_Create(HTMLElement*,IHTMLCurrentStyle**) DECLSPEC_HIDDE
 void ConnectionPointContainer_Init(ConnectionPointContainer*,IUnknown*,const cpc_entry_t*) DECLSPEC_HIDDEN;
 void ConnectionPointContainer_Destroy(ConnectionPointContainer*) DECLSPEC_HIDDEN;
 
-HRESULT create_nscontainer(HTMLDocumentObj*,NSContainer**) DECLSPEC_HIDDEN;
-void NSContainer_Release(NSContainer*) DECLSPEC_HIDDEN;
+HRESULT create_gecko_browser(HTMLDocumentObj*,GeckoBrowser**) DECLSPEC_HIDDEN;
+void detach_gecko_browser(GeckoBrowser*) DECLSPEC_HIDDEN;
 
 compat_mode_t lock_document_mode(HTMLDocumentNode*) DECLSPEC_HIDDEN;
 
@@ -923,8 +923,8 @@ void register_nsservice(nsIComponentRegistrar*,nsIServiceManager*) DECLSPEC_HIDD
 void init_nsio(nsIComponentManager*) DECLSPEC_HIDDEN;
 void release_nsio(void) DECLSPEC_HIDDEN;
 BOOL is_gecko_path(const char*) DECLSPEC_HIDDEN;
-void set_viewer_zoom(NSContainer*,float) DECLSPEC_HIDDEN;
-float get_viewer_zoom(NSContainer*) DECLSPEC_HIDDEN;
+void set_viewer_zoom(GeckoBrowser*,float) DECLSPEC_HIDDEN;
+float get_viewer_zoom(GeckoBrowser*) DECLSPEC_HIDDEN;
 
 void init_node_cc(void) DECLSPEC_HIDDEN;
 
@@ -953,7 +953,7 @@ HRESULT return_nsform(nsresult,nsIDOMHTMLFormElement*,IHTMLFormElement**) DECLSP
 
 nsICommandParams *create_nscommand_params(void) DECLSPEC_HIDDEN;
 HRESULT nsnode_to_nsstring(nsIDOMNode*,nsAString*) DECLSPEC_HIDDEN;
-void get_editor_controller(NSContainer*) DECLSPEC_HIDDEN;
+void get_editor_controller(GeckoBrowser*) DECLSPEC_HIDDEN;
 nsresult get_nsinterface(nsISupports*,REFIID,void**) DECLSPEC_HIDDEN;
 nsIWritableVariant *create_nsvariant(void) DECLSPEC_HIDDEN;
 nsIXMLHttpRequest *create_nsxhr(nsIDOMWindow *nswindow) DECLSPEC_HIDDEN;

dlls/mshtml/nsevents.c

@@ -119,7 +119,7 @@ static nsrefcnt NSAPI nsDOMEventListener_Release(nsIDOMEventListener *iface)
     return release_listener(This->This);
 }
 
-static BOOL is_doc_child_focus(NSContainer *nscontainer)
+static BOOL is_doc_child_focus(GeckoBrowser *nscontainer)
 {
     HWND hwnd;
 

dlls/mshtml/nsio.c

@@ -235,7 +235,7 @@ static BOOL exec_shldocvw_67(HTMLDocumentObj *doc, BSTR url)
     return TRUE;
 }
 
-static nsresult before_async_open(nsChannel *channel, NSContainer *container, BOOL *cancel)
+static nsresult before_async_open(nsChannel *channel, GeckoBrowser *container, BOOL *cancel)
 {
     HTMLDocumentObj *doc = container->doc;
     BSTR display_uri;

dlls/mshtml/view.c

@@ -66,7 +66,7 @@ static void paint_document(HTMLDocumentObj *This)
     EndPaint(This->hwnd, &ps);
 }
 
-static void activate_gecko(NSContainer *This)
+static void activate_gecko(GeckoBrowser *This)
 {
     TRACE("(%p) %p\n", This, This->window);