August 2015 - Wine-commits - list.winehq.org

Jacek Caban : ieframe: Store container IOleCommandTarget in DocHost.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 221bb4261c28fb446a48f6f0e00794a07360200c URL: http://source.winehq.org/git/wine.git/?a=commit;h=221bb4261c28fb446a48f6f0e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 16:30:45 2015 +0200 ieframe: Store container IOleCommandTarget in DocHost. --- dlls/ieframe/dochost.c | 5 +++++ dlls/ieframe/ieframe.h | 1 + dlls/ieframe/oleobject.c | 11 +++++++++++ dlls/ieframe/webbrowser.c | 20 ++------------------ 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index b0d713b..a495292 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -582,6 +582,11 @@ void release_dochost_client(DocHost *This) IOleInPlaceFrame_Release(This->frame); This->frame = NULL; } + + if(This->olecmd) { + IOleCommandTarget_Release(This->olecmd); + This->olecmd = NULL; + } } static inline DocHost *impl_from_IOleCommandTarget(IOleCommandTarget *iface) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index a83ff35..8a0b074 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -128,6 +128,7 @@ struct DocHost { IDispatch *client_disp; IDocHostUIHandler *hostui; IOleInPlaceFrame *frame; + IOleCommandTarget *olecmd; IUnknown *document; IOleDocumentView *view; diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index fb9e12f..3a75a71 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -458,6 +458,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE { WebBrowser *This = impl_from_IOleObject(iface); IDocHostUIHandler *hostui; + IOleCommandTarget *olecmd; IOleContainer *container; IDispatch *disp; HRESULT hres; @@ -502,9 +503,19 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE ITargetContainer_Release(target_container); } + hres = IOleContainer_QueryInterface(container, &IID_IOleCommandTarget, (void**)&olecmd); + if(FAILED(hres)) + olecmd = NULL; + IOleContainer_Release(container); + }else { + hres = IOleClientSite_QueryInterface(This->client, &IID_IOleCommandTarget, (void**)&olecmd); + if(FAILED(hres)) + olecmd = NULL; } + This->doc_host.olecmd = olecmd; + create_shell_embedding_hwnd(This); on_offlineconnected_change(This); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 1f58bbb..8689c7e 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -1206,33 +1206,17 @@ static HRESULT WINAPI DocHostContainer_SetStatusText(DocHost* This, LPCWSTR text static void WINAPI DocHostContainer_SetURL(DocHost* This, LPCWSTR url) { - } static HRESULT DocHostContainer_exec(DocHost *doc_host, const GUID *cmd_group, DWORD cmdid, DWORD execopt, VARIANT *in, VARIANT *out) { - WebBrowser *This = impl_from_DocHost(doc_host); - IOleCommandTarget *cmdtrg = NULL; HRESULT hres; - if(This->client) { - hres = IOleClientSite_QueryInterface(This->client, &IID_IOleCommandTarget, (void**)&cmdtrg); - if(FAILED(hres)) - cmdtrg = NULL; - } - - if(!cmdtrg && This->container) { - hres = IOleContainer_QueryInterface(This->container, &IID_IOleCommandTarget, (void**)&cmdtrg); - if(FAILED(hres)) - cmdtrg = NULL; - } - - if(!cmdtrg) + if(!doc_host->olecmd) return E_NOTIMPL; - hres = IOleCommandTarget_Exec(cmdtrg, cmd_group, cmdid, execopt, in, out); - IOleCommandTarget_Release(cmdtrg); + hres = IOleCommandTarget_Exec(doc_host->olecmd, cmd_group, cmdid, execopt, in, out); if(SUCCEEDED(hres)) TRACE("Exec returned %08x %s\n", hres, debugstr_variant(out)); else

1 0

