October 2012 - Wine-devel - list.winehq.org

Re: [PATCH 4/6] [cmd] Add for /f parsingkeyword parsing, add support for skip=
by Alexandre Julliard 17 Oct '12

17 Oct '12

Ann and Jason Edmeades <jason(a)edmeades.me.uk> writes: > Parse the options you can provide with for /f to control the > subsequent parsing, and add support for the simplest (skip). > @@ -1546,6 +1545,13 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { > int itemNum; > CMD_LIST *thisCmdStart; > int parameterNo = 0; > + WCHAR forf_eol=0; > + int forf_skip=0; > + WCHAR forf_delims[256]; > + WCHAR forf_tokens[MAXSTRING]; > + BOOL forf_usebackq = FALSE; > + static const WCHAR forf_defaultdelims[] = {' ', '\t'}; > + static const WCHAR forf_defaulttokens[] = {'1'}; It's clearly time to start splitting WCMD_for into several helper functions. -- Alexandre Julliard julliard(a)winehq.org

2 1

[PATCH] krnl386.exe: Implement INT 33h function 15h
by Christian Costa 17 Oct '12

17 Oct '12

1 0

Re: [PATCH 20/25] mciseq: Check stop condition after sleeping. (Try 5)
by Marcus Meissner 17 Oct '12

17 Oct '12

On Wed, Oct 17, 2012 at 10:36:44AM +0200, Joerg-Cyril.Hoehle(a)t-systems.com wrote: > Please note that the patch queue failed to detect some superseded patches: > > 90588: I should not have named that 17/25 in the first place. > 90672 + 90674: the original 20-21/25 were never marked superseded by later patches. > 90841+ 90482: try 3 was superseded by try 4, now superseded by this try 5. I would suggest to resubmit your queue in smaller batches (like eg. 5 pieces per day) and wait for it to get applied. In the current state testbot will not be run on the sequence I think. Ciao, Marcus

1 0

Re: testbot/lib: If we cannot open the log file, then log to stderr.
by Christian Costa 17 Oct '12

17 Oct '12

Hi François, While your are at it. I would like to do a suggestion. Indeed that would be great to be able to download some files along with the test. Typically for me avi files and dlls (or .drv) would be great ! :D Thanks Christian, 2012/10/15 Francois Gouget <fgouget(a)codeweavers.com> > --- > testbot/lib/WineTestBot/Log.pm | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) > > diff --git a/testbot/lib/WineTestBot/Log.pm > b/testbot/lib/WineTestBot/Log.pm > index 6883968..7de6dcb 100644 > --- a/testbot/lib/WineTestBot/Log.pm > +++ b/testbot/lib/WineTestBot/Log.pm > @@ -38,20 +38,18 @@ sub LogMsg(@) > if (!defined $logfile) > { > my $oldumask = umask(002); > - if (open($logfile, ">>", "$LogDir/log")) > - { > - # Flush after each print > - my $tmp=select($logfile); > - $| = 1; > - select($tmp); > - } > - else > + if (!open($logfile, ">>", "$LogDir/log")) > { > require File::Basename; > print STDERR File::Basename::basename($0), ":warning: could not > open '$LogDir/log' for writing: $!\n"; > - $logfile = undef; > + open($logfile, ">>&=", 2); > } > umask($oldumask); > + > + # Flush after each print > + my $tmp=select($logfile); > + $| = 1; > + select($tmp); > } > print $logfile scalar localtime, " ", @_ if ($logfile); > } > -- > 1.7.10.4 > > > >

4 10

Re: [PATCH 3/3] mshtml: Added more ActiveX loading and script binding tests
by Marvin 17 Oct '12

17 Oct '12

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=22282 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Tr : d3dx9_36 [patch 1/3]: Fix the case out = in for D3DXSHRotateZ
by Nozomi Kodama 17 Oct '12

17 Oct '12

Hi Both your patch and mine fail to pass the attached tests. More thoughts are needed. Nozomi >Hi Nozomi, > >the huge arrays, the loop, it looks a bit ugly. Your implementation makes the D3DXSHRotateZ function a >bit more compatible. What comes into my mind is: >D3DXSHRotateZ(out, y, 1,25f, in); >D3DXSHRotateZ(out, y, 1,25f, out); >D3DXSHRotateZ(out, y, 1,25f, &out[x]); // x ... 1 - y * y >D3DXSHRotateZ(&out[x], y, 1,25f, out); // x ... 1 - y * y > >Do the last 2 also work and are they producing the same values as native? > >Attached is a simple hack to succeed your test, it has some major stuff which needs to be fixed first, but >nevertheless, please have a look. I think the implementation could be a lot smaller and faster. What do you >think? I'd like to hear your opinion, before you try to send a patch. > >+FLOAT * WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, CONST FLOAT *in) >There is a double space after "order,". > >Cheers >Rico

1 0

Re: [PATCH 5/5] ddraw/tests: Add some display mode set / restore tests with multiple ddraw objects.
by Marvin 16 Oct '12

16 Oct '12

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=22275 Your paranoid android. === WNT4WSSP6 (32 bit ddraw2) === ddraw2.c:2526: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw2.c:2543: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw2.c:2551: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw2.c:2553: Test failed: Got unexpected screen width 800. ddraw2.c:2555: Test failed: Got unexpected screen height 600. ddraw2.c:2574: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw2.c:2582: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw2.c:2584: Test failed: Got unexpected screen width 800. ddraw2.c:2586: Test failed: Got unexpected screen height 600. ddraw2.c:2606: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw2.c:2608: Test failed: Got unexpected screen width 800. ddraw2.c:2610: Test failed: Got unexpected screen height 600. ddraw2.c:2615: Test failed: Got unexpected screen width 800. ddraw2.c:2617: Test failed: Got unexpected screen height 600. ddraw2.c:2630: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw2.c:2638: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw2.c:2640: Test failed: Got unexpected screen width 800. ddraw2.c:2642: Test failed: Got unexpected screen height 600. ddraw2.c:2650: Test failed: Got unexpected screen width 800. ddraw2.c:2652: Test failed: Got unexpected screen height 600. ddraw2.c:2664: Test failed: SetDipslayMode failed, hr 0x887600e1. === WNT4WSSP6 (32 bit ddraw1) === ddraw1.c:2389: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw1.c:2406: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw1.c:2414: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw1.c:2416: Test failed: Got unexpected screen width 800. ddraw1.c:2418: Test failed: Got unexpected screen height 600. ddraw1.c:2437: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw1.c:2445: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw1.c:2447: Test failed: Got unexpected screen width 800. ddraw1.c:2449: Test failed: Got unexpected screen height 600. ddraw1.c:2469: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw1.c:2471: Test failed: Got unexpected screen width 800. ddraw1.c:2473: Test failed: Got unexpected screen height 600. ddraw1.c:2478: Test failed: Got unexpected screen width 800. ddraw1.c:2480: Test failed: Got unexpected screen height 600. ddraw1.c:2493: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw1.c:2501: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw1.c:2503: Test failed: Got unexpected screen width 800. ddraw1.c:2505: Test failed: Got unexpected screen height 600. ddraw1.c:2513: Test failed: Got unexpected screen width 800. ddraw1.c:2515: Test failed: Got unexpected screen height 600. ddraw1.c:2527: Test failed: SetDipslayMode failed, hr 0x887600e1.

1 0

Re: [PATCH] user32: Add tests showing that MapWindowPoints, ClientToScreen and ScreenToClient never fail.
by Henri Verbeet 16 Oct '12

16 Oct '12

On 16 October 2012 20:12, Christian Costa <titan.costa(a)gmail.com> wrote: > + //SetWindowPos(wnd, NULL, 0, 0, rect.right / 2, rect.bottom / 2, 0); C99 comment. I don't think these are very interesting cases though, it's probably more interesting what happens with e.g. a destroyed window, or a fullscreen window.

3 3

Re: [PATCH] user32: Add tests showing that MapWindowPoints, ClientToScreen and ScreenToClient never fail.
by Austin English 16 Oct '12

16 Oct '12

On Tue, Oct 16, 2012 at 11:12 AM, Christian Costa <titan.costa(a)gmail.com> wrote: ... > + wnd = CreateWindowA("static", NULL, 0, 0, 0, rect.right / 2, rect.bottom / 2, 0, 0, 0, 0); > + //SetWindowPos(wnd, NULL, 0, 0, rect.right / 2, rect.bottom / 2, 0); Leftover debug code. Cheers, Austin

2 1

Re: programs/winemenubuilder: scale 64x64 classic icons to 48x48 for Mac OS/X
by Alexandre Julliard 16 Oct '12

16 Oct '12

Aric Stewart <aric(a)codeweavers.com> writes: > @@ -403,6 +404,13 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indices, int numInd > WINE_ERR("error 0x%08X creating IWICBitmapDecoder\n", hr); > goto end; > } > +#ifdef __APPLE__ > + hr = IWICImagingFactory_CreateBitmapScaler(factory, &scaler); > + if (FAILED(hr)) > + { > + WINE_WARN("error 0x%08X creating IWICBitmapScaler\n", hr); > + } > +#endif Please try to do that without adding #ifdefs in generic functions. -- Alexandre Julliard julliard(a)winehq.org

2 2