wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Detlef Riekenberg : advapi32/tests: Fix a failure on 64bit NT 5.x.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: aaad900d1edaba58d6073e5082530e42958a2201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaad900d1edaba58d6073e508… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Nov 12 05:50:13 2012 +0100 advapi32/tests: Fix a failure on 64bit NT 5.x. --- dlls/advapi32/tests/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index ba0750b..f5fc4e2 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4294,7 +4294,7 @@ static void test_TokenIntegrityLevel(void) res = GetTokenInformation(token, TokenIntegrityLevel, buffer, sizeof(buffer), &size); /* not supported before Vista */ - if (!res && (GetLastError() == ERROR_INVALID_PARAMETER)) + if (!res && ((GetLastError() == ERROR_INVALID_PARAMETER) || GetLastError() == ERROR_INVALID_FUNCTION)) { win_skip("TokenIntegrityLevel not supported\n"); CloseHandle(token);

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: c27d20902aaf25ea803fbf49853e375b331ef506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c27d20902aaf25ea803fbf498… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Nov 12 11:18:56 2012 +0900 po: Update Korean translation. --- po/ko.po | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/po/ko.po b/po/ko.po index 0ccb19b..a0bd4b9 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8241,44 +8241,36 @@ msgid "Security Warning" msgstr "보안 경고" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "그래도 계속 진행하겠습니까?" +msgstr "이 소프트웨어를 설치하기를 원합니까?" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" msgstr "위치:" #: urlmon.rc:36 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Don't install" -msgstr "설치/삭제" +msgstr "설치 안 함" #: urlmon.rc:40 msgid "" "When installed, ActiveX has full access to your computer.Do not click " "install unless you have absolute trust in the above source." msgstr "" +"설치할 때,ActiveX는 당신의 컴퓨터에 완전한 접근권한을 가질 것입니다. 당신이" +"이 원본을 완전히 신뢰하지 않는다면 설치를 클릭하지 마십시오." #: urlmon.rc:47 -#, fuzzy -#| msgid "Installation transform failed to apply.\n" msgid "Installation of component failed: %08x" -msgstr "설치 변환 실패가 추가됨.\n" +msgstr "구성요소 설치가 실패함: %08x" #: urlmon.rc:48 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "설치(&I)" +msgstr "설치 (%d)" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "설치(&I)" +msgstr "설치" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window"

1 0

Jacek Caban : ieframe: Added IWebBrowser2::Refresh tests.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 8b1bd3e5bfe8e3951e19a3063942d1d0cce8cc4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b1bd3e5bfe8e3951e19a3063… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:59:33 2012 +0100 ieframe: Added IWebBrowser2::Refresh tests. --- dlls/ieframe/tests/webbrowser.c | 43 +++++++++++++++++++++++++++++++------- 1 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 213e43d..25cce8a 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -126,6 +126,7 @@ DEFINE_EXPECT(Exec_SETTITLE); DEFINE_EXPECT(QueryStatus_SETPROGRESSTEXT); DEFINE_EXPECT(Exec_STOP); DEFINE_EXPECT(Exec_IDM_STOP); +DEFINE_EXPECT(Exec_DocHostCommandHandler_2300); DEFINE_EXPECT(QueryStatus_STOP); DEFINE_EXPECT(QueryStatus_IDM_STOP); DEFINE_EXPECT(DocHost_EnableModeless_TRUE); @@ -160,6 +161,7 @@ static int wb_version; #define DWL_FROM_PUT_HREF 0x02 #define DWL_FROM_GOBACK 0x04 #define DWL_HTTP 0x08 +#define DWL_REFRESH 0x10 static DWORD dwl_flags; @@ -453,6 +455,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 105: /* TODO */ case 138: /* TODO */ case 140: /* TODO (Win7) */ + case 144: /* TODO */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID); @@ -468,6 +471,9 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID switch(nCmdID) { case 6041: /* TODO */ break; + case 2300: + CHECK_EXPECT(Exec_DocHostCommandHandler_2300); + return E_NOTIMPL; default: ok(0, "unexpected nCmdID %d of CGID_DocHostCommandHandler\n", nCmdID); } @@ -2697,14 +2703,15 @@ static void test_ExecWB(IWebBrowser2 *webbrowser, BOOL use_custom_target, BOOL h static void test_download(DWORD flags) { + BOOL *b = (flags & DWL_REFRESH) ? &called_Exec_SETDOWNLOADSTATE_0 : &called_Invoke_DOCUMENTCOMPLETE; MSG msg; is_downloading = TRUE; dwl_flags = flags; - test_ready_state((flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); + test_ready_state((flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK|DWL_REFRESH)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); - if((is_http && !(flags & DWL_FROM_GOBACK)) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) + if((is_http && !(flags & (DWL_FROM_GOBACK|DWL_REFRESH))) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) SET_EXPECT(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2727,11 +2734,13 @@ static void test_download(DWORD flags) SET_EXPECT(GetHostInfo); SET_EXPECT(Exec_SETDOWNLOADSTATE_0); SET_EXPECT(Invoke_TITLECHANGE); - SET_EXPECT(Invoke_NAVIGATECOMPLETE2); + if(!(flags & DWL_REFRESH)) + SET_EXPECT(Invoke_NAVIGATECOMPLETE2); if(is_first_load) SET_EXPECT(GetDropTarget); SET_EXPECT(Invoke_PROGRESSCHANGE); - SET_EXPECT(Invoke_DOCUMENTCOMPLETE); + if(!(flags & DWL_REFRESH)) + SET_EXPECT(Invoke_DOCUMENTCOMPLETE); if(flags & DWL_HTTP) SET_EXPECT(Exec_SETTITLE); @@ -2739,12 +2748,12 @@ static void test_download(DWORD flags) SET_EXPECT(Exec_UPDATECOMMANDS); SET_EXPECT(QueryStatus_STOP); - while(!called_Invoke_DOCUMENTCOMPLETE && GetMessage(&msg, NULL, 0, 0)) { + while(!*b && GetMessage(&msg, NULL, 0, 0)) { TranslateMessage(&msg); DispatchMessage(&msg); } - if((is_http && !(flags & DWL_FROM_GOBACK)) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) + if((is_http && !(flags & (DWL_FROM_GOBACK|DWL_REFRESH))) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) todo_wine CHECK_CALLED(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2773,11 +2782,13 @@ static void test_download(DWORD flags) todo_wine CHECK_CALLED(GetHostInfo); CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); todo_wine CHECK_CALLED(Invoke_TITLECHANGE); - CHECK_CALLED(Invoke_NAVIGATECOMPLETE2); + if(!(flags & DWL_REFRESH)) + CHECK_CALLED(Invoke_NAVIGATECOMPLETE2); if(is_first_load) todo_wine CHECK_CALLED(GetDropTarget); todo_wine CHECK_CALLED(Invoke_PROGRESSCHANGE); - CHECK_CALLED(Invoke_DOCUMENTCOMPLETE); + if(!(flags & DWL_REFRESH)) + CHECK_CALLED(Invoke_DOCUMENTCOMPLETE); is_downloading = FALSE; @@ -2795,6 +2806,20 @@ static void test_download(DWORD flags) CLEAR_CALLED(QueryStatus_STOP); } +static void test_Refresh(IWebBrowser2 *webbrowser) +{ + HRESULT hres; + + trace("Refresh...\n"); + + SET_EXPECT(Exec_DocHostCommandHandler_2300); + hres = IWebBrowser2_Refresh(webbrowser); + ok(hres == S_OK, "Refresh failed: %08x\n", hres); + CHECK_CALLED(Exec_DocHostCommandHandler_2300); + + test_download(DWL_REFRESH); +} + static void test_olecmd(IWebBrowser2 *unk, BOOL loaded) { IOleCommandTarget *cmdtrg; @@ -3336,6 +3361,8 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_Navigate2(webbrowser, "http://test.winehq.org/tests/hello.html"); test_download(DWL_EXPECT_BEFORE_NAVIGATE|DWL_HTTP); + test_Refresh(webbrowser); + trace("put_href http URL...\n"); test_put_href(webbrowser, "http://www.winehq.org/"); test_download(DWL_FROM_PUT_HREF|DWL_HTTP);

1 0

Jacek Caban : ieframe: Added IWebBrowser2::Refresh implementation.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 9c3c57040e64bab4a8ddc1b93200f538565d5886 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c3c57040e64bab4a8ddc1b93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:59:20 2012 +0100 ieframe: Added IWebBrowser2::Refresh implementation. --- dlls/ieframe/dochost.c | 26 ++++++++++++++++++++++++++ dlls/ieframe/ie.c | 6 ++++-- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/webbrowser.c | 6 ++++-- 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index c063851..1b10fb4 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -453,6 +453,32 @@ void deactivate_document(DocHost *This) This->document = NULL; } +HRESULT refresh_document(DocHost *This) +{ + IOleCommandTarget *cmdtrg; + VARIANT vin, vout; + HRESULT hres; + + if(!This->document) { + FIXME("no document\n"); + return E_FAIL; + } + + hres = IUnknown_QueryInterface(This->document, &IID_IOleCommandTarget, (void**)&cmdtrg); + if(FAILED(hres)) + return hres; + + V_VT(&vin) = VT_EMPTY; + V_VT(&vout) = VT_EMPTY; + hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_REFRESH, OLECMDEXECOPT_PROMPTUSER, &vin, &vout); + IOleCommandTarget_Release(cmdtrg); + if(FAILED(hres)) + return hres; + + VariantClear(&vout); + return S_OK; +} + void release_dochost_client(DocHost *This) { if(This->hwnd) { diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index 02d0c28..da0e99c 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -182,8 +182,10 @@ static HRESULT WINAPI InternetExplorer_Navigate(IWebBrowser2 *iface, BSTR szUrl, static HRESULT WINAPI InternetExplorer_Refresh(IWebBrowser2 *iface) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return refresh_document(&This->doc_host->doc_host); } static HRESULT WINAPI InternetExplorer_Refresh2(IWebBrowser2 *iface, VARIANT *Level) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 8dd3f17..0c13c82 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -265,6 +265,7 @@ void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*) DECLSPEC_HIDDEN; HRESULT navigate_url(DocHost*,LPCWSTR,const VARIANT*,const VARIANT*,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; HRESULT go_home(DocHost*) DECLSPEC_HIDDEN; HRESULT go_back(DocHost*) DECLSPEC_HIDDEN; +HRESULT refresh_document(DocHost*) DECLSPEC_HIDDEN; HRESULT get_location_url(DocHost*,BSTR*) DECLSPEC_HIDDEN; HRESULT set_dochost_url(DocHost*,const WCHAR*) DECLSPEC_HIDDEN; void handle_navigation_error(DocHost*,HRESULT,BSTR,IHTMLWindow2*) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 1bd14fa..dda957a 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -292,8 +292,10 @@ static HRESULT WINAPI WebBrowser_Navigate(IWebBrowser2 *iface, BSTR szUrl, static HRESULT WINAPI WebBrowser_Refresh(IWebBrowser2 *iface) { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return refresh_document(&This->doc_host); } static HRESULT WINAPI WebBrowser_Refresh2(IWebBrowser2 *iface, VARIANT *Level)

1 0

Jacek Caban : ieframe: Forward more DocHost::Exec calls to embedders.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: d22a8bbd66261b4005495a3d704de1d111778ffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d22a8bbd66261b4005495a3d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:59:06 2012 +0100 ieframe: Forward more DocHost::Exec calls to embedders. --- dlls/ieframe/dochost.c | 4 ++++ dlls/ieframe/iexplore.c | 3 ++- dlls/ieframe/tests/webbrowser.c | 4 ++-- dlls/ieframe/webbrowser.c | 6 ++++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 0449f24..c063851 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -526,6 +526,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, if(!pguidCmdGroup) { switch(nCmdID) { case OLECMDID_UPDATECOMMANDS: + case OLECMDID_SETDOWNLOADSTATE: return This->container_vtbl->exec(This, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); default: FIXME("Unimplemented cmdid %d\n", nCmdID); @@ -605,6 +606,9 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, } } + if(IsEqualGUID(&CGID_DocHostCommandHandler, pguidCmdGroup)) + return This->container_vtbl->exec(This, 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/iexplore.c b/dlls/ieframe/iexplore.c index c4641bd..0643f16 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -789,8 +789,9 @@ static void WINAPI DocHostContainer_SetURL(DocHost* iface, LPCWSTR url) static HRESULT DocHostContainer_exec(DocHost* This, const GUID *cmd_group, DWORD cmdid, DWORD execopt, VARIANT *in, VARIANT *out) { - return S_OK; + return E_NOTIMPL; } + static const IDocHostContainerVtbl DocHostContainerVtbl = { IEDocHost_addref, IEDocHost_release, diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 57c2be9..213e43d 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2753,7 +2753,7 @@ static void test_download(DWORD flags) } todo_wine CHECK_CALLED(Exec_SETPROGRESSMAX); todo_wine CHECK_CALLED(Exec_SETPROGRESSPOS); - todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_1); + CHECK_CALLED(Exec_SETDOWNLOADSTATE_1); CLEAR_CALLED(DocHost_EnableModeless_FALSE); /* IE 7 */ CLEAR_CALLED(DocHost_EnableModeless_TRUE); /* IE 7 */ todo_wine CHECK_CALLED(Invoke_SETSECURELOCKICON); @@ -2771,7 +2771,7 @@ static void test_download(DWORD flags) CLEAR_CALLED(EnableModeless_FALSE); /* IE 8 */ if(!is_first_load) todo_wine CHECK_CALLED(GetHostInfo); - todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); + CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); todo_wine CHECK_CALLED(Invoke_TITLECHANGE); CHECK_CALLED(Invoke_NAVIGATECOMPLETE2); if(is_first_load) diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index b82233b..1bd14fa 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -1219,11 +1219,13 @@ static HRESULT DocHostContainer_exec(DocHost *doc_host, const GUID *cmd_group, D } if(!cmdtrg) - return S_OK; + return E_NOTIMPL; hres = IOleCommandTarget_Exec(cmdtrg, cmd_group, cmdid, execopt, in, out); IOleCommandTarget_Release(cmdtrg); - if(FAILED(hres)) + if(SUCCEEDED(hres)) + TRACE("Exec returned %08x %s\n", hres, debugstr_variant(out)); + else FIXME("Exec failed\n"); return hres;

1 0

Jacek Caban : mshtml: Added refresh tests.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 47274313db0f442e1f7b58043aa4283010461260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47274313db0f442e1f7b58043… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:58:54 2012 +0100 mshtml: Added refresh tests. --- dlls/mshtml/tests/htmldoc.c | 79 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 65 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index faa8ba7..1669943 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -132,6 +132,7 @@ DEFINE_EXPECT(Exec_ShellDocView_103); DEFINE_EXPECT(Exec_ShellDocView_105); DEFINE_EXPECT(Exec_ShellDocView_138); DEFINE_EXPECT(Exec_ShellDocView_140); +DEFINE_EXPECT(Exec_DocHostCommandHandler_2300); DEFINE_EXPECT(Exec_UPDATECOMMANDS); DEFINE_EXPECT(Exec_SETTITLE); DEFINE_EXPECT(Exec_HTTPEQUIV); @@ -203,7 +204,7 @@ static BOOL set_clientsite, container_locked; static BOOL readystate_set_loading = FALSE, readystate_set_interactive = FALSE, load_from_stream; static BOOL editmode = FALSE, ignore_external_qi; static BOOL inplace_deactivated, open_call; -static BOOL complete, loading_js, loading_hash; +static BOOL complete, loading_js, loading_hash, is_refresh; static DWORD status_code = HTTP_STATUS_OK; static BOOL asynchronous_binding = FALSE; static BOOL support_wbapp, allow_new_window; @@ -931,7 +932,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D test_readyState(NULL); return S_OK; case 1005: - CHECK_EXPECT(OnChanged_1005); + CHECK_EXPECT2(OnChanged_1005); if(!editmode) test_readyState(NULL); readystate_set_interactive = (load_state != LD_INTERACTIVE); @@ -2728,7 +2729,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { if((!pguidCmdGroup || !IsEqualGUID(pguidCmdGroup, &CGID_Explorer)) - && (!pguidCmdGroup || !IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup) || nCmdID != 63)) + && (!pguidCmdGroup || !IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup) + || (nCmdID != 63 && (!is_refresh || nCmdID != 37)))) test_readyState(NULL); if(!pguidCmdGroup) { @@ -2824,12 +2826,20 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 37: CHECK_EXPECT2(Exec_ShellDocView_37); - if(nav_url) - test_GetCurMoniker(doc_unk, NULL, nav_serv_url); - else if(load_from_stream) - test_GetCurMoniker(doc_unk, NULL, "about:blank"); - else if(!editmode) - test_GetCurMoniker(doc_unk, doc_mon, NULL); + if(is_refresh && load_state == LD_COMPLETE) { + load_state = LD_DOLOAD; + test_readyState(NULL); + }else if(is_refresh && load_state == LD_DOLOAD) { + test_readyState(NULL); + load_state = LD_LOADING; + }else { + if(nav_url) + test_GetCurMoniker(doc_unk, NULL, nav_serv_url); + else if(load_from_stream) + test_GetCurMoniker(doc_unk, NULL, "about:blank"); + else if(!editmode) + test_GetCurMoniker(doc_unk, doc_mon, NULL); + } ok(pvaOut == NULL, "pvaOut=%p, expected NULL\n", pvaOut); ok(pvaIn != NULL, "pvaIn == NULL\n"); @@ -3041,6 +3051,9 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case OLECMDID_SHOWSCRIPTERROR: /* TODO */ return S_OK; + case 2300: + CHECK_EXPECT(Exec_DocHostCommandHandler_2300); + return E_NOTIMPL; default: ok(0, "unexpected command %d\n", nCmdID); return E_FAIL; @@ -3414,7 +3427,7 @@ static HRESULT WINAPI DocObjectService_ActiveElementChanged( IDocObjectService* This, IHTMLElement *pHTMLElement) { - CHECK_EXPECT(ActiveElementChanged); + CHECK_EXPECT2(ActiveElementChanged); return E_NOTIMPL; } @@ -5041,6 +5054,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) #define DWL_ONREADY_LOADING 0x0040 #define DWL_EXPECT_HISTUPDATE 0x0080 #define DWL_FROM_HISTORY 0x0100 +#define DWL_REFRESH 0x0200 static void test_download(DWORD flags) { @@ -5050,12 +5064,17 @@ static void test_download(DWORD flags) MSG msg; b = is_js ? &called_Exec_SETDOWNLOADSTATE_0 : &called_Exec_HTTPEQUIV_DONE; + is_refresh = (flags & DWL_REFRESH) != 0; hwnd = FindWindowA("Internet Explorer_Hidden", NULL); ok(hwnd != NULL, "Could not find hidden window\n"); test_readyState(NULL); + if(flags & DWL_REFRESH) { + SET_EXPECT(Invoke_AMBIENT_SILENT); + SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + } if(flags & (DWL_VERBDONE|DWL_HTTP)) SET_EXPECT(Exec_SETPROGRESSMAX); if((flags & DWL_VERBDONE) && !load_from_stream && !is_js) @@ -5121,7 +5140,7 @@ static void test_download(DWORD flags) SET_EXPECT(UpdateBackForwardState); } if(!is_js) { - if(!editmode) { + if(!editmode && !(flags & DWL_REFRESH)) { if(!(flags & DWL_EMPTY)) SET_EXPECT(FireNavigateComplete2); SET_EXPECT(FireDocumentComplete); @@ -5136,6 +5155,10 @@ static void test_download(DWORD flags) DispatchMessage(&msg); } + if(flags & DWL_REFRESH) { + CHECK_CALLED(Invoke_AMBIENT_SILENT); + CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + } if(flags & DWL_VERBDONE) CHECK_CALLED(Exec_SETPROGRESSMAX); if(flags & DWL_HTTP) @@ -5174,7 +5197,7 @@ static void test_download(DWORD flags) SET_CALLED(Frame_EnableModeless_TRUE); /* IE7 */ SET_CALLED(EnableModeless_FALSE); /* IE7 */ SET_CALLED(Frame_EnableModeless_FALSE); /* IE7 */ - if(nav_url && !is_js) + if(nav_url && !is_js && !(flags & DWL_REFRESH)) todo_wine CHECK_CALLED(Exec_ShellDocView_37); else if(flags & (DWL_CSS|DWL_HTTP)) CLEAR_CALLED(Exec_ShellDocView_37); /* Called by IE9 */ @@ -5182,7 +5205,10 @@ static void test_download(DWORD flags) if(!(flags & DWL_FROM_HISTORY)) todo_wine CHECK_CALLED(OnChanged_1012); todo_wine CHECK_CALLED(Exec_HTTPEQUIV); - todo_wine CHECK_CALLED(Exec_SETTITLE); + if(!(flags & DWL_REFRESH)) + todo_wine CHECK_CALLED(Exec_SETTITLE); + else + CHECK_CALLED(Exec_SETTITLE); } if(!is_js) { CHECK_CALLED(OnChanged_1005); @@ -5213,7 +5239,7 @@ static void test_download(DWORD flags) todo_wine CHECK_CALLED_BROKEN(UpdateBackForwardState); } if(!is_js) { - if(!editmode) { + if(!editmode && !(flags & DWL_REFRESH)) { if(!(flags & DWL_EMPTY)) { if(support_wbapp) CHECK_CALLED(FireNavigateComplete2); @@ -5474,6 +5500,30 @@ static void test_load_history(IHTMLDocument2 *doc) history_stream = NULL; } +static void test_refresh(IHTMLDocument2 *doc) +{ + IOleCommandTarget *cmdtrg; + VARIANT vin, vout; + HRESULT hres; + + trace("Refresh...\n"); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleCommandTarget, (void**)&cmdtrg); + ok(hres == S_OK, "Could not get IOleCommandTarget iface: %08x\n", hres); + + V_VT(&vin) = VT_EMPTY; + V_VT(&vout) = VT_EMPTY; + SET_EXPECT(Exec_DocHostCommandHandler_2300); + hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_REFRESH, OLECMDEXECOPT_PROMPTUSER, &vin, &vout); + ok(hres == S_OK, "Exec failed: %08x\n", hres); + ok(V_VT(&vout) == VT_EMPTY, "V_VT(vout) = %d\n", V_VT(&vout)); + CHECK_CALLED(Exec_DocHostCommandHandler_2300); + + IOleCommandTarget_Release(cmdtrg); + + test_download(DWL_VERBDONE|DWL_HTTP|DWL_ONREADY_LOADING|DWL_REFRESH); +} + static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) { IHTMLWindow2 *window, *new_window; @@ -6950,6 +7000,7 @@ static void test_HTMLDocument_http(BOOL with_wbapp) if(support_wbapp) { test_put_href(doc, FALSE, "#test", "http://www.winehq.org/#test", FALSE, TRUE, 0); test_travellog(doc); + test_refresh(doc); } test_put_href(doc, FALSE, NULL, "javascript:external%20&&undefined", TRUE, FALSE, 0); test_put_href(doc, FALSE, NULL, "about:blank", FALSE, FALSE, support_wbapp ? DWL_EXPECT_HISTUPDATE : 0);

