October 2009 - Wine-commits

Alexandre Julliard : rpcrt4: Specify the full application path when starting rpcss.exe.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: c4ebf3687b6964a95f0b2d474f47c928bb2abcbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ebf3687b6964a95f0b2d474… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 11:20:42 2009 +0100 rpcrt4: Specify the full application path when starting rpcss.exe. --- dlls/rpcrt4/rpc_epmap.c | 22 +++++----------------- 1 files changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index 60c4255..c1b8d1d 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -79,30 +79,18 @@ static BOOL start_rpcss(void) { PROCESS_INFORMATION pi; STARTUPINFOW si; - static WCHAR cmd[6]; - static const WCHAR rpcss[] = {'r','p','c','s','s',0}; + WCHAR cmd[MAX_PATH]; + static const WCHAR rpcss[] = {'\\','r','p','c','s','s','.','e','x','e',0}; BOOL rslt; TRACE("\n"); - ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); ZeroMemory(&si, sizeof(STARTUPINFOA)); si.cb = sizeof(STARTUPINFOA); + GetSystemDirectoryW( cmd, MAX_PATH - sizeof(rpcss)/sizeof(WCHAR) ); + lstrcatW( cmd, rpcss ); - memcpy(cmd, rpcss, sizeof(rpcss)); - - rslt = CreateProcessW( - NULL, /* executable */ - cmd, /* command line */ - NULL, /* process security attributes */ - NULL, /* primary thread security attributes */ - FALSE, /* inherit handles */ - 0, /* creation flags */ - NULL, /* use parent's environment */ - NULL, /* use parent's current directory */ - &si, /* STARTUPINFO pointer */ - &pi /* PROCESS_INFORMATION */ - ); + rslt = CreateProcessW( cmd, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); if (rslt) {

1 0

Alexandre Julliard : shell32: Specify the full application path when starting winemenubuilder.exe.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: d72e7af9b1883c5632e794d934da3bf187217d49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72e7af9b1883c5632e794d93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 11:21:34 2009 +0100 shell32: Specify the full application path when starting winemenubuilder.exe. --- dlls/shell32/changenotify.c | 30 +++--------------------------- dlls/shell32/shell32_main.h | 2 ++ dlls/shell32/shelllink.c | 35 ++++++++++++++++++++++++++++------- 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 43a5fb8..96ffd99 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -105,31 +105,6 @@ static const char * DumpEvent( LONG event ) #undef DUMPEV } -static BOOL RefreshFileTypeAssociations(void) -{ - static WCHAR szWinemenubuilder[] = { - 'w','i','n','e','m','e','n','u','b','u','i','l','d','e','r','.','e','x','e', - ' ','-','a',0 }; - STARTUPINFOW si; - PROCESS_INFORMATION pi; - BOOL ret; - - TRACE("starting %s\n",debugstr_w(szWinemenubuilder)); - - memset(&si, 0, sizeof(si)); - si.cb = sizeof(si); - - ret = CreateProcessW( NULL, szWinemenubuilder, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); - - if (ret) - { - CloseHandle( pi.hProcess ); - CloseHandle( pi.hThread ); - } - - return ret; -} - static const char * NodeName(const NOTIFICATIONLIST *item) { const char *str; @@ -425,10 +400,11 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID if (wEventId & SHCNE_ASSOCCHANGED) { + static const WCHAR args[] = {' ','-','a',0 }; TRACE("refreshing file type associations\n"); - RefreshFileTypeAssociations(); + run_winemenubuilder( args ); } - + /* if we allocated it, free it. The ANSI flag is also set in its Unicode sibling. */ if ((typeFlag & SHCNF_PATHA) || (typeFlag & SHCNF_PRINTERA)) { diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 12d50e2..16fb4a5 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -197,6 +197,8 @@ BOOL UNIXFS_is_rooted_at_desktop(void); extern const GUID CLSID_UnixFolder; extern const GUID CLSID_UnixDosFolder; +extern BOOL run_winemenubuilder( const WCHAR *args ); + /* Default shell folder value registration */ HRESULT SHELL_RegisterShellFolders(void); diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 231c72c..414cc54 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -395,30 +395,33 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFile return r; } -static BOOL StartLinkProcessor( LPCOLESTR szLink ) +BOOL run_winemenubuilder( const WCHAR *args ) { - static const WCHAR szFormat[] = { - 'w','i','n','e','m','e','n','u','b','u','i','l','d','e','r','.','e','x','e', - ' ','-','w',' ','"','%','s','"',0 }; + static const WCHAR menubuilder[] = {'\\','w','i','n','e','m','e','n','u','b','u','i','l','d','e','r','.','e','x','e',0}; LONG len; LPWSTR buffer; STARTUPINFOW si; PROCESS_INFORMATION pi; BOOL ret; + WCHAR app[MAX_PATH]; - len = sizeof(szFormat) + lstrlenW( szLink ) * sizeof(WCHAR); + GetSystemDirectoryW( app, MAX_PATH - sizeof(menubuilder)/sizeof(WCHAR) ); + strcatW( app, menubuilder ); + + len = (strlenW( app ) + strlenW( args ) + 1) * sizeof(WCHAR); buffer = HeapAlloc( GetProcessHeap(), 0, len ); if( !buffer ) return FALSE; - wsprintfW( buffer, szFormat, szLink ); + strcpyW( buffer, app ); + strcatW( buffer, args ); TRACE("starting %s\n",debugstr_w(buffer)); memset(&si, 0, sizeof(si)); si.cb = sizeof(si); - ret = CreateProcessW( NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + ret = CreateProcessW( app, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); HeapFree( GetProcessHeap(), 0, buffer ); @@ -431,6 +434,24 @@ static BOOL StartLinkProcessor( LPCOLESTR szLink ) return ret; } +static BOOL StartLinkProcessor( LPCOLESTR szLink ) +{ + static const WCHAR szFormat[] = {' ','-','w',' ','"','%','s','"',0 }; + LONG len; + LPWSTR buffer; + BOOL ret; + + len = sizeof(szFormat) + lstrlenW( szLink ) * sizeof(WCHAR); + buffer = HeapAlloc( GetProcessHeap(), 0, len ); + if( !buffer ) + return FALSE; + + wsprintfW( buffer, szFormat, szLink ); + ret = run_winemenubuilder( buffer ); + HeapFree( GetProcessHeap(), 0, buffer ); + return ret; +} + static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFileName, BOOL fRemember) { IShellLinkImpl *This = impl_from_IPersistFile(iface);

1 0

Alexandre Julliard : shdocvw: Specify the full application path when starting winemenubuilder.exe.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 0856f774704b33db2f016805803333c549e731f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0856f774704b33db2f0168058… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 11:22:32 2009 +0100 shdocvw: Specify the full application path when starting winemenubuilder.exe. --- dlls/shdocvw/intshcut.c | 37 +++++++++++++++++++++++++++++-------- 1 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index 86bc543..b389ec3 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -65,32 +65,35 @@ static inline InternetShortcut* impl_from_IPersistFile(IPersistFile *iface) return (InternetShortcut*)((char*)iface - FIELD_OFFSET(InternetShortcut, persistFile)); } -static BOOL StartLinkProcessor(LPCOLESTR szLink) +static BOOL run_winemenubuilder( const WCHAR *args ) { - static const WCHAR szFormat[] = { - 'w','i','n','e','m','e','n','u','b','u','i','l','d','e','r','.','e','x','e', - ' ','-','w',' ','-','u',' ','"','%','s','"',0 }; + static const WCHAR menubuilder[] = {'\\','w','i','n','e','m','e','n','u','b','u','i','l','d','e','r','.','e','x','e',0}; LONG len; LPWSTR buffer; STARTUPINFOW si; PROCESS_INFORMATION pi; BOOL ret; + WCHAR app[MAX_PATH]; - len = sizeof(szFormat) + lstrlenW( szLink ) * sizeof(WCHAR); + GetSystemDirectoryW( app, MAX_PATH - sizeof(menubuilder)/sizeof(WCHAR) ); + strcatW( app, menubuilder ); + + len = (strlenW( app ) + strlenW( args ) + 1) * sizeof(WCHAR); buffer = heap_alloc( len ); if( !buffer ) return FALSE; - wsprintfW( buffer, szFormat, szLink ); + strcpyW( buffer, app ); + strcatW( buffer, args ); TRACE("starting %s\n",debugstr_w(buffer)); memset(&si, 0, sizeof(si)); si.cb = sizeof(si); - ret = CreateProcessW( NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + ret = CreateProcessW( app, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); - HeapFree( GetProcessHeap(), 0, buffer ); + heap_free( buffer ); if (ret) { @@ -101,6 +104,24 @@ static BOOL StartLinkProcessor(LPCOLESTR szLink) return ret; } +static BOOL StartLinkProcessor( LPCOLESTR szLink ) +{ + static const WCHAR szFormat[] = { ' ','-','w',' ','-','u',' ','"','%','s','"',0 }; + LONG len; + LPWSTR buffer; + BOOL ret; + + len = sizeof(szFormat) + lstrlenW( szLink ) * sizeof(WCHAR); + buffer = heap_alloc( len ); + if( !buffer ) + return FALSE; + + wsprintfW( buffer, szFormat, szLink ); + ret = run_winemenubuilder( buffer ); + heap_free( buffer ); + return ret; +} + /* interface functions */ static HRESULT Unknown_QueryInterface(InternetShortcut *This, REFIID riid, PVOID *ppvObject)

1 0

Jacek Caban : mshtml: Moved bscallback to HTMLWindow.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 207fe98e2acef8415114bba72aca96c378b3fe10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=207fe98e2acef8415114bba72… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 26 23:03:53 2009 +0100 mshtml: Moved bscallback to HTMLWindow. --- dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 5 +++-- dlls/mshtml/navigate.c | 26 ++++++++++++++------------ dlls/mshtml/persist.c | 6 +++--- 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 134b108..05295f1 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1886,7 +1886,6 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) TRACE("(%p) ref = %u\n", This, ref); if(!ref) { - set_document_bscallback(&This->basedoc, NULL); set_current_mon(&This->basedoc, NULL); if(This->basedoc.doc_node) { This->basedoc.doc_node->basedoc.doc_obj = NULL; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index d760658..08f1139 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -158,6 +158,7 @@ static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) if(!ref) { DWORD i; + set_window_bscallback(This, NULL); window_set_docnode(This, NULL); release_children(This); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ed62cad..d7b5413 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -219,6 +219,8 @@ struct HTMLWindow { nsIDOMWindow *nswindow; HTMLWindow *parent; + nsChannelBSC *bscallback; + event_target_t *event_target; IHTMLEventObj *event; BOOL *event_vector; @@ -358,7 +360,6 @@ struct HTMLDocumentObj { DWORD update; /* FIXME: probably should be in document node object */ - nsChannelBSC *bscallback; IMoniker *mon; LPOLESTR url; struct list bindings; @@ -658,7 +659,7 @@ void init_nsevents(NSContainer*); void add_nsevent_listener(HTMLWindow*,LPCWSTR); nsresult get_nsinterface(nsISupports*,REFIID,void**); -void set_document_bscallback(HTMLDocument*,nsChannelBSC*); +void set_window_bscallback(HTMLWindow*,nsChannelBSC*); void set_current_mon(HTMLDocument*,IMoniker*); HRESULT start_binding(HTMLDocument*,BSCallback*,IBindCtx*); void detach_document_bindings(HTMLDocumentObj*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 33bf1c1..4f0e60e 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -951,7 +951,7 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) on_start_nsrequest(This); /* events are reset when a new document URI is loaded, so re-initialise them here */ - if(This->bsc.doc && This->bsc.doc->doc_obj->bscallback == This && This->bsc.doc->doc_obj->nscontainer) { + if(This->bsc.doc && This->bsc.doc->window->bscallback == This && This->bsc.doc->doc_obj->nscontainer) { update_window_doc(This->bsc.doc->window); init_nsevents(This->bsc.doc->doc_obj->nscontainer); } @@ -1107,27 +1107,29 @@ IMoniker *get_channelbsc_mon(nsChannelBSC *This) return This->bsc.mon; } -void set_document_bscallback(HTMLDocument *doc, nsChannelBSC *callback) +void set_window_bscallback(HTMLWindow *window, nsChannelBSC *callback) { BSCallback *iter; - if(doc->doc_obj->bscallback) { - if(doc->doc_obj->bscallback->bsc.binding) - IBinding_Abort(doc->doc_obj->bscallback->bsc.binding); - doc->doc_obj->bscallback->bsc.doc = NULL; - IBindStatusCallback_Release(STATUSCLB(&doc->doc_obj->bscallback->bsc)); + if(window->bscallback) { + if(window->bscallback->bsc.binding) + IBinding_Abort(window->bscallback->bsc.binding); + window->bscallback->bsc.doc = NULL; + IBindStatusCallback_Release(STATUSCLB(&window->bscallback->bsc)); } - LIST_FOR_EACH_ENTRY(iter, &doc->doc_obj->bindings, BSCallback, entry) { - iter->doc = NULL; - list_remove(&iter->entry); + if(window->doc_obj) { + LIST_FOR_EACH_ENTRY(iter, &window->doc_obj->bindings, BSCallback, entry) { + iter->doc = NULL; + list_remove(&iter->entry); + } } - doc->doc_obj->bscallback = callback; + window->bscallback = callback; if(callback) { IBindStatusCallback_AddRef(STATUSCLB(&callback->bsc)); - callback->bsc.doc = doc; + callback->bsc.doc = &window->doc_obj->basedoc; } } diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 36b1a34..01af487 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -196,7 +196,7 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO } } - set_document_bscallback(This, bscallback); + set_window_bscallback(This->window, bscallback); IUnknown_Release((IUnknown*)bscallback); CoTaskMemFree(url); @@ -292,7 +292,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva return hres; if(!bind_complete) - return start_binding(This, (BSCallback*)This->doc_obj->bscallback, pibc); + return start_binding(This, (BSCallback*)This->window->bscallback, pibc); return S_OK; } @@ -556,7 +556,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM if(FAILED(hres)) return hres; - return channelbsc_load_stream(This->doc_obj->bscallback, pStm); + return channelbsc_load_stream(This->window->bscallback, pStm); } static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, LPSTREAM pStm,

1 0

Jacek Caban : mshtml: Moved url and mon to HTMLWindow.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: fd47fa464750a2f59ea15e59e664ba29486dde56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd47fa464750a2f59ea15e59e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 26 23:04:28 2009 +0100 mshtml: Moved url and mon to HTMLWindow. --- dlls/mshtml/htmldoc.c | 3 +-- dlls/mshtml/htmllocation.c | 4 ++-- dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 6 +++--- dlls/mshtml/nsio.c | 2 +- dlls/mshtml/olecmd.c | 8 ++++---- dlls/mshtml/persist.c | 28 ++++++++++++++-------------- dlls/mshtml/secmgr.c | 4 ++-- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 05295f1..1d9c28f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -589,7 +589,7 @@ static HRESULT WINAPI HTMLDocument_get_URL(IHTMLDocument2 *iface, BSTR *p) TRACE("(%p)->(%p)\n", iface, p); - *p = SysAllocString(This->doc_obj->url ? This->doc_obj->url : about_blank_url); + *p = SysAllocString(This->window->url ? This->window->url : about_blank_url); return *p ? S_OK : E_OUTOFMEMORY; } @@ -1886,7 +1886,6 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) TRACE("(%p) ref = %u\n", This, ref); if(!ref) { - set_current_mon(&This->basedoc, NULL); if(This->basedoc.doc_node) { This->basedoc.doc_node->basedoc.doc_obj = NULL; IHTMLDocument2_Release(HTMLDOC(&This->basedoc.doc_node->basedoc)); diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index e7b6649..3b91429 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -37,12 +37,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static HRESULT get_url(HTMLLocation *This, const WCHAR **ret) { - if(!This->window || !This->window->doc_obj || !This->window->doc_obj->url) { + if(!This->window || !This->window->url) { FIXME("No current URL\n"); return E_NOTIMPL; } - *ret = This->window->doc_obj->url; + *ret = This->window->url; return S_OK; } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 08f1139..5a53e5a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -159,6 +159,7 @@ static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) DWORD i; set_window_bscallback(This, NULL); + set_current_mon(This, NULL); window_set_docnode(This, NULL); release_children(This); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d7b5413..ea6c349 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -220,6 +220,8 @@ struct HTMLWindow { HTMLWindow *parent; nsChannelBSC *bscallback; + IMoniker *mon; + LPOLESTR url; event_target_t *event_target; IHTMLEventObj *event; @@ -360,8 +362,6 @@ struct HTMLDocumentObj { DWORD update; /* FIXME: probably should be in document node object */ - IMoniker *mon; - LPOLESTR url; struct list bindings; }; @@ -660,7 +660,7 @@ void add_nsevent_listener(HTMLWindow*,LPCWSTR); nsresult get_nsinterface(nsISupports*,REFIID,void**); void set_window_bscallback(HTMLWindow*,nsChannelBSC*); -void set_current_mon(HTMLDocument*,IMoniker*); +void set_current_mon(HTMLWindow*,IMoniker*); HRESULT start_binding(HTMLDocument*,BSCallback*,IBindCtx*); void detach_document_bindings(HTMLDocumentObj*); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 070d79e..01ad685 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -737,7 +737,7 @@ static nsresult async_open(nsChannel *This, HTMLWindow *window, BOOL is_doc_chan return NS_ERROR_UNEXPECTED; if(is_doc_channel) - set_current_mon(&window->doc_obj->basedoc, mon); + set_current_mon(window, mon); bscallback = create_channelbsc(mon); IMoniker_Release(mon); diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index c2f6fef..487f6cb 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -543,9 +543,9 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, This->doc_obj->usermode = EDITMODE; - if(This->doc_obj->mon) { + if(This->window->mon) { CLSID clsid = IID_NULL; - hres = IMoniker_GetClassID(This->doc_obj->mon, &clsid); + hres = IMoniker_GetClassID(This->window->mon, &clsid); if(SUCCEEDED(hres)) { /* We should use IMoniker::Save here */ FIXME("Use CLSID %s\n", debugstr_guid(&clsid)); @@ -588,11 +588,11 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, update_doc(This, UPDATE_UI); - if(This->doc_obj->mon) { + if(This->window->mon) { /* FIXME: We should find nicer way to do this */ remove_doc_tasks(This); - mon = This->doc_obj->mon; + mon = This->window->mon; IMoniker_AddRef(mon); }else { static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 01af487..f708c64 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -48,31 +48,31 @@ static BOOL use_gecko_script(LPCWSTR url) && strncmpiW(aboutW, url, sizeof(aboutW)/sizeof(WCHAR)); } -void set_current_mon(HTMLDocument *This, IMoniker *mon) +void set_current_mon(HTMLWindow *This, IMoniker *mon) { HRESULT hres; - if(This->doc_obj->mon) { - IMoniker_Release(This->doc_obj->mon); - This->doc_obj->mon = NULL; + if(This->mon) { + IMoniker_Release(This->mon); + This->mon = NULL; } - if(This->doc_obj->url) { - CoTaskMemFree(This->doc_obj->url); - This->doc_obj->url = NULL; + if(This->url) { + CoTaskMemFree(This->url); + This->url = NULL; } if(!mon) return; IMoniker_AddRef(mon); - This->doc_obj->mon = mon; + This->mon = mon; - hres = IMoniker_GetDisplayName(mon, NULL, NULL, &This->doc_obj->url); + hres = IMoniker_GetDisplayName(mon, NULL, NULL, &This->url); if(FAILED(hres)) WARN("GetDisplayName failed: %08x\n", hres); - set_script_mode(This->window, use_gecko_script(This->doc_obj->url) ? SCRIPTMODE_GECKO : SCRIPTMODE_ACTIVESCRIPT); + set_script_mode(This, use_gecko_script(This->url) ? SCRIPTMODE_GECKO : SCRIPTMODE_ACTIVESCRIPT); } static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BOOL *bind_complete) @@ -127,7 +127,7 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO TRACE("got url: %s\n", debugstr_w(url)); - set_current_mon(This, mon); + set_current_mon(This->window, mon); if(This->doc_obj->client) { VARIANT silent, offline; @@ -318,11 +318,11 @@ static HRESULT WINAPI PersistMoniker_GetCurMoniker(IPersistMoniker *iface, IMoni TRACE("(%p)->(%p)\n", This, ppimkName); - if(!This->doc_obj->mon) + if(!This->window || !This->window->mon) return E_UNEXPECTED; - IMoniker_AddRef(This->doc_obj->mon); - *ppimkName = This->doc_obj->mon; + IMoniker_AddRef(This->window->mon); + *ppimkName = This->window->mon; return S_OK; } diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index c71bb4b..8938943 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -78,7 +78,7 @@ static HRESULT WINAPI InternetHostSecurityManager_ProcessUrlAction(IInternetHost TRACE("(%p)->(%d %p %d %p %d %x %x)\n", This, dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); - url = This->basedoc.doc_obj->url ? This->basedoc.doc_obj->url : about_blankW; + url = This->basedoc.window->url ? This->basedoc.window->url : about_blankW; return IInternetSecurityManager_ProcessUrlAction(This->secmgr, url, dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); @@ -124,7 +124,7 @@ static HRESULT WINAPI InternetHostSecurityManager_QueryCustomPolicy(IInternetHos TRACE("(%p)->(%s %p %p %p %d %x)\n", This, debugstr_guid(guidKey), ppPolicy, pcbPolicy, pContext, cbContext, dwReserved); - url = This->basedoc.doc_obj->url ? This->basedoc.doc_obj->url : about_blankW; + url = This->basedoc.window->url ? This->basedoc.window->url : about_blankW; hres = IInternetSecurityManager_QueryCustomPolicy(This->secmgr, url, guidKey, ppPolicy, pcbPolicy, pContext, cbContext, dwReserved);

1 0

Jacek Caban : mshtml: Allow task queue to be used for different targets.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 12bddc55edf91d27eeab158d4eab8f2a22da6b7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=12bddc55edf91d27eeab158d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 26 23:05:10 2009 +0100 mshtml: Allow task queue to be used for different targets. --- dlls/mshtml/htmldoc.c | 3 +- dlls/mshtml/mshtml_private.h | 34 ++++++---- dlls/mshtml/mutation.c | 19 ++++-- dlls/mshtml/nsio.c | 21 +++++-- dlls/mshtml/olecmd.c | 2 +- dlls/mshtml/persist.c | 99 +++++++++++++++++++++++---- dlls/mshtml/task.c | 153 +++++++++--------------------------------- 7 files changed, 167 insertions(+), 164 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12bddc55edf91d27eeab1…

1 0

Jacek Caban : mshtml: Moved binding list to HTMLDocumentNode.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 745f601d2359f7a72d6c839991e9b7d287e54d29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=745f601d2359f7a72d6c83999… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 26 23:05:37 2009 +0100 mshtml: Moved binding list to HTMLDocumentNode. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlwindow.c | 3 ++ dlls/mshtml/mshtml_private.h | 11 ++++----- dlls/mshtml/navigate.c | 49 ++++++++++++++++++++++++----------------- dlls/mshtml/nsio.c | 37 +++++++++++++++++++++++++------ dlls/mshtml/persist.c | 2 +- dlls/mshtml/script.c | 2 +- 7 files changed, 70 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=745f601d2359f7a72d6c8…

1 0

Andrew Eikum : mshtml: Fix typo in TRACE.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 9d62f4753391435bb365d0341de8f808ab2dbf60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d62f4753391435bb365d0341… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 26 18:02:14 2009 -0500 mshtml: Fix typo in TRACE. --- dlls/mshtml/htmlwindow.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index bda8719..c66f245 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -124,7 +124,7 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii TRACE("(%p)->(IID_IHTMLWindow2 %p)\n", This, ppv); *ppv = HTMLWINDOW2(This); }else if(IsEqualGUID(&IID_IHTMLWindow3, riid)) { - TRACE("(%p)->(IID_IHTMLWindow2 %p)\n", This, ppv); + TRACE("(%p)->(IID_IHTMLWindow3 %p)\n", This, ppv); *ppv = HTMLWINDOW3(This); }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE;

1 0

Juan Lang : cryptui: Support sorting columns by clicking on their headers.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 3a7d3fcc8a00a69ee763195c56e3e47c076b549a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7d3fcc8a00a69ee763195c5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 26 15:30:16 2009 -0700 cryptui: Support sorting columns by clicking on their headers. --- dlls/cryptui/main.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 9807064..a772329 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1062,6 +1062,49 @@ static void cert_mgr_do_export(HWND hwnd) } } +static int CALLBACK cert_mgr_sort_by_text(HWND lv, int col, int index1, + int index2) +{ + LVITEMW item; + WCHAR buf1[MAX_STRING_LEN]; + WCHAR buf2[MAX_STRING_LEN]; + + item.cchTextMax = sizeof(buf1) / sizeof(buf1[0]); + item.mask = LVIF_TEXT; + item.pszText = buf1; + item.iItem = index1; + item.iSubItem = col; + SendMessageW(lv, LVM_GETITEMW, 0, (LPARAM)&item); + item.pszText = buf2; + item.iItem = index2; + SendMessageW(lv, LVM_GETITEMW, 0, (LPARAM)&item); + return strcmpW(buf1, buf2); +} + +static int CALLBACK cert_mgr_sort_by_subject(LPARAM lp1, LPARAM lp2, LPARAM lp) +{ + return cert_mgr_sort_by_text((HWND)lp, 0, lp1, lp2); +} + +static int CALLBACK cert_mgr_sort_by_issuer(LPARAM lp1, LPARAM lp2, LPARAM lp) +{ + return cert_mgr_sort_by_text((HWND)lp, 1, lp1, lp2); +} + +static int CALLBACK cert_mgr_sort_by_date(LPARAM lp1, LPARAM lp2, LPARAM lp) +{ + PCCERT_CONTEXT cert1 = (PCCERT_CONTEXT)lp1; + PCCERT_CONTEXT cert2 = (PCCERT_CONTEXT)lp2; + return CompareFileTime(&cert1->pCertInfo->NotAfter, + &cert2->pCertInfo->NotAfter); +} + +static int CALLBACK cert_mgr_sort_by_friendly_name(LPARAM lp1, LPARAM lp2, + LPARAM lp) +{ + return cert_mgr_sort_by_text((HWND)lp, 3, lp1, lp2); +} + static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -1141,6 +1184,35 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, cert_mgr_do_remove(hwnd); break; } + case LVN_COLUMNCLICK: + { + NMLISTVIEW *nmlv = (NMLISTVIEW *)lp; + HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS); + + /* FIXME: doesn't support swapping sort order between ascending + * and descending. + */ + switch (nmlv->iSubItem) + { + case 0: + SendMessageW(lv, LVM_SORTITEMSEX, (WPARAM)lv, + (LPARAM)cert_mgr_sort_by_subject); + break; + case 1: + SendMessageW(lv, LVM_SORTITEMSEX, (WPARAM)lv, + (LPARAM)cert_mgr_sort_by_issuer); + break; + case 2: + SendMessageW(lv, LVM_SORTITEMS, 0, + (LPARAM)cert_mgr_sort_by_date); + break; + case 3: + SendMessageW(lv, LVM_SORTITEMSEX, (WPARAM)lv, + (LPARAM)cert_mgr_sort_by_friendly_name); + break; + } + break; + } } break; }

1 0

Juan Lang : cryptui: Sort certificates by subject name by default.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: c3775d82d3153ecca42eab318542565e3ebf0290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3775d82d3153ecca42eab318… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 26 15:43:21 2009 -0700 cryptui: Sort certificates by subject name by default. --- dlls/cryptui/main.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index a772329..b02c56a 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -348,6 +348,8 @@ static CERT_ENHKEY_USAGE *create_advanced_filter(void) return advancedUsage; } +static int CALLBACK cert_mgr_sort_by_subject(LPARAM lp1, LPARAM lp2, LPARAM lp); + static void show_store_certs(HWND hwnd, HCERTSTORE store) { HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS); @@ -443,6 +445,8 @@ static void show_store_certs(HWND hwnd, HCERTSTORE store) HeapFree(GetProcessHeap(), 0, advanced->rgpszUsageIdentifier); HeapFree(GetProcessHeap(), 0, advanced); } + SendMessageW(lv, LVM_SORTITEMSEX, (WPARAM)lv, + (LPARAM)cert_mgr_sort_by_subject); } static const WCHAR my[] = { 'M','y',0 };

1 0