October 2009 - Wine-Commits

Jacek Caban : mshtml: Moved bscallback to HTMLWindow.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

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 Oct. 27, 2009

Oct. 27, 2009

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

Juan Lang : cryptui: Sort certificates by subject name by default.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

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

Hans Leidekker : wininet: Avoid accessing uninitialized memory in ConvertUrlComponentValue.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

Module: wine Branch: master Commit: b707a523e31256be818b69d279922b0c6524c23e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b707a523e31256be818b69d27… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 27 10:03:14 2009 +0100 wininet: Avoid accessing uninitialized memory in ConvertUrlComponentValue. Found by valgrind. --- dlls/wininet/internet.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index dbee0a2..65bb3d2 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1133,11 +1133,14 @@ static void ConvertUrlComponentValue(LPSTR* lppszComponent, LPDWORD dwComponentL DWORD nASCIILength=WideCharToMultiByte(CP_ACP,0,lpwszComponent,dwwComponentLen,NULL,0,NULL,NULL); if (*lppszComponent == NULL) { - int nASCIIOffset=WideCharToMultiByte(CP_ACP,0,lpwszStart,lpwszComponent-lpwszStart,NULL,0,NULL,NULL); if (lpwszComponent) - *lppszComponent = (LPSTR)lpszStart+nASCIIOffset; + { + int offset = WideCharToMultiByte(CP_ACP, 0, lpwszStart, lpwszComponent-lpwszStart, NULL, 0, NULL, NULL); + *lppszComponent = (LPSTR)lpszStart + offset; + } else *lppszComponent = NULL; + *dwComponentLen = nASCIILength; } else @@ -1184,7 +1187,7 @@ BOOL WINAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags, InternetCrackUrlW should not include it */ if (dwUrlLength == -1) nLength--; - lpwszUrl=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR)*nLength); + lpwszUrl = HeapAlloc(GetProcessHeap(), 0, nLength * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP,0,lpszUrl,dwUrlLength,lpwszUrl,nLength); memset(&UCW,0,sizeof(UCW));

1 0

Jacek Caban : mshtml: Use HTMLWindow in AsyncOpen implementation.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

