November 2012 - Wine-Devel - list.winehq.org

Re: [PATCH 2/4] [cmd] Prevent external env vars causing tests to fail

by Ann and Jason Edmeades

> IMHO it might be better to use variable names like WINE_xxx for tests > involving "enumerations" to avoid needlessly altering the environment. > (not that BAR, FOO or FOOBAR are likely to be already used environment > variables) > > Frédéric > Thanks! We dont really change the environment long term, as the test spawns a process which has its process modified and runs to completion ie any changes are thrown away. However, I do agree that if there was an important environment variable which controlled the shell (in the bug's case it was BASH_xxx, but could be anything) then it would be wise to leave it in place, so such a change probably isnt a bad idea anyway. (I'll make this change in try 2, as I need to fix the broken NT4 stuff from patch 1 anyway) Jason

Nov. 19, 2012

Re: [PATCH 3/4] [cmd] Add support for NUL in copy

by Marvin

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=23016 Your paranoid android. === WNT4WSSP6 (32 bit) === batch.c:312: Test failed: unexpected char 0x53 position 0 in line 419 (got 'Skipping file size check on NT4', wanted 'Passed: file size check on a.a [7]') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 420 (got 'Skipping file size check on NT4', wanted 'Passed: file size check on b.b [8]') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 421 (got 'Skipping file size check on NT4', wanted 'Passed: file size check on a.a [7]') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 422 (got 'Skipping file size check on NT4', wanted 'Passed: file size check on b.b [8]') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 423 (got 'Skipping file size check on NT4', wanted 'Passed: file size check on a.a [7]') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 424 (got 'Skipping file size check on NT4', wanted 'Passed: file size check on subdir\a.a [8]') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 866 (got 'h=%h i=a j=b k=c l=e m= o=%o', wanted 'h=%h i=a j=b k=c l=e m=%m o=%o') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 868 (got 'h=%h i=a j=b k=c l=d e f g m= n=%n o=%o', wanted 'h=%h i=a j=b k=c l=d e f g m=%m n=%n o=%o') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 869 (got 'h=%h i=a j=c k= l= m= n=%n o=%o', wanted 'h=%h i=a j=c k= l= m=%m n=%n o=%o') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 870 (got 'h=%h i=b j=c k= l= m= n=%n o=%o', wanted 'h=%h i=b j=c k= l= m=%m n=%n o=%o') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 871 (got 'h=%h i=b j=c k= l= m= n=%n o=%o', wanted 'h=%h i=b j=c k= l= m=%m n=%n o=%o')

Nov. 19, 2012

Re: [PATCH 2/4] [cmd] Prevent external env vars causing tests to fail

by Marvin

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=23015 Your paranoid android. === WNT4WSSP6 (32 bit) === batch.c:312: Test failed: unexpected char 0x68 position 0 in line 860 (got 'h=%h i=a j=b k=c l=e m= o=%o', wanted 'h=%h i=a j=b k=c l=e m=%m o=%o') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 862 (got 'h=%h i=a j=b k=c l=d e f g m= n=%n o=%o', wanted 'h=%h i=a j=b k=c l=d e f g m=%m n=%n o=%o') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 863 (got 'h=%h i=a j=c k= l= m= n=%n o=%o', wanted 'h=%h i=a j=c k= l= m=%m n=%n o=%o') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 864 (got 'h=%h i=b j=c k= l= m= n=%n o=%o', wanted 'h=%h i=b j=c k= l= m=%m n=%n o=%o') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 865 (got 'h=%h i=b j=c k= l= m= n=%n o=%o', wanted 'h=%h i=b j=c k= l= m=%m n=%n o=%o')

Nov. 19, 2012

Re: [PATCH 2/4] [cmd] Prevent external env vars causing tests to fail

by Frédéric Delanoy

On Mon, Nov 19, 2012 at 10:03 PM, Ann and Jason Edmeades <jason(a)edmeades.me.uk> wrote: > Existance of external environment variables should not cause > make test to fail, but it can cause extra lines in some of the > set commands if the test does not first clear them out. > > [Fixes bug 32087] > diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd > index a1a3c4a..3efcd2a 100644 > --- a/programs/cmd/tests/test_builtins.cmd > +++ b/programs/cmd/tests/test_builtins.cmd > @@ -239,6 +239,9 @@ set FOO= > > echo ------------ Testing 'set' ------------ > call :setError 0 > +rem Remove any FOO* BA* environment variables from shell before proceeding > +for /f "delims==" %%i in ('set ba') do set %%i= > +for /f "delims==" %%i in ('set foo') do set %%i= > set FOOBAR 2> nul > nul > echo %ErrorLevel% > set FOOBAR = baz IMHO it might be better to use variable names like WINE_xxx for tests involving "enumerations" to avoid needlessly altering the environment. (not that BAR, FOO or FOOBAR are likely to be already used environment variables) Frédéric

Nov. 19, 2012

Re: [PATCH 1/4] [cmd] Add support for tokens= (for /f)

by Marvin

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=23014 Your paranoid android. === WNT4WSSP6 (32 bit) === batch.c:312: Test failed: unexpected char 0x68 position 0 in line 860 (got 'h=%h i=a j=b k=c l=e m= o=%o', wanted 'h=%h i=a j=b k=c l=e m=%m o=%o') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 862 (got 'h=%h i=a j=b k=c l=d e f g m= n=%n o=%o', wanted 'h=%h i=a j=b k=c l=d e f g m=%m n=%n o=%o') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 863 (got 'h=%h i=a j=c k= l= m= n=%n o=%o', wanted 'h=%h i=a j=c k= l= m=%m n=%n o=%o') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 864 (got 'h=%h i=b j=c k= l= m= n=%n o=%o', wanted 'h=%h i=b j=c k= l= m=%m n=%n o=%o') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 865 (got 'h=%h i=b j=c k= l= m= n=%n o=%o', wanted 'h=%h i=b j=c k= l= m=%m n=%n o=%o')