Jacek Caban : ieframe: Use stored IOleCommandTarget in Exec implementation and get rid of no longer needed exec in IDocHostContainerVtbl.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: dfb79624cc60b40758325eecbc5214a123ae4bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb79624cc60b40758325eecb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 16:30:50 2015 +0200 ieframe: Use stored IOleCommandTarget in Exec implementation and get rid of no longer needed exec in IDocHostContainerVtbl. --- dlls/ieframe/dochost.c | 16 +++++++++++++--- dlls/ieframe/ieframe.h | 1 - dlls/ieframe/iexplore.c | 9 +-------- dlls/ieframe/webbrowser.c | 20 +------------------- 4 files changed, 15 insertions(+), 31 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index a495292..55c1dfe 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -639,8 +639,15 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, if(!pguidCmdGroup) { switch(nCmdID) { case OLECMDID_UPDATECOMMANDS: + if(!This->olecmd) + return E_NOTIMPL; + return IOleCommandTarget_Exec(This->olecmd, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); case OLECMDID_SETDOWNLOADSTATE: - return This->container_vtbl->exec(This, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); + if(This->olecmd) + return IOleCommandTarget_Exec(This->olecmd, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); + + FIXME("Default action not implemented.\n"); + return E_NOTIMPL; default: FIXME("Unimplemented cmdid %d\n", nCmdID); return E_NOTIMPL; @@ -719,8 +726,11 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, } } - if(IsEqualGUID(&CGID_DocHostCommandHandler, pguidCmdGroup)) - return This->container_vtbl->exec(This, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); + if(IsEqualGUID(&CGID_DocHostCommandHandler, pguidCmdGroup)) { + if(!This->olecmd) + return E_NOTIMPL; + return IOleCommandTarget_Exec(This->olecmd, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); + } FIXME("Unimplemented cmdid %d of group %s\n", nCmdID, debugstr_guid(pguidCmdGroup)); return E_NOTIMPL; diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 8a0b074..031cfae 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -106,7 +106,6 @@ typedef struct _IDocHostContainerVtbl void (WINAPI* GetDocObjRect)(DocHost*,RECT*); HRESULT (WINAPI* SetStatusText)(DocHost*,LPCWSTR); void (WINAPI* SetURL)(DocHost*,LPCWSTR); - HRESULT (*exec)(DocHost*,const GUID*,DWORD,DWORD,VARIANT*,VARIANT*); } IDocHostContainerVtbl; struct DocHost { diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 08bb167..6260476 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -771,19 +771,12 @@ static void WINAPI DocHostContainer_SetURL(DocHost* iface, LPCWSTR url) SendMessageW(This->frame_hwnd, WM_UPDATEADDRBAR, 0, (LPARAM)url); } -static HRESULT DocHostContainer_exec(DocHost* This, const GUID *cmd_group, DWORD cmdid, DWORD execopt, VARIANT *in, - VARIANT *out) -{ - return E_NOTIMPL; -} - static const IDocHostContainerVtbl DocHostContainerVtbl = { IEDocHost_addref, IEDocHost_release, DocHostContainer_GetDocObjRect, DocHostContainer_SetStatusText, - DocHostContainer_SetURL, - DocHostContainer_exec + DocHostContainer_SetURL }; static HRESULT create_ie(InternetExplorer **ret_obj) diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 8689c7e..5b4348b 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -1208,30 +1208,12 @@ static void WINAPI DocHostContainer_SetURL(DocHost* This, LPCWSTR url) { } -static HRESULT DocHostContainer_exec(DocHost *doc_host, const GUID *cmd_group, DWORD cmdid, DWORD execopt, VARIANT *in, - VARIANT *out) -{ - HRESULT hres; - - if(!doc_host->olecmd) - return E_NOTIMPL; - - hres = IOleCommandTarget_Exec(doc_host->olecmd, cmd_group, cmdid, execopt, in, out); - if(SUCCEEDED(hres)) - TRACE("Exec returned %08x %s\n", hres, debugstr_variant(out)); - else - FIXME("Exec failed\n"); - - return hres; -} - static const IDocHostContainerVtbl DocHostContainerVtbl = { WebBrowser_addref, WebBrowser_release, DocHostContainer_GetDocObjRect, DocHostContainer_SetStatusText, - DocHostContainer_SetURL, - DocHostContainer_exec + DocHostContainer_SetURL }; static HRESULT create_webbrowser(int version, IUnknown *outer, REFIID riid, void **ppv)

