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

Re: msvcr110: Fix typo in exported symbol _set_SSE2_enable.
by Piotr Caban June 16, 2014

June 16, 2014

Hi, You need to generate the patch on top of newest wine from git. Cheers, Piotr

1 0

Re: ole32: Return the correct error in FileLockBytesImpl_*LockRegion*().
by Vincent Povirk June 16, 2014

June 16, 2014

It looks to me like locks that fail due to conflicts will set ERROR_LOCK_VIOLATION, not ERROR_ACCESS_DENIED. We should probably add some tests for the error to the LockFileEx tests. I'd also be interested in what Windows returns on a filesystem that doesn't support locking, if such a thing exists.

1 0

Re: ole32: Fix StorageImpl_LockRegionSync() to actually wait between locking attempts.
by Vincent Povirk June 16, 2014

June 16, 2014

Oops. Thanks for the fix. On Mon, Jun 16, 2014 at 11:23 AM, Francois Gouget <fgouget(a)free.fr> wrote: > --- > dlls/ole32/storage32.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c > index 757138d..49d16fd 100644 > --- a/dlls/ole32/storage32.c > +++ b/dlls/ole32/storage32.c > @@ -2874,16 +2874,16 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs > ULARGE_INTEGER cb, DWORD dwLockType) > { > HRESULT hr; > + int delay; > > /* if it's a FileLockBytesImpl use LockFileEx in blocking mode */ > if (SUCCEEDED(FileLockBytesImpl_LockRegionSync(This->lockBytes, offset, cb))) > return S_OK; > > /* otherwise we have to fake it based on an async lock */ > + delay = 0; > do > { > - int delay=0; > - > hr = ILockBytes_LockRegion(This->lockBytes, offset, cb, dwLockType); > > if (hr == STG_E_ACCESSDENIED) > -- > 2.0.0 > > >

1 0

Re: [PATCH 5/5] ddraw/tests: Properly declare matrices.
by Marvin June 16, 2014

June 16, 2014

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=7524 Your paranoid android. === w8 (32 bit visual) === visual.c:2619: Test failed: unexpected colortable on offscreen surface === w2000pro (32 bit d3d) === d3d.c:1261: Test failed: Homogeneous output was generated despite UNCLIPPED flag === wxppro (32 bit d3d) === d3d.c:1261: Test failed: Homogeneous output was generated despite UNCLIPPED flag === wvistau64 (32 bit d3d) === d3d.c:1261: Test failed: Homogeneous output was generated despite UNCLIPPED flag === w2008s64 (32 bit d3d) === d3d.c:1261: Test failed: Homogeneous output was generated despite UNCLIPPED flag === w7u (32 bit d3d) === d3d.c:1261: Test failed: Homogeneous output was generated despite UNCLIPPED flag === w8 (32 bit d3d) === d3d.c:1261: Test failed: Homogeneous output was generated despite UNCLIPPED flag

2 1

Re: kernel32: Raise DBG_PRINTEXCEPTION_C exception in OutputDebugStringA.
by Marvin June 15, 2014

June 15, 2014

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=7510 Your paranoid android. === w2000pro (32 bit exception) === exception.c:406: Test failed: 42: Wrong exception address 00950000/00950001 exception: unhandled exception 80000004 at 00950000 exception.c:406: Test failed: 42: Wrong exception address 7C5C20B0/00950001 === wxppro (32 bit exception) === exception.c:406: Test failed: 42: Wrong exception address 00A30000/00A30001 exception: unhandled exception 80000004 at 00A30000 exception.c:406: Test failed: 42: Wrong exception address 7C80DF3C/00A30001 === wvistau64 (32 bit exception) === exception.c:406: Test failed: 42: Wrong exception address 00340000/00340001 exception: unhandled exception 80000004 at 00340000 exception.c:406: Test failed: 42: Wrong exception address 7751ED97/00340001 === w2008s64 (32 bit exception) === exception.c:406: Test failed: 42: Wrong exception address 003C0000/003C0001 exception: unhandled exception 80000004 at 003C0000 exception.c:406: Test failed: 42: Wrong exception address 77E5ED97/003C0001 === w7u (32 bit exception) === exception.c:406: Test failed: 42: Wrong exception address 003F0000/003F0001 exception: unhandled exception 80000004 at 003F0000 exception.c:406: Test failed: 42: Wrong exception address 77CDE34F/003F0001 === w8 (32 bit exception) === exception.c:406: Test failed: 42: Wrong exception address 004F0000/004F0001 exception: unhandled exception 80000004 at 004F0000 exception.c:406: Test failed: 42: Wrong exception address 77174D17/004F0001

1 0

Re: windowscodecs/tests: Fixed some leaks on error path (Valgrind)
by Vincent Povirk June 15, 2014

June 15, 2014

+ if (FAILED(hr)) + { + IStream_Release(stream); + IWICComponentFactory_Release(factory); + return; + } The rest of the function is already has code to handle failure, so returning early is unnecessary.

1 0

Re: shell32: Fix SHFileOperation when deleting a nonexistent directory. (try 2)
by Zhenbo Li June 14, 2014

June 14, 2014

2014-05-21 9:23 GMT+08:00 Zhenbo Li <litimetal(a)gmail.com>: > Thanks Alexandre > > try 2: > 1. Let SHELL_DeleteDirectoryW return DWORD > 2. Get the right return value by > ret = SHNotifyRemoveDirectoryW(pszDir) > origin: > Thanks Bruno Jesus > This patch would fix bug 34324, by returning correct > error value of SHFileOperation. > > --- > dlls/shell32/shlfileop.c | 55 > +++++++++++++++++++++--------------------- > dlls/shell32/tests/shlfileop.c | 4 --- > 2 files changed, 27 insertions(+), 32 deletions(-) Hi, Could someone have a look with my patch after three weeks :-) Thank you very much -- Have a nice day! Zhenbo Li

1 0

Re: ws2_32/socket.c: Fix compile for linux systems without net/ipx.h
by Bruno Jesus June 13, 2014

June 13, 2014

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

2 3

Re: [1/4] msvcrt/tests: Add a test for fwrite flushing behavior. (try 2)
by Piotr Caban June 13, 2014

June 13, 2014

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

2 2

Re: vbscript: Reset error number on error mode change.
by Marvin June 13, 2014

June 13, 2014

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=7476 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

1 0

Re: [PATCH 1/2] riched20: Implement ITextSelection::GetText.
by Jactry Zeng June 13, 2014

June 13, 2014

Hello, Could someone take a look at this patch? Any comment will be appreciate! Thanks. 2014-05-28 15:17 GMT+08:00 Jactry Zeng <wine(a)jactry.com>: > ChangeLog: > - skip a test in native 64bit riched20 > - implementing without helper function > > --- > dlls/riched20/richole.c | 28 +++++++++++++- > dlls/riched20/tests/richole.c | 88 ++++++++++++++++++++++++++++++ > ++++++++++++- > 2 files changed, 113 insertions(+), 3 deletions(-) > > > > > > -- Regards, Jactry Zeng

1 0

Re: [PATCH 2/2] vbscript: Fixed CStr
by Jacek Caban June 13, 2014

June 13, 2014

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

2 1

Re: [3/4] msvcrt: change default buffer size to 4k.
by Piotr Caban June 13, 2014

June 13, 2014

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

2 2

Re: [PATCH 2/2] vbscript: Fixed CStr
by Piotr Caban June 13, 2014

June 13, 2014

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

1 0

Re: [PATCH 2/2] vbscript: Fixed CStr
by Marvin June 13, 2014

June 13, 2014

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

1 0

Re: [PATCH 1/2] msvcrt: Add _strxfrm_l implementation
by Marvin June 12, 2014

June 12, 2014

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

1 0

Re: services: Defer service delete until all handles are closed
by Marvin June 12, 2014

June 12, 2014

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=7438 Your paranoid android. === w7u (32 bit service) === service.c:1381: Test failed: Something wrong in the calculation service.c:1417: Test failed: Active services mismatch 1 The test timed out

2 1

Re: [PATCH 07/10] dmloader: Use the generic DirectMusicObject implementation for DMContainer.
by Marvin June 12, 2014

June 12, 2014

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=7450 Your paranoid android. === build (build) === Patch failed to apply

2 1

Re: [PATCH 09/10] dmloader: Add and use a generic IPersistStream_GetClassID.
by Marvin June 12, 2014

June 12, 2014

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=7452 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 08/10] dmloader/tests: Add more DirectMusicCollection tests.
by Marvin June 12, 2014

