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

Re: [PATCH v2 4/7] ucrtbase: Implement the new printf corner case behaviour

by Martin Storsjö

On Tue, 3 Nov 2015, Piotr Caban wrote: > On 11/02/15 22:26, Martin Storsjo wrote: >> - if (options & ~UCRTBASE_PRINTF_TERMINATION_MASK) >> - FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); > Shouldn't this be changed to: > if(options & ~UCRTBASE_PRINTF_MASK) > FIXME("...); > instead of being removed? Perhaps, although these are all the flags that are currently defined, so as far as I can see, there's nothing left to warn about (unless someone calls this internal function deliberately with weird/undefined flags). (The mask when caling pf_printf is only to make sure that we don't accidentally alias the flags of our own.) Should we keep a warning in case a future version adds more flags? // Martin

Nov. 3, 2015

Re: [PATCH v2 5/7] msvcrt: Interpret 'I' as size_t size specifier for integer conversions

by Piotr Caban

On 11/02/15 22:26, Martin Storsjo wrote: > + format = "%Ix %d"; > + r = sprintf(buffer,format,0x123456,1); > + ok(!strcmp(buffer,"123456 1"),"Pointer formatted incorrectly\n"); > + ok( r==8, "return count wrong\n"); Please change the test failure message (I would prefer something like ok(!strcmp(...), "buffer = %s\n", buffer)). Thanks, Piotr

Nov. 3, 2015

Re: [PATCH v2 4/7] ucrtbase: Implement the new printf corner case behaviour

by Piotr Caban

On 11/02/15 22:26, Martin Storsjo wrote: > + test_legacy_wide(); > + test_legacy_msvcrt(); > + test_legacy_three_digit_exp(); I also think it would be nicer if this tests are called e.g. test_printf_legacy_wide. Thanks, Piotr

Nov. 3, 2015

Re: [PATCH v2 4/7] ucrtbase: Implement the new printf corner case behaviour

by Piotr Caban

On 11/02/15 22:26, Martin Storsjo wrote: > - if (options & ~UCRTBASE_PRINTF_TERMINATION_MASK) > - FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); Shouldn't this be changed to: if(options & ~UCRTBASE_PRINTF_MASK) FIXME("...); instead of being removed? Thanks, Piotr

Nov. 3, 2015