1 0

Jacek Caban : ieframe: Added support for DownloadBegin and DownloadComplete events.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 37c8166b8a80e6f3b11ba1464e9ec6d7e75ed07e URL: http://source.winehq.org/git/wine.git/?a=commit;h=37c8166b8a80e6f3b11ba1464… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 16:30:57 2015 +0200 ieframe: Added support for DownloadBegin and DownloadComplete events. --- dlls/ieframe/dochost.c | 7 +++++-- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/navigate.c | 8 ++++++++ dlls/ieframe/tests/webbrowser.c | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 55c1dfe..3c7afb6 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -646,8 +646,11 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, if(This->olecmd) return IOleCommandTarget_Exec(This->olecmd, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); - FIXME("Default action not implemented.\n"); - return E_NOTIMPL; + if(!pvaIn || V_VT(pvaIn) != VT_I4) + return E_INVALIDARG; + + notify_download_state(This, V_I4(pvaIn)); + return S_OK; default: FIXME("Unimplemented cmdid %d\n", nCmdID); return E_NOTIMPL; diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 031cfae..057c2f6 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -277,6 +277,7 @@ void set_doc_state(DocHost*,READYSTATE) DECLSPEC_HIDDEN; void deactivate_document(DocHost*) DECLSPEC_HIDDEN; void create_doc_view_hwnd(DocHost*) DECLSPEC_HIDDEN; void on_commandstate_change(DocHost*,LONG,VARIANT_BOOL) DECLSPEC_HIDDEN; +void notify_download_state(DocHost*,BOOL) DECLSPEC_HIDDEN; #define WM_DOCHOSTTASK (WM_USER+0x300) void push_dochost_task(DocHost*,task_header_t*,task_proc_t,task_destr_t,BOOL) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index b1753a6..93d3f07 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -146,6 +146,13 @@ HRESULT set_dochost_url(DocHost *This, const WCHAR *url) return S_OK; } +void notify_download_state(DocHost *dochost, BOOL is_downloading) +{ + DISPPARAMS dwl_dp = {NULL}; + TRACE("(%x)\n", is_downloading); + call_sink(dochost->cps.wbe2, is_downloading ? DISPID_DOWNLOADBEGIN : DISPID_DOWNLOADCOMPLETE, &dwl_dp); +} + static inline BindStatusCallback *impl_from_IBindStatusCallback(IBindStatusCallback *iface) { return CONTAINING_RECORD(iface, BindStatusCallback, IBindStatusCallback_iface); @@ -896,6 +903,7 @@ static HRESULT navigate_bsc(DocHost *This, BindStatusCallback *bsc, IMoniker *mo return S_OK; } + notify_download_state(This, TRUE); on_commandstate_change(This, CSC_NAVIGATEBACK, VARIANT_FALSE); on_commandstate_change(This, CSC_NAVIGATEFORWARD, VARIANT_FALSE); diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index aa90755..36994a4 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2718,7 +2718,7 @@ static void test_Navigate2(IWebBrowser2 *webbrowser, const char *nav_url) CHECK_CALLED(Invoke_AMBIENT_USERMODE); todo_wine CHECK_CALLED(Invoke_PROPERTYCHANGE); CHECK_CALLED(Invoke_BEFORENAVIGATE2); - todo_wine CHECK_CALLED(Invoke_DOWNLOADBEGIN); + CHECK_CALLED(Invoke_DOWNLOADBEGIN); if (use_container_olecmd) todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_1); CHECK_CALLED(EnableModeless_FALSE); CHECK_CALLED(Invoke_STATUSTEXTCHANGE);

1 0

