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

Re: [PATCH 2/2] vbscript: Fixed CStr

by Shuai Meng

2014-06-13 19:45 GMT+08:00 Jacek Caban <jacek(a)codeweavers.com>: > Hi Shuai, > > On 06/13/14 06:26, Shuai Meng wrote: > > - hres = to_string(arg, &str); > > + assert(args_cnt == 1); > > + > > + V_VT(&v) = VT_EMPTY; > > + hres = VariantChangeType(&v, arg, VARIANT_LOCALBOOL, VT_BSTR); > > Why do you change it? to_string() already does the same call. > Yes, you are right, I made a mistake, it's unnecessary to change it. > > Jacek > > >

June 13, 2014

Re: ws2_32/socket.c: Fix compile for linux systems without net/ipx.h

by Bruno Jesus

On Mon, Jun 2, 2014 at 3:01 PM, Felix Janda <felix.janda(a)posteo.de> wrote: > --- > dlls/ws2_32/socket.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c > index e31f396..cf5473d 100644 > --- a/dlls/ws2_32/socket.c > +++ b/dlls/ws2_32/socket.c > @@ -109,6 +109,8 @@ > # include <linux/types.h> > # endif > # include <linux/ipx.h> > +# define SOL_IPX 256 > +# define IPX_TYPE 1 > # define HAS_IPX > #endif Hi, can you share the details about how you are compiling this? There may be a better solution like not defining HAS_IPX if SOL_IPX is not present. If you help me reproduce the issue I can help to fix it. Best regards, Bruno

June 13, 2014

Re: [3/4] msvcrt: change default buffer size to 4k.

by Piotr Caban

On 06/13/14 13:34, Grazvydas Ignotas wrote: > On Fri, Jun 13, 2014 at 12:08 PM, Piotr Caban <piotr.caban(a)gmail.com> wrote: >> On 06/13/14 01:27, Grazvydas Ignotas wrote: >>> >>> -#define MSVCRT_BUFSIZ 512 >>> +#define MSVCRT_BUFSIZ 4096 >> >> You can't change BUFSIZ value. > > Why not? This is internal MSVCRT_BUFSIZ from internal header, not the > public BUFSIZ one, which is more or less unrelated. > It's there because it's not possible to include msvcrt headers in the dll. You will also need BUFSIZ==512 for setvbuf implementation.

June 13, 2014

Re: [PATCH 2/2] vbscript: Fixed CStr

by Jacek Caban

Hi Shuai, On 06/13/14 06:26, Shuai Meng wrote: > - hres = to_string(arg, &str); > + assert(args_cnt == 1); > + > + V_VT(&v) = VT_EMPTY; > + hres = VariantChangeType(&v, arg, VARIANT_LOCALBOOL, VT_BSTR); Why do you change it? to_string() already does the same call. Jacek

June 13, 2014

Re: [3/4] msvcrt: change default buffer size to 4k.

by Grazvydas Ignotas

On Fri, Jun 13, 2014 at 12:08 PM, Piotr Caban <piotr.caban(a)gmail.com> wrote: > On 06/13/14 01:27, Grazvydas Ignotas wrote: >> >> -#define MSVCRT_BUFSIZ 512 >> +#define MSVCRT_BUFSIZ 4096 > > You can't change BUFSIZ value. Why not? This is internal MSVCRT_BUFSIZ from internal header, not the public BUFSIZ one, which is more or less unrelated. -- Gražvydas

June 13, 2014

Re: [PATCH 2/2] vbscript: Fixed CStr

by Piotr Caban

On 06/13/14 06:26, Shuai Meng wrote: > --- > dlls/vbscript/global.c | 16 +++++++++++++--- > dlls/vbscript/tests/api.vbs | 21 +++++++++++++++++++++ > 2 files changed, 34 insertions(+), 3 deletions(-) > You have probably sent wrong patch, one that you've sent me earlier is better (https://github.com/Shuai-Meng/wine/commit/54bb6a783a623a3bf30c8fe33187c8a35…) Taking in account you'll need to resend it, could you please also change: + if(!res) + return DISP_E_BADVARTYPE; + else { + *res = v; + return S_OK; + } to if(!res) return DISP_E_BADVARTYPE; *res = v; return S_OK; It's a style change that makes your code similar to other code in global.c Thanks, Piotr

June 13, 2014

Re: [3/4] msvcrt: change default buffer size to 4k.

by Piotr Caban

On 06/13/14 01:27, Grazvydas Ignotas wrote: > -#define MSVCRT_BUFSIZ 512 > +#define MSVCRT_BUFSIZ 4096 You can't change BUFSIZ value.

June 13, 2014

Re: [1/4] msvcrt/tests: Add a test for fwrite flushing behavior. (try 2)

by Piotr Caban

Hi, On 06/13/14 01:27, Grazvydas Ignotas wrote: > +static void test_write_flush(void) > +{ > + char iobuf[1024]; > + char *tempf; > + FILE *file; > + > + tempf = _tempnam(".","wne"); > + file = fopen(tempf, "wb+"); > + ok(file != NULL, "unable to create test file\n"); > + /* the default should be 4K */ > + test_write_flush_size(file, 4096); It would be nice to read the size from the file->_bufsiz instead of hard-coding 4096. This value is not initialized while the file is opened so you will need to call something before reading it's value. > + setvbuf(file, iobuf, _IOFBF, sizeof(iobuf)); > + test_write_flush_size(file, sizeof(iobuf)); > + fclose(file); Current implemententation of setvbuf is broken in wine. This code will cause free(iobuf) to be called. I think that setvbuf needs to be fixed before this test can be added. > + unlink(tempf); > + free(tempf); _tempnam returns internal buffer, free should not be called on it. Thanks, Piotr

June 13, 2014

Re: [PATCH 2/2] vbscript: Fixed CStr

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=7468 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

June 13, 2014

Re: [PATCH 1/2] msvcrt: Add _strxfrm_l implementation

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=7457 Your paranoid android. === w2000pro (32 bit string) === string: unhandled exception c0000005 at 78010362 === wxppro (32 bit string) === string: unhandled exception c0000005 at 77C47AD8

June 12, 2014