Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
87e04f2f
Commit
87e04f2f
authored
Mar 06, 2006
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 06, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shdocvw: Added get_LocationURL implementation.
parent
d6d76870
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
7 deletions
+21
-7
navigate.c
dlls/shdocvw/navigate.c
+10
-5
webbrowser.c
dlls/shdocvw/webbrowser.c
+11
-2
No files found.
dlls/shdocvw/navigate.c
View file @
87e04f2f
...
...
@@ -315,7 +315,7 @@ static IBindStatusCallback *create_callback(WebBrowser *This, PBYTE post_data,
return
BINDSC
(
ret
);
}
static
void
on_before_navigate2
(
WebBrowser
*
This
,
PBYTE
post_data
,
ULONG
post_data_len
,
static
void
on_before_navigate2
(
WebBrowser
*
This
,
LPWSTR
url
,
PBYTE
post_data
,
ULONG
post_data_len
,
LPWSTR
headers
,
VARIANT_BOOL
*
cancel
)
{
VARIANT
var_url
,
var_flags
,
var_frame_name
,
var_post_data
,
var_post_data2
,
var_headers
;
...
...
@@ -366,13 +366,14 @@ static void on_before_navigate2(WebBrowser *This, PBYTE post_data, ULONG post_da
V_VT
(
params
+
5
)
=
(
VT_BYREF
|
VT_VARIANT
);
V_VARIANTREF
(
params
+
5
)
=
&
var_url
;
V_VT
(
&
var_url
)
=
VT_BSTR
;
V_BSTR
(
&
var_url
)
=
SysAllocString
(
This
->
url
);
V_BSTR
(
&
var_url
)
=
SysAllocString
(
url
);
V_VT
(
params
+
6
)
=
(
VT_DISPATCH
);
V_DISPATCH
(
params
+
6
)
=
(
IDispatch
*
)
WEBBROWSER2
(
This
);
call_sink
(
This
->
cp_wbe2
,
DISPID_BEFORENAVIGATE2
,
&
dispparams
);
SysFreeString
(
V_BSTR
(
&
var_url
));
if
(
post_data_len
)
SafeArrayDestroy
(
V_ARRAY
(
&
var_post_data
));
}
...
...
@@ -472,6 +473,7 @@ HRESULT navigate_hlink(WebBrowser *This, IMoniker *mon, IBindCtx *bindctx,
IBindStatusCallback
*
callback
)
{
IHttpNegotiate
*
http_negotiate
;
LPWSTR
url
=
NULL
;
PBYTE
post_data
=
NULL
;
ULONG
post_data_len
=
0
;
LPWSTR
headers
=
NULL
;
...
...
@@ -480,8 +482,8 @@ HRESULT navigate_hlink(WebBrowser *This, IMoniker *mon, IBindCtx *bindctx,
DWORD
bindf
=
0
;
HRESULT
hres
;
IMoniker_GetDisplayName
(
mon
,
NULL
,
NULL
,
&
This
->
url
);
TRACE
(
"navigating to %s
\n
"
,
debugstr_w
(
This
->
url
));
IMoniker_GetDisplayName
(
mon
,
NULL
,
NULL
,
&
url
);
TRACE
(
"navigating to %s
\n
"
,
debugstr_w
(
url
));
hres
=
IBindStatusCallback_QueryInterface
(
callback
,
&
IID_IHttpNegotiate
,
(
void
**
)
&
http_negotiate
);
...
...
@@ -504,16 +506,19 @@ HRESULT navigate_hlink(WebBrowser *This, IMoniker *mon, IBindCtx *bindctx,
post_data
=
bindinfo
.
stgmedData
.
u
.
hGlobal
;
}
on_before_navigate2
(
This
,
post_data
,
post_data_len
,
headers
,
&
cancel
);
on_before_navigate2
(
This
,
url
,
post_data
,
post_data_len
,
headers
,
&
cancel
);
CoTaskMemFree
(
headers
);
ReleaseBindInfo
(
&
bindinfo
);
if
(
cancel
)
{
FIXME
(
"navigation canceled
\n
"
);
CoTaskMemFree
(
url
);
return
S_OK
;
}
This
->
url
=
url
;
return
navigate
(
This
,
mon
,
bindctx
,
callback
);
}
...
...
dlls/shdocvw/webbrowser.c
View file @
87e04f2f
...
...
@@ -351,8 +351,17 @@ static HRESULT WINAPI WebBrowser_get_LocationName(IWebBrowser2 *iface, BSTR *Loc
static
HRESULT
WINAPI
WebBrowser_get_LocationURL
(
IWebBrowser2
*
iface
,
BSTR
*
LocationURL
)
{
WebBrowser
*
This
=
WEBBROWSER_THIS
(
iface
);
FIXME
(
"(%p)->(%p)
\n
"
,
This
,
LocationURL
);
return
E_NOTIMPL
;
if
(
!
This
->
url
)
{
static
const
WCHAR
null_char
=
0
;
*
LocationURL
=
SysAllocString
(
&
null_char
);
return
S_FALSE
;
}
*
LocationURL
=
SysAllocString
(
This
->
url
);
return
S_OK
;
}
static
HRESULT
WINAPI
WebBrowser_get_Busy
(
IWebBrowser2
*
iface
,
VARIANT_BOOL
*
pBool
)
...
...
@@ -543,7 +552,7 @@ static HRESULT WINAPI WebBrowser_Navigate2(IWebBrowser2 *iface, VARIANT *URL, VA
return
E_INVALIDARG
;
headers
=
V_BSTR
(
Headers
);
FIXM
E
(
"Headers: %s
\n
"
,
debugstr_w
(
headers
));
TRAC
E
(
"Headers: %s
\n
"
,
debugstr_w
(
headers
));
}
if
(
!
This
->
doc_view_hwnd
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment