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
23e7fe48
Commit
23e7fe48
authored
Sep 16, 2009
by
Jacek Caban
Committed by
Alexandre Julliard
Sep 17, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Move mime to HTMLDocumentObj.
parent
05d19947
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
7 deletions
+6
-7
htmldoc.c
dlls/mshtml/htmldoc.c
+1
-1
mshtml_private.h
dlls/mshtml/mshtml_private.h
+1
-2
nsio.c
dlls/mshtml/nsio.c
+2
-2
persist.c
dlls/mshtml/persist.c
+2
-2
No files found.
dlls/mshtml/htmldoc.c
View file @
23e7fe48
...
...
@@ -1763,7 +1763,6 @@ static void destroy_htmldoc(HTMLDocument *This)
if
(
This
->
event_target
)
release_event_target
(
This
->
event_target
);
heap_free
(
This
->
mime
);
release_nodes
(
This
);
release_dispex
(
&
This
->
dispex
);
...
...
@@ -1894,6 +1893,7 @@ static ULONG HTMLDocumentObj_Release(HTMLDocument *base)
if
(
This
->
hwnd
)
DestroyWindow
(
This
->
hwnd
);
heap_free
(
This
->
mime
);
destroy_htmldoc
(
&
This
->
basedoc
);
...
...
dlls/mshtml/mshtml_private.h
View file @
23e7fe48
...
...
@@ -284,8 +284,6 @@ struct HTMLDocument {
HTMLWindow
*
window
;
nsIDOMHTMLDocument
*
nsdoc
;
LPWSTR
mime
;
DWORD
update
;
event_target_t
*
event_target
;
...
...
@@ -350,6 +348,7 @@ struct HTMLDocumentObj {
USERMODE
usermode
;
READYSTATE
readystate
;
LPWSTR
mime
;
/* FIXME: probably should be in document node object */
nsChannelBSC
*
bscallback
;
...
...
dlls/mshtml/nsio.c
View file @
23e7fe48
...
...
@@ -708,9 +708,9 @@ static nsresult async_open_doc_uri(nsChannel *This, NSContainer *container,
if
(
container
->
bscallback
)
{
channelbsc_set_channel
(
container
->
bscallback
,
This
,
listener
,
context
);
if
(
container
->
doc
&&
container
->
doc
->
basedoc
.
mime
)
{
if
(
container
->
doc
&&
container
->
doc
->
mime
)
{
heap_free
(
This
->
content_type
);
This
->
content_type
=
heap_strdupWtoA
(
container
->
doc
->
basedoc
.
mime
);
This
->
content_type
=
heap_strdupWtoA
(
container
->
doc
->
mime
);
}
return
NS_OK
;
...
...
dlls/mshtml/persist.c
View file @
23e7fe48
...
...
@@ -370,8 +370,8 @@ static HRESULT WINAPI MonikerProp_PutProperty(IMonikerProp *iface, MONIKERPROPER
switch
(
mkp
)
{
case
MIMETYPEPROP
:
heap_free
(
This
->
mime
);
This
->
mime
=
heap_strdupW
(
val
);
heap_free
(
This
->
doc_obj
->
mime
);
This
->
doc_obj
->
mime
=
heap_strdupW
(
val
);
break
;
case
CLASSIDPROP
:
...
...
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