January 2013 - Wine-Devel - list.winehq.org

Re: [PATCH (try2)] ieframe: Strip 'file://' from file URLs in BEFORENAVIGATE2 callbacks
by Jacek Caban Jan. 9, 2013

Jan. 9, 2013

Hi Andrew, On 01/09/13 16:56, Andrew Eikum wrote: > --- > > This should fix the Office 2007 half of Bug 17271. > > try2: Fix test failures on XP by expanding the expected path name. > > dlls/ieframe/navigate.c | 7 +++++- > dlls/ieframe/tests/webbrowser.c | 56 ++++++++++++++++++++++++++++++++++++++--- > 2 files changed, 59 insertions(+), 4 deletions(-) > > > 0001-ieframe-Strip-file-from-file-URLs-in-BEFORENAVIGATE2.patch > > > diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c > index dd4a976..2601ba8 100644 > --- a/dlls/ieframe/navigate.c > +++ b/dlls/ieframe/navigate.c > @@ -566,6 +566,8 @@ static void on_before_navigate2(DocHost *This, LPCWSTR url, SAFEARRAY *post_data > VARIANT var_url, var_flags, var_frame_name, var_post_data, var_post_data2, var_headers; > DISPPARAMS dispparams; > VARIANTARG params[7]; > + WCHAR file_path[MAX_PATH]; > + DWORD file_path_len = sizeof(file_path) / sizeof(*file_path); > > dispparams.cArgs = 7; > dispparams.cNamedArgs = 0; > @@ -607,7 +609,10 @@ static void on_before_navigate2(DocHost *This, LPCWSTR url, SAFEARRAY *post_data > V_VT(params+5) = (VT_BYREF|VT_VARIANT); > V_VARIANTREF(params+5) = &var_url; > V_VT(&var_url) = VT_BSTR; > - V_BSTR(&var_url) = SysAllocString(url); > + if(PathCreateFromUrlW(url, file_path, &file_path_len, 0) == S_OK) > + V_BSTR(&var_url) = SysAllocString(file_path); > + else > + V_BSTR(&var_url) = SysAllocString(url); > > V_VT(params+6) = (VT_DISPATCH); > V_DISPATCH(params+6) = (IDispatch*)This->wb; > diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c > index 25cce8a..70c785b 100644 > --- a/dlls/ieframe/tests/webbrowser.c > +++ b/dlls/ieframe/tests/webbrowser.c > @@ -151,7 +151,7 @@ static VARIANT_BOOL exvb; > static IWebBrowser2 *wb; > > static HWND container_hwnd, shell_embedding_hwnd; > -static BOOL is_downloading, is_first_load, use_container_olecmd, test_close, is_http, use_container_dochostui; > +static BOOL is_downloading, is_first_load, use_container_olecmd, test_close, is_http, is_file, use_container_dochostui; > static HRESULT hr_dochost_TranslateAccelerator = E_NOTIMPL; > static HRESULT hr_site_TranslateAccelerator = E_NOTIMPL; > static const char *current_url; > @@ -690,8 +690,14 @@ static void test_OnBeforeNavigate(const VARIANT *disp, const VARIANT *url, const > ok(V_VT(V_VARIANTREF(url)) == VT_BSTR, "V_VT(V_VARIANTREF(url))=%d, expected VT_BSTR\n", > V_VT(V_VARIANTREF(url))); > ok(V_BSTR(V_VARIANTREF(url)) != NULL, "V_BSTR(V_VARIANTREF(url)) == NULL\n"); > - ok(!strcmp_wa(V_BSTR(V_VARIANTREF(url)), current_url), "unexpected url %s, expected %s\n", > - wine_dbgstr_w(V_BSTR(V_VARIANTREF(url))), current_url); > + if(is_file){ > + char full_path[MAX_PATH]; > + GetLongPathNameA(current_url, full_path, sizeof(full_path)); I think expanding the path would be better done while constructing the URL instead of here. + test_DoVerb(webbrowser); + test_Navigate2(webbrowser, file_url); + + IWebBrowser2_Release(webbrowser); This is not enough for proper clean up. You may verify that by checking ref count here. At least setting client site to NULL is needed. Cheers, Jacek

1 0

Re: [PATCH (try2)] ieframe: Strip 'file://' from file URLs in BEFORENAVIGATE2 callbacks
by Marvin Jan. 9, 2013

Jan. 9, 2013

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=23818 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [PATCH] ieframe: Strip 'file://' from file URLs in BEFORENAVIGATE2 callbacks
by Marvin Jan. 9, 2013

Jan. 9, 2013

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=23816 Your paranoid android. === WNT4WSSP6 (32 bit webbrowser) === webbrowser.c:3320: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3320: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3320: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3461: Test failed: Creating WebBrowser object failed: 80040154 webbrowser: unhandled exception c0000005 at 0040816F === W2KPROSP4 (32 bit webbrowser) === webbrowser.c:2607: Test failed: expected GetOverridesKeyPath webbrowser.c:2612: Test failed: expected Invoke_SETSECURELOCKICON webbrowser.c:2613: Test failed: expected Invoke_FILEDOWNLOAD webbrowser.c:3046: Test failed: doc_disp == NULL webbrowser: unhandled exception c0000005 at 00402F21 === WXPPROSP3 (32 bit webbrowser) === webbrowser.c:693: Test failed: unexpected url L"C:\\Documents and Settings\\winetest\\Local Settings\\Temp\\wine_test.html", expected C:\DOCUME~1\winetest\LOCALS~1\Temp\wine_test.html === W2K3R2SESP2 (32 bit webbrowser) === webbrowser.c:693: Test failed: unexpected url L"C:\\Documents and Settings\\winetest\\Local Settings\\Temp\\wine_test.html", expected C:\DOCUME~1\winetest\LOCALS~1\Temp\wine_test.html

1 0

Re: Truncate MIDI SysEx messages after termination byte
by Christian Costa Jan. 9, 2013

Jan. 9, 2013

Le 09/01/2013 03:12, Johannes Kroll a écrit : > While using the KORG Kontrol Editor software [1] under Wine to configure > my nanoPAD2 MIDI controller, I noticed that uploading parameters to the > hardware doesn't work. The program displays a timeout message. > > The program relies on the MIDI driver to remove data after the SysEx > termination byte [2], but the Wine's winmm implementation doesn't do > this. The complete MIDIHDR buffer is sent, including excess bytes in the > case when the buffer is larger than the MIDI message. > > The attached patch fixes the problem by truncating SysEx messages after > the termination byte, ignoring any excess bytes. > > I tested the patch with KORG Kontrol Editor under Ubuntu 12.04 64-bit > (32-bit wine). > > [1] http://www.korg.co.uk/support/downloads/nano2_dl.php > [2] http://home.roadrunner.com/~jgglatt/tech/midispec/sysex.htm > > Hi, Please be consistent when using space. 1 space before and after operators (<, ==, =, ...). Christian

2 3

Re: [PATCH 2/4] kernel32/path : implement copyfileexW progressroutine callback
by Nikolay Sivov Jan. 9, 2013

Jan. 9, 2013

On 1/8/2013 22:19, Patrick Rudolph wrote: > + BOOL progressRoutine_enabled = progressRoutine != 0; Why do you need this? You could always check for callback pointer directly.

2 2

Re: vbscript: Added support for a few more constants
by Marvin Jan. 9, 2013

Jan. 9, 2013

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=23812 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [1/2] windowscodecs: Add a test for loading a .bmp file with BITMAPINFOHEADER.
by Marvin Jan. 9, 2013

Jan. 9, 2013

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=23802 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

2 1

Re: [2/2] windowscodecs: BMP decoder should always return valid image resolution.
by Marvin Jan. 9, 2013

Jan. 9, 2013

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=23803 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [PATCH 2/4] kernel32/path : implement copyfileexW progressroutine callback
by Nikolay Sivov Jan. 8, 2013

Jan. 8, 2013

On 1/8/2013 22:19, Patrick Rudolph wrote: > This should fix bug http://bugs.winehq.org/show_bug.cgi?id=29232 > It fixes lots of tests on wine. That's suspicious cause you don't have test diff in this patch. > >

1 0

Re: kernel32/tests : added tests for copyfileex
by Marvin Jan. 8, 2013

Jan. 8, 2013

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=23794 Your paranoid android. === WVISTAADM (32 bit path) === path.c:1809: Test failed: Expected GetFileAttributesEx to return nonzero, got 0 === W2K8SE (32 bit path) === Failure running script in VM: The specified guest user must be logged in interactively to perform this operation === W7PRO (32 bit path) === path.c:1809: Test failed: Expected GetFileAttributesEx to return nonzero, got 0 === W7PROX64 (32 bit path) === path.c:1809: Test failed: Expected GetFileAttributesEx to return nonzero, got 0 === TEST64_W7SP1 (32 bit path) === path.c:1809: Test failed: Expected GetFileAttributesEx to return nonzero, got 0 === W7PROX64 (64 bit path) === path.c:1809: Test failed: Expected GetFileAttributesEx to return nonzero, got 0 === TEST64_W7SP1 (64 bit path) === path.c:1809: Test failed: Expected GetFileAttributesEx to return nonzero, got 0

1 0