June 2016 - Wine-Devel - list.winehq.org

Re: include: Add an inline version of CopyRect() too.

by Alexandre Julliard

Michael Stefaniuc <mstefani(a)redhat.de> writes: > Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> > --- > Around 95 use cases. > No, I do *not* want to do change RECT struct assignments to CopyRect(). Good, but how about changing CopyRect to assignments? ;-) -- Alexandre Julliard julliard(a)winehq.org

June 21, 2016

Re: [PATCH] msvcrt: Implement _wperror (v2)

by Piotr Caban

On 06/21/16 15:17, Hugh McMaster wrote: > On Tuesday, 21 June 2016 10:58 PM, Piotr Caban wrote: >> On 06/21/16 14:42, Hugh McMaster wrote: >>> + size = MSVCRT_wcstombs(NULL, str, 0) + 1; >>> + buffer = MSVCRT_malloc(size); >>> + if (!buffer) return; >>> + MSVCRT_wcstombs(buffer, str, size); >> Please handle MSVCRT_wcstombs failure. > > Other than checking for a return value of -1 and freeing the buffer, > is there any other error handling needed? Probably not. Thanks, Piotr

June 21, 2016

Re: [PATCH] msvcrt: Implement _wperror (v2)

by Hugh McMaster

On Tuesday, 21 June 2016 10:58 PM, Piotr Caban wrote: >On 06/21/16 14:42, Hugh McMaster wrote: >> + size = MSVCRT_wcstombs(NULL, str, 0) + 1; >> + buffer = MSVCRT_malloc(size); >> + if (!buffer) return; >> + MSVCRT_wcstombs(buffer, str, size); >Please handle MSVCRT_wcstombs failure. Other than checking for a return value of -1 and freeing the buffer, is there any other error handling needed? MSDN says errno is set to EILSEQ on failure, but I'm assuming MSVCRT_wcstombs does this by itself. Thanks, Hugh

June 21, 2016

Re: [PATCH] msvcrt: Implement _wperror (v2)

by Piotr Caban

On 06/21/16 14:42, Hugh McMaster wrote: > + size = MSVCRT_wcstombs(NULL, str, 0) + 1; > + buffer = MSVCRT_malloc(size); > + if (!buffer) return; > + MSVCRT_wcstombs(buffer, str, size); Please handle MSVCRT_wcstombs failure. Thanks, Piotr

June 21, 2016

Re: [2/8] msvcirt: Implement ostream::operator<< for characters

by Piotr Caban

On 06/21/16 11:54, Iván Matellanes wrote: > @@ -2608,8 +2615,7 @@ ostream* __thiscall ostream_print_char(ostream *this, char c) > DEFINE_THISCALL_WRAPPER(ostream_print_unsigned_char, 8) > ostream* __thiscall ostream_print_unsigned_char(ostream *this, unsigned char c) > { > - FIXME("(%p %c) stub\n", this, c); > - return this; > + return ostream_print_char(this, (char) c); > } The cast here is not needed. > + pssb = (strstreambuf*) call_func1(p_strstreambuf_ctor, &ssb); > + ok(pssb == &ssb, "wrong return, expected %p got %p\n", &ssb, pssb); > + pos = (ostream*) call_func3(p_ostream_sb_ctor, &os, (streambuf*) &ssb, TRUE); As well as this ones. Such casts can potentially hide problems otherwise visible during 64-bit compilation. > + pos = (ostream*) call_func2(p_ostream_print_char, &os, (int) tests[i].param.c); break; The cast here is also not needed. Thanks, Piotr

June 21, 2016

Re: [7/8] msvcirt: Implement ostream::operator<< for streambuf

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 https://testbot.winehq.org/JobDetails.pl?Key=23764 Your paranoid android. === wxppro (32 bit msvcirt) === Found no trace of the test summary line or of a crash === w2003std (32 bit msvcirt) === Found no trace of the test summary line or of a crash

June 21, 2016

Re: [6/8] msvcirt: Implement ostream::operator<< for pointers

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 https://testbot.winehq.org/JobDetails.pl?Key=23763 Your paranoid android. === wxppro (32 bit msvcirt) === Found no trace of the test summary line or of a crash === w2003std (32 bit msvcirt) === Found no trace of the test summary line or of a crash

