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

Jacek Caban : ieframe: Use IPersistHistory for history navigation, if possible.
by Alexandre Julliard 02 Apr '13

02 Apr '13

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: Added GoForward implementation.
by Alexandre Julliard 02 Apr '13

02 Apr '13

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: Improved debug traces.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 64ead391d8afb1342efaeb2a0cdc27ac19f1f7af URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ead391d8afb1342efaeb2a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 2 17:39:57 2013 +0200 ieframe: Improved debug traces. --- dlls/ieframe/dochost.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index f95c4bd..7522c38 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -363,6 +363,16 @@ static IStream *get_travellog_stream(DocHost *This) return stream; } +void dump_travellog(DocHost *This) +{ + unsigned i; + + for(i=0; i < This->travellog.length; i++) + TRACE("%d: %s %s\n", i, i == This->travellog.position ? "=>" : " ", debugstr_w(This->travellog.log[i].url)); + if(i == This->travellog.position) + TRACE("%d: =>\n", i); +} + static void update_travellog(DocHost *This) { travellog_entry_t *new_entry; @@ -407,6 +417,8 @@ static void update_travellog(DocHost *This) } if(This->travellog.position > This->travellog.length) This->travellog.length = This->travellog.position; + + dump_travellog(This); } void create_doc_view_hwnd(DocHost *This)

1 0

Stefan Leichter : msvcp: Match architecture with function we' re forwarding to.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: c19275302faf43e683c6f2918bd66e42a9d6e567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19275302faf43e683c6f2918… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Mar 30 13:48:33 2013 +0100 msvcp: Match architecture with function we're forwarding to. --- dlls/msvcp100/msvcp100.spec | 138 ++-- dlls/msvcp70/msvcp70.spec | 1408 +++++++++++++++++++++--------------------- dlls/msvcp80/msvcp80.spec | 1438 +++++++++++++++++++++--------------------- dlls/msvcp90/msvcp90.spec | 1438 +++++++++++++++++++++--------------------- 4 files changed, 2211 insertions(+), 2211 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c19275302faf43e683c6f…

1 0

Stefan Leichter : msvcp110: Add VS2012 C/C++ runtime.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 56538fdf8983d999a91517b5ef4c0b7fe932f1e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56538fdf8983d999a91517b5e… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Mar 30 13:48:49 2013 +0100 msvcp110: Add VS2012 C/C++ runtime. --- configure | 1 + configure.ac | 1 + dlls/msvcp110/Makefile.in | 5 + dlls/msvcp110/msvcp110.c | 37 + dlls/msvcp110/msvcp110.spec | 3900 +++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 6 files changed, 3945 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56538fdf8983d999a9151…

1 0

Sergey Guralnik : extrac32: Merge identical case statements.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: a5ac00aaf422398a0bb6f47f815dd24eea10fc9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5ac00aaf422398a0bb6f47f8… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Sat Mar 30 07:04:42 2013 +0200 extrac32: Merge identical case statements. --- programs/extrac32/extrac32.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index fc1ae1c..11dd755 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -130,9 +130,6 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho return 0; break; case 'C': - if (cmd) return 0; - cmd = check; - break; case 'E': case 'D': if (cmd) return 0;

1 0

Sergey Guralnik : extrac32: Allow leading '-' for command line switches.
by Alexandre Julliard 02 Apr '13

02 Apr '13

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

Sergey Guralnik : extrac32: Extract by default when required files are specified.
by Alexandre Julliard 02 Apr '13

02 Apr '13

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: Get default path only when it is really necessary.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: da46ce10deeb8a327ad445ed86086dec33d16eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=da46ce10deeb8a327ad445ed8… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Sat Mar 30 07:27:44 2013 +0200 extrac32: Get default path only when it is really necessary. --- 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 5216627..addd732 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -153,7 +153,7 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho /* Use extraction by default if names of required files presents */ cmd = i < argc ? 'E' : 'D'; - if (!path[0]) + if (cmd == 'E' && !path[0]) GetCurrentDirectoryW(MAX_PATH, path); lstrcatW(path, backslash);

1 0

André Hentschel : dpnet: Increase reported buffer size .
by Alexandre Julliard 02 Apr '13

02 Apr '13

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