Jacek Caban : mshtml: Call set_current_uri in navigate_proc.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 01949aead45a4062e6b2acc6d1bcf109ab70718e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=01949aead45a4062e6b2acc6d1...

Author: Jacek Caban 
Date:   Thu Nov  8 18:16:59 2012 +0100

mshtml: Call set_current_uri in navigate_proc.

---

dlls/mshtml/navigate.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index 06d1207..e2eecef 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -1949,6 +1949,7 @@ typedef struct {
     HTMLOuterWindow *window;
     nsChannelBSC *bscallback;
     IMoniker *mon;
+    IUri *uri;
 } navigate_task_t;

static void navigate_proc(task_t *_task)
@@ -1959,6 +1960,7 @@ static void navigate_proc(task_t *_task)
     hres = set_moniker(&task->window->doc_obj->basedoc, task->mon, NULL, task->bscallback, TRUE);
     if(SUCCEEDED(hres)) {
         set_current_mon(task->window, task->bscallback->bsc.mon);
+        set_current_uri(task->window, task->uri);
         start_binding(task->window->pending_window, &task->bscallback->bsc, NULL);
     }
 }
@@ -1969,6 +1971,7 @@ static void navigate_task_destr(task_t *_task)

IBindStatusCallback_Release(&task->bscallback->bsc.IBindStatusCallback_iface);
     IMoniker_Release(task->mon);
+    IUri_Release(task->uri);
     heap_free(task);
 }

@@ -2109,6 +2112,9 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, const WCHAR *headers,
         task->window = window;
         task->bscallback = bsc;
         task->mon = mon;
+
+        IUri_AddRef(uri);
+        task->uri = uri;
         hres = push_task(&task->header, navigate_proc, navigate_task_destr, window->task_magic);
     }else {
         navigate_javascript_task_t *task;