Jacek Caban : mshtml: Move update flags to HTMLDocumentObj.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 95080eac65f9ec326870aab2f07d636e31381ace
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=95080eac65f9ec326870aab2f0...

Author: Jacek Caban 
Date:   Wed Sep 16 22:13:13 2009 +0200

mshtml: Move update flags to HTMLDocumentObj.

---

dlls/mshtml/mshtml_private.h |    4 ++--
 dlls/mshtml/view.c           |   16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index d5fcd8d..699054a 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -284,8 +284,6 @@ struct HTMLDocument {
     HTMLWindow *window;
     nsIDOMHTMLDocument *nsdoc;

-    DWORD update;
-
     event_target_t *event_target;
     ConnectionPointContainer cp_container;
     ConnectionPoint cp_htmldocevents;
@@ -350,6 +348,8 @@ struct HTMLDocumentObj {
     READYSTATE readystate;
     LPWSTR mime;

+    DWORD update;
+
     /* FIXME: probably should be in document node object */
     nsChannelBSC *bscallback;
     IMoniker *mon;
diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c
index ff28995..0d1d055 100644
--- a/dlls/mshtml/view.c
+++ b/dlls/mshtml/view.c
@@ -97,10 +97,10 @@ static void activate_gecko(NSContainer *This)

void update_doc(HTMLDocument *This, DWORD flags)
 {
-    if(!This->update && This->doc_obj->hwnd)
+    if(!This->doc_obj->update && This->doc_obj->hwnd)
         SetTimer(This->doc_obj->hwnd, TIMER_ID, 100, NULL);

-    This->update |= flags;
+    This->doc_obj->update |= flags;
 }

void update_title(HTMLDocumentObj *This)
@@ -108,10 +108,10 @@ void update_title(HTMLDocumentObj *This)
     IOleCommandTarget *olecmd;
     HRESULT hres;

-    if(!(This->basedoc.update & UPDATE_TITLE))
+    if(!(This->update & UPDATE_TITLE))
         return;

-    This->basedoc.update &= ~UPDATE_TITLE;
+    This->update &= ~UPDATE_TITLE;

if(!This->client)
         return;
@@ -133,14 +133,14 @@ void update_title(HTMLDocumentObj *This)

static LRESULT on_timer(HTMLDocumentObj *This)
 {
-    TRACE("(%p) %x\n", This, This->basedoc.update);
+    TRACE("(%p) %x\n", This, This->update);

KillTimer(This->hwnd, TIMER_ID);

-    if(!This->basedoc.update)
+    if(!This->update)
         return 0;

-    if(This->basedoc.update & UPDATE_UI) {
+    if(This->update & UPDATE_UI) {
         if(This->hostui)
             IDocHostUIHandler_UpdateUI(This->hostui);

@@ -159,7 +159,7 @@ static LRESULT on_timer(HTMLDocumentObj *This)
     }

update_title(This);
-    This->basedoc.update = 0;
+    This->update = 0;
     return 0;
 }