June 12, 2014

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=7451 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: wined3d: Recognize cards that expose GLSL 1.30 as DX10 capable even if they don't support EXT_GPU_SHADER4 (try 4)
by Stefan Dösinger June 11, 2014

June 11, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-05-30 00:45, schrieb Andrei Slăvoiu: > Add back glsl check to make sure the card is capable of DX10. > > --- dlls/wined3d/directx.c | 4 +++- 1 file changed, 3 > insertions(+), 1 deletion(-) Looks good to me. Note that Alexandre and Henri are on holidays right now, so it might take a while before it is committed or you receive further comments. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTiD0QAAoJEN0/YqbEcdMwcjcP/jAOsNo8MoM8sSlc2RVtU7Y5 tHVmUyMZ0xPSa7DaA13GFT7/hPnRXimRY39epjJ3subulmprkXV+HNtaHWBVkEvR lB+YSJJDFGJ9V81o7aVSUfXydeY81C3TB6TbztO9WtVPSVaE9/ZXJ1ZO3edufoXT XhXMJwce9HmL8nU+SRFo+mAc/FLimCuTwMMf6OF61KlAMTkzGSQoh8sUSwO0hndL /+yARXxgYhBAtepVb2vuL7411/VWlbzrD8S8h4sZhEnCgLNuyGjXFyggjTZn+MWd zYf5MgBWmY/YJu1VES3lkM8VM5FpgJgEcM3DG8BEQ3yI5eyBLReMiKQe3uuyhlnJ KdE9tSPP3Ts2gHYeZ90kGImebtjy5sxA0gsekY5J4oNsbDUfO01OoHde+54GG6WD 25aogs1+edJNZMGI6pxScDl6EoPgbTlBjL5dJ2xDYc1P/ACezNqPBe+tCDoqoVon WBlqNSNntcfCUBEoiXpOcRFK0PeJDIMHRKpZEBM63V3gFW6w0KuI+Sj0JcwFxy+u saLOwXDpaGerhar2njWiCEKwM1NfW2Wj7wcY0/eiy56bi9UvhDCAUqqZ98xlFZuP m8Js4Bwzlp7NHQjaqXo/h3uK36B0OngHZkjRm/hXMEFuQHfCSbKtUMZLn27JI+3a chXJiqk95eUes6GLKzGo =tusS -----END PGP SIGNATURE-----