Module: wine Branch: master Commit: 50588739e367a8c18cf4213b12521910a91cc0a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50588739e367a8c18cf4213b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 26 23:03:29 2009 +0100 mshtml: Use HTMLWindow in AsyncOpen implementation. --- dlls/mshtml/nsio.c | 121 +++++++++++++++++++++++++-------------------------- 1 files changed, 59 insertions(+), 62 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 5025670..070d79e 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -636,9 +636,9 @@ static HRESULT create_mon_for_nschannel(nsChannel *channel, IMoniker **mon) return hres; } -static NSContainer *get_nscontainer_from_load_group(nsChannel *This) +static HTMLWindow *get_window_from_load_group(nsChannel *This) { - NSContainer *container; + HTMLWindow *window; nsIChannel *channel; nsIRequest *req; nsIWineURI *wine_uri; @@ -675,10 +675,10 @@ static NSContainer *get_nscontainer_from_load_group(nsChannel *This) return NULL; } - nsIWineURI_GetNSContainer(wine_uri, &container); + nsIWineURI_GetWindow(wine_uri, &window); nsIWineURI_Release(wine_uri); - return container; + return window; } static HTMLWindow *get_channel_window(nsChannel *This) @@ -724,49 +724,7 @@ static HTMLWindow *get_channel_window(nsChannel *This) return window; } -static nsresult async_open_doc_uri(nsChannel *This, NSContainer *container, - nsIStreamListener *listener, nsISupports *context, BOOL *open) -{ - IMoniker *mon; - HRESULT hres; - - *open = FALSE; - - if(container->bscallback) { - channelbsc_set_channel(container->bscallback, This, listener, context); - - if(container->doc && container->doc->mime) { - heap_free(This->content_type); - This->content_type = heap_strdupWtoA(container->doc->mime); - } - - return NS_OK; - }else { - BOOL cont = before_async_open(This, container); - - if(!cont) { - TRACE("canceled\n"); - return NS_ERROR_UNEXPECTED; - } - - if(!container->doc) { - return This->channel - ? nsIChannel_AsyncOpen(This->channel, listener, context) - : NS_ERROR_UNEXPECTED; - } - - hres = create_mon_for_nschannel(This, &mon); - if(FAILED(hres)) { - return NS_ERROR_UNEXPECTED; - } - set_current_mon(&container->doc->basedoc, mon); - } - - *open = TRUE; - return NS_OK; -} - -static nsresult async_open(nsChannel *This, NSContainer *container, nsIStreamListener *listener, +static nsresult async_open(nsChannel *This, HTMLWindow *window, BOOL is_doc_channel, nsIStreamListener *listener, nsISupports *context) { nsChannelBSC *bscallback; @@ -778,6 +736,9 @@ static nsresult async_open(nsChannel *This, NSContainer *container, nsIStreamLis if(FAILED(hres)) return NS_ERROR_UNEXPECTED; + if(is_doc_channel) + set_current_mon(&window->doc_obj->basedoc, mon); + bscallback = create_channelbsc(mon); IMoniker_Release(mon); @@ -785,7 +746,7 @@ static nsresult async_open(nsChannel *This, NSContainer *container, nsIStreamLis task = heap_alloc(sizeof(task_t)); - task->doc = &container->doc->basedoc; + task->doc = &window->doc_obj->basedoc; task->task_id = TASK_START_BINDING; task->next = NULL; task->bscallback = bscallback; @@ -799,8 +760,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen nsISupports *aContext) { nsChannel *This = NSCHANNEL_THIS(iface); - NSContainer *container; - HTMLWindow *window; + HTMLWindow *window = NULL; PRBool is_doc_uri; BOOL open = TRUE; nsresult nsres = NS_OK; @@ -819,32 +779,69 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen window = get_channel_window(This); if(window) { nsIWineURI_SetWindow(This->uri, window); - IHTMLWindow2_Release(HTMLWINDOW2(window)); + }else { + NSContainer *nscontainer; + + nsIWineURI_GetNSContainer(This->uri, &nscontainer); + if(nscontainer) { + BOOL b; + + /* nscontainer->doc should be NULL which means navigation to a new window */ + if(nscontainer->doc) + FIXME("nscontainer->doc = %p\n", nscontainer->doc); + + b = before_async_open(This, nscontainer); + nsIWebBrowserChrome_Release(NSWBCHROME(nscontainer)); + if(b) + FIXME("Navigation not cancelled\n"); + return NS_ERROR_UNEXPECTED; + } } } - nsIWineURI_GetNSContainer(This->uri, &container); + if(!window) { + nsIWineURI_GetWindow(This->uri, &window); - if(!container && This->load_group) { - container = get_nscontainer_from_load_group(This); - if(container) - nsIWineURI_SetNSContainer(This->uri, container); + if(!window && This->load_group) { + window = get_window_from_load_group(This); + if(window) + nsIWineURI_SetWindow(This->uri, window); + } } - if(!container) { - TRACE("container = NULL\n"); + if(!window) { + TRACE("window = NULL\n"); return This->channel ? nsIChannel_AsyncOpen(This->channel, aListener, aContext) : NS_ERROR_UNEXPECTED; } - if(is_doc_uri && (This->load_flags & LOAD_INITIAL_DOCUMENT_URI)) - nsres = async_open_doc_uri(This, container, aListener, aContext, &open); + if(is_doc_uri && (This->load_flags & LOAD_INITIAL_DOCUMENT_URI)) { + if(window->doc_obj->nscontainer->bscallback) { + NSContainer *nscontainer = window->doc_obj->nscontainer; + + channelbsc_set_channel(nscontainer->bscallback, This, aListener, aContext); + + if(nscontainer->doc->mime) { + heap_free(This->content_type); + This->content_type = heap_strdupWtoA(nscontainer->doc->mime); + } + + open = FALSE; + }else { + open = before_async_open(This, window->doc_obj->nscontainer); + if(!open) { + TRACE("canceled\n"); + nsres = NS_ERROR_UNEXPECTED; + } + } + } if(open) - nsres = async_open(This, container, aListener, aContext); + nsres = async_open(This, window, is_doc_uri, aListener, aContext); - nsIWebBrowserChrome_Release(NSWBCHROME(container)); + if(window) + IHTMLWindow2_Release(HTMLWINDOW2(window)); return nsres; }

1 0

Owen Rudge : mapi32: Use separate pointer for drafts folder when sending via extended MAPI.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

Module: wine Branch: master Commit: d6bc1f5e229ce2ad59a5463adb08ddbb17a0f892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6bc1f5e229ce2ad59a5463ad… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Oct 26 13:19:05 2009 -0500 mapi32: Use separate pointer for drafts folder when sending via extended MAPI. This patch fixes a crash in the MAPISendMail extended mail wrapper due to reusing the "folder" variable for two separate objects. --- dlls/mapi32/sendmail.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 13fb4c7..08aceb0 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -59,7 +59,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM IMAPITable* msg_table; LPSRowSet rows = NULL; IMsgStore* msg_store; - IMAPIFolder* folder = NULL; + IMAPIFolder* folder = NULL, *draft_folder = NULL; LPENTRYID entry_id; LPSPropValue props; ULONG entry_len; @@ -151,10 +151,10 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM goto logoff; IMsgStore_OpenEntry(msg_store, props[0].Value.bin.cb, (LPENTRYID) props[0].Value.bin.lpb, - NULL, MAPI_MODIFY, &obj_type, (LPUNKNOWN *) &folder); + NULL, MAPI_MODIFY, &obj_type, (LPUNKNOWN *) &draft_folder); /* Create a new message */ - if (IMAPIFolder_CreateMessage(folder, NULL, 0, &msg) == S_OK) + if (IMAPIFolder_CreateMessage(draft_folder, NULL, 0, &msg) == S_OK) { ULONG token; SPropValue p; @@ -329,7 +329,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM { /* Show the message form (edit window) */ - ret = IMAPISession_ShowForm(session, 0, msg_store, folder, NULL, + ret = IMAPISession_ShowForm(session, 0, msg_store, draft_folder, NULL, token, NULL, 0, status, flags, access, props->Value.lpszA); @@ -354,6 +354,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM } /* Free up the resources we've used */ + IMAPIFolder_Release(draft_folder); IMAPIFolder_Release(folder); IMsgStore_Release(msg_store);

1 0

Jacek Caban : mshtml: Store window reference in nsURI.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

Module: wine Branch: master Commit: 45ce37fe64e689497fcfa6fd91476e25ce473581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45ce37fe64e689497fcfa6fd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 26 23:02:50 2009 +0100 mshtml: Store window reference in nsURI. --- dlls/mshtml/htmlwindow.c | 13 ++++ dlls/mshtml/mshtml_private.h | 20 ++++++- dlls/mshtml/nsiface.idl | 18 +++++- dlls/mshtml/nsio.c | 137 ++++++++++++++++++++++++++++++++++++------ 4 files changed, 168 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45ce37fe64e689497fcfa…

1 0

Yann Droneaud : ntdll: Use __asm__ keyword instead of asm in signal_sparc.c .
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

Module: wine Branch: master Commit: c8553641ac8536ba6d61d3845cc24a56e607f44d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8553641ac8536ba6d61d3845… Author: Yann Droneaud <yann(a)droneaud.fr> Date: Mon Oct 26 15:33:15 2009 +0100 ntdll: Use __asm__ keyword instead of asm in signal_sparc.c. --- dlls/ntdll/signal_sparc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index afde5f8..5450402 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -779,7 +779,7 @@ void signal_init_process(void) the process. wine-devel did not reach a conclusion on whether this is correct, because that is what x86 does, or it is harmful because it could obscure problems in user code */ - asm("ta 6"); /* 6 == ST_FIX_ALIGN defined in sys/trap.h */ + __asm__("ta 6"); /* 6 == ST_FIX_ALIGN defined in sys/trap.h */ return; error:

1 0

Yann Droneaud : libwine: Test against __linux__ define instead of just linux.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

Module: wine Branch: master Commit: fec1e88984fb2c3625a551995a59e31932b19c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec1e88984fb2c3625a551995… Author: Yann Droneaud <yann(a)droneaud.fr> Date: Mon Oct 26 15:36:20 2009 +0100 libwine: Test against __linux__ define instead of just linux. --- libs/wine/ldt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 7475d51..685ed6a 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -35,7 +35,7 @@ #ifdef __i386__ -#ifdef linux +#ifdef __linux__ #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h>

1 0

Yann Droneaud : loader: Use __asm__ keyword instead of asm.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

Module: wine Branch: master Commit: 23e91047210a05e1da780f451ae14c0eb78868f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e91047210a05e1da780f451… Author: Yann Droneaud <yann(a)droneaud.fr> Date: Mon Oct 26 15:33:14 2009 +0100 loader: Use __asm__ keyword instead of asm. --- loader/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/main.c b/loader/main.c index 6de500e..628a0fa 100644 --- a/loader/main.c +++ b/loader/main.c @@ -40,8 +40,8 @@ #ifdef __APPLE__ -asm(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x40000000"); -asm(".zerofill WINE_SHAREDHEAP, WINE_SHAREDHEAP, ___wine_shared_heap, 0x03000000"); +__asm__(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x40000000"); +__asm__(".zerofill WINE_SHAREDHEAP, WINE_SHAREDHEAP, ___wine_shared_heap, 0x03000000"); extern char __wine_dos[0x40000000], __wine_shared_heap[0x03000000]; static const struct wine_preload_info wine_main_preload_info[] =

1 0