Jacek Caban : ieframe: Properly test events when container doesn' t support IOleCommandTarget add added more tests.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 4d1fa5d1b838a3507884bd700ac870919c9717cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d1fa5d1b838a3507884bd700… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 16:31:09 2015 +0200 ieframe: Properly test events when container doesn't support IOleCommandTarget add added more tests. --- dlls/ieframe/navigate.c | 2 + dlls/ieframe/tests/webbrowser.c | 150 ++++++++++++++++++++++++++-------------- 2 files changed, 99 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d1fa5d1b838a3507884b…

1 0

Jacek Caban : mshtml: Added IHTMLCurrentStyle3:: whiteSpace property implementation.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 5d52373c62f665185e7c9b7b06e71a5b7f70e9df URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d52373c62f665185e7c9b7b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 16:59:13 2015 +0200 mshtml: Added IHTMLCurrentStyle3::whiteSpace property implementation. --- dlls/mshtml/htmlcurstyle.c | 6 ++++-- dlls/mshtml/tests/style.c | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index bf46cfc..8e7a146 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -1191,8 +1191,10 @@ static HRESULT WINAPI HTMLCurrentStyle3_get_wordSpacing(IHTMLCurrentStyle3 *ifac static HRESULT WINAPI HTMLCurrentStyle3_get_whiteSpace(IHTMLCurrentStyle3 *iface, BSTR *p) { HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr(This->nsstyle, STYLEID_WHITE_SPACE, p, 0); } static const IHTMLCurrentStyle3Vtbl HTMLCurrentStyle3Vtbl = { diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index fffade0..5d8e158 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2435,6 +2435,17 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(str, "nowrap"), "whiteSpace = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + str = a2bstr("normal"); + hres = IHTMLStyle_put_whiteSpace(style, str); + SysFreeString(str); + ok(hres == S_OK, "put_whiteSpace failed: %08x\n", hres); + + str = NULL; + hres = IHTMLStyle_get_whiteSpace(style, &str); + ok(hres == S_OK, "get_whiteSpace failed: %08x\n", hres); + ok(!strcmp_wa(str, "normal"), "whiteSpace = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + /* listStyleType */ hres = IHTMLStyle_get_listStyleType(style, &str); ok(hres == S_OK, "get_listStyleType failed: %08x\n", hres); @@ -2622,6 +2633,7 @@ static void test_style_filters(IHTMLElement *elem) static void test_current_style(IHTMLCurrentStyle *current_style) { IHTMLCurrentStyle2 *current_style2; + IHTMLCurrentStyle3 *current_style3; VARIANT_BOOL b; BSTR str; HRESULT hres; @@ -2895,6 +2907,16 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(b == VARIANT_TRUE, "hasLayout = %x\n", b); IHTMLCurrentStyle2_Release(current_style2); + + hres = IHTMLCurrentStyle_QueryInterface(current_style, &IID_IHTMLCurrentStyle3, (void**)&current_style3); + ok(hres == S_OK, "Could not get IHTMLCurrentStyle3 iface: %08x\n", hres); + + hres = IHTMLCurrentStyle3_get_whiteSpace(current_style3, &str); + ok(hres == S_OK, "get_whiteSpace failed: %08x\n", hres); + ok(!strcmp_wa(str, "normal"), "whiteSpace = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IHTMLCurrentStyle3_Release(current_style3); } static const char basic_test_str[] = "<html><body><div id=\"divid\"></div/</body></html>";

1 0

Jacek Caban : mshtml: Properly handle request aborted inside OnStartRequest.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: ce83ff735129d28ac4ebb0099ccbf841cc2cf7ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce83ff735129d28ac4ebb0099… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 17:25:07 2015 +0200 mshtml: Properly handle request aborted inside OnStartRequest. --- dlls/mshtml/navigate.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index c22080d..b324160 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -939,6 +939,8 @@ static HRESULT on_start_nsrequest(nsChannelBSC *This) } if(This->is_doc_channel) { + if(!This->bsc.window) + return E_ABORT; /* Binding aborted in OnStartRequest call. */ update_window_doc(This->bsc.window); if(This->bsc.window->base.outer_window->readystate != READYSTATE_LOADING) set_ready_state(This->bsc.window->base.outer_window, READYSTATE_LOADING); @@ -1053,7 +1055,9 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) return E_OUTOFMEMORY; } - on_start_nsrequest(This); + hres = on_start_nsrequest(This); + if(FAILED(hres)) + return hres; } nsres = nsIStreamListener_OnDataAvailable(This->nslistener,

1 0

Vincent Povirk : comdlg32: Add test for IFileDialogEvents::OnOverwrite.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 3ec84397c95ada14d2ee2300d55b0ea227d51a43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ec84397c95ada14d2ee2300d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 13 15:12:25 2015 -0500 comdlg32: Add test for IFileDialogEvents::OnOverwrite. --- dlls/comdlg32/tests/itemdlg.c | 162 ++++++++++++++++++++++++++++++++++++++++++ include/shobjidl.idl | 2 +- 2 files changed, 163 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index ddf21f6..b7238bb 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -288,6 +288,9 @@ static HRESULT WINAPI IFileDialogEvents_fnOnOverwrite(IFileDialogEvents *iface, { IFileDialogEventsImpl *This = impl_from_IFileDialogEvents(iface); This->OnOverwrite++; + ok(*pResponse == FDEOR_DEFAULT, "overwrite response %u\n", *pResponse); + *pResponse = FDEOR_ACCEPT; + ok(!This->OnFileOk, "OnFileOk already called %u times\n", This->OnFileOk); return S_OK; } @@ -2261,6 +2264,164 @@ if (0) IFileDialog_Release(fd); } +static void test_overwrite(void) +{ + static const WCHAR filename_winetest[] = {'w','i','n','e','t','e','s','t','.','o','v','w',0}; + IFileDialogEventsImpl *pfdeimpl; + IFileDialogEvents *pfde; + IFileDialog *fd; + DWORD cookie; + LPWSTR filename; + IShellItem *psi_current; + WCHAR buf[MAX_PATH]; + HRESULT hr; + + GetCurrentDirectoryW(MAX_PATH, buf); + ok(!!pSHCreateItemFromParsingName, "SHCreateItemFromParsingName is missing.\n"); + hr = pSHCreateItemFromParsingName(buf, NULL, &IID_IShellItem, (void**)&psi_current); + ok(hr == S_OK, "Got 0x%08x\n", hr); + + touch_file(filename_winetest); + + /* FOS_OVERWRITEPROMPT has no effect on open dialog */ + hr = CoCreateInstance(&CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, + &IID_IFileDialog, (void**)&fd); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IFileDialog_SetOptions(fd, FOS_OVERWRITEPROMPT | FOS_NOCHANGEDIR); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IFileDialog_SetFolder(fd, psi_current); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + pfde = IFileDialogEvents_Constructor(); + pfdeimpl = impl_from_IFileDialogEvents(pfde); + pfdeimpl->set_filename = filename_winetest; + hr = IFileDialog_Advise(fd, pfde, &cookie); + ok(hr == S_OK, "Advise failed: Got 0x%08x\n", hr); + + hr = IFileDialog_Show(fd, NULL); + ok(hr == S_OK, "Show failed: Got 0x%08x\n", hr); + + ok(!pfdeimpl->OnOverwrite, "got %u overwrite events\n", pfdeimpl->OnOverwrite); + ok(pfdeimpl->OnFileOk == 1, "got %u ok events\n", pfdeimpl->OnFileOk); + + hr = IFileDialog_GetFileName(fd, &filename); + ok(hr == S_OK, "GetFileName failed: Got 0x%08x\n", hr); + ok(!lstrcmpW(filename, filename_winetest), "Got %s\n", wine_dbgstr_w(filename)); + CoTaskMemFree(filename); + + hr = IFileDialog_Unadvise(fd, cookie); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + IFileDialog_Release(fd); + + IFileDialogEvents_Release(pfde); + + /* Save dialog doesn't check for overwrite without FOS_OVERWRITEPROMPT set */ + hr = CoCreateInstance(&CLSID_FileSaveDialog, NULL, CLSCTX_INPROC_SERVER, + &IID_IFileDialog, (void**)&fd); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IFileDialog_SetOptions(fd, FOS_NOREADONLYRETURN | FOS_PATHMUSTEXIST | FOS_NOCHANGEDIR); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IFileDialog_SetFolder(fd, psi_current); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + pfde = IFileDialogEvents_Constructor(); + pfdeimpl = impl_from_IFileDialogEvents(pfde); + pfdeimpl->set_filename = filename_winetest; + hr = IFileDialog_Advise(fd, pfde, &cookie); + ok(hr == S_OK, "Advise failed: Got 0x%08x\n", hr); + + hr = IFileDialog_Show(fd, NULL); + ok(hr == S_OK, "Show failed: Got 0x%08x\n", hr); + + ok(!pfdeimpl->OnOverwrite, "got %u overwrite events\n", pfdeimpl->OnOverwrite); + ok(pfdeimpl->OnFileOk == 1, "got %u ok events\n", pfdeimpl->OnFileOk); + + hr = IFileDialog_GetFileName(fd, &filename); + ok(hr == S_OK, "GetFileName failed: Got 0x%08x\n", hr); + ok(!lstrcmpW(filename, filename_winetest), "Got %s\n", wine_dbgstr_w(filename)); + CoTaskMemFree(filename); + + hr = IFileDialog_Unadvise(fd, cookie); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + IFileDialog_Release(fd); + + IFileDialogEvents_Release(pfde); + + /* Save dialog with FOS_OVERWRITEPROMPT set */ + hr = CoCreateInstance(&CLSID_FileSaveDialog, NULL, CLSCTX_INPROC_SERVER, + &IID_IFileDialog, (void**)&fd); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IFileDialog_SetFolder(fd, psi_current); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + pfde = IFileDialogEvents_Constructor(); + pfdeimpl = impl_from_IFileDialogEvents(pfde); + pfdeimpl->set_filename = filename_winetest; + hr = IFileDialog_Advise(fd, pfde, &cookie); + ok(hr == S_OK, "Advise failed: Got 0x%08x\n", hr); + + hr = IFileDialog_Show(fd, NULL); + ok(hr == S_OK, "Show failed: Got 0x%08x\n", hr); + + todo_wine ok(pfdeimpl->OnOverwrite == 1, "got %u overwrite events\n", pfdeimpl->OnOverwrite); + ok(pfdeimpl->OnFileOk == 1, "got %u ok events\n", pfdeimpl->OnFileOk); + + hr = IFileDialog_GetFileName(fd, &filename); + ok(hr == S_OK, "GetFileName failed: Got 0x%08x\n", hr); + ok(!lstrcmpW(filename, filename_winetest), "Got %s\n", wine_dbgstr_w(filename)); + CoTaskMemFree(filename); + + hr = IFileDialog_Unadvise(fd, cookie); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + IFileDialog_Release(fd); + + IFileDialogEvents_Release(pfde); + + DeleteFileW(filename_winetest); + + /* Save dialog with FOS_OVERWRITEPROMPT set but without existing file */ + hr = CoCreateInstance(&CLSID_FileSaveDialog, NULL, CLSCTX_INPROC_SERVER, + &IID_IFileDialog, (void**)&fd); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IFileDialog_SetFolder(fd, psi_current); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + pfde = IFileDialogEvents_Constructor(); + pfdeimpl = impl_from_IFileDialogEvents(pfde); + pfdeimpl->set_filename = filename_winetest; + hr = IFileDialog_Advise(fd, pfde, &cookie); + ok(hr == S_OK, "Advise failed: Got 0x%08x\n", hr); + + hr = IFileDialog_Show(fd, NULL); + ok(hr == S_OK, "Show failed: Got 0x%08x\n", hr); + + ok(!pfdeimpl->OnOverwrite, "got %u overwrite events\n", pfdeimpl->OnOverwrite); + ok(pfdeimpl->OnFileOk == 1, "got %u ok events\n", pfdeimpl->OnFileOk); + + hr = IFileDialog_GetFileName(fd, &filename); + ok(hr == S_OK, "GetFileName failed: Got 0x%08x\n", hr); + ok(!lstrcmpW(filename, filename_winetest), "Got %s\n", wine_dbgstr_w(filename)); + CoTaskMemFree(filename); + + hr = IFileDialog_Unadvise(fd, cookie); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + IFileDialog_Release(fd); + + IFileDialogEvents_Release(pfde); + + IShellItem_Release(psi_current); +} + START_TEST(itemdlg) { OleInitialize(NULL); @@ -2274,6 +2435,7 @@ START_TEST(itemdlg) test_filename(); test_customize(); test_persistent_state(); + test_overwrite(); } else skip("Skipping all Item Dialog tests.\n"); diff --git a/include/shobjidl.idl b/include/shobjidl.idl index b021178..1cc6132 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -2716,7 +2716,7 @@ interface IFileDialog; typedef [v1_enum] enum FDE_OVERWRITE_RESPONSE { FDEOR_DEFAULT = 0, - FDEOR_ACCCEP = 1, + FDEOR_ACCEPT = 1, FDEOR_REFUSE = 2 } FDE_OVERWRITE_RESPONSE;

1 0

Vincent Povirk : comdlg32: Implement overwrite check in item dialog.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: b206287c91cc69a8b6621a4c8dace7eb169bfeb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b206287c91cc69a8b6621a4c8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 13 15:57:02 2015 -0500 comdlg32: Implement overwrite check in item dialog. --- dlls/comdlg32/itemdlg.c | 83 +++++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/tests/itemdlg.c | 2 +- 2 files changed, 84 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index d1a52cd..3150485 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -213,6 +213,47 @@ static void events_OnTypeChange(FileDialogImpl *This) } } +static HRESULT events_OnOverwrite(FileDialogImpl *This, IShellItem *shellitem) +{ + events_client *cursor; + HRESULT hr = S_OK; + FDE_OVERWRITE_RESPONSE response = FDEOR_DEFAULT; + TRACE("%p %p\n", This, shellitem); + + LIST_FOR_EACH_ENTRY(cursor, &This->events_clients, events_client, entry) + { + TRACE("Notifying %p\n", cursor); + hr = IFileDialogEvents_OnOverwrite(cursor->pfde, (IFileDialog*)&This->IFileDialog2_iface, shellitem, &response); + TRACE("<-- hr=%x response=%u\n", hr, response); + if(FAILED(hr) && hr != E_NOTIMPL) + break; + } + + if(hr == E_NOTIMPL) + hr = S_OK; + + if(SUCCEEDED(hr)) + { + if (response == FDEOR_DEFAULT) + { + WCHAR buf[100]; + int answer; + + LoadStringW(COMDLG32_hInstance, IDS_OVERWRITEFILE, buf, 100); + answer = MessageBoxW(This->dlg_hwnd, buf, This->custom_title, + MB_YESNO | MB_ICONEXCLAMATION); + if (answer == IDNO || answer == IDCANCEL) + { + hr = E_FAIL; + } + } + else if (response == FDEOR_REFUSE) + hr = E_FAIL; + } + + return hr; +} + static inline HRESULT get_cctrl_event(IFileDialogEvents *pfde, IFileDialogControlEvents **pfdce) { return IFileDialogEvents_QueryInterface(pfde, &IID_IFileDialogControlEvents, (void**)pfdce); @@ -423,6 +464,28 @@ static LPWSTR get_first_ext_from_spec(LPWSTR buf, LPCWSTR spec) return ext; } +static BOOL shell_item_exists(IShellItem* shellitem) +{ + LPWSTR filename; + HRESULT hr; + BOOL result; + + hr = IShellItem_GetDisplayName(shellitem, SIGDN_FILESYSPATH, &filename); + if (SUCCEEDED(hr)) + { + /* FIXME: Implement SFGAO_VALIDATE in Wine and use it instead. */ + result = (GetFileAttributesW(filename) != INVALID_FILE_ATTRIBUTES); + CoTaskMemFree(filename); + } + else + { + SFGAOF attributes; + result = SUCCEEDED(IShellItem_GetAttributes(shellitem, SFGAO_VALIDATE, &attributes)); + } + + return result; +} + static HRESULT on_default_action(FileDialogImpl *This) { IShellFolder *psf_parent, *psf_desktop; @@ -589,6 +652,26 @@ static HRESULT on_default_action(FileDialogImpl *This) } } + if((This->options & FOS_OVERWRITEPROMPT) && This->dlg_type == ITEMDLG_TYPE_SAVE) + { + IShellItem *shellitem; + + for (i=0; SUCCEEDED(hr) && i<file_count; i++) + { + hr = IShellItemArray_GetItemAt(This->psia_results, i, &shellitem); + if (SUCCEEDED(hr)) + { + if (shell_item_exists(shellitem)) + hr = events_OnOverwrite(This, shellitem); + + IShellItem_Release(shellitem); + } + } + + if (FAILED(hr)) + break; + } + if(events_OnFileOk(This) == S_OK) ret = S_OK; } diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index b7238bb..6ea3481 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -2370,7 +2370,7 @@ static void test_overwrite(void) hr = IFileDialog_Show(fd, NULL); ok(hr == S_OK, "Show failed: Got 0x%08x\n", hr); - todo_wine ok(pfdeimpl->OnOverwrite == 1, "got %u overwrite events\n", pfdeimpl->OnOverwrite); + ok(pfdeimpl->OnOverwrite == 1, "got %u overwrite events\n", pfdeimpl->OnOverwrite); ok(pfdeimpl->OnFileOk == 1, "got %u ok events\n", pfdeimpl->OnFileOk); hr = IFileDialog_GetFileName(fd, &filename);