Re: [6/6] oleaut32/tests: Add a bunch of new tests for typelib generation.

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=17920 Your paranoid android. === wxppro (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 77C47740 === w2003std (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 77BD85F0 === wvistau64 (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 77189BBD === w2008s64 (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 74FB9BBD === w7u (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 77598B21 === w7pro64 (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 769A8B21 === w8 (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 76B0B4BF === w864 (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 7748B4BF === w1064 (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 75688E90 === wvistau64 (64 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4617: Test failed: typeattr->cbSizeInstance expected 8 got 4 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 40 got 32 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 24 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 000007FEFE804E90 === w2008s64 (64 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4617: Test failed: typeattr->cbSizeInstance expected 8 got 4 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 40 got 32 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 24 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 000007FEFF134E90 === w7pro64 (64 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4617: Test failed: typeattr->cbSizeInstance expected 8 got 4 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 40 got 32 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 24 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 000007FEFDB35960 === w864 (64 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4617: Test failed: typeattr->cbSizeInstance expected 8 got 4 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 40 got 32 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 24 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 00007FFB7B0A11A0 === w1064 (64 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4617: Test failed: typeattr->cbSizeInstance expected 8 got 4 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 40 got 32 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 24 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 00007FF85AA7C510

Nov. 3, 2015

Re: [4/6] widl: Attributes of the alias are supposed to replace attributes of a tag in the typelib. Resend.

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=17919 Your paranoid android. === wxppro (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w2003std (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === wvistau64 (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w2008s64 (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w7u (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w7pro64 (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w8 (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w864 (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w1064 (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === wvistau64 (64 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w2008s64 (64 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w7pro64 (64 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w864 (64 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w1064 (64 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b

Nov. 3, 2015

Re: Downloads Site Mirrors

by Alexandre Julliard

Austin English <austinenglish(a)gmail.com> writes: > On Mon, Nov 2, 2015 at 4:01 PM, Jeremy Newman > <jnewman(a)codeweavers.com> wrote: > > We are now mirroring https://ftp.winehq.org, as > https://dl.winehq.org/ > > For faster downloads, if you are using our old ftp site for files, > change it to the new dl site. > > Thanks go out to the fine folks at Fastly for providing this > service to Wine. > > -N > > Does this mean we can migrate away from SourceForge? There are some details to be worked out, but that's the plan, yes. -- Alexandre Julliard julliard(a)winehq.org

Nov. 3, 2015

Re: [PATCH 1/5] winepulse: Add initial stub for pulseaudio support

by Alexandre Julliard

Andrew Eikum <aeikum(a)codeweavers.com> writes: > On Tue, Nov 03, 2015 at 12:22:09AM +0900, Alexandre Julliard wrote: >> If it's just because things are missing, then that's OK. But you better >> hope that once the whole series is in, it no longer crashes here ;-) > > After those five, there are three more patches to implement missing > critical interfaces (volume, session, and marshalling). All three > should be in the next wave. After those, I expect the audio tests to > pass. Then there are a couple of other patches for small improvements > and consistency with other drivers, split out to retain authorship. It does work fine with the remaining patches applied. Thanks! -- Alexandre Julliard julliard(a)winehq.org

Nov. 3, 2015

Re: [PATCH 3/5] winepulse: Add audioclient

by Andrew Eikum

On Tue, Nov 03, 2015 at 01:32:01AM +0100, Sebastian Lackner wrote: > I know this patch is already committed, but still... > > On 29.10.2015 18:04, Andrew Eikum wrote: > > } > > if (pulse_ml) > > pa_mainloop_quit(pulse_ml, 0); > > + if (pulse_thread) { > > + WaitForSingleObject(pulse_thread, INFINITE); > > This can't work. You can't wait for a thread while holding the loader lock. > Hm, I wondered about this, and it did seem to work when I tested it. > > > > +static DWORD CALLBACK pulse_mainloop_thread(void *tmp) { > > + int ret; > > + pulse_ml = pa_mainloop_new(); > > I might be wrong, but I see a risk here that the pulse_ml conflicts with the use in pulse_test_connect(). > Is it guaranteed that pulse_test_connect() is only called once after loading the DLL? > Yeah, pulse_test_connect() is called only from GetPriority, which is only called once from mmdevapi, when it's determining which driver to use. Andrew

Nov. 3, 2015

Re: [2/2] winepulse.drv: Silence the correct buffer.

by Andrew Eikum

On Tue, Nov 03, 2015 at 01:26:16AM +0100, Sebastian Lackner wrote: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > > It seems this was a mistake while rebasing. Please note that different > buffers are used (This->tmp_buffer vs This->locked_ptr). > Good eye. I already have a patch to fix this in the sequence, unsent yet. My version adds a silence_buffer() utility method to avoid the duplicate check for the format. It'll be in the next wave. Andrew > dlls/winepulse.drv/mmdevdrv.c | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > > diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c > index 4863bb3..47e9b0d 100644 > --- a/dlls/winepulse.drv/mmdevdrv.c > +++ b/dlls/winepulse.drv/mmdevdrv.c > @@ -1738,18 +1738,17 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( > return AUDCLNT_E_INVALID_SIZE; > } > > - if (flags & AUDCLNT_BUFFERFLAGS_SILENT) { > - if (This->ss.format == PA_SAMPLE_U8) > - memset(This->tmp_buffer, 128, written_bytes); > - else > - memset(This->tmp_buffer, 0, written_bytes); > - } > - > This->locked = 0; > - if (This->locked_ptr) > + if (This->locked_ptr) { > + if (flags & AUDCLNT_BUFFERFLAGS_SILENT) > + memset(This->locked_ptr, This->ss.format == PA_SAMPLE_U8 ? 0x80 : 0, written_bytes); > pa_stream_write(This->stream, This->locked_ptr, written_bytes, NULL, 0, PA_SEEK_RELATIVE); > - else > + } else { > + if (flags & AUDCLNT_BUFFERFLAGS_SILENT) > + memset(This->tmp_buffer, This->ss.format == PA_SAMPLE_U8 ? 0x80 : 0, written_bytes); > pa_stream_write(This->stream, This->tmp_buffer, written_bytes, pulse_free_noop, 0, PA_SEEK_RELATIVE); > + } > + > This->pad += written_bytes; > This->locked_ptr = NULL; > TRACE("Released %u, pad %zu\n", written_frames, This->pad / pa_frame_size(&This->ss)); > -- > 2.6.2

Nov. 3, 2015