Jacek Caban : mshtml: Move hlink_frame_navigate function.
Alexandre Julliard
julliard at winehq.org
Mon Mar 24 07:54:48 CDT 2008
Module: wine
Branch: master
Commit: 6738db5af2dcdc4c61d9f20f9d889f8965537121
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6738db5af2dcdc4c61d9f20f9d889f8965537121
Author: Jacek Caban <jacek at codeweavers.com>
Date: Sun Mar 23 02:16:36 2008 +0100
mshtml: Move hlink_frame_navigate function.
---
dlls/mshtml/navigate.c | 98 ++++++++++++++++++++++++------------------------
1 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index 2349178..2f15313 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -816,55 +816,6 @@ static void parse_post_data(nsIInputStream *post_data_stream, LPWSTR *headers_re
*post_data_len_ret = post_data_len;
}
-void hlink_frame_navigate(HTMLDocument *doc, IHlinkFrame *hlink_frame,
- LPCWSTR uri, nsIInputStream *post_data_stream, DWORD hlnf)
-{
- BSCallback *callback;
- IBindCtx *bindctx;
- IMoniker *mon;
- IHlink *hlink;
- HRESULT hr;
-
- callback = create_channelbsc(NULL);
-
- if(post_data_stream) {
- parse_post_data(post_data_stream, &callback->headers, &callback->post_data,
- &callback->post_data_len);
- TRACE("headers = %s post_data = %s\n", debugstr_w(callback->headers),
- debugstr_an(callback->post_data, callback->post_data_len));
- }
-
- hr = CreateAsyncBindCtx(0, STATUSCLB(callback), NULL, &bindctx);
- if (FAILED(hr)) {
- IBindStatusCallback_Release(STATUSCLB(callback));
- return;
- }
-
- hr = CoCreateInstance(&CLSID_StdHlink, NULL, CLSCTX_INPROC_SERVER, &IID_IHlink, (LPVOID*)&hlink);
- if (FAILED(hr)) {
- IBindCtx_Release(bindctx);
- IBindStatusCallback_Release(STATUSCLB(callback));
- return;
- }
-
- hr = CreateURLMoniker(NULL, uri, &mon);
- if (SUCCEEDED(hr)) {
- IHlink_SetMonikerReference(hlink, 0, mon, NULL);
-
- if(hlnf & HLNF_OPENINNEWWINDOW) {
- static const WCHAR wszBlank[] = {'_','b','l','a','n','k',0};
- IHlink_SetTargetFrameName(hlink, wszBlank); /* FIXME */
- }
-
- IHlinkFrame_Navigate(hlink_frame, hlnf, bindctx, STATUSCLB(callback), hlink);
-
- IMoniker_Release(mon);
- }
-
- IBindCtx_Release(bindctx);
- IBindStatusCallback_Release(STATUSCLB(callback));
-}
-
HRESULT start_binding(HTMLDocument *doc, BSCallback *bscallback, IBindCtx *bctx)
{
IStream *str = NULL;
@@ -965,3 +916,52 @@ void channelbsc_set_channel(BSCallback *This, nsChannel *channel, nsIStreamListe
This->nscontext = context;
}
}
+
+void hlink_frame_navigate(HTMLDocument *doc, IHlinkFrame *hlink_frame,
+ LPCWSTR uri, nsIInputStream *post_data_stream, DWORD hlnf)
+{
+ BSCallback *callback;
+ IBindCtx *bindctx;
+ IMoniker *mon;
+ IHlink *hlink;
+ HRESULT hr;
+
+ callback = create_channelbsc(NULL);
+
+ if(post_data_stream) {
+ parse_post_data(post_data_stream, &callback->headers, &callback->post_data,
+ &callback->post_data_len);
+ TRACE("headers = %s post_data = %s\n", debugstr_w(callback->headers),
+ debugstr_an(callback->post_data, callback->post_data_len));
+ }
+
+ hr = CreateAsyncBindCtx(0, STATUSCLB(callback), NULL, &bindctx);
+ if (FAILED(hr)) {
+ IBindStatusCallback_Release(STATUSCLB(callback));
+ return;
+ }
+
+ hr = CoCreateInstance(&CLSID_StdHlink, NULL, CLSCTX_INPROC_SERVER, &IID_IHlink, (LPVOID*)&hlink);
+ if (FAILED(hr)) {
+ IBindCtx_Release(bindctx);
+ IBindStatusCallback_Release(STATUSCLB(callback));
+ return;
+ }
+
+ hr = CreateURLMoniker(NULL, uri, &mon);
+ if (SUCCEEDED(hr)) {
+ IHlink_SetMonikerReference(hlink, 0, mon, NULL);
+
+ if(hlnf & HLNF_OPENINNEWWINDOW) {
+ static const WCHAR wszBlank[] = {'_','b','l','a','n','k',0};
+ IHlink_SetTargetFrameName(hlink, wszBlank); /* FIXME */
+ }
+
+ IHlinkFrame_Navigate(hlink_frame, hlnf, bindctx, STATUSCLB(callback), hlink);
+
+ IMoniker_Release(mon);
+ }
+
+ IBindCtx_Release(bindctx);
+ IBindStatusCallback_Release(STATUSCLB(callback));
+}
More information about the wine-cvs
mailing list