3 2

Re: [PATCH 4/5] ddraw: Properly support creating compressed user memory surfaces.
by Marvin June 11, 2014

June 11, 2014

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=7433 Your paranoid android. === wvistau64 (64 bit ddraw7) === ddraw7.c:6467: Test failed: Test 7: Got unexpected pitch 252, expected 256. === w2008s64 (64 bit ddraw7) === ddraw7.c:6467: Test failed: Test 7: Got unexpected pitch 252, expected 256. === wvistau64 (64 bit ddraw4) === ddraw4.c:6644: Test failed: Test 7: Got unexpected pitch 252, expected 256. === w2008s64 (64 bit ddraw4) === ddraw4.c:6644: Test failed: Test 7: Got unexpected pitch 252, expected 256.

1 0

Re: [PATCH 1/5] ddraw: Clear DDSD_LINEARSIZE on uncompressed surfaces.
by Marvin June 11, 2014

June 11, 2014

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=7432 Your paranoid android. === wvistau64 (64 bit ddraw2) === ddraw2.c:5647: Test failed: Test 3: Got unexpected pitch 252, expected 256. ddraw2.c:5647: Test failed: Test 7: Got unexpected pitch 252, expected 256. === w2008s64 (64 bit ddraw2) === ddraw2.c:5647: Test failed: Test 3: Got unexpected pitch 252, expected 256. ddraw2.c:5647: Test failed: Test 7: Got unexpected pitch 252, expected 256. === wvistau64 (64 bit ddraw1) === ddraw1.c:4571: Test failed: Test 3: Got unexpected pitch 252, expected 256. ddraw1.c:4571: Test failed: Test 7: Got unexpected pitch 252, expected 256. === w2008s64 (64 bit ddraw1) === ddraw1.c:4571: Test failed: Test 3: Got unexpected pitch 252, expected 256. ddraw1.c:4571: Test failed: Test 7: Got unexpected pitch 252, expected 256. === wvistau64 (64 bit ddraw7) === ddraw7.c:6377: Test failed: Test 7: Got unexpected pitch 252, expected 256. === w2008s64 (64 bit ddraw7) === ddraw7.c:6377: Test failed: Test 7: Got unexpected pitch 252, expected 256. === wvistau64 (64 bit ddraw4) === ddraw4.c:6554: Test failed: Test 7: Got unexpected pitch 252, expected 256. === w2008s64 (64 bit ddraw4) === ddraw4.c:6554: Test failed: Test 7: Got unexpected pitch 252, expected 256.

1 0

Undocumented Function in WINE-API
by Pit Demmer June 11, 2014

June 11, 2014

Hi! I´m a 47 year old German - programming BASIC, Assembler and sometime pure C since 1981. Please! NO discussion´s about my love - the VB and Power BASIC's... ;-) My newest project (It´s called LetsLOCO), is a "MultiIO-LongDistance-BusSystem for Logging and Controlling" over an electrical- and protocol-extended I2C-Bus which can adress standard I2C compatible IC´s, too. The fully Project is not only Software! I´ve made many HardWare, too. I want to make this Project free. Hardware fully free under a license similar to a GPL. The Software should be at first Freeware, but only for running under WINE! If somebody plan to use the Software outside WINE... I want some little money for it. And here is the problem... I need a function, which exist in the WINE-API but not in the Original Win-API´s. Can anyone from the WINE-Developers help me? Exist a little 'dummy'-function in user32.dll, kernel32.dll, shell32.dll,... which have no similar function in the original Win-DLL´s? Any other 'safe' way to verify that my EXEs and DLLs running through WINE is welcome, too. Thanks! And sorry for my English! Pit

2 1