June 21, 2016

Re: [2/8] msvcirt: Implement ostream::operator<< for characters

by Piotr Caban

On 06/21/16 11:54, Iván Matellanes wrote: > + struct ostream_print_test { > + enum { CHAR } type; > + union { > + char c; > + } param; > + ios_io_state state; > + ios_flags flags; > + int precision; > + int fill; > + int width; > + const char *expected_text; > + ios_io_state expected_flags; > + } tests[] = { > + /* char */ > + {CHAR, {.c = 'a'}, IOSTATE_badbit, 0, 6, ' ', 0, "", IOSTATE_badbit|IOSTATE_failbit}, > + {CHAR, {.c = 'a'}, IOSTATE_eofbit, 0, 6, ' ', 0, "", IOSTATE_eofbit|IOSTATE_failbit}, > + {CHAR, {.c = 'a'}, IOSTATE_goodbit, 0, 6, ' ', 0, "a", IOSTATE_goodbit}, > + {CHAR, {.c = 'a'}, IOSTATE_goodbit, 0, 6, ' ', 4, " a", IOSTATE_goodbit}, > + {CHAR, {.c = 'a'}, IOSTATE_goodbit, 0, 6, 'x', 3, "xxa", IOSTATE_goodbit}, > + {CHAR, {.c = 'a'}, IOSTATE_goodbit, FLAGS_left, 6, ' ', 4, "a ", IOSTATE_goodbit}, > + {CHAR, {.c = 'a'}, IOSTATE_goodbit, FLAGS_left|FLAGS_internal, 6, ' ', 4, " a", IOSTATE_goodbit}, > + {CHAR, {.c = 'a'}, IOSTATE_goodbit, FLAGS_internal|FLAGS_hex|FLAGS_showbase, 6, ' ', 4, " a", IOSTATE_goodbit}, > + {CHAR, {.c = '9'}, IOSTATE_goodbit, FLAGS_oct|FLAGS_showbase|FLAGS_uppercase, 6, 'i', 2, "i9", IOSTATE_goodbit}, > + {CHAR, {.c = '9'}, IOSTATE_goodbit, FLAGS_showpos|FLAGS_scientific, 0, 'i', 2, "i9", IOSTATE_goodbit}, > + {CHAR, {.c = 'e'}, IOSTATE_goodbit, FLAGS_left|FLAGS_right|FLAGS_uppercase, 0, '*', 8, "e*******", IOSTATE_goodbit} > + }; This is not portable (the {.c = 'a'} part). Thanks, Piotr

June 21, 2016

Re: [5/8] msvcirt: Implement ostream::operator<< for floats

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 https://testbot.winehq.org/JobDetails.pl?Key=23762 Your paranoid android. === wxppro (32 bit msvcirt) === Found no trace of the test summary line or of a crash === w2003std (32 bit msvcirt) === Found no trace of the test summary line or of a crash

June 21, 2016

Re: msvcrt: Implement _wperror

by Piotr Caban

On 06/21/16 12:37, Hugh McMaster wrote: > On Tuesday, 21 June 2016 7:04 PM UTC+10, Piotr Caban wrote: >> This is not how the function works. It shouldn't print wchar_t string to >> stderr. Probably the simplest implementation is to convert input >> parameter and call _perror (CP_ACP is not the correct encoding, you can >> use MSVCRT_wcstombs). > > I don't understand. The MSDN page [1] contradicts your statement. > "The perror function prints an error message to stderr. _wperror is a wide-character version > of _perror; the string argument to _wperror is a wide-character string. _wperror and _perror > behave identically otherwise." The function is not writing wide-characters to stderr. It can be easily tested, e.g. do something like this: freopen("test.txt", "wb", stderr); errno = 3; _wperror(L"test"); and see what's in the file when run on Windows/with your implementation. It will also display incorrectly when _wperror is run inside wine's cmd window. > Also, if we convert the wide string to multibyte, there is a risk any non-Unicode characters > supplied as input will not display correctly. So, IMHO converting to a multibyte string is a > bad approach. This is something that is worth testing. Anyway the conversion needs to be done. > Still, if that's what you want, I'll do it. I want the function to be implemented correctly. Thanks, Piotr

June 21, 2016