1 0

Jacek Caban : mshtml: Added exec_refresh implementation.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 1cc3cf1b640f5e00732cae92cda11a7e7ebee8e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc3cf1b640f5e00732cae92c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:58:41 2012 +0100 mshtml: Added exec_refresh implementation. --- dlls/mshtml/binding.h | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mutation.c | 3 +- dlls/mshtml/navigate.c | 20 +++++++------ dlls/mshtml/nsevents.c | 4 ++- dlls/mshtml/olecmd.c | 64 ++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/persist.c | 3 +- 7 files changed, 82 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 7934c90..42560ea 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -101,6 +101,7 @@ typedef struct { #define BINDING_NAVIGATED 0x0001 #define BINDING_REPLACE 0x0002 #define BINDING_FROMHIST 0x0004 +#define BINDING_REFRESH 0x0008 HRESULT set_http_header(struct list*,const WCHAR*,int,const WCHAR*,int) DECLSPEC_HIDDEN; HRESULT create_redirect_nschannel(const WCHAR*,nsChannel*,nsChannel**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3a02416..6c7662e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -374,6 +374,7 @@ struct HTMLOuterWindow { IUri *uri; IUri *uri_nofrag; BSTR url; + DWORD load_flags; SCRIPTMODE scriptmode; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index fcae9ff..4b07c3f 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -32,6 +32,7 @@ #include "mshtml_private.h" #include "htmlscript.h" #include "htmlevent.h" +#include "binding.h" #include "wine/debug.h" @@ -267,7 +268,7 @@ static void parse_complete(HTMLDocumentObj *doc) call_property_onchanged(&doc->basedoc.cp_propnotif, 1005); call_explorer_69(doc); - if(doc->is_webbrowser && doc->usermode != EDITMODE) + if(doc->is_webbrowser && doc->usermode != EDITMODE && !(doc->basedoc.window->load_flags & BINDING_REFRESH)) IDocObjectService_FireNavigateComplete2(doc->doc_object_service, &doc->basedoc.window->base.IHTMLWindow2_iface, 0); /* FIXME: IE7 calls EnableModelless(TRUE), EnableModelless(FALSE) and sets interactive state here */ diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 1c6b80c..346524d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2052,7 +2052,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC if(!uri_nofrag) return E_FAIL; - if(window->doc_obj->client) { + if(window->doc_obj->client && !(flags & BINDING_REFRESH)) { IOleCommandTarget *cmdtrg; hres = IOleClientSite_QueryInterface(window->doc_obj->client, &IID_IOleCommandTarget, (void**)&cmdtrg); @@ -2075,7 +2075,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC } } - if(window->uri_nofrag && !post_data_size) { + if(!(flags & BINDING_REFRESH) && window->uri_nofrag && !post_data_size) { BOOL eq; hres = IUri_IsEqual(uri_nofrag, window->uri_nofrag, &eq); @@ -2115,7 +2115,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC /* Silently and repeated when real loading starts? */ window->readystate = READYSTATE_LOADING; - if(!(flags & BINDING_FROMHIST)) + if(!(flags & (BINDING_FROMHIST|BINDING_REFRESH))) call_docview_84(window->doc_obj); task->window = window; @@ -2266,13 +2266,15 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis HRESULT hres; if(window->doc_obj && window->doc_obj->is_webbrowser && window == window->doc_obj->basedoc.window) { - BOOL cancel = FALSE; + if(!(flags & BINDING_REFRESH)) { + BOOL cancel = FALSE; - hres = IDocObjectService_FireBeforeNavigate2(window->doc_obj->doc_object_service, NULL, display_uri, 0x40, - NULL, NULL, 0, NULL, TRUE, &cancel); - if(SUCCEEDED(hres) && cancel) { - TRACE("Navigation canceled\n"); - return S_OK; + hres = IDocObjectService_FireBeforeNavigate2(window->doc_obj->doc_object_service, NULL, display_uri, 0x40, + NULL, NULL, 0, NULL, TRUE, &cancel); + if(SUCCEEDED(hres) && cancel) { + TRACE("Navigation canceled\n"); + return S_OK; + } } return super_navigate(window, uri, flags, NULL, NULL, 0); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 5f23e08..297ef8c 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -34,6 +34,7 @@ #include "mshtml_private.h" #include "htmlscript.h" #include "htmlevent.h" +#include "binding.h" #include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -258,7 +259,8 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event update_title(doc_obj); } - if(doc_obj && doc_obj->usermode!=EDITMODE && doc_obj->doc_object_service) + if(doc_obj && doc_obj->usermode!=EDITMODE && doc_obj->doc_object_service + && !(doc->basedoc.window->load_flags & BINDING_REFRESH)) IDocObjectService_FireDocumentComplete(doc_obj->doc_object_service, &doc->basedoc.window->base.IHTMLWindow2_iface, 0); diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 8932843..bda06b5 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -32,6 +32,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "binding.h" #include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -384,10 +385,69 @@ static HRESULT exec_get_zoom_range(HTMLDocument *This, DWORD nCmdexecopt, VARIAN return E_NOTIMPL; } +typedef struct { + task_t header; + HTMLOuterWindow *window; +}refresh_task_t; + +static void refresh_proc(task_t *_task) +{ + refresh_task_t *task = (refresh_task_t*)_task; + HTMLOuterWindow *window = task->window; + + TRACE("%p\n", window); + + window->readystate = READYSTATE_UNINITIALIZED; + + if(window->doc_obj && window->doc_obj->client_cmdtrg) { + VARIANT var; + + V_VT(&var) = VT_I4; + V_I4(&var) = 0; + IOleCommandTarget_Exec(window->doc_obj->client_cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); + } + + load_uri(task->window, task->window->uri, BINDING_REFRESH); +} + +static void refresh_destr(task_t *_task) +{ + refresh_task_t *task = (refresh_task_t*)_task; + + IHTMLWindow2_Release(&task->window->base.IHTMLWindow2_iface); + heap_free(task); +} + static HRESULT exec_refresh(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { - FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut); - return E_NOTIMPL; + refresh_task_t *task; + HRESULT hres; + + TRACE("(%p)->(%d %s %p)\n", This, nCmdexecopt, debugstr_variant(pvaIn), pvaOut); + + if(This->doc_obj->client) { + IOleCommandTarget *olecmd; + + hres = IOleClientSite_QueryInterface(This->doc_obj->client, &IID_IOleCommandTarget, (void**)&olecmd); + if(SUCCEEDED(hres)) { + hres = IOleCommandTarget_Exec(olecmd, &CGID_DocHostCommandHandler, 2300, nCmdexecopt, pvaIn, pvaOut); + IOleCommandTarget_Release(olecmd); + if(SUCCEEDED(hres)) + return S_OK; + } + } + + if(!This->window) + return E_UNEXPECTED; + + task = heap_alloc(sizeof(*task)); + if(!task) + return E_OUTOFMEMORY; + + IHTMLWindow2_AddRef(&This->window->base.IHTMLWindow2_iface); + task->window = This->window; + + return push_task(&task->header, refresh_proc, refresh_destr, This->window->task_magic); } static HRESULT exec_stop(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 210fab0..430786f 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -130,12 +130,13 @@ void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags) HRESULT hres; if(This->mon) { - if(This->doc_obj && !(flags & BINDING_REPLACE)) + if(This->doc_obj && !(flags & (BINDING_REPLACE|BINDING_REFRESH))) notify_travellog_update(This->doc_obj); IMoniker_Release(This->mon); This->mon = NULL; } + This->load_flags = flags; if(!mon) return;

1 0

Jacek Caban : mshtml: Store embedder' s IOleComandTarget iface in HTMLDocumentObj and use it in handle_navigation_error .
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: f0b7db4df8622d6f4b36b32ce94f665d6cf8e503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b7db4df8622d6f4b36b32ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:58:27 2012 +0100 mshtml: Store embedder's IOleComandTarget iface in HTMLDocumentObj and use it in handle_navigation_error. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 11 +++-------- dlls/mshtml/oleobj.c | 9 +++++++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 74f1b39..3a02416 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -531,6 +531,7 @@ struct HTMLDocumentObj { IOleClientSite *client; IDocHostUIHandler *hostui; + IOleCommandTarget *client_cmdtrg; BOOL custom_hostui; IOleInPlaceSite *ipsite; IOleInPlaceFrame *frame; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 9532a82..1c6b80c 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1450,7 +1450,6 @@ static void handle_navigation_error(nsChannelBSC *This, DWORD result) { HTMLOuterWindow *outer_window; HTMLDocumentObj *doc; - IOleCommandTarget *olecmd; BOOL is_error_url; SAFEARRAY *sa; SAFEARRAYBOUND bound; @@ -1473,18 +1472,15 @@ static void handle_navigation_error(nsChannelBSC *This, DWORD result) if(FAILED(hres) || is_error_url) return; - hres = IOleClientSite_QueryInterface(doc->client, - &IID_IOleCommandTarget, (void**)&olecmd); + if(!doc->client_cmdtrg) if(FAILED(hres)) return; bound.lLbound = 0; bound.cElements = 8; sa = SafeArrayCreate(VT_VARIANT, 1, &bound); - if(!sa) { - IOleCommandTarget_Release(olecmd); + if(!sa) return; - } ind = 0; V_VT(&var) = VT_I4; @@ -1532,11 +1528,10 @@ static void handle_navigation_error(nsChannelBSC *This, DWORD result) V_ARRAY(&var) = sa; V_VT(&varOut) = VT_BOOL; V_BOOL(&varOut) = VARIANT_TRUE; - IOleCommandTarget_Exec(olecmd, &CGID_DocHostCmdPriv, 1, 0, &var, FAILED(hres)?NULL:&varOut); + IOleCommandTarget_Exec(doc->client_cmdtrg, &CGID_DocHostCmdPriv, 1, 0, &var, FAILED(hres)?NULL:&varOut); SysFreeString(unk); SafeArrayDestroy(sa); - IOleCommandTarget_Release(olecmd); } static HRESULT nsChannelBSC_stop_binding(BSCallback *bsc, HRESULT result) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 0a1f97c..d62c306 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -231,6 +231,11 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite This->doc_obj->usermode = UNKNOWN_USERMODE; } + if(This->doc_obj->client_cmdtrg) { + IOleCommandTarget_Release(This->doc_obj->client_cmdtrg); + This->doc_obj->client_cmdtrg = NULL; + } + if(This->doc_obj->hostui && !This->doc_obj->custom_hostui) { IDocHostUIHandler_Release(This->doc_obj->hostui); This->doc_obj->hostui = NULL; @@ -319,6 +324,8 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite VARIANT var; OLECMD cmd = {OLECMDID_SETPROGRESSTEXT, 0}; + This->doc_obj->client_cmdtrg = cmdtrg; + if(!hostui_setup) { IDocObjectService *doc_object_service; IBrowserService *browser_service; @@ -361,8 +368,6 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite OLECMDEXECOPT_DONTPROMPTUSER, &var, NULL); IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_SETPROGRESSPOS, OLECMDEXECOPT_DONTPROMPTUSER, &var, NULL); - - IOleCommandTarget_Release(cmdtrg); } if(This->doc_obj->usermode == UNKNOWN_USERMODE)

1 0

Jacek Caban : mshtml: Added IPersistHistory tests.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 0d1ce5a308ab2e1aad7fa1f157d387ecc5e6b127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d1ce5a308ab2e1aad7fa1f15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:58:13 2012 +0100 mshtml: Added IPersistHistory tests. --- dlls/mshtml/tests/htmldoc.c | 118 +++++++++++++++++++++++++++++++++--------- 1 files changed, 92 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d1ce5a308ab2e1aad7fa…

1 0

Jacek Caban : mshtml: Don't skip history notification for about: URLs.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 8f1bb21f35d7ffdb58c9891d599ed0611839d587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1bb21f35d7ffdb58c9891d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:57:58 2012 +0100 mshtml: Don't skip history notification for about: URLs. --- dlls/mshtml/persist.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 457f5dc..210fab0 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -80,15 +80,6 @@ static void notify_travellog_update(HTMLDocumentObj *doc) if(!doc->is_webbrowser) return; - /* Don't notify if we were in about: page */ - if(doc->basedoc.window->uri) { - DWORD scheme; - - hres = IUri_GetScheme(doc->basedoc.window->uri, &scheme); - if(SUCCEEDED(hres) && scheme == URL_SCHEME_ABOUT) - return; - } - hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&cmdtrg); if(SUCCEEDED(hres)) { VARIANT vin;

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012