1 0

Vincent Povirk : shell32: Use return value from IShellFolder_GetAttributesOf.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 642b2fe789942d1632f3aa9f1394435fd7e89e63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=642b2fe789942d1632f3aa9f1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 14 11:41:55 2015 -0500 shell32: Use return value from IShellFolder_GetAttributesOf. --- dlls/shell32/shellitem.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index a410381..853325c 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -271,10 +271,13 @@ static HRESULT WINAPI ShellItem_GetAttributes(IShellItem2 *iface, SFGAOF sfgaoMa *psfgaoAttribs &= sfgaoMask; IShellFolder_Release(parent_folder); - if(sfgaoMask == *psfgaoAttribs) - return S_OK; - else - return S_FALSE; + if (SUCCEEDED(ret)) + { + if(sfgaoMask == *psfgaoAttribs) + return S_OK; + else + return S_FALSE; + } } return ret;

1 0

Vincent Povirk : shell32: Fix getting parent shell folder when it' s the desktop folder.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 8657547d9e5b410a5b07dcab68ab73c158ecc22e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8657547d9e5b410a5b07dcab6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 14 14:55:20 2015 -0500 shell32: Fix getting parent shell folder when it's the desktop folder. BindToObject fails in this case. --- dlls/shell32/shellitem.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 853325c..f64c2d0 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -143,8 +143,15 @@ static HRESULT ShellItem_get_parent_shellfolder(ShellItem *This, IShellFolder ** ret = SHGetDesktopFolder(&desktop); if (SUCCEEDED(ret)) { - ret = IShellFolder_BindToObject(desktop, parent_pidl, NULL, &IID_IShellFolder, (void**)ppsf); - IShellFolder_Release(desktop); + if (_ILIsDesktop(parent_pidl)) + { + *ppsf = desktop; + } + else + { + ret = IShellFolder_BindToObject(desktop, parent_pidl, NULL, &IID_IShellFolder, (void**)ppsf); + IShellFolder_Release(desktop); + } } ILFree(parent_pidl); }

1 0