Re: gdi32: CLIP_DFA_DISABLE should disable the font association mechanism.
by Marvin June 10, 2014

June 10, 2014

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=7430 Your paranoid android. === wvistau64 (32 bit font) === The test timed out === wvistau64 (64 bit font) === The test timed out

1 0

Re: ntdll: Use lockfree implementation for get_cached_fd. (try 3)
by Bruno Jesus June 9, 2014

June 9, 2014

On Tue, Jun 10, 2014 at 12:08 AM, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > Thanks for all the feedback @ Ken, Daniel, Bruno and all the other > people I talked to. > > Changes in try 3: > > * Although the fd_cache_epoch was slightly faster in my tests (-> see > plots in mail for try 1) and should also work on PPC, its probably > better to choose a method which is easier to verify, and where we can be > sure, that it doesn't break with the next gcc release. ;) In this patch > I switched back to the old approach using interlocked_cmpxchg64 to > set/get both fd and associated attributes at the same time. > > * Although used in some other places, its probably better to avoid > assert() for stuff, which should never be optimized away. Just an update to my tests: http://influenza.blog.br/wine/testpatch3.pdf As expected it' slightly slower (Try 3 column), but still much better than the current implementation and still under windows 7 measures in my machine. Best wishes, Bruno

1 0

Re: [PATCH try2] vbscript: Added support for exponental form of numeric literals.
by Marvin June 5, 2014

June 5, 2014

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=7411 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

1 0

Re: vbscript: Added support for exponental form of numeric literals.
by Marvin June 5, 2014

June 5, 2014

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=7409 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

1 0

Re: oleaut32: Fix TLB dependencies lookup (try 2)
by Marvin June 4, 2014

June 4, 2014

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=7406 Your paranoid android. === w2000pro (32 bit typelib) === typelib.c:5452: Test failed: got: 80029c4a

1 0

Re: [PATCH 2/6] wined3d: Set palettes on the swapchain (v3).
by Henri Verbeet June 4, 2014

June 4, 2014

