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

Re: [PATCH 2/4] [cmd] Prevent external env vars causing tests to fail
by Marvin 19 Nov '12

19 Nov '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=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')

1 0

Re: [PATCH 1/4] [cmd] Add support for tokens= (for /f)
by Marvin 19 Nov '12

19 Nov '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=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')

1 0

Re: [PATCH 4/4] [kernel] Support opening of console for read
by Christian Costa 19 Nov '12

19 Nov '12

+ * 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

1 0

Re: [PATCH 1/2] usp10: Fixed wgBlank, wgDefault, wgInvalid and wgKashida (try 4).
by Alexandre Julliard 19 Nov '12

19 Nov '12

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

2 1

Re: [1/5] windowscodecs: Implement QueryCapability in the PNG decoder.
by Vincent Povirk 19 Nov '12

19 Nov '12

You should at least look at the stream and check that it looks like an image in a format the decoder can read. 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. The method should also invalidate the decoder object, so we don't accidentally introduce code that reuses it.

2 3

Ubuntu 12.10 - anyone?
by Daniel Jelinski 19 Nov '12

19 Nov '12

Hello, Is it possible to compile 32bit wine in 64bit ubuntu 12.10? I heard there were problems in 12.04 - were they resolved? Regards, Daniel

7 11

Re: [PATCH] regedit: fixed a fclose(stdin) issue (Coverity)
by Frédéric Delanoy 19 Nov '12

19 Nov '12

On Sat, Nov 17, 2012 at 9:28 PM, Marcus Meissner <meissner(a)suse.de> wrote: > Hi, > > If we have multiple filenames on the commandline, and the second one is -, > we would fclose(stdin) as realname is not NULL. > > (And also double free realname.) > > So set it back to NULL after free and in the stdin case. > > Ciao, Marcus > --- > programs/regedit/regedit.c | 1 + > 1 Datei geändert, 1 Zeile hinzugefügt(+) > > diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c > index acff701..b6f74ee 100644 > --- a/programs/regedit/regedit.c > +++ b/programs/regedit/regedit.c > @@ -143,6 +143,7 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s) > if (strcmp(filename, "-") == 0) > { > reg_file = stdin; > + realname = NULL; > } > else > { realname is set to NULL at the start of every iteration, so this is not useful. Frédéric

1 0

Re: cmd: Fix possible NULL pointer access in heap_strdupW
by Frédéric Delanoy 19 Nov '12

19 Nov '12

On Sat, Nov 17, 2012 at 10:52 PM, André Hentschel <nerv(a)dawncrow.de> wrote: > we already do that (ieframe,vbscript,wininet,.. are good examples), but not consistent all over the place > --- > programs/cmd/wcmd.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h > index 3cc4c0b..303d260 100644 > --- a/programs/cmd/wcmd.h > +++ b/programs/cmd/wcmd.h > @@ -142,7 +142,8 @@ static inline WCHAR *heap_strdupW(const WCHAR *str) > > size = (strlenW(str)+1)*sizeof(WCHAR); > ret = heap_alloc(size); > - memcpy(ret, str, size); > + if(ret) > + memcpy(ret, str, size); > } > > return ret; > -- > 1.8.0 heap_alloc is cmd was made infallible, so this isn't necessary (c6d24089dbc284f0fef5e1ce37b75ac04c6ebd94) Frédéric

1 0

Re: [PATCH 1/2] usp10/tests: Added tests for wgBlank, wgDefault, wgInvalid and wgKashida (try 3).
by Alexandre Julliard 18 Nov '12

18 Nov '12

Qian Hong <fracting(a)gmail.com> writes: > - Merge tests functions. > > --- > dlls/usp10/tests/usp10.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 156 insertions(+) > The test fails: ../../../tools/runtest -q -P wine -M usp10.dll -T ../../.. -p usp10_test.exe.so usp10.c && touch usp10.ok usp10.c:1958: Test failed: wgBlank 0000 tmBreakChar 0020 usp10.c:1958: Test failed: wgBlank 0000 tmBreakChar 0020 usp10.c:1958: Test failed: wgBlank 0000 tmBreakChar 0020 usp10.c:1958: Test failed: wgBlank 0000 tmBreakChar 0020 etc. -- Alexandre Julliard julliard(a)winehq.org

2 3

certificate problem accessing https://source.winehq.org ?
by Dan Kegel 17 Nov '12

17 Nov '12

$ git clone https://source.winehq.org/git/wine.git newwine-git Cloning into 'newwine-git'... error: server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none while accessing https://source.winehq.org/git/wine.git/info/refs Maybe that's related to the big fat red warning Chrome gives when visiting https://source.winehq.org/ Happily, just leaving off the 's' is a workaround.

2 2