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
15937c99
Commit
15937c99
authored
Apr 02, 2013
by
Jacek Caban
Committed by
Alexandre Julliard
Apr 02, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ieframe: Moved travellog to its own struct.
parent
a792a5b4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
21 deletions
+23
-21
dochost.c
dlls/ieframe/dochost.c
+15
-15
ieframe.h
dlls/ieframe/ieframe.h
+6
-4
navigate.c
dlls/ieframe/navigate.c
+2
-2
No files found.
dlls/ieframe/dochost.c
View file @
15937c99
...
@@ -331,33 +331,33 @@ static void update_travellog(DocHost *This)
...
@@ -331,33 +331,33 @@ static void update_travellog(DocHost *This)
{
{
travellog_entry_t
*
new_entry
;
travellog_entry_t
*
new_entry
;
if
(
!
This
->
travellog
)
{
if
(
!
This
->
travellog
.
log
)
{
This
->
travellog
=
heap_alloc
(
4
*
sizeof
(
*
This
->
travel
log
));
This
->
travellog
.
log
=
heap_alloc
(
4
*
sizeof
(
*
This
->
travellog
.
log
));
if
(
!
This
->
travellog
)
if
(
!
This
->
travellog
.
log
)
return
;
return
;
This
->
travellog
_
size
=
4
;
This
->
travellog
.
size
=
4
;
}
else
if
(
This
->
travellog
_size
<
This
->
travellog_
position
+
1
)
{
}
else
if
(
This
->
travellog
.
size
<
This
->
travellog
.
position
+
1
)
{
travellog_entry_t
*
new_travellog
;
travellog_entry_t
*
new_travellog
;
new_travellog
=
heap_realloc
(
This
->
travellog
,
This
->
travellog_size
*
2
*
sizeof
(
*
This
->
travel
log
));
new_travellog
=
heap_realloc
(
This
->
travellog
.
log
,
This
->
travellog
.
size
*
2
*
sizeof
(
*
This
->
travellog
.
log
));
if
(
!
new_travellog
)
if
(
!
new_travellog
)
return
;
return
;
This
->
travellog
=
new_travellog
;
This
->
travellog
.
log
=
new_travellog
;
This
->
travellog
_
size
*=
2
;
This
->
travellog
.
size
*=
2
;
}
}
while
(
This
->
travellog
_length
>
This
->
travellog_
position
)
while
(
This
->
travellog
.
length
>
This
->
travellog
.
position
)
heap_free
(
This
->
travellog
[
--
This
->
travellog_
length
].
url
);
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
);
new_entry
->
url
=
heap_strdupW
(
This
->
url
);
if
(
!
new_entry
->
url
)
if
(
!
new_entry
->
url
)
return
;
return
;
This
->
travellog
_
position
++
;
This
->
travellog
.
position
++
;
}
}
void
create_doc_view_hwnd
(
DocHost
*
This
)
void
create_doc_view_hwnd
(
DocHost
*
This
)
...
@@ -994,9 +994,9 @@ void DocHost_Release(DocHost *This)
...
@@ -994,9 +994,9 @@ void DocHost_Release(DocHost *This)
ConnectionPointContainer_Destroy
(
&
This
->
cps
);
ConnectionPointContainer_Destroy
(
&
This
->
cps
);
while
(
This
->
travellog
_
length
)
while
(
This
->
travellog
.
length
)
heap_free
(
This
->
travellog
[
--
This
->
travellog_
length
].
url
);
heap_free
(
This
->
travellog
.
log
[
--
This
->
travellog
.
length
].
url
);
heap_free
(
This
->
travellog
);
heap_free
(
This
->
travellog
.
log
);
heap_free
(
This
->
url
);
heap_free
(
This
->
url
);
}
}
dlls/ieframe/ieframe.h
View file @
15937c99
...
@@ -153,10 +153,12 @@ struct DocHost {
...
@@ -153,10 +153,12 @@ struct DocHost {
ShellBrowser
*
browser_service
;
ShellBrowser
*
browser_service
;
IShellUIHelper2
*
shell_ui_helper
;
IShellUIHelper2
*
shell_ui_helper
;
travellog_entry_t
*
travellog
;
struct
{
unsigned
travellog_size
;
travellog_entry_t
*
log
;
unsigned
travellog_length
;
unsigned
size
;
unsigned
travellog_position
;
unsigned
length
;
unsigned
position
;
}
travellog
;
ConnectionPointContainer
cps
;
ConnectionPointContainer
cps
;
IEHTMLWindow
html_window
;
IEHTMLWindow
html_window
;
...
...
dlls/ieframe/navigate.c
View file @
15937c99
...
@@ -1063,12 +1063,12 @@ HRESULT go_back(DocHost *This)
...
@@ -1063,12 +1063,12 @@ HRESULT go_back(DocHost *This)
WCHAR
*
url
;
WCHAR
*
url
;
HRESULT
hres
;
HRESULT
hres
;
if
(
!
This
->
travellog
_
position
)
{
if
(
!
This
->
travellog
.
position
)
{
WARN
(
"No history available
\n
"
);
WARN
(
"No history available
\n
"
);
return
E_FAIL
;
return
E_FAIL
;
}
}
url
=
This
->
travellog
[
--
This
->
travellog_
position
].
url
;
url
=
This
->
travellog
.
log
[
--
This
->
travellog
.
position
].
url
;
if
(
This
->
doc_navigate
)
{
if
(
This
->
doc_navigate
)
{
hres
=
async_doc_navigate
(
This
,
url
,
NULL
,
NULL
,
0
,
FALSE
);
hres
=
async_doc_navigate
(
This
,
url
,
NULL
,
NULL
,
0
,
FALSE
);
...
...
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