Nov. 19, 2012

Re: [PATCH 4/4] [kernel] Support opening of console for read

by Christian Costa

+ * write_console_input + * + * Helper function for bare_console_fetch_input calling WriteConsoleInput + * The handle passed to ReadConsole etc may not have been opened for write, + * and hence the calls to WriteConsoleInput may fail. This routine handles such + * a failure, and retries the write by opening the console for write, using + * it and then closing it again. + * + * Returns as per WriteConsoleInputW (TRUE on success) + */ +BOOL WINAPI write_console_input( HANDLE handle, const INPUT_RECORD *buffer, + DWORD count, LPDWORD written ) +{ + BOOL result = WriteConsoleInputW(handle, buffer, count, written); + + /* If this fails with access denied */ + if (!result && GetLastError() == ERROR_ACCESS_DENIED) { + HANDLE hConRW = CreateFileW(coninW, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, 0); + if (hConRW != INVALID_HANDLE_VALUE) { + result = WriteConsoleInputW(hConRW, buffer, count, written); + CloseHandle(hConRW); + } + } + + return result; +} Hi Jason, That would be better to use 4 spaces identation as the rest of the file. Christian

Nov. 19, 2012

Re: [PATCH 1/2] usp10: Fixed wgBlank, wgDefault, wgInvalid and wgKashida (try 4).

by Qian Hong

On Tue, Nov 20, 2012 at 2:12 AM, Alexandre Julliard <julliard(a)winehq.org> wrote: > > It doesn't seem useful to have all these separate set and get functions, > particularly since their implementation is very similar. Ah, yes, thanks for reminder! I must drank too much Wine LOL. -- Regards, Qian Hong - Sent from Ubuntu http://www.ubuntu.com/

Nov. 19, 2012

Re: [PATCH 1/2] usp10: Fixed wgBlank, wgDefault, wgInvalid and wgKashida (try 4).

by Alexandre Julliard

Qian Hong <fracting(a)gmail.com> writes: > @@ -813,6 +926,12 @@ static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc) > return E_INVALIDARG; > } > sc->sfnt = (GetFontData(hdc, MS_MAKE_TAG('h','e','a','d'), 0, NULL, 0)!=GDI_ERROR); > + > + set_cache_blank_char(hdc, sc); > + set_cache_default_char(hdc, sc); > + set_cache_invalid_char(hdc, sc); > + set_cache_kashida_char(hdc, sc); > + > *psc = sc; > TRACE("<- %p\n", sc); > return S_OK; > @@ -1063,12 +1182,11 @@ HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPR > if (sfp->cBytes != sizeof(SCRIPT_FONTPROPERTIES)) > return E_INVALIDARG; > > - /* return something sensible? */ > - sfp->wgBlank = 0; > + sfp->wgBlank = get_cache_blank_char(psc); > sfp->wgDefault = get_cache_default_char(psc); > - sfp->wgInvalid = 0; > - sfp->wgKashida = 0xffff; > - sfp->iKashidaWidth = 0; > + sfp->wgInvalid = get_cache_invalid_char(psc); > + sfp->wgKashida = get_cache_kashida_char(psc); > + sfp->iKashidaWidth = 0; /* TODO */ It doesn't seem useful to have all these separate set and get functions, particularly since their implementation is very similar. -- Alexandre Julliard julliard(a)winehq.org

Nov. 19, 2012

Re: [1/5] windowscodecs: Implement QueryCapability in the PNG decoder.

by Dmitry Timoshkov

Vincent Povirk <madewokherd(a)gmail.com> wrote: > >> For JPEG and TIFF, which are extensible formats, there's also the > >> possibility that an image has something in it that we don't support > >> (and that the corresponding decoder on Windows doesn't support) but > >> some other decoder on the system can. > > > > A not supported stream format is a bug and should be fixed IMO. I believe > > that an implementation which declares support for all formats is better > > than a not implemented stub. > > I'm not sure. There are plenty of standard TIFF files that native > can't handle (though I don't think it's a bug if we can), and there's > the possibility of non-standard TIFF files that a corresponding > third-party decoder can. That's a pretty questionable argument IMO. -- Dmitry.

Nov. 19, 2012

Re: [1/5] windowscodecs: Implement QueryCapability in the PNG decoder.

by Dmitry Timoshkov

Vincent Povirk <madewokherd(a)gmail.com> wrote: > You should at least look at the stream and check that it looks like an > image in a format the decoder can read. An invalid image format is a completely not related case, that I'd prefer ignore for now. > For PNG, you could maybe argue that given a correct magic number and a > correctly-working decoder, the decoder must be able to read all the > images or either the decoder or image is broken. Then again, you're > not even checking the magic number.. > > For TGA, though, we don't have an exact magic number. It's entirely > possible that we our TGA magic number matches some files that aren't > really TGA images but are images in some other format that we can > decode. We need QueryCapabilities to disambiguate the decoders in > these cases. > > For JPEG and TIFF, which are extensible formats, there's also the > possibility that an image has something in it that we don't support > (and that the corresponding decoder on Windows doesn't support) but > some other decoder on the system can. A not supported stream format is a bug and should be fixed IMO. I believe that an implementation which declares support for all formats is better than a not implemented stub. -- Dmitry.

Nov. 19, 2012