ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Move mime to HTMLDocumentObj.

Browse Source
This commit is contained in:
Jacek Caban 2009-09-16 22:12:56 +02:00 committed by Alexandre Julliard
parent 05d199474b
commit 23e7fe481b
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/mshtml/htmldoc.c
View File

@ -1763,7 +1763,6 @@ static void destroy_htmldoc(HTMLDocument *This)
if(This->event_target) if(This->event_target)
release_event_target(This->event_target); release_event_target(This->event_target);
heap_free(This->mime);
release_nodes(This); release_nodes(This);
release_dispex(&This->dispex); release_dispex(&This->dispex);
@ -1894,6 +1893,7 @@ static ULONG HTMLDocumentObj_Release(HTMLDocument *base)
if(This->hwnd) if(This->hwnd)
DestroyWindow(This->hwnd); DestroyWindow(This->hwnd);
heap_free(This->mime);
destroy_htmldoc(&This->basedoc); destroy_htmldoc(&This->basedoc);

3
dlls/mshtml/mshtml_private.h
View File

@ -284,8 +284,6 @@ struct HTMLDocument {
HTMLWindow *window; HTMLWindow *window;
nsIDOMHTMLDocument *nsdoc; nsIDOMHTMLDocument *nsdoc;
LPWSTR mime;
DWORD update; DWORD update;
event_target_t *event_target; event_target_t *event_target;
@ -350,6 +348,7 @@ struct HTMLDocumentObj {
USERMODE usermode; USERMODE usermode;
READYSTATE readystate; READYSTATE readystate;
LPWSTR mime;
/* FIXME: probably should be in document node object */ /* FIXME: probably should be in document node object */
nsChannelBSC *bscallback; nsChannelBSC *bscallback;

4
dlls/mshtml/nsio.c
View File

@ -708,9 +708,9 @@ static nsresult async_open_doc_uri(nsChannel *This, NSContainer *container,
if(container->bscallback) { if(container->bscallback) {
channelbsc_set_channel(container->bscallback, This, listener, context); 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); 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; return NS_OK;

4
dlls/mshtml/persist.c
View File

@ -370,8 +370,8 @@ static HRESULT WINAPI MonikerProp_PutProperty(IMonikerProp *iface, MONIKERPROPER
switch(mkp) { switch(mkp) {
case MIMETYPEPROP: case MIMETYPEPROP:
heap_free(This->mime); heap_free(This->doc_obj->mime);
This->mime = heap_strdupW(val); This->doc_obj->mime = heap_strdupW(val);
break; break;
case CLASSIDPROP: case CLASSIDPROP: