September 2006 - Wine-commits

Marcus Meissner : ntdll: Avoid ebx being clobbered in exception handler.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 07d84bf656abf3c7b0e6be5f6170e41d70094a52 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=07d84bf656abf3c7b0e6be5… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Sep 25 06:43:41 2006 +0200 ntdll: Avoid ebx being clobbered in exception handler. --- dlls/ntdll/signal_i386.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 6ff7e39..44f47ec 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1481,7 +1481,7 @@ __ASM_GLOBAL_FUNC( DbgUserBreakPoint, "i __ASM_GLOBAL_FUNC( EXC_CallHandler, " pushl %ebp\n" " movl %esp, %ebp\n" -" subl $4,%esp\n" +" pushl %ebx\n" " movl 28(%ebp), %edx\n" /* ugly hack to pass the 6th param needed because of Shrinker */ " pushl 24(%ebp)\n" " pushl 20(%ebp)\n" @@ -1489,6 +1489,7 @@ __ASM_GLOBAL_FUNC( EXC_CallHandler, " pushl 12(%ebp)\n" " pushl 8(%ebp)\n" " call " __ASM_NAME("call_exception_handler") "\n" +" popl %ebx\n" " leave\n" " ret\n" );

1 0

Jacek Caban : mshtml: Set dwOptions in GetBindInfo to 0x80000 to make test pass.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: e15b5c70106573cd381a33d08858448cba35bc9f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e15b5c70106573cd381a33d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 24 23:43:29 2006 +0200 mshtml: Set dwOptions in GetBindInfo to 0x80000 to make test pass. --- dlls/mshtml/navigate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index d5a9242..efa5ff7 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -366,7 +366,7 @@ static HRESULT WINAPI BindStatusCallback pbindinfo->cbStgmedData = This->post_data_len; pbindinfo->dwCodePage = CP_UTF8; - pbindinfo->dwOptions = 0x00020000; + pbindinfo->dwOptions = 0x80000; if(This->post_data) { pbindinfo->dwBindVerb = BINDVERB_POST;

1 0

Jacek Caban : mshtml: Initialize url in OnStartURIOpen.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 06d9c5ca71e966c4d97a88465c952b8b71800ec2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=06d9c5ca71e966c4d97a884… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 24 23:41:50 2006 +0200 mshtml: Initialize url in OnStartURIOpen. --- dlls/mshtml/nsembed.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 1089164..cf5fe20 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -797,7 +797,7 @@ static nsresult NSAPI nsURIContentListen nsIWineURI_SetNSContainer(wine_uri, This); if(This->bscallback && This->bscallback->mon) { - LPWSTR url; + LPWSTR url = NULL; HRESULT hres; hres = IMoniker_GetDisplayName(This->bscallback->mon, NULL, 0, &url);

1 0

Jacek Caban : mshtml: Store BSCallback in HTMDocument.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: ccd339994766a01022abd5e2125e78918fc47175 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ccd339994766a01022abd5e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 24 23:39:55 2006 +0200 mshtml: Store BSCallback in HTMDocument. --- dlls/mshtml/htmldoc.c | 2 ++ dlls/mshtml/mshtml_private.h | 7 ++++++- dlls/mshtml/navigate.c | 22 ++++++++++++++++++++-- dlls/mshtml/nsio.c | 2 +- dlls/mshtml/persist.c | 5 ++++- 5 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 52c2c20..5ba1632 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -152,6 +152,8 @@ static ULONG WINAPI HTMLDocument_Release if(This->ipsite) IOleDocumentView_SetInPlaceSite(DOCVIEW(This), NULL); + set_document_bscallback(This, NULL); + if(This->tooltips_hwnd) DestroyWindow(This->tooltips_hwnd); if(This->hwnd) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6af2a8c..b71277b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -86,6 +86,8 @@ struct HTMLDocument { IOleInPlaceSite *ipsite; IOleInPlaceFrame *frame; + BSCallback *bscallback; + HWND hwnd; HWND tooltips_hwnd; @@ -176,6 +178,8 @@ struct BSCallback { IMoniker *mon; IBinding *binding; + HTMLDocument *doc; + nsProtocolStream *nsstream; }; @@ -314,8 +318,9 @@ void nsAString_Finish(nsAString*); nsIInputStream *create_nsstream(const char*,PRInt32); nsICommandParams *create_nscommand_params(void); -BSCallback *create_bscallback(HTMLDocument*,IMoniker*); +BSCallback *create_bscallback(IMoniker*); HRESULT start_binding(BSCallback*); +void set_document_bscallback(HTMLDocument*,BSCallback*); IHlink *Hlink_Create(void); IHTMLSelectionObject *HTMLSelectionObject_Create(nsISelection*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 15b38b6..9bb1c31 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -586,7 +586,7 @@ static const IServiceProviderVtbl Servic BSCServiceProvider_QueryService }; -BSCallback *create_bscallback(HTMLDocument *doc, IMoniker *mon) +BSCallback *create_bscallback(IMoniker *mon) { BSCallback *ret = mshtml_alloc(sizeof(BSCallback)); @@ -604,6 +604,7 @@ BSCallback *create_bscallback(HTMLDocume ret->nscontext = NULL; ret->nsstream = NULL; ret->binding = NULL; + ret->doc = NULL; if(mon) IMoniker_AddRef(mon); @@ -690,7 +691,7 @@ void hlink_frame_navigate(HTMLDocument * IMoniker *mon; IHlink *hlink; - callback = create_bscallback(doc, NULL); + callback = create_bscallback(NULL); if(post_data_stream) { parse_post_data(post_data_stream, &callback->headers, &callback->post_data, @@ -745,3 +746,20 @@ HRESULT start_binding(BSCallback *bscall bscallback->mon = NULL; return S_OK; } + +void set_document_bscallback(HTMLDocument *doc, BSCallback *callback) +{ + if(doc->bscallback) { + if(doc->bscallback->binding) + IBinding_Abort(doc->bscallback->binding); + doc->bscallback->doc = NULL; + IBindStatusCallback_Release(STATUSCLB(doc->bscallback)); + } + + doc->bscallback = callback; + + if(callback) { + IBindStatusCallback_AddRef(STATUSCLB(callback)); + callback->doc = doc; + } +} diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d643e35..24a70b5 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -668,7 +668,7 @@ static nsresult NSAPI nsChannel_AsyncOpe return NS_ERROR_UNEXPECTED; } - bscallback = create_bscallback(NULL, mon); + bscallback = create_bscallback(mon); IMoniker_Release(mon); nsIChannel_AddRef(NSCHANNEL(This)); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index c9baf7c..f2347a0 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -218,7 +218,7 @@ static HRESULT WINAPI PersistMoniker_Loa } } - bscallback = create_bscallback(This, pimkName); + bscallback = create_bscallback(pimkName); task = mshtml_alloc(sizeof(task_t)); @@ -260,6 +260,7 @@ static HRESULT WINAPI PersistMoniker_Loa if(pibc) FIXME("not supported pibc\n"); + set_document_bscallback(This, bscallback); hres = start_binding(bscallback); IBindStatusCallback_Release(STATUSCLB(bscallback)); @@ -508,4 +509,6 @@ void HTMLDocument_Persist_Init(HTMLDocum This->lpPersistFileVtbl = &PersistFileVtbl; This->lpMonikerPropVtbl = &MonikerPropVtbl; This->lpPersistStreamInitVtbl = &PersistStreamInitVtbl; + + This->bscallback = NULL; }

1 0

Jacek Caban : mshtml: Added PARSECOMPLETE task implementation.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: ac2aeb6e1721cd8a392d84d521678729b3f0cd73 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac2aeb6e1721cd8a392d84d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 24 23:40:32 2006 +0200 mshtml: Added PARSECOMPLETE task implementation. --- dlls/mshtml/navigate.c | 14 ++++++++++++++ dlls/mshtml/task.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 9bb1c31..d5a9242 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -333,6 +333,20 @@ static HRESULT WINAPI BindStatusCallback } } + if(This->doc) { + task_t *task = mshtml_alloc(sizeof(task_t)); + + task->doc = This->doc; + task->task_id = TASK_PARSECOMPLETE; + task->next = NULL; + + /* + * This should be done in the worker thread that parses HTML, + * but we don't have such thread (Gecko parses HTML for us). + */ + push_task(task); + } + return S_OK; } diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 6af1cda..8f2c21e 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -123,11 +123,54 @@ static void set_downloading(HTMLDocument } } +static void set_parsecomplete(HTMLDocument *doc) +{ + IOleCommandTarget *olecmd; + HRESULT hres; + + TRACE("(%p)\n", doc); + + call_property_onchanged(doc->cp_propnotif, 1005); + call_property_onchanged(doc->cp_propnotif, DISPID_READYSTATE); + + if(!doc->client) + return; + + hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd); + if(SUCCEEDED(hres)) { + VARIANT state, title, progress; + WCHAR empty[] = {0}; + + V_VT(&progress) = VT_I4; + V_I4(&progress) = 0; + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETPROGRESSPOS, OLECMDEXECOPT_DONTPROMPTUSER, + &progress, NULL); + + V_VT(&state) = VT_I4; + V_I4(&state) = 0; + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETDOWNLOADSTATE, OLECMDEXECOPT_DONTPROMPTUSER, + &state, NULL); + + IOleCommandTarget_Exec(olecmd, &CGID_MSHTML, IDM_PARSECOMPLETE, 0, NULL, NULL); + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_HTTPEQUIV_DONE, 0, NULL, NULL); + + V_VT(&title) = VT_BSTR; + V_BSTR(&title) = SysAllocString(empty); + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETTITLE, OLECMDEXECOPT_DONTPROMPTUSER, + &title, NULL); + SysFreeString(V_BSTR(&title)); + + IOleCommandTarget_Release(olecmd); + } +} + static void process_task(task_t *task) { switch(task->task_id) { case TASK_SETDOWNLOADSTATE: return set_downloading(task->doc); + case TASK_PARSECOMPLETE: + return set_parsecomplete(task->doc); default: ERR("Wrong task_id %d\n", task->task_id); }

1 0

Jacek Caban : mshtml: Remove FIXMEs and fix a typo.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 10d3feae3513360a91d02e14d6ff700f7dccd961 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=10d3feae3513360a91d02e1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 24 23:41:01 2006 +0200 mshtml: Remove FIXMEs and fix a typo. --- dlls/mshtml/persist.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index f2347a0..5b5f01c 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -253,13 +253,6 @@ static HRESULT WINAPI PersistMoniker_Loa } } - /* FIXME: Use grfMode */ - - if(fFullyAvailable) - FIXME("not supported fFullyAvailable\n"); - if(pibc) - FIXME("not supported pibc\n"); - set_document_bscallback(This, bscallback); hres = start_binding(bscallback); @@ -425,7 +418,7 @@ static const IPersistFileVtbl PersistFil PersistFile_GetCurFile }; -#define PERSTRINIT_THIS(iface) DEFINE_THIS(HTMLDocument, PersistStreamInit, iface); +#define PERSTRINIT_THIS(iface) DEFINE_THIS(HTMLDocument, PersistStreamInit, iface) static HRESULT WINAPI PersistStreamInit_QueryInterface(IPersistStreamInit *iface, REFIID riid, void **ppv)

1 0

Jacek Caban : mshtml: Store IBinding interface in BSCallback.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 7f107fb8daafdddd308b4880d86824c49631ad28 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7f107fb8daafdddd308b488… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 24 23:12:23 2006 +0200 mshtml: Store IBinding interface in BSCallback. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6cb6ce4..6af2a8c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -174,6 +174,7 @@ struct BSCallback { nsISupports *nscontext; IMoniker *mon; + IBinding *binding; nsProtocolStream *nsstream; }; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index c588f05..15b38b6 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -248,6 +248,8 @@ static ULONG WINAPI BindStatusCallback_R nsIInputStream_Release(NSINSTREAM(This->nsstream)); if(This->mon) IMoniker_Release(This->mon); + if(This->binding) + IBinding_Release(This->binding); mshtml_free(This->headers); mshtml_free(This); } @@ -259,7 +261,12 @@ static HRESULT WINAPI BindStatusCallback DWORD dwReserved, IBinding *pbind) { BSCallback *This = STATUSCLB_THIS(iface); - FIXME("(%p)->(%ld %p)\n", This, dwReserved, pbind); + + TRACE("(%p)->(%ld %p)\n", This, dwReserved, pbind); + + IBinding_AddRef(pbind); + This->binding = pbind; + return S_OK; } @@ -309,6 +316,9 @@ static HRESULT WINAPI BindStatusCallback TRACE("(%p)->(%08lx %s)\n", This, hresult, debugstr_w(szError)); + IBinding_Release(This->binding); + This->binding = NULL; + if(This->nslistener) { nsIStreamListener_OnStopRequest(This->nslistener, (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext, NS_OK); @@ -593,6 +603,7 @@ BSCallback *create_bscallback(HTMLDocume ret->nslistener = NULL; ret->nscontext = NULL; ret->nsstream = NULL; + ret->binding = NULL; if(mon) IMoniker_AddRef(mon);

1 0

Jonathan Ernst : dlls: Assorted French translation improvements.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 8fc83b1f46f325fd29def2c0442c86d1a65d47a0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8fc83b1f46f325fd29def2c… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Sep 25 14:59:10 2006 +0200 dlls: Assorted French translation improvements. --- dlls/devenum/devenum.rc | 9 +++++ dlls/shell32/shell32_Fr.rc | 82 ++++++++++++++++++++------------------------ 2 files changed, 46 insertions(+), 45 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index 35409c7..a8e4b80 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -43,6 +43,15 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT } STRINGTABLE DISCARDABLE +LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +{ + 7 "DirectSound par d�faut" + 8 "DirectSound�: %s" + 9 "P�riph�rique WaveOut par d�faut" + 10 "P�riph�rique MidiOut par d�faut" +} + +STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT { 7 "Standard DirectSound" diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index c8385b7..043c66c 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -3,6 +3,7 @@ * French language support * * Copyright 1998 Juergen Schmied + * Copyright 2006 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,8 +24,8 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL MENU_001 MENU DISCARDABLE BEGIN - MENUITEM "&Grands ic�nes", FCIDM_SHVIEW_BIGICON - MENUITEM "&Petits ic�nes", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Grandes ic�nes", FCIDM_SHVIEW_BIGICON + MENUITEM "&Petites ic�nes", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&D�tails", FCIDM_SHVIEW_REPORTVIEW END @@ -38,8 +39,8 @@ BEGIN BEGIN POPUP "&Affichage" BEGIN - MENUITEM "&Grands ic�nes", FCIDM_SHVIEW_BIGICON - MENUITEM "&Petits ic�nes", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Grandes ic�nes", FCIDM_SHVIEW_BIGICON + MENUITEM "&Petites ic�nes", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&D�tails", FCIDM_SHVIEW_REPORTVIEW END @@ -55,10 +56,10 @@ BEGIN END MENUITEM "Aligner les ic�nes", FCIDM_SHVIEW_SNAPTOGRID MENUITEM SEPARATOR - MENUITEM "Rafra�chir", FCIDM_SHVIEW_REFRESH + MENUITEM "Actualiser", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR MENUITEM "Coller", FCIDM_SHVIEW_INSERT - MENUITEM "Coller comme un lien", FCIDM_SHVIEW_INSERTLINK + MENUITEM "Coller comme lien", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR POPUP "Nouveau" BEGIN @@ -134,66 +135,57 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Parcourir...", 12288, 170, 63, 50, 14, WS_TABSTOP } -/* - special folders -*/ STRINGTABLE DISCARDABLE { + /* columns in the shellview */ + IDS_SHV_COLUMN1 "Fichier" + IDS_SHV_COLUMN2 "Taille" + IDS_SHV_COLUMN3 "Type" + IDS_SHV_COLUMN4 "Modifi�" + IDS_SHV_COLUMN5 "Attributs" + IDS_SHV_COLUMN6 "Capacit�" + IDS_SHV_COLUMN7 "Espace disponible" + IDS_SHV_COLUMN8 "Nom" + IDS_SHV_COLUMN9 "Commentaires" + IDS_SHV_COLUMN10 "Propri�taire" + IDS_SHV_COLUMN11 "Groupe" + IDS_SHV_COLUMN_DELFROM "Emplacement d'origine" + IDS_SHV_COLUMN_DELDATE "Date de suppression" + + /* special folders */ IDS_DESKTOP "Bureau" IDS_MYCOMPUTER "Poste de travail" -} + IDS_RECYCLEBIN_FOLDER_NAME "Corbeille" -/* - context menus -*/ -STRINGTABLE DISCARDABLE -{ - IDS_VIEW_LARGE "&Grands ic�nes" - IDS_VIEW_SMALL "&Petits ic�nes" + /* context menus */ + IDS_VIEW_LARGE "&Grandes ic�nes" + IDS_VIEW_SMALL "&Petites ic�nes" IDS_VIEW_LIST "&Liste" IDS_VIEW_DETAILS "&D�tails" IDS_SELECT "S�lectionner" IDS_OPEN "Ouvrir" -} -STRINGTABLE DISCARDABLE -{ IDS_CREATEFOLDER_DENIED "Impossible de cr�er le nouveau dossier : permission refus�e." IDS_CREATEFOLDER_CAPTION "Erreur lors de la cr�ation du nouveau dossier" IDS_DELETEITEM_CAPTION "Confirmer la suppression du fichier" IDS_DELETEFOLDER_CAPTION "Confirmer la suppression du dossier" IDS_DELETEITEM_TEXT "�tes-vous s�r de vouloir supprimer '%1'?" - IDS_DELETEMULTIPLE_TEXT "�tes-vous s�t de vouloir supprimer ces %1 items ?" - IDS_OVERWRITEFILE_TEXT "�craser le fichier %1?" + IDS_DELETEMULTIPLE_TEXT "�tes-vous s�r de vouloir supprimer ces %1 �l�ments ?" + IDS_DELETESELECTED_TEXT "�tes-vous s�r de vouloir supprimer le(les) �l�ment(s) s�l�ectionn�(s)�?" + IDS_TRASHITEM_TEXT "�tes-vous s�r de vouloir mettre ��%1�� dans la corbeille�?" + IDS_TRASHFOLDER_TEXT "�tes-vous s�r de vouloir mettre ��%1�� et tout ce qu'il contient dans la corbeille�?" + IDS_TRASHMULTIPLE_TEXT "�tes-vous s�r de vouloir mettre ces %1 �l�ments dans la corbeille�?" + IDS_CANTTRASH_TEXT "L'�l�ment ��%1�� ne peut pas �tre mis dans la corbeille. Souhaitez-vous le supprimer � la place�?" + IDS_OVERWRITEFILE_TEXT "�craser le fichier %1�?" IDS_OVERWRITEFILE_CAPTION "Confirmer l'�crasement du fichier" -} -/* columns in the shellview */ -STRINGTABLE -BEGIN - IDS_SHV_COLUMN1 "Fichier" - IDS_SHV_COLUMN2 "Taille" - IDS_SHV_COLUMN3 "Type" - IDS_SHV_COLUMN4 "Modifi�" - IDS_SHV_COLUMN5 "Attributs" - IDS_SHV_COLUMN6 "Capacit�" - IDS_SHV_COLUMN7 "Espace disponible" - IDS_SHV_COLUMN8 "Nom" - IDS_SHV_COLUMN9 "Commentaires" -END - -/* message box strings */ -STRINGTABLE DISCARDABLE -{ + /* message box strings */ IDS_RESTART_TITLE "Red�marrer" - IDS_RESTART_PROMPT "Voulez-vous simuler le red�marrage de Windows?" + IDS_RESTART_PROMPT "Voulez-vous simuler le red�marrage de Windows�?" IDS_SHUTDOWN_TITLE "Arr�ter" - IDS_SHUTDOWN_PROMPT "Voulez-vous fermer la session Wine?" -} + IDS_SHUTDOWN_PROMPT "Voulez-vous fermer la session Wine�?" /* shell folder path default values */ -STRINGTABLE DISCARDABLE -{ IDS_PROGRAMS "Menu D�marrer\\Programmes" IDS_PERSONAL "Mes documents" IDS_FAVORITES "Favoris"

1 0

Jacek Caban : mshtml: Create one "Internet Explorer_Hidden" window per thread.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: a14e2aaf97e638a46c56d618b08c7d9bf7b6885e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a14e2aaf97e638a46c56d61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 24 23:10:38 2006 +0200 mshtml: Create one "Internet Explorer_Hidden" window per thread. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/htmldoc.c | 3 + dlls/mshtml/main.c | 31 +++++++++++-- dlls/mshtml/mshtml_private.h | 16 ++++++- dlls/mshtml/task.c | 98 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/view.c | 32 -------------- 6 files changed, 140 insertions(+), 41 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index a6942ff..b3009b1 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -35,6 +35,7 @@ C_SRCS = \ protocol.c \ selection.c \ service.c \ + task.c \ txtrange.c \ view.c diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index c991e28..066e87d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -154,7 +154,6 @@ static ULONG WINAPI HTMLDocument_Release DestroyWindow(This->tooltips_hwnd); if(This->hwnd) DestroyWindow(This->hwnd); - DestroyWindow(This->hidden_hwnd); release_nodes(This); @@ -1093,5 +1092,7 @@ HRESULT HTMLDocument_Create(IUnknown *pU ret->nscontainer = NSContainer_Create(ret, NULL); + get_thread_hwnd(); + return hres; } diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index f713e27..d49a8d2 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -47,16 +47,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); HINSTANCE hInst; LONG module_ref = 0; +DWORD mshtml_tls = 0; + +static void thread_detach(void) +{ + thread_data_t *thread_data = get_thread_data(FALSE); + + if(!thread_data) + return; + + if(thread_data->thread_hwnd) + DestroyWindow(thread_data->thread_hwnd); + + mshtml_free(thread_data); +} BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { switch(fdwReason) { - case DLL_PROCESS_ATTACH: - hInst = hInstDLL; - break; - case DLL_PROCESS_DETACH: - close_gecko(); - break; + case DLL_PROCESS_ATTACH: + hInst = hInstDLL; + break; + case DLL_PROCESS_DETACH: + close_gecko(); + if(mshtml_tls) + TlsFree(mshtml_tls); + break; + case DLL_THREAD_DETACH: + thread_detach(); + break; } return TRUE; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b9eb7d3..75d132c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -87,7 +87,6 @@ struct HTMLDocument { IOleInPlaceFrame *frame; HWND hwnd; - HWND hidden_hwnd; HWND tooltips_hwnd; USERMODE usermode; @@ -316,7 +315,6 @@ nsICommandParams *create_nscommand_param BSCallback *create_bscallback(HTMLDocument*,IMoniker*); HRESULT start_binding(BSCallback*); -void create_hidden_hwnd(HTMLDocument*); IHlink *Hlink_Create(void); IHTMLSelectionObject *HTMLSelectionObject_Create(nsISelection*); @@ -340,6 +338,15 @@ void release_nodes(HTMLDocument*); void install_wine_gecko(void); +extern DWORD mshtml_tls; + +typedef struct { + HWND thread_hwnd; +} thread_data_t; + +thread_data_t *get_thread_data(BOOL); +HWND get_thread_hwnd(void); + DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_JSProtocol, 0x3050F3B2, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_MailtoProtocol, 0x3050F3DA, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); @@ -359,6 +366,11 @@ static inline void *mshtml_alloc(size_t return HeapAlloc(GetProcessHeap(), 0, len); } +static inline void *mshtml_alloc_zero(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + static inline void *mshtml_realloc(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), 0, mem, len); diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c new file mode 100644 index 0000000..0619cd1 --- /dev/null +++ b/dlls/mshtml/task.c @@ -0,0 +1,98 @@ +/* + * Copyright 2006 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "mshtmcid.h" + +#include "wine/debug.h" + +#include "mshtml_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +#define WM_PROCESSTASK 0x8008 + +static LRESULT WINAPI hidden_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if(msg > WM_USER) + FIXME("(%p %d %x %lx)\n", hwnd, msg, wParam, lParam); + + return DefWindowProcW(hwnd, msg, wParam, lParam); +} + +static HWND create_thread_hwnd(void) +{ + static ATOM hidden_wnd_class = 0; + static const WCHAR wszInternetExplorer_Hidden[] = {'I','n','t','e','r','n','e','t', + ' ','E','x','p','l','o','r','e','r','_','H','i','d','d','e','n',0}; + + if(!hidden_wnd_class) { + WNDCLASSEXW wndclass = { + sizeof(WNDCLASSEXW), 0, + hidden_proc, + 0, 0, hInst, NULL, NULL, NULL, NULL, + wszInternetExplorer_Hidden, + NULL + }; + + hidden_wnd_class = RegisterClassExW(&wndclass); + } + + return CreateWindowExW(0, wszInternetExplorer_Hidden, NULL, WS_POPUP, + 0, 0, 0, 0, NULL, NULL, hInst, NULL); +} + +HWND get_thread_hwnd(void) +{ + thread_data_t *thread_data = get_thread_data(TRUE); + + if(!thread_data->thread_hwnd) + thread_data->thread_hwnd = create_thread_hwnd(); + + return thread_data->thread_hwnd; +} + +thread_data_t *get_thread_data(BOOL create) +{ + thread_data_t *thread_data; + + if(!mshtml_tls) { + if(create) + mshtml_tls = TlsAlloc(); + else + return NULL; + } + + thread_data = TlsGetValue(mshtml_tls); + if(!thread_data && create) { + thread_data = mshtml_alloc_zero(sizeof(thread_data_t)); + TlsSetValue(mshtml_tls, thread_data); + } + + return thread_data; +} diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index dc7a74f..e233d7a 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -49,36 +49,6 @@ typedef struct { WNDPROC proc; } tooltip_data; -static LRESULT WINAPI hidden_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - if(msg > WM_USER) - FIXME("(%p %d %x %lx)\n", hwnd, msg, wParam, lParam); - - return DefWindowProcW(hwnd, msg, wParam, lParam); -} - -static void create_hidden_window(HTMLDocument *This) -{ - static ATOM hidden_wnd_class = 0; - static const WCHAR wszInternetExplorer_Hidden[] = {'I','n','t','e','r','n','e','t', - ' ','E','x','p','l','o','r','e','r','_','H','i','d','d','e','n',0}; - - if(!hidden_wnd_class) { - WNDCLASSEXW wndclass = { - sizeof(WNDCLASSEXW), 0, - hidden_proc, - 0, 0, hInst, NULL, NULL, NULL, NULL, - wszInternetExplorer_Hidden, - NULL - }; - - hidden_wnd_class = RegisterClassExW(&wndclass); - } - - This->hidden_hwnd = CreateWindowExW(0, wszInternetExplorer_Hidden, NULL, WS_POPUP, - 0, 0, 0, 0, NULL, NULL, hInst, This); -} - static void paint_disabled(HWND hwnd) { HDC hdc; PAINTSTRUCT ps; @@ -696,6 +666,4 @@ void HTMLDocument_View_Init(HTMLDocument This->in_place_active = FALSE; This->ui_active = FALSE; This->window_active = FALSE; - - create_hidden_window(This); }

1 0

Jacek Caban : mshtml: Add SETDOWNLOADSTATE task implementation and use it in IPersistMoniker:: Load.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 38b6665ae6e2b2e194aec0a84167d025ccd85f45 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=38b6665ae6e2b2e194aec0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 24 23:12:06 2006 +0200 mshtml: Add SETDOWNLOADSTATE task implementation and use it in IPersistMoniker::Load. --- dlls/mshtml/htmldoc.c | 2 + dlls/mshtml/mshtml_private.h | 15 ++++++ dlls/mshtml/persist.c | 9 +++ dlls/mshtml/task.c | 110 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 136 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 066e87d..52c2c20 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -143,6 +143,8 @@ static ULONG WINAPI HTMLDocument_Release TRACE("(%p) ref = %lu\n", This, ref); if(!ref) { + remove_doc_tasks(This); + if(This->client) IOleObject_SetClientSite(OLEOBJ(This), NULL); if(This->in_place_active) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 75d132c..6cb6ce4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -340,12 +340,27 @@ void install_wine_gecko(void); extern DWORD mshtml_tls; +typedef struct task_t { + HTMLDocument *doc; + + enum { + TASK_SETDOWNLOADSTATE, + TASK_PARSECOMPLETE + } task_id; + + struct task_t *next; +} task_t; + typedef struct { HWND thread_hwnd; + task_t *task_queue_head; + task_t *task_queue_tail; } thread_data_t; thread_data_t *get_thread_data(BOOL); HWND get_thread_hwnd(void); +void push_task(task_t*); +void remove_doc_tasks(HTMLDocument*); DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_JSProtocol, 0x3050F3B2, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 15af135..c9baf7c 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -156,6 +156,7 @@ static HRESULT WINAPI PersistMoniker_Loa HTMLDocument *This = PERSISTMON_THIS(iface); BSCallback *bscallback; LPOLESTR url = NULL; + task_t *task; HRESULT hres; nsresult nsres; @@ -219,6 +220,14 @@ static HRESULT WINAPI PersistMoniker_Loa bscallback = create_bscallback(This, pimkName); + task = mshtml_alloc(sizeof(task_t)); + + task->doc = This; + task->task_id = TASK_SETDOWNLOADSTATE; + task->next = NULL; + + push_task(task); + if(This->nscontainer) { nsIInputStream *post_data_stream = get_post_data_stream(pibc); diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 0619cd1..6af1cda 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -37,8 +37,118 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define WM_PROCESSTASK 0x8008 +void push_task(task_t *task) +{ + thread_data_t *thread_data = get_thread_data(TRUE); + + if(thread_data->task_queue_tail) + thread_data->task_queue_tail->next = task; + else + thread_data->task_queue_head = task; + + thread_data->task_queue_tail = task; + + PostMessageW(thread_data->thread_hwnd, WM_PROCESSTASK, 0, 0); +} + +static task_t *pop_task(void) +{ + thread_data_t *thread_data = get_thread_data(TRUE); + task_t *task = thread_data->task_queue_head; + + if(!task) + return NULL; + + thread_data->task_queue_head = task->next; + if(!thread_data->task_queue_head) + thread_data->task_queue_tail = NULL; + + return task; +} + +void remove_doc_tasks(HTMLDocument *doc) +{ + thread_data_t *thread_data = get_thread_data(FALSE); + task_t *iter, *tmp; + + while(thread_data->task_queue_head + && thread_data->task_queue_head->doc == doc) + pop_task(); + + for(iter = thread_data->task_queue_head; iter; iter = iter->next) { + while(iter->next && iter->next->doc == doc) { + tmp = iter->next; + iter->next = tmp->next; + mshtml_free(tmp); + } + + if(!iter->next) + thread_data->task_queue_tail = iter; + } +} + +static void set_downloading(HTMLDocument *doc) +{ + IOleCommandTarget *olecmd; + HRESULT hres; + + TRACE("(%p)\n", doc); + + if(doc->frame) + IOleInPlaceFrame_SetStatusText(doc->frame, NULL /* FIXME */); + + if(!doc->client) + return; + + hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd); + if(SUCCEEDED(hres)) { + VARIANT var; + + V_VT(&var) = VT_I4; + V_I4(&var) = 1; + + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETDOWNLOADSTATE, OLECMDEXECOPT_DONTPROMPTUSER, + &var, NULL); + IOleCommandTarget_Release(olecmd); + } + + if(doc->hostui) { + IDropTarget *drop_target = NULL; + + hres = IDocHostUIHandler_GetDropTarget(doc->hostui, NULL /* FIXME */, &drop_target); + if(drop_target) { + FIXME("Use IDropTarget\n"); + IDropTarget_Release(drop_target); + } + } +} + +static void process_task(task_t *task) +{ + switch(task->task_id) { + case TASK_SETDOWNLOADSTATE: + return set_downloading(task->doc); + default: + ERR("Wrong task_id %d\n", task->task_id); + } +} + static LRESULT WINAPI hidden_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { + switch(msg) { + case WM_PROCESSTASK: + while(1) { + task_t *task = pop_task(); + if(!task) + break; + + process_task(task); + mshtml_free(task); + } + + return 0; + } + if(msg > WM_USER) FIXME("(%p %d %x %lx)\n", hwnd, msg, wParam, lParam);

1 0