Jacek Caban : ieframe: Moved travellog to its own struct.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 15937c99eb85aaafe764898aaa5a0896ac7f0f26
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=15937c99eb85aaafe764898aaa...

Author: Jacek Caban 
Date:   Tue Apr  2 17:39:07 2013 +0200

ieframe: Moved travellog to its own struct.

---

dlls/ieframe/dochost.c  |   30 +++++++++++++++---------------
 dlls/ieframe/ieframe.h  |   10 ++++++----
 dlls/ieframe/navigate.c |    4 ++--
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c
index 1b10fb4..c910c74 100644
--- a/dlls/ieframe/dochost.c
+++ b/dlls/ieframe/dochost.c
@@ -331,33 +331,33 @@ static void update_travellog(DocHost *This)
 {
     travellog_entry_t *new_entry;

-    if(!This->travellog) {
-        This->travellog = heap_alloc(4 * sizeof(*This->travellog));
-        if(!This->travellog)
+    if(!This->travellog.log) {
+        This->travellog.log = heap_alloc(4 * sizeof(*This->travellog.log));
+        if(!This->travellog.log)
             return;

-        This->travellog_size = 4;
-    }else if(This->travellog_size < This->travellog_position+1) {
+        This->travellog.size = 4;
+    }else if(This->travellog.size < This->travellog.position+1) {
         travellog_entry_t *new_travellog;

-        new_travellog = heap_realloc(This->travellog, This->travellog_size*2*sizeof(*This->travellog));
+        new_travellog = heap_realloc(This->travellog.log, This->travellog.size*2*sizeof(*This->travellog.log));
         if(!new_travellog)
             return;

-        This->travellog = new_travellog;
-        This->travellog_size *= 2;
+        This->travellog.log = new_travellog;
+        This->travellog.size *= 2;
     }

-    while(This->travellog_length > This->travellog_position)
-        heap_free(This->travellog[--This->travellog_length].url);
+    while(This->travellog.length > This->travellog.position)
+        heap_free(This->travellog.log[--This->travellog.length].url);

-    new_entry = This->travellog + This->travellog_position;
+    new_entry = This->travellog.log + This->travellog.position;

new_entry->url = heap_strdupW(This->url);
     if(!new_entry->url)
         return;

-    This->travellog_position++;
+    This->travellog.position++;
 }

void create_doc_view_hwnd(DocHost *This)
@@ -994,9 +994,9 @@ void DocHost_Release(DocHost *This)

ConnectionPointContainer_Destroy(&This->cps);

-    while(This->travellog_length)
-        heap_free(This->travellog[--This->travellog_length].url);
-    heap_free(This->travellog);
+    while(This->travellog.length)
+        heap_free(This->travellog.log[--This->travellog.length].url);
+    heap_free(This->travellog.log);

heap_free(This->url);
 }
diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h
index 0c13c82..a20afbc5 100644
--- a/dlls/ieframe/ieframe.h
+++ b/dlls/ieframe/ieframe.h
@@ -153,10 +153,12 @@ struct DocHost {
     ShellBrowser *browser_service;
     IShellUIHelper2 *shell_ui_helper;

-    travellog_entry_t *travellog;
-    unsigned travellog_size;
-    unsigned travellog_length;
-    unsigned travellog_position;
+    struct {
+        travellog_entry_t *log;
+        unsigned size;
+        unsigned length;
+        unsigned position;
+    } travellog;

ConnectionPointContainer cps;
     IEHTMLWindow html_window;
diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c
index 3a35acf..42d0c85 100644
--- a/dlls/ieframe/navigate.c
+++ b/dlls/ieframe/navigate.c
@@ -1063,12 +1063,12 @@ HRESULT go_back(DocHost *This)
     WCHAR *url;
     HRESULT hres;

-    if(!This->travellog_position) {
+    if(!This->travellog.position) {
         WARN("No history available\n");
         return E_FAIL;
     }

-    url = This->travellog[--This->travellog_position].url;
+    url = This->travellog.log[--This->travellog.position].url;

if(This->doc_navigate) {
         hres = async_doc_navigate(This, url, NULL, NULL, 0, FALSE);