On 3 June 2014 09:41, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -473,17 +473,17 @@ static HRESULT ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectD > prev->flags &= ~DDPCAPS_PRIMARYSURFACE; > if (palette_impl) > palette_impl->flags |= DDPCAPS_PRIMARYSURFACE; > - /* Update the wined3d frontbuffer if this is the primary. */ > - if (surface->ddraw->wined3d_frontbuffer) > - wined3d_surface_set_palette(surface->ddraw->wined3d_frontbuffer, > + /* Update the wined3d swapchain if this is the primary. */ > + if (surface->ddraw->wined3d_swapchain) > + wined3d_swapchain_set_palette(surface->ddraw->wined3d_swapchain, > palette_impl ? palette_impl->wineD3DPalette : NULL); > + ddraw_surface_update_frontbuffer(surface, NULL, FALSE); Can this get called when wined3d_swapchain is NULL? The main case I'm not sure of would be ddraw_destroy_swapchain(), but in that case you may not want to call ddraw_surface_update_frontbuffer() either.

1 0

Re: oleaut32: Fix TLB dependencies lookup
by Nikolay Sivov June 4, 2014

June 4, 2014

> -IMPORTS = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 > +IMPORTS = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 shlwapi > + StrCatW(pathW, (WCHAR[3]){'\\','4',0}); You don't need this. Just use lstrcatW() and please define constant string in a cleaner way.

1 0

Re: oleaut32: Fix TLB dependencies lookup
by Guillaume Charifi June 4, 2014

June 4, 2014

Hello, Thanks for your remarks, I am sending a corrected patch. Regards

1 0

Re: oleaut32: Fix TLB dependencies lookup
by Andrew Eikum June 4, 2014

June 4, 2014

Looking mostly good, but some problems below. On Tue, Jun 03, 2014 at 08:50:46PM +0200, guillaume.charifi(a)sfr.fr wrote: > + hr = LoadTypeLibEx(testTLBNameW, REGKIND_NONE, &ptLib); > + if(hr == S_OK) { > + ITypeLib_Release(ptLib); > + win_skip("test_tlb.tlb is on the path or registered, skipping typelib dependency tests\n"); > + return; > + } > + This fails when I run the tests in my source tree: [aeikum(a)aeikum tests]$ pwd /home/aeikum/wine/dlls/oleaut32/tests typelib.c:5434: Test failed: test_tlb.tlb is on the path or registered, skipping typelib dependency tests Makefile:345: recipe for target 'typelib.ok' failed make: *** [typelib.ok] Error 1 > + /* Search in resource table */ > + if(1) { Why is this if-statement here? > + static const WCHAR TYPELIBW[] = {'T','Y','P','E','L','I','B',0}; > + struct search_res_tlb_param *param = heap_alloc(sizeof(*param)); Why aren't you allocating this on the stack? > + > + param->guid = (GUID *)TLB_get_guid_null(ref_type->pImpTLInfo->guid); > + > + EnumResourceNamesW(NULL, TYPELIBW, search_res_tlb, (LONG_PTR)param); > + > + pTLib = param->pTLib; > + result = param->result; If search_res_tlb() is never run, I think (result == 0 == S_OK). You should initialize it to some failure condition before calling EnumResourceNames. Andrew

1 0

Re: oleaut32: Fix TLB dependencies lookup
by Marvin June 3, 2014

June 3, 2014

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=7404 Your paranoid android. === w2000pro (32 bit typelib) === typelib.c:5451: Test failed: got: 80029c4a

1 0

Re: [3/3] msvcrt: Implement 4k block flushing behavior.
by Piotr Caban June 3, 2014

June 3, 2014

On 05/31/14 01:00, Grazvydas Ignotas wrote: > + } else if(wrcnt >= MSVCRT_WRITE_BLOCK_SIZE) { > + if(msvcrt_set_write_direction(file) != 0) > + break; > + > + if(file->_bufsiz && file->_ptr != file->_base) > + if(msvcrt_flush_buffer(file) == MSVCRT_EOF) > + break; > + > + if(MSVCRT__write(file->_file, ptr, MSVCRT_WRITE_BLOCK_SIZE) <= 0) { > + file->_flag |= MSVCRT__IOERR; > + break; > + } > + written += MSVCRT_WRITE_BLOCK_SIZE; > + wrcnt -= MSVCRT_WRITE_BLOCK_SIZE; > + ptr = (const char*)ptr + MSVCRT_WRITE_BLOCK_SIZE; This doesn't look right for me. It doesn't make sense to have some special size blocks written in different way. I think this is caused by 2 differences in native and wine's implementation of fwrite: - if you check file->_bufsiz value on windows it's set to 4096 (on wine it's 512), this is probably causing the flash to be done when 4096 bytes are written - probably there's some kind of optimization that writes integral number of buffers directly to file - I was not checking it but maybe native flushes the output when buffer is full, wine will exit fwrite with full buffer in this case I've also seen that _bufsiz is set to 0 on wine if buffer was not yet allocated. On windows it's value is 4096 just after opening the file. Cheers, Piotr

2 3

Re: [PATCH 4/6] d3d8/tests: Add a test for D3DUSAGE_WRITEONLY.
by Marvin June 3, 2014

June 3, 2014

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=7398 Your paranoid android. === w8 (32 bit device) === device.c:2397: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3039: Test failed: Expected wndproc 0x412780, got 0x412780.

1 0

Re: Recognize cards that expose GLSL 1.30 as DX10 capable even if they don't support EXT_GPU_SHADER4
by Stefan Dösinger June 3, 2014

June 3, 2014

Am 23.05.2014 um 00:23 schrieb Andrei Slăvoiu <andrei.slavoiu(a)gmail.com>: > Mesa drivers do not expose EXT_GPU_SHADER4 as all functionality it offers is > already part of OpenGL 3.0. This causes all cards that are not explicitly > recognized by wine (for example all GCN cards) to be treated as DX9 cards and > presented to Windows apps as Radeon 9500. The problem is that without GL_EXT_gpu_shader4 or GL_ARB_shader_texture_lod we cannot handle the texldd instruction. Right now we cannot use core contexts, so unless the driver exposes one of those extensions in compatibility contexts we are stuck on a shader model 2 feature level :-( . The level detection your patch changes isn't directly related to this, as the shader model version support is controlled differently. But a Radeon 9500 matches a card with shader model 2 support much better than a Radeon R9. Does this driver / gpu combination support GL_ARB_shader_texture_lod?

3 9

[PATCH 0/4] Improve compilation with musl libc
by Felix Janda June 3, 2014

June 3, 2014

Hello, I'm trying to reduce the number of patches required to build wine on a musl libc[1] based system. The first two patches merely fix warnings because of use of deprecated headers. So they are not strictly necessary. The patches should also update configure but why is configure at all in the git repo? To compile wine without patches two other issues remain: Various tools used during the build expect getopt_long_only() to have GNU semantics. They don't expect that musl's getopt_long_only() stops after the first non-option argument. The cleanest fix seems to be to add a configure check testing whether getopt_long_only() behaves correctly instead of just testing for its existence. Then there are problems with compiling dlls/ws2_32/socket.c related to IPX but I haven't investigated their cause yet. [1]: http://musl-libc.org Felix Janda (4): Use <poll.h> instead of <sys/poll.h> Remove unecessary <sys/signal> includes Add missing includes of <poll.h> (POLLIN,...) dnsapi: Replace NETDB_INTERNAL by -1 configure.ac | 2 -- dlls/dinput/joystick_linux.c | 4 ++-- dlls/dinput/joystick_linuxinput.c | 4 ++-- dlls/dnsapi/query.c | 2 +- dlls/iphlpapi/icmp.c | 4 ++-- dlls/kernel32/console.c | 4 ++-- dlls/ntdll/file.c | 5 +---- dlls/ntdll/serial.c | 4 ++-- dlls/ntdll/signal_arm.c | 3 --- dlls/ntdll/signal_arm64.c | 3 --- dlls/ntdll/signal_i386.c | 3 --- dlls/ntdll/signal_powerpc.c | 4 ---- dlls/ntdll/signal_x86_64.c | 3 --- dlls/ntdll/sync.c | 5 +---- dlls/rpcrt4/rpc_transport.c | 4 ++-- dlls/wineoss.drv/midi.c | 5 +---- dlls/winex11.drv/event.c | 5 +---- dlls/wininet/internet.c | 5 +---- dlls/wininet/netconnection.c | 5 +---- dlls/winmm/time.c | 5 +---- dlls/ws2_32/socket.c | 5 +---- include/config.h.in | 6 ------ programs/winedbg/gdbproxy.c | 4 ++-- server/change.c | 3 +++ server/fd.c | 5 +---- server/file.c | 2 +- server/named_pipe.c | 2 +- server/object.h | 4 ++-- server/process.c | 2 +- server/queue.c | 3 +++ server/request.c | 2 +- server/serial.c | 2 +- server/signal.c | 5 +---- server/sock.c | 3 +++ server/thread.c | 2 +- 35 files changed, 42 insertions(+), 87 deletions(-) -- 1.8.5.5

3 8

Re: ntdll: Use lockfree implementation for get_cached_fd.
by Ken Thomases June 2, 2014

June 2, 2014

On May 31, 2014, at 10:28 AM, Sebastian Lackner wrote: > Explanation: The basic idea of this patch is that we have a global > counter 'fd_cache_epoch' which is incremented, whenever the file > descriptor cache is updated. get_cached_fd() first reads the counter, > then the fd entry, and afterwards the counter again - if the counter has > changed we know that a second thread has maybe modified the content, and > have to read it again. The memory barrier is there to ensure that > compilers don't optimize away the two reads of 'fd_cache_epoch'. Please > note that: > > * the order of the write instructions when updating the content is > important - this way we ensure that threads only see either (0, *) = not > set, or a valid entry. > > * I assume that reading/writing up to the pointer size can be done as an > atomic operation (threads either see the old or new value, but no > partial updates). This assumption is also used in a lot other parts of > wine, for example here: > http://source.winehq.org/source/dlls/ntdll/sync.c#L1295 > [ It would probably be more safe to introduce special > interlocked_get/interlocked_set macros/functions for that, but not sure > what other people think about that... ] Thanks for working on this. Interesting stuff. I think there are still some issues. In order to ensure a consistent view of the ordering of memory operations, memory barriers have to be used in both the writer and the reader. The writer issues a write barrier after it has written and the reader issues a read barrier before it reads. The appropriate barriers are implicit in interlocked_xchg_add() for incrementing fd_cache_epoch, but the first read of it in get_cached_fd() has no read barrier before it. I think this is benign, though, because I think this can only result in the code thinking the epoch changed when it hasn't. It may retry unnecessarily. More problematic is the writing of the fd and its attributes. There are barriers implicit in the interlocked_xchg() which clears the fd, but there's no write barrier after the final write to it. There's no read barrier before the first read of them. You mention the order of writing, attributes first then fd, as being important. But there's no barrier in between the two operations, so either the compiler or the CPU could reorder either the writes or the reads, thwarting your design. The compiler can also reorder the reading of the fd_cache_epoch with respect to the reading of the fd or attributes. I think you can get this as the effective sequence: thread1 / get_cached_fd / read fd, get old fd thread2 / add_fd_to_cache / clear fd thread2 / add_fd_to_cache / increment epoch thread2 / add_fd_to_cache / set fd thread1 / get_cached_fd / read epoch thread1 / get_cached_fd / check if epoch has changed, conclude it hasn't thread1 / get_cached_fd / return old fd I think it's sufficient to have a write barrier after writing the fd and then a read barrier just before reading it. I _think_ that this obviates the need for the barrier at the bottom of the do-while loop. That is, you can just move that barrier up a line. I'm not 100% confident of my analysis of that. (Well, frankly, I'm never 100% certain of my analysis of this sort of code.) In the email thread regarding Daniel Horn's patch, I suggested an approach using interlocked_cmpxchg() to check if the fd had changed after reading the attributes. Was there a reason you rejected that approach? You mentioned an approach you experimented with using interlocked_cmpxchg64(). What was that about? Were you treating the fd and attributes combined as a single 64-bit value and then checking them both? Was that safer than my suggestion for some reason? If the only advantage is a slight performance improvement (especially in light of the huge difference that either approach has to the status quo, judging by your chart), then I'd argue for the simpler approach that's more easily analyzed for correctness. If the above issue is addressed, that leaves one remaining problem: get_cached_fd() can encounter a false negative: thread1 / add_fd_to_cache / set fd to -1 thread1 / add_fd_to_cache / increment epoch thread2 / get_cached_fd / read epoch thread2 / get_cached_fd / read attributes thread2 / get_cached_fd / read fd, gets -1 thread2 / get_cached_fd / check if epoch has changed, conclude it hasn't thread1 / add_fd_to_cache / set attributes thread1 / add_fd_to_cache / set fd thread2 / get_cached_fd / return -1 thread2 / server_get_unix_fd / see get_cached_fd as having failed since it returns -1 thread2 / server_get_unix_fd / do get_handle_fd server request thread2 / server_get_unix_fd / call add_fd_to_cache to cache the new fd I think you want to try get_cached_fd() again, inside the critical section, if the first call fails. -Ken

2 2

Re: [2/2] imagehlp: Implement (parts of) BindImageEx (try 8)
by Marvin June 2, 2014

June 2, 2014

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=7391 Your paranoid android. === wvistau64 (64 bit image) === image.c:426: Test failed: Expected StatusRoutine to be called once with reason BindImportProcedure, but it was called 0 times === w2008s64 (64 bit image) === image.c:426: Test failed: Expected StatusRoutine to be called once with reason BindImportProcedure, but it was called 0 times

1 0

Re: [1/2] imagehlp: Implement (parts of) BindImageEx (try 8)
by Marvin June 2, 2014

June 2, 2014

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=7390 Your paranoid android. === wvistau64 (64 bit image) === image.c:426: Test failed: Expected StatusRoutine to be called once with reason BindImportProcedure, but it was called 0 times === w2008s64 (64 bit image) === image.c:426: Test failed: Expected StatusRoutine to be called once with reason BindImportProcedure, but it was called 0 times

1 0

Video memory size detection in D3D
by Ruslan Kabatsayev June 2, 2014

June 2, 2014

Hello all, It seems Wine doesn't use any way to reliably detect video memory size, and for many video cards needs it to be specified as HKCU\Software\Wine\Direct3D\VideoMemorySize key in registry. But there exist at least three (vendor-specific) GL/GLX extensions which seem to address exactly this. Namely, for Mesa it's GLX_MESA_query_renderer [1], for nVidia it's GL_NVX_gpu_memory_info [2], and for ATI/AMD it's GL_ATI_meminfo [3]. Mesa extension is shipping starting from Mesa 10.0, nVidia ships their extension in 195.XX drivers (said in specification; I have it exposed with my 313.09 driver), don't know status of ATI extension though (marked as "???" in spec). It'd be good if Wine could utilize these. Is there any work towards this already? Regards, Ruslan [1]: http://www.opengl.org/registry/specs/MESA/glx_query_renderer.txt [2]: https://www.opengl.org/registry/specs/NVX/gpu_memory_info.txt [3]: http://www.opengl.org/registry/specs/ATI/meminfo.txt

5 6

Re: wined3d: Recognize cards that expose ARB_shader_texture_lod as DX10 capable even if they don't support EXT_gpu_shader4 (try 3)
by Stefan Dösinger June 2, 2014

June 2, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-05-29 01:33, schrieb Andrei Slăvoiu: > Drop the check for glsl_version. All wine shaders use #version 120 > so it doesn't matter. That's not quite right. Yes, it is true that we never use GLSL 130, so the version check isn't representative for what wined3d actually supports. For shader model 4 support we need much more than just GLSL 130, half of the d3d10 infrastructure is still missing. GL_ARB_shader_texture_lod doesn't imply shader model 4 support. My Radeon X1600 supports this extension on OSX, and this is a shader model 3 card. The X1600 doesn't support EXT_gpu_shader4 or GLSL 130. The point of this code is to check the capabilities of the card, not the capabilities of our d3d implementation. Thus to prevent SM 3 cards from being reported with PCI IDs that suggest SM 4 capabilities you need to check for all the other functionality that's supported by EXT_gpu_shader4 / GLSL 130. Even if we have a SM 4 capable card our d3d9 implementation does not expose SM 4 support. But neither does Microsoft's d3d9 implementation. There's also GLX_MESA_query_renderer. It gives us the PCI IDs and video memory size directly, without all the string parsing guesswork. We cannot use it wined3d directly. A possible approach would be to expose a similar WGL_WINE/MESA_query_renderer extension from winex11.drv and winemac.drv and use that in wined3d. The current wined3d guesswork code could be moved to winex11.drv and used in cases where GLX_MESA_query_renderer is not supported. (OSX has similar functionality that's always available) User32 also has a function (EnumDisplayDevices) to query the GPU identification string, and some applications (Company of Heroes demo) fail if the user32 GPU name differs from the d3d9 GPU name. So maybe a WGL extension isn't quite the right interface, and it should be something that does not require a GL context so user32.dll can use it as well. EnumDisplayDevices does not export all the information wined3d needs though - the PCI IDs and video memory size are missing I think. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJThvZZAAoJEN0/YqbEcdMwsY8QAJG1NQVMSqjwaguVR0cwwNXq IMYCRWL+5cJPxK4Eodt4bF+zZDObqCz9r3hAJVlkA6bJIcflNHJwedT0ddeOAfpe 0Xc8g+NvspN715yNt51PpzcnlSqh2vS18qp1JLb4l00pZuPt8PMNqC0gaePkv+tY 1wY3B/kgbl0TfcIRpxWbwZBcIAM2h4g+FGCHFPFeznhMYWqFaJ67OKW1KAdfpBTT lPZsaNDXtU8hSaVQYVk7ITulUl0C8tW/MExnh4zclz6b/wQuG+/M0WRg5v/YDlNq 0ZAsVqT60+MbepR87ehYDnLB7RMjZMjZhEZ4/drafFbOQBmqL7YJjgbFsbBBXLTt COf/1mjiz7TptUvSUyDRc27o1K+YP1UoswsVdXT37sWkP9gtHtQFeLLNx8ZuR4pa 2yQ7xNIBi7KPNBjz9Q0RKYvc11oGVUvFSuD0gLgNuHZxdOmBWwZyHeSce9adHHGU 5t4Oz0FsTZuEiiuJXPTDatp06KQQpUZ/c7FgcO7bxIpn/NNUCZGKZdKT/ZYM1waf BEtBL2Ov+DzRnvRM3/lVPdaiMD1IY54bqTeU7NOiKCEFhBl0elCAblj155tVaKdR 5WekiCEsvB8S4FE6stDa+GewpBWUZiVLGSL49S0MViPqAbkbgcjcNlRVg6IEH2Zo tyQIl6/9DwdY1TCllA9W =Z1W8 -----END PGP SIGNATURE-----

3 7

New Wine patches
by Chakke, Neha (GE Oil & Gas) June 2, 2014

June 2, 2014

Hello , I am trying to run a GE software and hardware on Debian (Linux platform) using WineHQ. In order to run the hardware we need to install device drivers for USB (Cypress) . http://wiki.winehq.org/USB I have been trying to look for some solutions online since a week. Could you kindly send me the new wine patches and please guide me with the procedure. Thanks and regards, Miss Neha Chakke Engineering/Technology GE Oil & Gas Measurement & Control T: +49 (0) 2233 601 123 neha.chakke(a)ge.com<mailto:neha.chakke(a)ge.com> www.ge-mcs.com<http://www.ge-mcs.com/> [NewMeatball] GE Sensing & Inspection Technologies GmbH Robert-Bosch-Str. 3 50354 Hürth Germany

3 2

Re: [PATCH 3/3] vbscript: Fixed CInt(try 2)
by Marvin June 1, 2014

June 1, 2014

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=7387 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

1 0

Re: [PATCH 2/3] vbscript: Implemented CLng(try 2)
by Marvin June 1, 2014

June 1, 2014

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=7386 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

1 0

Re: [PATCH 1/3] vbscript: Implemented CDbl(try 2)
by Marvin June 1, 2014

June 1, 2014

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=7385 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

1 0

Re: shlwapi/tests: Skip if test ini file wasn't created
by Marvin June 1, 2014

June 1, 2014

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=7382 Your paranoid android. === wvistau64 (32 bit ordinal) === ordinal.c:1934: Test failed: expected (L"01 \062c\0648\0627\0646, 2014") got (L"\200f01 \200f\062c\0648\0627\0646, \200f2") for date part ordinal.c:1960: Test failed: expected (L"01 \062c\0648\0627\0646, 2014") got (L"\200f01 \200f\062c\0648\0627\0646, \200f2") for date part === wvistau64 (64 bit ordinal) === ordinal.c:1934: Test failed: expected (L"01 \062c\0648\0627\0646, 2014") got (L"\200f01 \200f\062c\0648\0627\0646, \200f2") for date part ordinal.c:1960: Test failed: expected (L"01 \062c\0648\0627\0646, 2014") got (L"\200f01 \200f\062c\0648\0627\0646, \200f2") for date part

2 1

Re: ntdll: Use lockfree implementation for get_cached_fd. (try 2)
by Ken Thomases June 1, 2014

June 1, 2014

On May 31, 2014, at 12:05 PM, Sebastian Lackner wrote: > Changes in try 2: > > * Always try to access the fd cache two times - this ensures that we > don't release a file descriptor when its still in use by a second thread. Heh. Well, you can ignore that part of my reply to your previous try. :) > * Replace interlocked_xchg() with an assert(). The original code looks > like its valid that the fd is nonzero at this point, but in fact this > would cause releasing a file descriptor which is still in use. I'll leave it to others to comment on that. > Replacing with an assert() also saves a couple of CPU cycles. I understand that this is an attempt to improve performance, but I don't think it's necessary to squeeze every last CPU cycle out of this code. -Ken

2 1