April 2013 - Wine-Commits - list.winehq.org

Jacek Caban : ieframe: Added GoForward implementation.
by Alexandre Julliard April 2, 2013

April 2, 2013

Module: wine Branch: master Commit: 0d30e51084afa88e25dad2ef59a7acf82f33cfee URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d30e51084afa88e25dad2ef5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 2 17:40:14 2013 +0200 ieframe: Added GoForward implementation. --- dlls/ieframe/ie.c | 4 ++-- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/navigate.c | 10 ++++++++++ dlls/ieframe/webbrowser.c | 4 ++-- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index da0e99c..afbd2e9 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -149,8 +149,8 @@ static HRESULT WINAPI InternetExplorer_GoBack(IWebBrowser2 *iface) static HRESULT WINAPI InternetExplorer_GoForward(IWebBrowser2 *iface) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + TRACE("(%p)\n", This); + return go_forward(&This->doc_host->doc_host); } static HRESULT WINAPI InternetExplorer_GoHome(IWebBrowser2 *iface) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 4140e05..bbb3e4c 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -269,6 +269,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 go_forward(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; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 703e32c..d730b10 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -1099,6 +1099,16 @@ HRESULT go_back(DocHost *This) return navigate_history(This, This->travellog.position-1); } +HRESULT go_forward(DocHost *This) +{ + if(This->travellog.position >= This->travellog.length) { + WARN("No history available\n"); + return E_FAIL; + } + + return navigate_history(This, This->travellog.position+1); +} + HRESULT get_location_url(DocHost *This, BSTR *ret) { FIXME("semi-stub\n"); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 0a9f2a5..02edfd7 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -259,8 +259,8 @@ static HRESULT WINAPI WebBrowser_GoBack(IWebBrowser2 *iface) static HRESULT WINAPI WebBrowser_GoForward(IWebBrowser2 *iface) { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + TRACE("(%p)\n", This); + return go_forward(&This->doc_host); } static HRESULT WINAPI WebBrowser_GoHome(IWebBrowser2 *iface)

1 0

Jacek Caban : ieframe: Use IPersistHistory for history navigation, if possible.
by Alexandre Julliard April 2, 2013

April 2, 2013

Module: wine Branch: master Commit: 0f5badf44fb476feff7f320e0a993e79c118db9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f5badf44fb476feff7f320e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 2 17:39:45 2013 +0200 ieframe: Use IPersistHistory for history navigation, if possible. --- dlls/ieframe/dochost.c | 28 ++++++++++++++++++++++++++++ dlls/ieframe/ieframe.h | 1 + dlls/ieframe/navigate.c | 45 +++++++++++++++++++++++++++++++-------------- 3 files changed, 60 insertions(+), 14 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index e1a897a..f95c4bd 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -20,6 +20,7 @@ #include "exdispid.h" #include "mshtml.h" +#include "perhist.h" #include "initguid.h" #include "wine/debug.h" @@ -335,9 +336,33 @@ static LRESULT WINAPI doc_view_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l static void free_travellog_entry(travellog_entry_t *entry) { + if(entry->stream) + IStream_Release(entry->stream); heap_free(entry->url); } +static IStream *get_travellog_stream(DocHost *This) +{ + IPersistHistory *persist_history; + IStream *stream; + HRESULT hres; + + hres = IUnknown_QueryInterface(This->document, &IID_IPersistHistory, (void**)&persist_history); + if(FAILED(hres)) + return NULL; + + hres = CreateStreamOnHGlobal(NULL, TRUE, &stream); + if(SUCCEEDED(hres)) + hres = IPersistHistory_SaveHistory(persist_history, stream); + IPersistHistory_Release(persist_history); + if(FAILED(hres)) { + IStream_Release(stream); + return NULL; + } + + return stream; +} + static void update_travellog(DocHost *This) { travellog_entry_t *new_entry; @@ -368,9 +393,12 @@ static void update_travellog(DocHost *This) new_entry = This->travellog.log + This->travellog.position; new_entry->url = heap_strdupW(This->url); + TRACE("Adding %s at %d\n", debugstr_w(This->url), This->travellog.position); if(!new_entry->url) return; + new_entry->stream = get_travellog_stream(This); + if(This->travellog.loading_pos == -1) { This->travellog.position++; }else { diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 2508ef2..4140e05 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -96,6 +96,7 @@ typedef struct { typedef struct { WCHAR *url; + IStream *stream; } travellog_entry_t; typedef struct _IDocHostContainerVtbl diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index b6e277c..703e32c 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -27,6 +27,7 @@ #include "shlwapi.h" #include "wininet.h" #include "mshtml.h" +#include "perhist.h" #include "resource.h" #include "wine/debug.h" @@ -1058,30 +1059,46 @@ HRESULT go_home(DocHost *This) return navigate_url(This, wszPageName, NULL, NULL, NULL, NULL); } -HRESULT go_back(DocHost *This) +static HRESULT navigate_history(DocHost *This, unsigned travellog_pos) { - WCHAR *url; + IPersistHistory *persist_history; + travellog_entry_t *entry; + LARGE_INTEGER li; HRESULT hres; - if(!This->travellog.position) { - WARN("No history available\n"); - return E_FAIL; + if(!This->doc_navigate) { + FIXME("unsupported doc_navigate FALSE\n"); + return E_NOTIMPL; } - This->travellog.loading_pos = This->travellog.position-1; - url = This->travellog.log[This->travellog.loading_pos].url; + This->travellog.loading_pos = travellog_pos; + entry = This->travellog.log + This->travellog.loading_pos; - if(This->doc_navigate) { - hres = async_doc_navigate(This, url, NULL, NULL, 0, FALSE); - }else { - FIXME("unsupported doc_navigate FALSE\n"); - hres = E_NOTIMPL; - } + if(!entry->stream) + return async_doc_navigate(This, entry->url, NULL, NULL, 0, FALSE); + + hres = IUnknown_QueryInterface(This->document, &IID_IPersistHistory, (void**)&persist_history); + if(FAILED(hres)) + return hres; + + li.QuadPart = 0; + IStream_Seek(entry->stream, li, STREAM_SEEK_SET, NULL); - heap_free(url); + hres = IPersistHistory_LoadHistory(persist_history, entry->stream, NULL); + IPersistHistory_Release(persist_history); return hres; } +HRESULT go_back(DocHost *This) +{ + if(!This->travellog.position) { + WARN("No history available\n"); + return E_FAIL; + } + + return navigate_history(This, This->travellog.position-1); +} + HRESULT get_location_url(DocHost *This, BSTR *ret) { FIXME("semi-stub\n");

1 0

Jacek Caban : ieframe: Fixed index of stored history when loading from history.
by Alexandre Julliard April 2, 2013

April 2, 2013

Module: wine Branch: master Commit: 00226935c79c9fa06b597eb5526159048c114989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00226935c79c9fa06b597eb55… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 2 17:39:21 2013 +0200 ieframe: Fixed index of stored history when loading from history. --- dlls/ieframe/dochost.c | 50 +++++++++++++++++++++++++++++------------- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/navigate.c | 3 +- dlls/ieframe/shellbrowser.c | 9 +++++++- 4 files changed, 45 insertions(+), 18 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index c910c74..0788132 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -195,6 +195,12 @@ void set_doc_state(DocHost *This, READYSTATE doc_state) static void update_ready_state(DocHost *This, READYSTATE ready_state) { + if(ready_state > READYSTATE_LOADING && This->travellog.loading_pos != -1) { + WARN("histupdate not notified\n"); + This->travellog.position = This->travellog.loading_pos; + This->travellog.loading_pos = -1; + } + if(ready_state > READYSTATE_LOADING && This->doc_state <= READYSTATE_LOADING && !This->browser_service /* FIXME */) notif_complete(This, DISPID_NAVIGATECOMPLETE2); @@ -331,25 +337,28 @@ static void update_travellog(DocHost *This) { travellog_entry_t *new_entry; - if(!This->travellog.log) { - This->travellog.log = heap_alloc(4 * sizeof(*This->travellog.log)); - if(!This->travellog.log) - return; + if(This->travellog.loading_pos == -1) { + /* Clear forward history. */ + if(!This->travellog.log) { + This->travellog.log = heap_alloc(4 * sizeof(*This->travellog.log)); + if(!This->travellog.log) + return; - This->travellog.size = 4; - }else if(This->travellog.size < This->travellog.position+1) { - travellog_entry_t *new_travellog; + This->travellog.size = 4; + }else if(This->travellog.size < This->travellog.position+1) { + travellog_entry_t *new_travellog; - new_travellog = heap_realloc(This->travellog.log, This->travellog.size*2*sizeof(*This->travellog.log)); - if(!new_travellog) - return; + new_travellog = heap_realloc(This->travellog.log, This->travellog.size*2*sizeof(*This->travellog.log)); + if(!new_travellog) + return; - This->travellog.log = new_travellog; - This->travellog.size *= 2; - } + This->travellog.log = new_travellog; + This->travellog.size *= 2; + } - while(This->travellog.length > This->travellog.position) - heap_free(This->travellog.log[--This->travellog.length].url); + while(This->travellog.length > This->travellog.position) + heap_free(This->travellog.log[--This->travellog.length].url); + } new_entry = This->travellog.log + This->travellog.position; @@ -357,7 +366,14 @@ static void update_travellog(DocHost *This) if(!new_entry->url) return; - This->travellog.position++; + if(This->travellog.loading_pos == -1) { + This->travellog.position++; + }else { + This->travellog.position = This->travellog.loading_pos; + This->travellog.loading_pos = -1; + } + if(This->travellog.position > This->travellog.length) + This->travellog.length = This->travellog.position; } void create_doc_view_hwnd(DocHost *This) @@ -975,6 +991,8 @@ void DocHost_Init(DocHost *This, IWebBrowser2 *wb, const IDocHostContainerVtbl* This->ready_state = READYSTATE_UNINITIALIZED; list_init(&This->task_queue); + This->travellog.loading_pos = -1; + DocHost_ClientSite_Init(This); DocHost_Frame_Init(This); diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index a20afbc5..2508ef2 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -158,6 +158,7 @@ struct DocHost { unsigned size; unsigned length; unsigned position; + int loading_pos; } travellog; ConnectionPointContainer cps; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 42d0c85..b6e277c 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -1068,7 +1068,8 @@ HRESULT go_back(DocHost *This) return E_FAIL; } - url = This->travellog.log[--This->travellog.position].url; + This->travellog.loading_pos = This->travellog.position-1; + url = This->travellog.log[This->travellog.loading_pos].url; if(This->doc_navigate) { hres = async_doc_navigate(This, url, NULL, NULL, 0, FALSE); diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 6e84264..944c7bc 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -726,6 +726,7 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( DWORD dwFlags) { ShellBrowser *This = impl_from_IDocObjectService(iface); + DocHost *doc_host = This->doc_host; IHTMLPrivateWindow *priv_window; VARIANTARG params[2]; DISPPARAMS dp = {params, NULL, 2, 0}; @@ -735,6 +736,12 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( TRACE("%p %p %x\n", This, pHTMLWindow2, dwFlags); + if(doc_host->travellog.loading_pos != -1) { + WARN("histupdate not notified\n"); + doc_host->travellog.position = doc_host->travellog.loading_pos; + doc_host->travellog.loading_pos = -1; + } + hres = IHTMLWindow2_QueryInterface(pHTMLWindow2, &IID_IHTMLPrivateWindow, (void**)&priv_window); if(FAILED(hres)) return hres; @@ -751,7 +758,7 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( V_VARIANTREF(params) = &url_var; V_VT(params+1) = VT_DISPATCH; - V_DISPATCH(params+1) = (IDispatch*)This->doc_host->wb; + V_DISPATCH(params+1) = (IDispatch*)doc_host->wb; V_VT(&url_var) = VT_BSTR; V_BSTR(&url_var) = url;

1 0

Jacek Caban : ieframe: Moved travellog to its own struct.
by Alexandre Julliard April 2, 2013

April 2, 2013

Module: wine Branch: master Commit: 15937c99eb85aaafe764898aaa5a0896ac7f0f26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15937c99eb85aaafe764898aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 2 17:39:07 2013 +0200 ieframe: Moved travellog to its own struct. --- dlls/ieframe/dochost.c | 30 +++++++++++++++--------------- dlls/ieframe/ieframe.h | 10 ++++++---- dlls/ieframe/navigate.c | 4 ++-- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 1b10fb4..c910c74 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -331,33 +331,33 @@ static void update_travellog(DocHost *This) { travellog_entry_t *new_entry; - if(!This->travellog) { - This->travellog = heap_alloc(4 * sizeof(*This->travellog)); - if(!This->travellog) + if(!This->travellog.log) { + This->travellog.log = heap_alloc(4 * sizeof(*This->travellog.log)); + if(!This->travellog.log) return; - This->travellog_size = 4; - }else if(This->travellog_size < This->travellog_position+1) { + This->travellog.size = 4; + }else if(This->travellog.size < This->travellog.position+1) { travellog_entry_t *new_travellog; - new_travellog = heap_realloc(This->travellog, This->travellog_size*2*sizeof(*This->travellog)); + new_travellog = heap_realloc(This->travellog.log, This->travellog.size*2*sizeof(*This->travellog.log)); if(!new_travellog) return; - This->travellog = new_travellog; - This->travellog_size *= 2; + This->travellog.log = new_travellog; + This->travellog.size *= 2; } - while(This->travellog_length > This->travellog_position) - heap_free(This->travellog[--This->travellog_length].url); + while(This->travellog.length > This->travellog.position) + heap_free(This->travellog.log[--This->travellog.length].url); - new_entry = This->travellog + This->travellog_position; + new_entry = This->travellog.log + This->travellog.position; new_entry->url = heap_strdupW(This->url); if(!new_entry->url) return; - This->travellog_position++; + This->travellog.position++; } void create_doc_view_hwnd(DocHost *This) @@ -994,9 +994,9 @@ void DocHost_Release(DocHost *This) ConnectionPointContainer_Destroy(&This->cps); - while(This->travellog_length) - heap_free(This->travellog[--This->travellog_length].url); - heap_free(This->travellog); + while(This->travellog.length) + heap_free(This->travellog.log[--This->travellog.length].url); + heap_free(This->travellog.log); heap_free(This->url); } diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 0c13c82..a20afbc5 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -153,10 +153,12 @@ struct DocHost { ShellBrowser *browser_service; IShellUIHelper2 *shell_ui_helper; - travellog_entry_t *travellog; - unsigned travellog_size; - unsigned travellog_length; - unsigned travellog_position; + struct { + travellog_entry_t *log; + unsigned size; + unsigned length; + unsigned position; + } travellog; ConnectionPointContainer cps; IEHTMLWindow html_window; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 3a35acf..42d0c85 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -1063,12 +1063,12 @@ HRESULT go_back(DocHost *This) WCHAR *url; HRESULT hres; - if(!This->travellog_position) { + if(!This->travellog.position) { WARN("No history available\n"); return E_FAIL; } - url = This->travellog[--This->travellog_position].url; + url = This->travellog.log[--This->travellog.position].url; if(This->doc_navigate) { hres = async_doc_navigate(This, url, NULL, NULL, 0, FALSE);

1 0

André Hentschel : advapi32/tests: Remove bad key set on cleanup.
by Alexandre Julliard April 2, 2013

April 2, 2013

Module: wine Branch: master Commit: 9374c5bb56de0855e9a8dae64be6fdce2b2209c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9374c5bb56de0855e9a8dae64… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 2 00:09:29 2013 +0200 advapi32/tests: Remove bad key set on cleanup. --- dlls/advapi32/tests/crypt.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 5f4d4e2..768dd3b 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -146,6 +146,13 @@ static void clean_up_environment(void) pCryptReleaseContext(hProv, 0); pCryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } + + /* Remove container "wine_test_bad_keyset" */ + if (pCryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) + { + pCryptReleaseContext(hProv, 0); + pCryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + } } static void test_acquire_context(void)

1 0

André Hentschel : dpnet: Increase reported buffer size .
by Alexandre Julliard April 2, 2013

April 2, 2013

Module: wine Branch: master Commit: 9d6543b61279e06e90a4fffebf95e99646c1ba4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6543b61279e06e90a4fffeb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 1 16:21:53 2013 +0200 dpnet: Increase reported buffer size. --- dlls/dpnet/peer.c | 2 +- dlls/dpnet/tests/peer.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index b3eb9cd..ef100a3 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -404,7 +404,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_GetSPCaps(IDirectPlay8Peer *iface, co pdpspCaps->dwDefaultEnumTimeout = 1500; pdpspCaps->dwMaxEnumPayloadSize = 983; pdpspCaps->dwBuffersPerThread = 1; - pdpspCaps->dwSystemBufferSize = 8192; + pdpspCaps->dwSystemBufferSize = 0x10000; return DPN_OK; } diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index fc22f66..a9ab01d 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -140,7 +140,8 @@ static void test_get_sp_caps(void) ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout); ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); - ok(caps.dwSystemBufferSize == 8192, "expected 8192, got %d\n", caps.dwSystemBufferSize); + ok(caps.dwSystemBufferSize == 0x10000 || broken(caps.dwSystemBufferSize == 0x2000 /* before Win8 */), + "expected 0x10000, got 0x%x\n", caps.dwSystemBufferSize); } static void test_cleanup_dp(void)

1 0

Sergey Guralnik : extrac32: Extract by default when required files are specified.
by Alexandre Julliard April 2, 2013

April 2, 2013

Module: wine Branch: master Commit: 085c50683265b7482be2eb9b53d8367989ad3d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=085c50683265b7482be2eb9b5… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Sat Mar 30 07:22:41 2013 +0200 extrac32: Extract by default when required files are specified. --- programs/extrac32/extrac32.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index ade7456..5216627 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -149,6 +149,9 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho if (!GetFullPathNameW(argv[i], MAX_PATH, path, NULL)) return 0; } + else if (!cmd) + /* Use extraction by default if names of required files presents */ + cmd = i < argc ? 'E' : 'D'; if (!path[0]) GetCurrentDirectoryW(MAX_PATH, path); @@ -166,7 +169,6 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho /* Extract CAB archive */ extract(cabfile, path); break; - case 0: case 'D': /* Display CAB archive */ WINE_FIXME("/D not implemented\n");

1 0

Sergey Guralnik : extrac32: Allow leading '-' for command line switches.
by Alexandre Julliard April 2, 2013

April 2, 2013

Module: wine Branch: master Commit: 8c5deb56497494a66c8244bfdc40121d00103ec3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c5deb56497494a66c8244bfd… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Sat Mar 30 07:12:47 2013 +0200 extrac32: Allow leading '-' for command line switches. --- programs/extrac32/extrac32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index 11dd755..ade7456 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -105,7 +105,7 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho for(i = 0; i < argc; i++) { /* Get cabfile */ - if (argv[i][0] != '/') + if (argv[i][0] != '/' && argv[i][0] != '-') { if (!cabfile) {

1 0

Alexandre Julliard : user32: Don' t print a warning when creating the HWND_MESSAGE parent window.
by Alexandre Julliard April 2, 2013

April 2, 2013

Module: wine Branch: master Commit: 59c0c5fb2d53c1bf84f86e0d08a5664a5aaf9612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c0c5fb2d53c1bf84f86e0d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 2 12:46:39 2013 +0200 user32: Don't print a warning when creating the HWND_MESSAGE parent window. --- dlls/user32/driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 1c12134..8f02e71 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -299,9 +299,10 @@ static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd ) static BOOL CDECL nulldrv_CreateWindow( HWND hwnd ) { static int warned; + HWND parent = GetAncestor( hwnd, GA_PARENT ); /* HWND_MESSAGE windows don't need a graphics driver */ - if (GetAncestor( hwnd, GA_PARENT ) == get_user_thread_info()->msg_window) return TRUE; + if (!parent || parent == get_user_thread_info()->msg_window) return TRUE; if (warned++) return FALSE; MESSAGE( "Application tried to create a window, but no driver could be loaded.\n");

1 0

Jacek Caban : wininet: Moved more compat logic to netcon_secure_connect_setup.
by Alexandre Julliard April 2, 2013

April 2, 2013

Module: wine Branch: master Commit: 083500caf216a100500e54379d12e494c72e04cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=083500caf216a100500e54379… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 2 11:13:48 2013 +0200 wininet: Moved more compat logic to netcon_secure_connect_setup. --- dlls/wininet/netconnection.c | 36 ++++++++++++++++++++++-------------- 1 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index c33f45a..17518b9 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -808,13 +808,25 @@ int sock_get_error( int err ) return err; } -#ifdef SONAME_LIBSSL -static DWORD netcon_secure_connect_setup(netconn_t *connection, long tls_option) +static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode) { +#ifdef SONAME_LIBSSL + long tls_option; void *ssl_s; DWORD res; int bits; + tls_option = get_tls_option(); + + if(compat_mode) { +#ifdef SSL_OP_NO_TLSv1_2 + tls_option |= SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2; + pSSL_CTX_set_options(ctx,SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2); +#else + return ERROR_INTERNET_SECURITY_CHANNEL_ERROR; +#endif + } + ssl_s = pSSL_new(ctx); if (!ssl_s) { @@ -850,6 +862,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, long tls_option) connection->ssl_s = ssl_s; connection->secure = TRUE; + connection->security_flags |= SECURITY_FLAG_SECURE; bits = NETCON_GetCipherStrength(connection); if (bits >= 128) @@ -858,7 +871,6 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, long tls_option) connection->security_flags |= SECURITY_FLAG_STRENGTH_MEDIUM; else connection->security_flags |= SECURITY_FLAG_STRENGTH_WEAK; - connection->security_flags |= SECURITY_FLAG_SECURE; if(connection->mask_errors) connection->server->security_flags = connection->security_flags; @@ -871,8 +883,11 @@ fail: pSSL_free(ssl_s); } return res; -} +#else + FIXME("Cannot connect, OpenSSL not available.\n"); + return ERROR_NOT_SUPPORTED; #endif +} /****************************************************************************** * NETCON_secure_connect @@ -880,7 +895,7 @@ fail: */ DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) { - DWORD res = ERROR_NOT_SUPPORTED; + DWORD res; /* can't connect if we are already connected */ if(connection->secure) { @@ -894,28 +909,21 @@ DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) connection->server = server; } -#ifdef SONAME_LIBSSL /* connect with given TLS options */ - res = netcon_secure_connect_setup(connection, get_tls_option()); + res = netcon_secure_connect_setup(connection, FALSE); if (res == ERROR_SUCCESS) return res; -#ifdef SSL_OP_NO_TLSv1_2 /* FIXME: when got version alert and FIN from server */ /* fallback to connect without TLSv1.1/TLSv1.2 */ if (res == ERROR_INTERNET_SECURITY_CHANNEL_ERROR) { closesocket(connection->socket); - pSSL_CTX_set_options(ctx,SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2); res = create_netconn_socket(connection->server, connection, 500); if (res != ERROR_SUCCESS) return res; - res = netcon_secure_connect_setup(connection, get_tls_option()|SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2); + res = netcon_secure_connect_setup(connection, TRUE); } -#endif -#else - FIXME("Cannot connect, OpenSSL not available.\n"); -#endif return res; }

1 0