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

UMR in CRYPT_RemoveStringFromMultiString()
by Dan Kegel Nov. 19, 2009

Nov. 19, 2009

Hi Juan, http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/vg-crypt32_oid.txt says Invalid read of size 1 at memmove (mc_replace_strmem.c:613) by CRYPT_RemoveStringFromMultiString (oid.c:885) by CryptUnregisterDefaultOIDFunction (oid.c:1010) by test_registerDefaultOIDFunction (oid.c:437) by func_oid (oid.c:601) by run_test (test.h:535) by main (test.h:585) Address 0x7f040ed4 is 0 bytes after a block of size 44 alloc'd at notify_alloc (heap.c:279) by RtlAllocateHeap (heap.c:1521) by CryptMemAlloc (main.c:125) by CRYPT_GetDefaultOIDDlls (oid.c:930) by CryptUnregisterDefaultOIDFunction (oid.c:1009) by test_registerDefaultOIDFunction (oid.c:437) This is near the code changed in crypt32: Don't copy past end of buffer when removing the last string in a multistring. - Dan

1 0

Re: Difficulties with Regression Testing
by James Mckenzie Nov. 19, 2009

Nov. 19, 2009

Austin English wrote: > >On Thu, Nov 19, 2009 at 9:41 AM, James Mckenzie ><jjmckenzie51(a)earthlink.net> wrote: >>>From: Austin English <austinenglish(a)gmail.com> >>>Sent: Nov 19, 2009 10:31 AM >>>To: James Mckenzie <jjmckenzie51(a)earthlink.net> >>>Cc: Wine Development Mailing List <wine-devel(a)winehq.org> >>>Subject: Re: Difficulties with Regression Testing >>> >>>On Thu, Nov 19, 2009 at 8:51 AM, James Mckenzie >>><jjmckenzie51(a)earthlink.net> wrote: >>>> All: >>>> >>>> I've been running regression tests to find a commit between wine-1.1.10 and wine-1.1.11 that breaks the EM_FORMATRANGE >>>> patch or to discover what I need to do to fix the patch to make it work with wine-1.1.11. I've been following the >>>> instructions on the Regression Testing Wiki page. I am on the fourth git bisect good and I run into two different >>>> problems: >>>> >>>> 1. The tools/Makefile.in file gets corrupted on the fourth git bisect good. This is unexpected as I am not aware of >>>> any changes to this file that would cause corruption. This happens interrmittently and a git fetch sometimes causes >>>> the error that tools/Makefile.in needs to be updated to appear when I apply/remove a patch which is needed to correct >>>> wordpad, one of the programs I am using to test the EM_FORMATRANGE patch. The build fails when attempting to build >>>> makedep.c. The includes appear to be incorrect and do not pick up the files in the source directory thus the Wine >>>> includes are not included. >>> >>>Try doing a make clean / make distclean. >>> >> I don't think this will do anything, but I'll try it. > >Ah, Makefile.in...nm, misread that. Not sure then. > Thanks for the thought. It is absolutely strange as this just started happening. I correct the Git and it happens after a few more tries at git bisect. Maybe something did change the file between wine-1.1.10 and wine-1.1.11 that git bisect corrupts. I'll be looking at this after the long ride this weekend and over the holiday next weekend. >>>> 2. Something else is causing the check.bmp file not to be found and thus the tests fail on the fourth git bisect >>>> good. The .rc file that calls this file is located in two different directorys but the check.bmp file only exists in >>>> the tools/subdirectory. >>> >>>IIRC, that was a file for the cryptui manager that AJ forgot to >>>include with the commit needing it. Try either putting it there >>>manually from another git branch, or using make -k. >>> >> Where does this need to be added? I might be able to figure it out, but I don't want to go guessing. > >Put it in dlls/cryptui/, or just use make -k to ignore it. > Thank you. I'll put it there and then try the build again. James McKenzie

1 0

Re: shell32: deal better with spaces in ASSOCSTR_COMMAND values
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Damjan Jovanovic <damjan.jov(a)gmail.com> writes: > @@ -324,7 +324,14 @@ static HRESULT ASSOC_GetExecutable(IQueryAssociationsImpl *This, > else > { > pszStart = pszCommand; > - pszEnd = strchrW(pszStart, ' '); > + for (pszEnd = pszStart; (pszEnd = strchrW(pszEnd, ' ')); pszEnd++) > + { > + WCHAR c = *pszEnd; > + *pszEnd = 0; > + if (SearchPathW(NULL, pszStart, NULL, pathlen, path, NULL)) > + break; > + *pszEnd = c; You have a redundant SearchPath call now. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winspool.drv: Acroread 9.2 relies on the buffer sizes returned by GetPrinterA and GetPrinterDriverA being large enough to hold their respective unicode versions' data.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Huw Davies <huw(a)codeweavers.com> writes: > --- > dlls/winspool.drv/info.c | 8 +++++--- > 1 files changed, 5 insertions(+), 3 deletions(-) This doesn't work here: ../../../tools/runtest -q -P wine -M winspool.drv -T ../../.. -p winspool.drv_test.exe.so info.c && touch info.ok info.c:2269: Test failed: needed 38 != filled 21 info.c:2269: Test failed: needed 414 != filled 219 info.c:2269: Test failed: needed 438 != filled 239 info.c:2269: Test failed: needed 446 != filled 245 info.c:2269: Test failed: needed 426 != filled 231 info.c:2269: Test failed: needed 482 != filled 281 make: *** [info.ok] Error 6 -- Alexandre Julliard julliard(a)winehq.org

1 0

Difficulties with Regression Testing
by James Mckenzie Nov. 19, 2009

Nov. 19, 2009

All: I've been running regression tests to find a commit between wine-1.1.10 and wine-1.1.11 that breaks the EM_FORMATRANGE patch or to discover what I need to do to fix the patch to make it work with wine-1.1.11. I've been following the instructions on the Regression Testing Wiki page. I am on the fourth git bisect good and I run into two different problems: 1. The tools/Makefile.in file gets corrupted on the fourth git bisect good. This is unexpected as I am not aware of any changes to this file that would cause corruption. This happens interrmittently and a git fetch sometimes causes the error that tools/Makefile.in needs to be updated to appear when I apply/remove a patch which is needed to correct wordpad, one of the programs I am using to test the EM_FORMATRANGE patch. The build fails when attempting to build makedep.c. The includes appear to be incorrect and do not pick up the files in the source directory thus the Wine includes are not included. 2. Something else is causing the check.bmp file not to be found and thus the tests fail on the fourth git bisect good. The .rc file that calls this file is located in two different directorys but the check.bmp file only exists in the tools/subdirectory. Can anyone confirm/deny that they are experiencing the same problems with a git build? Thank you.

2 1

Wine Icons - final round
by Joel Holdsworth Nov. 19, 2009

Nov. 19, 2009

Hi All, I wanted to fill you in on the progress on the Tango icon set. You can see it here: http://www.airwebreathe.org.uk/wine-icon/ Please let me know what you think - or if you have any comments. After the last two rounds, I'm hoping that we should basically be at a stage where most people are happy. The main change since last time is that I've replaced the user32 icons with icons that are similar to the Windows 7/Vista standard - but Tango compliant. I was unable to clarify the license for the icon I was using for the ramdisk icon, so I redrew one of my own - a DIMM, which in the end is more suitable than the SOIC chip we had before. The other major change is that I've decided to hold off on cryptui.dll. I'm not happy with the artwork yet, and cryptui.dll needs to be modified so that it uses HICONs rather the HBITMAPs, which don't cope with different colour depths well. When everyone is happy, I really need to freeze the icons from further modifications, because I need to begin the laborious process of making 8 and 4-bit versions. If anyone would like to help with this I'd be happy to have some helpers. But for now let me know if you have any thoughts. Best Regards Joel Holdsworth

3 2

Re: Problem to download git
by James Mckenzie Nov. 19, 2009

Nov. 19, 2009

> >> error: Unable to get pack file http://source.winehq.org/git/wine.git/objects/pack/pack- >>7c2ab792c6e1c8f603b784f9dcb81f56f03bbf75.pack > >Is this on a Mac, by any chance? I had similar problems using >MacPorts's git with a proxy server. I also had Linux running in a VM >on that machine, and fetching from the Linux VM always succeeded. The >odd thing is, fetching from Linux also fixed the MacPorts git fetch >for me, at least until the next day's update. > >If this isn't on a Mac, I don't know what to tell you. Mine was. I don't think Dan has a Mac though. It looks like the Git server was being a problem last night. I had to pull a full git as I thought that I had messed mine up. More on this in a separate message. James McKenzie

1 0

Re: Problem to download git
by James Mckenzie Nov. 19, 2009

Nov. 19, 2009

>On Wed, Nov 18, 2009 at 11:22 PM, Dan Kegel <dank(a)kegel.com> wrote: >> I'm having network errors with git tonight, too. e.g. >> >> $ git pull >> fatal: The remote end hung up unexpectedly >> >> >> > >Hangs up about half the time for me too tonight. > +1. The second pull worked. James McKenzie

1 0

Re: [PATCH 4/5] comctl32/tests: Add further tests for IImageList
by Paul Vriens Nov. 19, 2009

Nov. 19, 2009

On 11/13/2009 06:14 PM, Owen Rudge wrote: > --- > dlls/comctl32/tests/imagelist.c | 80 > +++++++++++++++++++++++++++++++++++++++ > 1 files changed, 80 insertions(+), 0 deletions(-) > Hi Owen, These tests introduce 3 failures on all 32bit XP boxes: http://test.winehq.org/data/tests/comctl32:imagelist.html Could you have a look? -- Cheers, Paul.

3 3

Test for Bug 4543: Testers needed
by Charles Davis Nov. 19, 2009

Nov. 19, 2009

Hi, I have a test that I wrote from scratch for bug 4543. It tests the operation of BitBlt to a metafile, first from the screen then pure whiteness. Unfortunately, I have no Windows boxes to test on, so I need people to run my test on Windows. After all, I need to verify that this test is an accurate representation of Windows' behavior! Also, testing under Wine would be appreciated. As a Mac user, I don't think my system is representative of the vast majority of Wine users (who probably run Linux). I've attached the patch so you can build a gdi32_test.exe that contains my tests. Thanks in advance. Chip >From db073155c888747b9259cb8fe0d5ff2a59ee5666 Mon Sep 17 00:00:00 2001 From: Charles Davis <cdavis(a)mymail.mines.edu> Date: Tue, 17 Nov 2009 11:10:50 -0700 Subject: [PATCH] gdi32/tests: Test BitBlt() to a metafile. To: wine-patches <wine-patches(a)winehq.org> Reply-To: wine-devel <wine-devel(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 68 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index b559901..6bf25e4 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -665,6 +665,74 @@ static void test_SaveDC(void) DestroyWindow(hwnd); } +static int CALLBACK test_BitBlt_record(HDC hdc, HANDLETABLE *table, const ENHMETARECORD *emfr, int nobj, LPARAM data) +{ + UINT *pi = (UINT *)data; + EMRBITBLT *emrbb; + + if(emfr->iType != EMR_BITBLT) return 1; + emrbb = (EMRBITBLT *)emfr; + + *pi++; + if(*pi > 2) return 1; + ok( emrbb->xDest == 0, "wrong xDest for BitBlt record: got %d, expected 0\n", emrbb->xDest ); + ok( emrbb->yDest == 0, "wrong yDest for BitBlt record: got %d, expected 0\n", emrbb->yDest ); + ok( emrbb->xSrc == 0, "wrong xSrc for BitBlt record: got %d, expected 0\n", emrbb->xSrc ); + ok( emrbb->ySrc == 0, "wrong ySrc for BitBlt record: got %d, expected 0\n", emrbb->ySrc ); + ok( emrbb->cxDest == GetSystemMetrics(SM_CXSCREEN), "wrong cxDest for BitBlt record: got %d\n", emrbb->cxDest ); + ok( emrbb->cyDest == GetSystemMetrics(SM_CYSCREEN), "wrong cyDest for BitBlt record: got %d\n", emrbb->cyDest ); + if(*pi == 1) /* First BitBlt */ + { + ok( emrbb->dwRop == SRCCOPY, "wrong ROP for BitBlt record: got %x, expected SRCCOPY\n", emrbb->dwRop ); + } + else + { + ok( emrbb->dwRop == WHITENESS, "wrong ROP for BitBlt record: got %x, expected WHITENESS\n", emrbb->dwRop ); + } + return 1; +} + +static void test_emf_BitBlt(void) +{ + HDC hdcDisplay, hdcMetafile; + HENHMETAFILE hMetafile; + ENHMETAHEADER emh; + BYTE *bits; + BOOL ret; + UINT i; + + hdcDisplay = CreateDCA(NULL, "DISPLAY", NULL, NULL); + ok( hdcDisplay != 0, "CreateDCA error %d\n", GetLastError() ); + hdcMetafile = CreateEnhMetaFileA(hdcDisplay, NULL, NULL, NULL); + ok( hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError() ); + + ret = BitBlt(hdcMetafile, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), hdcDisplay, 0, 0, SRCCOPY); + ok( ret, "BitBlt error %d\n", GetLastError() ); + ret = BitBlt(hdcMetafile, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), 0, 0, 0, WHITENESS); + ok( ret, "BitBlt error %d\n", GetLastError() ); + + hMetafile = CloseEnhMetaFile(hdcMetafile); + ok( hMetafile != 0, "CloseEnhMetaFile error %d\n", GetLastError() ); + + ret = GetEnhMetaFileHeader( hMetafile, sizeof(emh), &emh ); + ok( ret != 0, "GetEnhMetaFileHeader error %d\n", GetLastError() ); + ok( emh.dSignature == ENHMETA_SIGNATURE, "bad metafile signature %x\n", emh.dSignature ); + + bits = HeapAlloc( GetProcessHeap(), 0, emh.nBytes ); + if(!bits) + { + skip( "not enough memory for EMF bits\n" ); + return; + } + ret = GetEnhMetaFileBits( hMetafile, emh.nBytes, bits ); + ok( ret != 0, "GetEnhMetaFileBits error %d\n", GetLastError() ); + for(i = 0; i < emh.nBytes; i++) + ok( bits[i] == 0xff, "unexpected EMF bits: got %02x, expected 0xff\n", bits[i] ); + + EnumEnhMetaFile(0, hMetafile, test_BitBlt_record, (LPARAM)&i, NULL); + ok( i == 2, "too many/not enough BitBlt records: got %d, expected 2\n", i ); +} + static void test_mf_SaveDC(void) { HDC hdcMetafile; -- 1.6.5.2

3 14

Wineconf?
by Damjan Jovanovic Nov. 19, 2009

Nov. 19, 2009

Hi Can someone please write a bit about Wineconf 2009, for those of us that didn't go? Also is there videos/presentations to see? Thank you Damjan Jovanovic

4 7

switching to redmine?
by Dan Kegel Nov. 19, 2009

Nov. 19, 2009

http://yokozar.org/blog/archives/171 is a nice writeup (thanks Scott) of wineconf. It all sounds good except for that switching to redmine part... The current wiki and bugzilla are working reasonably well, doesn't seem worth the disruption to switch. I'm highly skeptical of these newfangled wiki+bugzilla+scm+mailinglist thingies. It's really hard to do all those jobs well. Sourceforge was the first, and it was really rough. Google Code is kind of ok, but it doesn't support git yet, and its svn has performance issues (for the moment). Launchpad is also kind of ok, and kind of supports git... Yet Another WBSM Thingy that I've never heard of seems unlikely to be as robust as the above systems. - Dan

3 2

Buffer overrun in LsaLookupNames2() found with valgrind+wine+new heap patch
by Dan Kegel Nov. 19, 2009

Nov. 19, 2009

Here's the first error it helped Valgrind find in tonight's automated run: ../../../tools/runtest -q -P wine -M advapi32.dll -T ../../.. -p advapi32_test.exe.so lsa.c && touch lsa.ok ... Invalid write of size 1 at memmove (mc_replace_strmem.c:613) by RtlCopySid (sec.c:376) by CopySid (security.c:905) by lookup_local_wellknown_name (security.c:2800) by lookup_name (lsa.c:308) by LsaLookupNames2 (lsa.c:411) by test_LsaLookupNames2 (lsa.c:336) by func_lsa (lsa.c:362) Address 0x7f03c550 is 6 bytes after a block of size 26 alloc'd at notify_alloc (heap.c:279) by RtlAllocateHeap (heap.c:1521) by LsaLookupNames2 (lsa.c:402) by test_LsaLookupNames2 (lsa.c:336) by func_lsa (lsa.c:362) Offhand that looks like a real problem. Aric, you may have touched that code last, could you have a look? Oh, and here's a bit that was missing from the patch. - Dan

1 0

re: Problem to download git
by Dan Kegel Nov. 19, 2009

Nov. 19, 2009

I'm having network errors with git tonight, too. e.g. $ git pull fatal: The remote end hung up unexpectedly

2 1

ntdll: implement FLG_HEAP_ENABLE_TAIL_CHECK
by Dan Kegel Nov. 19, 2009

Nov. 19, 2009

(Without a change like this, Valgrind can't properly detect buffer overruns, but even without Valgrind, this change will improve Wine's ability to detect buffer overruns.) With this change, users can enable buffer overrun detection in Wine by setting WINE_GLOBAL_FLAGS=0x10. This is like the overrun detection in Windows enabled by setting NtGlobalFlags to 0x10, but checks 16 bytes rather than 8, and works for large allocations, not just small ones. With this enabled, a remarkable number of tests break. I'm posting this to wine-devel for review while I add valgrind annotations (which should make it easier to tell whether the errors it detects are real or spurious) and fix the spurious breakages. Note that this change is a no-op under normal circumstances; without setting WINE_GLOBAL_FLAGS, you shouldn't see any breakage.

2 4

Resetting screen resolution on crash
by Erich Hoover Nov. 19, 2009

Nov. 19, 2009

I was reading the brief summary on WineConf ( http://yokozar.org/blog/archives/171) and saw an interesting item: > We need some help from Freedesktop.org for solving bug 10841. Essentially > we need a standard way of saying “hey reset the resolution when I’m done, > even if I crash.” I was “volunteered” for the task of approaching the > respective projects. I believe this is a case that we can detect on our own, attached is a small standalone example of using fork() in such a way that you could reset the screen resolution even if an application crashed. Erich Hoover ehoover(a)mines.edu

2 1

Re: [PATCH 6/6] msxml3: Implemented xmlnode_get_nodeTypedValue date related data types handling
by Paul Vriens Nov. 18, 2009

Nov. 18, 2009

On 11/18/2009 12:51 AM, Piotr Caban wrote: > --- > dlls/msxml3/node.c | 67 ++++++++++++++++++++++++++++++++++++++++ > dlls/msxml3/tests/domdoc.c | 72 > ++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 139 insertions(+), 0 deletions(-) > > Hi Piotr, These new tests introduce failures on XP and W2K3: http://test.winehq.org/data/tests/msxml3:domdoc.html (These two are the only platforms in as of this writing). Could you have a look? -- Cheers, Paul.

1 0

Re: ole32: Add a test for freeing the parent of an open stream.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

"Vincent Povirk" <vincent(a)codeweavers.com> writes: > From 1d583fc07db661bd0f0d0d00ea82c6208c3b744f Mon Sep 17 00:00:00 2001 > From: Vincent Povirk <vincent(a)codeweavers.com> > Date: Tue, 17 Nov 2009 11:20:34 -0600 > Subject: [PATCH 4/7] ole32: Add a test for freeing the parent of an open stream. It doesn't work here: ../../../tools/runtest -q -P wine -M ole32.dll -T ../../.. -p ole32_test.exe.so storage32.c && touch storage32.ok wine: Unhandled page fault on read access to 0x454556d6 at address 0x687dc2dd (thread 0045), starting debugger... Unhandled exception: page fault on read access to 0x454556d6 in 32-bit code (0x687dc2dd). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:687dc2dd ESP:0032f980 EBP:0032f9b8 EFLAGS:00010216( R- -- I -A-P- ) EAX:45455246 EBX:688587e4 ECX:00110058 EDX:00000100 ESI:45455246 EDI:00000011 Stack dump: 0x0032f980: 00000000 00000100 00000000 00000080 0x0032f990: 0032f9dc 0032f9b0 0032f9b8 7bc45af1 0x0032f9a0: 00000040 00040000 00141c80 7bc346cf 0x0032f9b0: 00141c58 688587e4 0032fa68 687dc339 0x0032f9c0: 45455246 00000002 0032f9dc 00000000 0x0032f9d0: 00000000 0032f9dc 00000000 00000000 Backtrace: =>0 0x687dc2dd StorageImpl_ReadRawDirEntry+0x3d(This=0x45455246, index=256, buffer="") [/home/julliard/wine/wine/dlls/ole32/storage32.c:3002] in ole32 (0x0032f9b8) 1 0x687dc339 StorageImpl_ReadDirEntry+0x39(This=0x45455246, index=2, buffer=0x32fa98) [/home/julliard/wine/wine/dlls/ole32/storage32.c:3127] in ole32 (0x0032fa68) 2 0x687d8268 StgStreamImpl_SetSize+0x98(iface=<register ESI not in topmost frame>, libNewSize=<register EDI not in topmost frame>) [/home/julliard/wine/wine/dlls/ole32/stg_stream.c:614] in ole32 (0x0032fb28) 3 0x687d86ee StgStreamImpl_Write+0x1ce(iface=0x141cd8, pv=0x6867cadc, cb=17, pcbWritten=<register EDI not in topmost frame>) [/home/julliard/wine/wine/dlls/ole32/stg_stream.c:420] in ole32 (0x0032fb78) 4 0x68662ea2 test_parent_free+0x222() [/home/julliard/wine/wine/dlls/ole32/tests/storage32.c:1322] in ole32_test (0x0032fbc8) 5 0x6866deea func_storage32+0x14ca() [/home/julliard/wine/wine/dlls/ole32/tests/storage32.c:2470] in ole32_test (0x0032fd98) 6 0x68671b40 run_test+0x130(name="storage32.c") [/home/julliard/wine/wine/dlls/ole32/tests/../../../include/wine/test.h:537] in ole32_test (0x0032fdd8) 7 0x68671d2e main+0x11e(argc=<register ECX not in topmost frame>, argv=<register ECX not in topmost frame>) [/home/julliard/wine/wine/dlls/ole32/tests/../../../include/wine/test.h:586] in ole32_test (0x0032fe88) 8 0x686727b4 __wine_spec_exe_entry+0x84(peb=0x7ffdf000) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in ole32_test (0x0032feb8) 9 0x7b8768a5 start_process+0x55(peb=<register ESI not in topmost frame>) [/home/julliard/wine/wine/dlls/kernel32/process.c:1025] in kernel32 (0x0032fee8) 10 0x7bc6de64 call_thread_func+0xc() in ntdll (0x0032fef8) 11 0x7bc6e080 call_thread_entry_point+0x70(entry=0x7b876850, arg=0x7ffdf000) [/home/julliard/wine/wine/dlls/ntdll/signal_i386.c:2342] in ntdll (0x0032ffc8) 12 0x7bc4b20a in ntdll (+0x3b20a) (0x0032ffe8) 13 0x68027e4d wine_call_on_stack+0x1d() in libwine.so.1 (0x00000000) 0x687dc2dd StorageImpl_ReadRawDirEntry+0x3d [/home/julliard/wine/wine/dlls/ole32/storage32.c:3002] in ole32: movl 0x490(%eax),%eax 3002 hr = BlockChainStream_ReadAt( -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: To error out or to skip tests?
by Greg Geldorp Nov. 18, 2009

Nov. 18, 2009

Hi Jörg > > The picture on test.winehq.org is a disaster: None of the w95, w98, nt4, > > 2k, 2k3, Vista, 2k8, w7 machines have performed winmm:wave tests! > > They all have no sound configured. Mostly useless. > > A lot of those VMware boxes are mine. They come in two flavors. Some of > them (starting with esx-) are ESX VMs, ESX is VMware's data center product, > which simply doesn't support sound. The others (starting with gvg-) are > Server VMs, which do support sound. The reason I didn't configure sound > on them is because I'm simply not interested in sound. I'll consider > enabling sound, but to be honest I'm a bit put off by your aggressive tone. > > Anyway, the end result is that there will always be ESX VMs that can't > run sound tests. After a bit of mucking around I got sound to work on the Linux host where those VMware Server VMs run, and enabled sound in the VMs where possible. I could not find correct sound drivers for some of the old stuff (NT4 and below), so those still don't have sound, neither do the ESX VMs. Best regards, Ge.

3 2

Re: advapi32/tests: Skip tests for ACL file info if ACL info not stored (try 2)
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Austin Lund <austin.lund(a)gmail.com> writes: > @@ -3143,6 +3146,13 @@ static void test_GetSecurityInfo(void) > return; > } > > + if (GetVolumePathName(myARGV[0], volumepathname, 50) && > + GetVolumeInformation(volumepathname, NULL, 0, NULL, NULL, &filesystemflags, NULL, 0) && > + (filesystemflags & FILE_PERSISTENT_ACLS)) > + { > + testacl = TRUE; > + } Testing file system flags is not a good idea, that won't work on Wine. It's better to test the results of the actual call. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: advapi32/tests: Skip tests for ACL file info if ACL info not stored (try 2)
by Paul Vriens Nov. 18, 2009

Nov. 18, 2009

On 11/18/2009 09:54 AM, Austin Lund wrote: > + TCHAR volumepathname[50]; Please don't use TCHAR's. > + BOOL testacl = FALSE; > + DWORD filesystemflags; > > if (!pGetSecurityInfo) > { > @@ -3143,6 +3146,13 @@ static void test_GetSecurityInfo(void) > return; > } > > + if (GetVolumePathName(myARGV[0], volumepathname, 50)&& > + GetVolumeInformation(volumepathname, NULL, 0, NULL, NULL,&filesystemflags, NULL, 0)&& > + (filesystemflags& FILE_PERSISTENT_ACLS)) > + { > + testacl = TRUE; > + } GetVolumePathName is not available before W2K so you should use GetProcAddress here and bail out or skip() if the function is not available. It's also probably better to use the explicit A-versions for both calls. -- Cheers, Paul.

1 0

Re: Test for Bug 4543: Testers needed
by Charles Davis Nov. 18, 2009

Nov. 18, 2009

Vincent Povirk wrote: > You still have the loop comparing to 0xff, and the test won't pass on > windows with the if(0). Whoops, that must have been an old version of the patch. I fixed the first one, and the second one should be fixed, too. Now the BitBlt(...,WHITENESS) call executes on Windows, but not on Wine. (There should be a function in wine/test.h for doing this.) Patch attached. > > On Tue, Nov 17, 2009 at 6:09 PM, Charles Davis <cdavis(a)mymail.mines.edu> wrote: >> All right, this should be the last one. The tests pass on Wine, and >> should pass on Windows if you un-if(0) the call to BitBlt(..., >> WHITENESS). I still don't have any results for the many other Windows >> versions (95, 98, ME, NT4, 2000, Vista, Win7), so I'm going to wait for >> results from these other platforms before I send this to wine-patches. >> >> Chip >> >> >> From 2d5aa7c607496c1b05a7a08adfee09db446754cb Mon Sep 17 00:00:00 2001 >> From: Charles Davis <cdavis(a)mymail.mines.edu> >> Date: Tue, 17 Nov 2009 11:10:50 -0700 >> Subject: [PATCH] gdi32/tests: Test BitBlt() to a metafile. >> To: wine-patches <wine-patches(a)winehq.org> >> Reply-To: wine-devel <wine-devel(a)winehq.org> >> >> --- >> dlls/gdi32/tests/metafile.c | 83 +++++++++++++++++++++++++++++++++++++++++++ >> 1 files changed, 83 insertions(+), 0 deletions(-) >> >> diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c >> index b559901..19401ed 100644 >> --- a/dlls/gdi32/tests/metafile.c >> +++ b/dlls/gdi32/tests/metafile.c >> @@ -665,6 +665,88 @@ static void test_SaveDC(void) >> DestroyWindow(hwnd); >> } >> >> +static int CALLBACK test_BitBlt_record(HDC hdc, HANDLETABLE *table, const ENHMETARECORD *emfr, int nobj, LPARAM data) >> +{ >> + UINT *pi = (UINT *)data; >> + EMRBITBLT *emrbb; >> + >> + if(emfr->iType != EMR_BITBLT) return 1; >> + emrbb = (EMRBITBLT *)emfr; >> + >> + (*pi)++; >> + if(*pi > 2) return 1; >> + ok( emrbb->xDest == 0, "wrong xDest for BitBlt record: got %d, expected 0\n", emrbb->xDest ); >> + ok( emrbb->yDest == 0, "wrong yDest for BitBlt record: got %d, expected 0\n", emrbb->yDest ); >> + ok( emrbb->xSrc == 0, "wrong xSrc for BitBlt record: got %d, expected 0\n", emrbb->xSrc ); >> + ok( emrbb->ySrc == 0, "wrong ySrc for BitBlt record: got %d, expected 0\n", emrbb->ySrc ); >> + ok( emrbb->cxDest == GetSystemMetrics(SM_CXSCREEN), "wrong cxDest for BitBlt record: got %d\n", emrbb->cxDest ); >> + ok( emrbb->cyDest == GetSystemMetrics(SM_CYSCREEN), "wrong cyDest for BitBlt record: got %d\n", emrbb->cyDest ); >> + if(*pi == 1) /* First BitBlt */ >> + { >> + ok( emrbb->dwRop == SRCCOPY, "wrong ROP for BitBlt record: got %x, expected SRCCOPY\n", emrbb->dwRop ); >> + } >> + else >> + { >> + todo_wine ok( emrbb->dwRop == WHITENESS, "wrong ROP for BitBlt record: got %x, expected WHITENESS\n", emrbb->dwRop ); >> + } >> + return 1; >> +} >> + >> +static void test_emf_BitBlt(void) >> +{ >> + HDC hdcDisplay, hdcMetafile, hdcBitmap; >> + HBITMAP hBitmap, hOldBitmap; >> + HENHMETAFILE hMetafile; >> + ENHMETAHEADER emh; >> + BYTE *bits; >> + BOOL ret; >> + UINT i; >> + >> + hdcDisplay = CreateDCA("DISPLAY", NULL, NULL, NULL); >> + ok( hdcDisplay != 0, "CreateDCA error %d\n", GetLastError() ); >> + hdcMetafile = CreateEnhMetaFileA(hdcDisplay, NULL, NULL, NULL); >> + ok( hdcMetafile != 0, "CreateEnhMetaFileA failed\n" ); >> + >> + hdcBitmap = CreateCompatibleDC(hdcDisplay); >> + ok( hdcBitmap != 0, "CreateCompatibleDC failed\n" ); >> + hBitmap = CreateCompatibleBitmap(hdcDisplay, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); >> + ok( hBitmap != 0, "CreateCompatibleBitmap failed\n" ); >> + hOldBitmap = SelectObject(hdcBitmap, hBitmap); >> + >> + ret = BitBlt(hdcMetafile, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), hdcBitmap, 0, 0, SRCCOPY); >> + ok( ret, "BitBlt failed\n" ); >> + if(0) /* Crashes on wine */ >> + { >> + ret = BitBlt(hdcMetafile, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), 0, 0, 0, WHITENESS); >> + ok( ret, "BitBlt failed\n" ); >> + } >> + >> + hMetafile = CloseEnhMetaFile(hdcMetafile); >> + ok( hMetafile != 0, "CloseEnhMetaFile failed\n" ); >> + >> + ret = GetEnhMetaFileHeader( hMetafile, sizeof(emh), &emh ); >> + ok( ret != 0, "GetEnhMetaFileHeader failed\n" ); >> + ok( emh.dSignature == ENHMETA_SIGNATURE, "bad metafile signature %x\n", emh.dSignature ); >> + >> + bits = HeapAlloc( GetProcessHeap(), 0, emh.nBytes ); >> + if(!bits) >> + { >> + skip( "not enough memory for EMF bits\n" ); >> + return; >> + } >> + ret = GetEnhMetaFileBits( hMetafile, emh.nBytes, bits ); >> + ok( ret != 0, "GetEnhMetaFileBits error %d\n", GetLastError() ); >> + for(i = 0; i < emh.nBytes; i++) >> + todo_wine ok( bits[i] == 0xff, "unexpected EMF bits: got %02x, expected 0xff\n", bits[i] ); >> + >> + EnumEnhMetaFile(0, hMetafile, test_BitBlt_record, &i, NULL); >> + todo_wine ok( i == 2, "too many/not enough BitBlt records: got %d, expected 2\n", i ); >> + >> + SelectObject(hdcBitmap, hOldBitmap); >> + DeleteObject(hBitmap); >> + DeleteDC(hdcBitmap); >> +} >> + >> static void test_mf_SaveDC(void) >> { >> HDC hdcMetafile; >> @@ -2628,6 +2710,7 @@ START_TEST(metafile) >> /* For enhanced metafiles (enhmfdrv) */ >> test_ExtTextOut(); >> test_SaveDC(); >> + test_emf_BitBlt(); >> >> /* For win-format metafiles (mfdrv) */ >> test_mf_SaveDC(); >> -- >> 1.6.5.2 >> >> >> > > > Chip >From 990018e6e74279c3243d2c3b48472e94d8839c8c Mon Sep 17 00:00:00 2001 From: Charles Davis <cdavis(a)mymail.mines.edu> Date: Tue, 17 Nov 2009 11:10:50 -0700 Subject: [PATCH] gdi32/tests: Test BitBlt() to a metafile. To: wine-patches <wine-patches(a)winehq.org> Reply-To: wine-devel <wine-devel(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 67 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index b559901..dbeff43 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -665,6 +665,72 @@ static void test_SaveDC(void) DestroyWindow(hwnd); } +static int CALLBACK test_BitBlt_record(HDC hdc, HANDLETABLE *table, const ENHMETARECORD *emfr, int nobj, LPARAM data) +{ + UINT *pi = (UINT *)data; + EMRBITBLT *emrbb; + + if(emfr->iType != EMR_BITBLT) return 1; + emrbb = (EMRBITBLT *)emfr; + + (*pi)++; + if(*pi > 2) return 1; + ok( emrbb->xDest == 0, "wrong xDest for BitBlt record: got %d, expected 0\n", emrbb->xDest ); + ok( emrbb->yDest == 0, "wrong yDest for BitBlt record: got %d, expected 0\n", emrbb->yDest ); + ok( emrbb->xSrc == 0, "wrong xSrc for BitBlt record: got %d, expected 0\n", emrbb->xSrc ); + ok( emrbb->ySrc == 0, "wrong ySrc for BitBlt record: got %d, expected 0\n", emrbb->ySrc ); + ok( emrbb->cxDest == GetSystemMetrics(SM_CXSCREEN), "wrong cxDest for BitBlt record: got %d\n", emrbb->cxDest ); + ok( emrbb->cyDest == GetSystemMetrics(SM_CYSCREEN), "wrong cyDest for BitBlt record: got %d\n", emrbb->cyDest ); + if(*pi == 1) /* First BitBlt */ + { + ok( emrbb->dwRop == SRCCOPY, "wrong ROP for BitBlt record: got %x, expected SRCCOPY\n", emrbb->dwRop ); + } + else + { + todo_wine ok( emrbb->dwRop == WHITENESS, "wrong ROP for BitBlt record: got %x, expected WHITENESS\n", emrbb->dwRop ); + } + return 1; +} + +static void test_emf_BitBlt(void) +{ + HDC hdcDisplay, hdcMetafile, hdcBitmap; + HBITMAP hBitmap, hOldBitmap; + HENHMETAFILE hMetafile; + BOOL ret; + UINT i; + + hdcDisplay = CreateDCA("DISPLAY", NULL, NULL, NULL); + ok( hdcDisplay != 0, "CreateDCA error %d\n", GetLastError() ); + hdcMetafile = CreateEnhMetaFileA(hdcDisplay, NULL, NULL, NULL); + ok( hdcMetafile != 0, "CreateEnhMetaFileA failed\n" ); + + hdcBitmap = CreateCompatibleDC(hdcDisplay); + ok( hdcBitmap != 0, "CreateCompatibleDC failed\n" ); + hBitmap = CreateCompatibleBitmap(hdcDisplay, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + ok( hBitmap != 0, "CreateCompatibleBitmap failed\n" ); + hOldBitmap = SelectObject(hdcBitmap, hBitmap); + + ret = BitBlt(hdcMetafile, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), hdcBitmap, 0, 0, SRCCOPY); + ok( ret, "BitBlt failed\n" ); + if(0) /* Crashes on wine */ + { + ret = BitBlt(hdcMetafile, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), 0, 0, 0, WHITENESS); + ok( ret, "BitBlt failed\n" ); + } + + hMetafile = CloseEnhMetaFile(hdcMetafile); + ok( hMetafile != 0, "CloseEnhMetaFile failed\n" ); + + i = 0; + EnumEnhMetaFile(0, hMetafile, test_BitBlt_record, &i, NULL); + todo_wine ok( i == 2, "too many/not enough BitBlt records: got %d, expected 2\n", i ); + + SelectObject(hdcBitmap, hOldBitmap); + DeleteObject(hBitmap); + DeleteDC(hdcBitmap); +} + static void test_mf_SaveDC(void) { HDC hdcMetafile; @@ -2628,6 +2694,7 @@ START_TEST(metafile) /* For enhanced metafiles (enhmfdrv) */ test_ExtTextOut(); test_SaveDC(); + test_emf_BitBlt(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC(); -- 1.6.5.2

1 0

Re: today's git broke winetricks gecko :-(
by James Mckenzie Nov. 18, 2009

Nov. 18, 2009

Jacek Caban wrote: >Sent: Nov 17, 2009 7:40 AM >To: Tom Wickline <twickline(a)gmail.com> >Cc: James Mckenzie <jjmckenzie51(a)earthlink.net>, Vincent Povirk <madewokherd+8cd9(a)gmail.com>, wine-devel(a)winehq.org >Subject: Re: today's git broke winetricks gecko :-( > >Tom Wickline wrote: >> >> >> On Tue, Nov 17, 2009 at 10:27 PM, James Mckenzie >> <jjmckenzie51(a)earthlink.net <mailto:jjmckenzie51(a)earthlink.net>> wrote: >> >> >> > >> +1 as well. Not all UNIXes have Gecko support packages built for them >> >> >> +1 as well, I haven't tested the changes on OpenSolaris yet, but I >> plan to. :) > >Which makes -0 from both of you as you clearly don't understand the way >Gecko package works. These are .dll files so they are only arch >dependent from Wine point of view. Are there not installer packages for the different UNIXes for Gecko? If there are not, then the package should install everywhere, including MacOSX and OpenSolaris. If they are system/OS dependent, then my comment stands. James McKenzie

5 8

Re: flaky uninit variable in jscript
by Dan Kegel Nov. 17, 2009

Nov. 17, 2009

There was a second new error in that file that is probably low hanging fruit: Conditional jump or move depends on uninitialised value(s) at invoke_constructor (function.c:243) by Function_value (function.c:521) by invoke_prop_func (dispex.c:259) by jsdisp_call (dispex.c:870) by disp_call (dispex.c:899) by new_expression_eval (engine.c:1568) by expr_eval (engine.c:42) by assign_expression_eval (engine.c:3110) by expr_eval (engine.c:42) by expression_statement_eval (engine.c:679) by stat_eval (engine.c:37) by exec_source (engine.c:473) by exec_global_code (jscript.c:107) by JScriptParse_ParseScriptText (jscript.c:717) by parse_script (run.c:765) by run_from_res (run.c:908) by run_tests (run.c:1057) by func_run (run.c:1095) by run_test (test.h:535) by main (test.h:585) Uninitialised value was created by a stack allocation at invoke_constructor (function.c:227) Both are still happening as of the last run I have, http://kegel.com/wine/valgrind/logs/2009-11-17-07.31/vg-jscript_run.txt - Dan On Thu, Nov 5, 2009 at 7:25 PM, Dan Kegel <dank(a)kegel.com> wrote: > Hi Jacek, > could you have a look at this? I think there are some variants that > aren't being > cleanly initialized. > > http://kegel.com/wine/valgrind/logs/2009-11-05-09.09/diff-jscript_run.txt > http://kegel.com/wine/valgrind/logs/2009-11-05-09.09/vg-jscript_run.txt > > Conditional jump or move depends on uninitialised value(s) > at VARIANT_ValidateType (variant.c:546) > by VariantClear (variant.c:599) > by exec_global_code (jscript.c:111) > by JScriptParse_ParseScriptText (jscript.c:717) > by parse_text (script.c:624) > by parse_inline_script (script.c:679) > by parse_script_elem (script.c:703) > by doc_insert_script (script.c:817) > by nsRunnable_Run (mutation.c:464) > by ??? > by ??? > by add_script_runner (mutation.c:196) > by push_mutation_queue (mutation.c:253) > by nsDocumentObserver_DoneAddingChildren (mutation.c:684) > by ??? > by ??? > by ??? > by ??? > by ??? > by ??? > Uninitialised value was created by a stack allocation > at exec_global_code (jscript.c:94) > > Thanks, > Dan >

1 0

re: Working on avifil32, sudden "non enough memory" error
by Dan Kegel Nov. 17, 2009

Nov. 17, 2009

Julius wrote: >With one file however (GOODTIME.AVI from the win95 cd) I get this > error after about a second: > err:heap:HEAP_ValidateInUseArena Heap 0x110000: in-use arena 0x184420 > next block has PREV_FREE flag > non enough memory > > I have no idea where this comes from and why it happens. (It appears to > be unrelated to the memcpy call in avifile.c around line 1114.) With > +heap I also get this before the error: > HIGHPERF/GOODTIME.AVI: heap.c:403: HEAP_GetPtr: Controletest '0' faalt. > (the assert fails) Sounds like heap corruption. You might want to cut down the file to the shortest one that causes the crash, then go after it (possibly using valgrind or the like) to look for the error. Does your implementation of avifil32 and friends work properly on windows?

3 3

Re: [PATCH 2/2] [Msvcrt]: in undname functions, no longer use a fixed-size array for storing internal information
by Paul Vriens Nov. 17, 2009

Nov. 17, 2009

On 11/15/2009 10:07 PM, Eric Pouech wrote: > > (fix for #20681) Hi Eric, This new test fails on all 32bit systems: http://test.winehq.org/data/tests/msvcrt:cpp.html The only box where there are no failures is a 64bit one, but no tests are actually run there ;) Could you have a look? -- Cheers, Paul.

2 1

Re: ddraw/tests: Fix test failure for D3DFMT_A2R10G10B10 pixel format in GetDC tests
by Stefan Dösinger Nov. 17, 2009

Nov. 17, 2009

Am 17.11.2009 um 12:16 schrieb Austin Lund: >>> <0001-ddraw-tests-Fix-test-failure-for-D3DFMT_A2R10G10B10-.txt> >> Where did this test fail? On Wine or Windows? If it was on windows, which windows version and GPU did you use? >> > > WinXP SP2 running in Virtual box 3.0.8 with guest additions installed: > > http://test.winehq.org/data/d51b4e19fb99e30eadd6207d8dba7b0d36363c3d/xp_apl… VirtualBox uses Wine's ddraw/d3d infrastructure. It is likely that you tested the new test against an old Wine prior to when this test and fixes were committed. Your patch contradicts the behavior I saw on a Geforce 7400 Go on Windows Vista, and on a Radeon 9000 Mobility on Windows XP. As such I don't think we should enable GetDC on this format unless we find evidence on a real system that A2R10G10B10 allows GetDC calls. If we find such a system the test should be changed to accept both outcomes(ie, comment out the A2R10G10B10 test)

1 0

new crash in urlmon/misc test?
by Dan Kegel Nov. 17, 2009

Nov. 17, 2009

http://kegel.com/wine/valgrind/logs/2009-11-16-19.12/diff-urlmon_misc.txt http://kegel.com/wine/valgrind/logs/2009-11-16-19.12/vg-urlmon_misc.txt show the new crash Unhandled exception: page fault on read access to 0xf0f0f0f0 in 32-bit code (0x0c530e3b). Register dump: CS:0023 SS:002b DS:002b ES:0000 FS:000b GS:0013 EIP:0c530e3b ESP:7f21fc48 EBP:7f21fc58 EFLAGS:00000084( - -- S - -P- ) EAX:f0f0f0f0 EBX:0ce3cff4 ECX:0cf416a0 EDX:00000409 ESI:7f21fe70 EDI:7bf00de0 Stack dump: 0x7f21fc48: 0cda560d 0cdfd62d 00000000 f0f0f0f0 0x7f21fc58: 7f21fc98 0cde15cd f0f0f0f0 7bf00de0 0x7f21fc68: 0cf0cebd 0cf34f5a 7f03f380 0cf41ff4 0x7f21fc78: 0cda560d 0cddff10 00000000 0cf36569 0x7f21fc88: 0cf3616c 00000409 0ce3cff4 0ce3cff4 0x7f21fc98: 7f21fcd8 0cde1b39 00000409 00000000 Backtrace: =>0 0x0c530e3b strlenW+0x15(str=0xf0f0f0f0) [include/wine/unicode.h:216] in libwine.so.1 1 0x0cde15cd CompareStringW+0xc6(lcid=1033, style=0, str1=0xf0f0f0f0, len1=-1, str2=0xcf365bc, len2=-1) [dlls/kernel32/locale.c:2737] in kernel32 2 0x0cde1b39 lstrcmpW+0x7a(str1=0xf0f0f0f0, str2=0xcf365bc) [dlls/kernel32/locale.c:2892] in kernel32 3 0x0cf0ef56 test_FindMimeFromData+0x119() [dlls/urlmon/tests/misc.c:623] in urlmon_test 4 0x0cf134b6 func_misc+0x44() [dlls/urlmon/tests/misc.c:1349] in urlmon_test - Dan

2 1

new valgrind results...
by Dan Kegel Nov. 17, 2009

Nov. 17, 2009

Yesterday's valgrind results are at http://kegel.com/wine/valgrind/logs/2009-11-16-19.12/ These were done with updated suppressions; see http://code.google.com/p/winezeug/source/list?path=/trunk/valgrind/valgrind… so don't get too excited about errors going away. (I really should include a histogram of used suppressions so we can know which ones still need fixing.) I now terminate hung tests (or those that just take too long) with SIGALARM, which shows up as "Command terminated by signal 14". For instance, see the bottom of http://kegel.com/wine/valgrind/logs/2009-11-16-19.12/vg-ole32_marshal.txt With luck, my automated script will now need no babying, and results will show up 'promptly' five hours after Alexandre commits. (I used to run tests in parallel to reduce that lag; perhaps I'll try doing that again sometime, carefully.)

1 0

Re: wineserver: Preserve existing UNIX permission bits unless a matching ACCESS_ALLOWED is specified in an ACL, always preserve directory bit
by Paul Vriens Nov. 17, 2009

Nov. 17, 2009

On 11/17/2009 04:48 PM, Paul Chitescu wrote: > > --- ./file.c.orig 2009-08-19 14:25:58.000000000 +0300 > +++ ./file.c 2009-11-17 17:26:31.000000000 +0200 Patches should be relative to the root. -- Cheers, Paul.

1 0

Re: gdi32/tests: simplify testcase
by Paul Vriens Nov. 17, 2009

Nov. 17, 2009

On 11/17/2009 05:14 PM, André Hentschel wrote: > + for(i=0;i<sizeof(TestName)/sizeof(TestName[0]);i++) > + { > + lstrcpyA(lf.lfFaceName, TestName[i]); Hi André, Even though it would slightly change the size of the patch, I wouldn't mind some indentation here (and it would be more in line with the style of the file). You should also try to keep with the current style in that file (meaning a space after the semi-colon) with respect to the for() statement. -- Cheers, Paul.

2 1

Re: shell32/tests: Fix Program Manager DDE Conformance Test Failures
by Paul Vriens Nov. 17, 2009

Nov. 17, 2009

On 11/14/2009 05:31 PM, Mikey Alexander wrote: > /* Timeout on DdeClientTransaction Call */ > #define MS_TIMEOUT_VAL 1000 > /* # of times to poll for window creation */ > -#define PDDE_POLL_NUM 50 > +#define PDDE_POLL_NUM 150 > /* time to sleep between polls */ > -#define PDDE_POLL_TIME 200 > +#define PDDE_POLL_TIME 300 Hi Mikey, Just raising the timeout was not enough to fix the test failures so something else must be going on? Some of the test results on test.winehq.org now show a general timeout for these tests (there is a hardcoded 120 second timeout for every test module). -- Cheers, Paul.

2 3

Owen Rudge : shell32: Implement SHGetImageList and remove todo_wine from imagelist tests.
by Nikolay Sivov Nov. 17, 2009

Nov. 17, 2009

Hi, Owen. There's a mistake here. + hNew = ImageList_Duplicate(iImageList == SHIL_LARGE ? hLarge : hSmall); + + /* Get the interface for the new image list */ + if (hNew) + { + ret = HIMAGELIST_QueryInterface(hNew, riid, ppv); + + if (!SUCCEEDED(ret)) + ImageList_Destroy(hNew); + } After duplication hNew already has refcount == 1, after HIMAGELIST_QueryInterface is goes to 2, and it isn't what you want. To hide checking riid just remove condition before ImageList_Destroy.

1 0

Re: today's git broke winetricks gecko :-(
by Ben Klein Nov. 17, 2009

Nov. 17, 2009

2009/11/17 Juan Lang <juan.lang(a)gmail.com>: >> If a previously-optional component is now deemed to be mandatory, and >> that component *on its own* happens to double the download size >> required to install Wine, I consider that a problem. Not everyone has >> a cable or ADSL2+ connection. > > Yes, but it's not updated as frequently. What guarantee is there of this in the future? In fact, if you can guarantee that there will never be another update to Gecko, then the argument on the size of Gecko disappears. > The development version of Wine is updated roughly every > two weeks, so if a user is willing to download a development version > approximately that often, why should a single, equally sized download > be an impediment? Gecko is not a core part of Wine. It is only needed for an MSHTML implementation. There are plenty of apps in existence that do not and will not have any use for Gecko. I argue that the size of Gecko is a good reason to not require it to be installed for those users who *know* they don't need it. >>>wine cmd /c echo yes now downloads gecko. >> How can you possibly justify this? > > Is this to me? I didn't say that. No, you didn't. But how can you support a scheme where running "wine cmd /c echo yes" prompts for Gecko download? 2009/11/17 Marcus Meissner <marcus(a)jet.franken.de>: > On Mon, Nov 16, 2009 at 11:29:51PM +0100, Ove Kaaven wrote: >> You can't *force* the creation of packages which would likely fail to >> meet the requirements for inclusion into Debian's main archive. Even if >> I didn't think the package's build system is a problem, the ftpmasters >> likely would. > > I btw thought of actually building wine-gecko using mingw instead of > just distributing the .cab. > > Just did not have the time to try it in the .spec file. > > This is also the 1 problem I see with distro inclusion here, so far > I just have it in my openSUSE buildservice repos. If Gecko is to be included as a requirement in the current fassion, I argue that it should be made packageable/installable from wine-git. I support Vincent's suggestion of "--disable-gecko-downloader", and would also like to see "--enable-gecko"/"--disable-gecko" to build the .cab file (on "make") and install it to the correct location (on "make install"). Or perhaps, a "make gecko"/"make install-gecko" pair (which would be more convenient for me as a package maintainer).

5 4

Re: today's git broke winetricks gecko :-(
by James Mckenzie Nov. 17, 2009

Nov. 17, 2009

Nate Gallaher wrote: >Vincent Povirk wrote: >> It also seems to me that a --disable-gecko-downloader configure switch >> that would disable the dialog COMPLETELY (even "when needed") would >> put gecko on equal footing with optional library requirements. It >> would mean: >> * You can warn about the perils of not having gecko at configure time. >> * If gecko is installed properly, it's used properly, installed at >> prefix creation time. >> * If gecko is not installed properly, programs that need it will >> simply fail, and you'll see an ERR in the console, as well as a nice >> "HTML rendering is disabled" message you wouldn't get from other >> components. >> >> > > >I would just like to second Vincent's suggestion. > +1 as well. Not all UNIXes have Gecko support packages built for them James McKenzie >

3 2

Re: WGL: add initial WGL_ARB_create_context support
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Roderick Colenbrander <thunderbird2k(a)gmail.com> writes: > This patch adds an initial implementation of WGL_ARB_create_context > which is required for OpenGL 3.x support. I have tried some basic GL3 > samples which work and the initial Wine tests. It doesn't work here: ../../../tools/runtest -q -P wine -M opengl32.dll -T ../../.. -p opengl32_test.exe.so opengl.c && touch opengl.ok opengl.c:562: Test failed: wglCreateContextAttribs with major version=0 should fail! X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 128 (GLX) Minor opcode of failed request: 34 () Value in failed request: 0x0 Serial number of failed request: 370 Current serial number in output stream: 373 make: *** [opengl.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/2] mshtml: Also search by node name attribute in IHTMLDocument3::getElementById
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Andrew Eikum <aeikum(a)codeweavers.com> writes: > --- > dlls/mshtml/htmldoc3.c | 26 ++++++++++++++++++++++---- > dlls/mshtml/tests/dom.c | 29 ++++++++++++++++++++++++++++- > 2 files changed, 50 insertions(+), 5 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M mshtml.dll -T ../../.. -p mshtml_test.exe.so dom.c && touch dom.ok dom.c:5401: Test failed: Got wrong tag: L"OPTION" make: *** [dom.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: ddraw/tests: Fix test failure for D3DFMT_A2R10G10B10 pixel format in GetDC tests
by Stefan Dösinger Nov. 17, 2009

Nov. 17, 2009

Am 17.11.2009 um 10:38 schrieb Austin Lund: > > <0001-ddraw-tests-Fix-test-failure-for-D3DFMT_A2R10G10B10-.txt> Where did this test fail? On Wine or Windows? If it was on windows, which windows version and GPU did you use?

1 0

Re: [PATCH] jscript: Implement decodeURIComponent
by Jacek Caban Nov. 16, 2009

Nov. 16, 2009

Hi Andrew, Andrew Eikum wrote: > --- > dlls/jscript/global.c | 104 > ++++++++++++++++++++++++++++++++++++++++++++- > dlls/jscript/tests/api.js | 20 +++++++++ > 2 files changed, 122 insertions(+), 2 deletions(-) > + while(*ptr == '%') { + if(hex_to_int(*(ptr+1)) < 0 || hex_to_int(*(ptr+2)) < 0) { + WARN("Invalid hex sequence: 0x%x 0x%x\n", *(ptr+1), *(ptr+2)); + SysFreeString(str); + return E_FAIL; URIError should be thrown here. If it's not, then you should put FIXME here. Same for other places where you return E_FAIL. + } + ptr += 3; + ++buf_len; + } + octets = heap_alloc(buf_len); You don't check allocation failure and leak octets here. You may avoid dynamic allocation at all by processing one utf8 char at the time. Then you know that it's not longer than 4 bytes. Ecma specification describes it well, although you may simplify the algorithm by checking number of bytes from the first byte, fetching bytes to the array and then use MultiByteToWideChar for conversion to UTF-16 and validation. Thanks, Jacek

2 1

Re: WineD3D: fix bug 20522
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Roderick Colenbrander <thunderbird2k(a)gmail.com> writes: > This patch fixes bug 20522 which was uncovered by 32-bit dibsection > support. I have added a test to show that the patch is correct. Like > with Blt the results varry depending on the drivers. It doesn't work here: ../../../tools/runtest -q -P wine -M ddraw.dll -T ../../.. -p ddraw_test.exe.so visual.c && touch visual.ok visual.c:2349: Test failed: got R 80 G 00 B 00, expected R 00 G FF B 00 make: *** [visual.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: comctl32/listview: use the infile ImageListRelease
by Nikolay Sivov Nov. 16, 2009

Nov. 16, 2009

Hi, Andre. Could you please wait with that? I have some similar patches already sent... On 11/16/09, André Hentschel <nerv(a)dawncrow.de> wrote: > Otherwise Apps crash on exit(e.g. uninstaller) > --- > dlls/comctl32/imagelist.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c > index 82d2664..44084fd 100644 > --- a/dlls/comctl32/imagelist.c > +++ b/dlls/comctl32/imagelist.c > @@ -81,6 +81,7 @@ static INTERNALDRAG InternalDrag = { 0, 0, 0, 0, 0, 0, > FALSE, 0 }; > > static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count, > UINT width); > static HRESULT ImageListImpl_CreateInstance(const IUnknown *pUnkOuter, > REFIID iid, void** ppv); > +static ULONG WINAPI ImageListImpl_Release(IImageList *iface); > > static inline BOOL is_valid(HIMAGELIST himl) > { > @@ -716,7 +717,7 @@ ImageList_Destroy (HIMAGELIST himl) > DeleteObject (himl->hbrBlend50); > > /* Free the IImageList instance */ > - IImageList_Release((IImageList *) himl); > + ImageListImpl_Release((IImageList *) himl); > return TRUE; > } > > -- > > Best Regards, André Hentschel > > >

2 1

Re: [PATCH 2/2] dsound: Simplify duplex code
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Maarten Lankhorst <m.b.lankhorst(a)gmail.com> writes: > @@ -48,37 +50,20 @@ typedef struct IDirectSoundFullDuplexImpl > > /* IDirectSoundFullDuplexImpl fields */ > DirectSoundDevice *renderer_device; > - DirectSoundCaptureDevice *capture_device; > - > - LPUNKNOWN pUnknown; > - LPDIRECTSOUND pDS; > - LPDIRECTSOUND8 pDS8; > - LPDIRECTSOUNDCAPTURE pDSC; > + IDirectSoundCapture *capture_device; > + > + const IUnknownVtbl *lpUnkVtbl; > + const IDirectSoundVtbl *lpDSVtbl; > + const IDirectSound8Vtbl *lpDS8Vtbl; > + const IDirectSoundCaptureVtbl *lpDSCVtbl; > + LONG unk_ref; > + LONG ds_ref; > + LONG ds8_ref; > + LONG dsc_ref; > } IDirectSoundFullDuplexImpl; > > -typedef struct IDirectSoundFullDuplex_IUnknown { > - const IUnknownVtbl *lpVtbl; > - LONG ref; > - IDirectSoundFullDuplexImpl *pdsfd; > -} IDirectSoundFullDuplex_IUnknown; > - > -typedef struct IDirectSoundFullDuplex_IDirectSound { > - const IDirectSoundVtbl *lpVtbl; > - LONG ref; > - IDirectSoundFullDuplexImpl *pdsfd; > -} IDirectSoundFullDuplex_IDirectSound; > - > -typedef struct IDirectSoundFullDuplex_IDirectSound8 { > - const IDirectSound8Vtbl *lpVtbl; > - LONG ref; > - IDirectSoundFullDuplexImpl *pdsfd; > -} IDirectSoundFullDuplex_IDirectSound8; > - > -typedef struct IDirectSoundFullDuplex_IDirectSoundCapture { > - const IDirectSoundCaptureVtbl *lpVtbl; > - LONG ref; > - IDirectSoundFullDuplexImpl *pdsfd; > -} IDirectSoundFullDuplex_IDirectSoundCapture; > +#define ICOM_THIS_MULTI(impl,field,iface) \ > + impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) Please define inline functions instead of ICOM_THIS_MULTI. Also the IUnknown vtable is most likely unnecessary. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/3] user32: Free window text to prevent leak in case whenWM_NCDESTROY doesn't get to default procedure
by Dmitry Timoshkov Nov. 16, 2009

Nov. 16, 2009

"Nikolay Sivov" <bunglehead(a)gmail.com> wrote: > This fixes a leak spotted by valgrind. > > Changelog: > - free window text to prevent leak in case when WM_NCDESTROY > doesn't get to default procedure Then WM_NCDESTROY handler should be removed from DefWindowProc to avoid a confusing duplication. -- Dmitry.

2 1

Re: [PATCH] winex11.drv: check for org = NULL (Coverity)
by Roderick Colenbrander Nov. 16, 2009

Nov. 16, 2009

Hi Marcus, A couple of hours ago I submitted a patch rewrites the function. It suffers from the same 'issue'. This and any other wgl function are called from gdi32/opengl.c which perform magic to arrive here and in case of wglsharelists it also performs the filtering. Roderick On Sun, Nov 15, 2009 at 7:28 PM, Marcus Meissner <marcus(a)jet.franken.de> wrote: > Hi, > > Coverity spotted some inconsistencies in "org" NULL > checking. > > org originates via Windows code (I think) so we better check it. > > Ciao, Marcus > --- > dlls/winex11.drv/opengl.c | 8 ++++++-- > 1 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c > index 45da479..774b205 100644 > --- a/dlls/winex11.drv/opengl.c > +++ b/dlls/winex11.drv/opengl.c > @@ -1918,11 +1918,15 @@ BOOL CDECL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { > > if (!has_opengl()) return FALSE; > > + if (NULL == org) { > + ERR("Could not share display lists, original context required.\n"); > + return FALSE; > + } > if (NULL != dest && dest->ctx != NULL) { > - ERR("Could not share display lists, context already created !\n"); > + ERR("Could not share display lists, context already created!\n"); > return FALSE; > } else { > - if(org && dest && (GetObjectType(org->hdc) == OBJ_MEMDC) ^ (GetObjectType(dest->hdc) == OBJ_MEMDC)) { > + if(dest && (GetObjectType(org->hdc) == OBJ_MEMDC) ^ (GetObjectType(dest->hdc) == OBJ_MEMDC)) { > WARN("Attempting to share a context between a direct and indirect rendering context, expect issues!\n"); > } > > -- > 1.5.6 > > >

2 2

re: [RFC] Extended Attributes for Dos Attributes, Creation Time, etc.
by Dan Kegel Nov. 16, 2009

Nov. 16, 2009

Hi Ben, did you see http://bugs.winehq.org/show_bug.cgi?id=15679 http://www.winehq.org/pipermail/wine-patches/2009-October/079842.html ? IMHO the way the Samba sources merged the fd and filename version of the calls makes for less duplication of code. (I tried to do it the other way first, and it seemed ugly.) - Dan

2 1

Re: user32: Destroy EDITSTATE structure in the WM_NCDESTROY messageprocessing
by Dmitry Timoshkov Nov. 16, 2009

Nov. 16, 2009

"Ilya Shpigor" <shpigor(a)etersoft.ru> wrote: > + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); > + SendMessageA(hWnd, WM_GETTEXT, MAXLEN, (LPARAM)buf); > + ok(!lstrcmp(buf, str), "Wrong contents of edit: %s\n", buf); > + lstrcpy(buf, ""); > + SendMessageA(hWnd, WM_DESTROY, 0, 0); > + SendMessageA(hWnd, WM_GETTEXT, MAXLEN, (LPARAM)buf); > + ok(!lstrcmp(buf, str), "Wrong contents of edit: %s\n", buf); > + lstrcpy(buf, ""); > + SendMessageA(hWnd, WM_NCDESTROY, 0, 0); > + SendMessageA(hWnd, WM_GETTEXT, MAXLEN, (LPARAM)buf); > + ok(!lstrcmp(buf, ""), "Wrong contents of edit: %s\n", buf); You should check return values of each SendMessage above. -- Dmitry.

1 0

[Fwd: Interesting Problem Building Wine for Regression Test]
by James McKenzie Nov. 16, 2009

Nov. 16, 2009

All: I continue to work with Tony Rollo's code as presented in bug 6254. I've found a problem with Wordpad's Print Preview between wine-1.1.10 and wine-1.1.11 and I attempted to run a regression test and end up with errors in makedep.c as follows: makedep.c:21:20: error: config.h: No such file or directory makedep.c:23:23: error: wine/port.h: No such file or directory makedep.c:35:23: error: wine/list.h: No such file or directory makedep.c:42: error: field ‘entry’ has incomplete type makedep.c:53: error: variable ‘sources’ has initializer but incomplete type makedep.c:53: error: ‘sources’ has an incomplete type makedep.c:54: error: variable ‘includes’ has initializer but incomplete type the list of errors continues but they are all related to the first three lines. These files exist in the include directory. What makes troubleshooting these errors difficult is that wine-1.1.10 AND wine-1.1.11 from the same git repository will build without these errors. What I did was: git bisect start git bisect good wine-1.1.10 git bisect bad wine-1.1.11 and I received the bisect message that there were 240 more changes to check. I do have an idea what commit caused the problem and attempted to manually backout the change, but the build also failed. I diffed the configure line and found no major differences between the configure on the build that finishes and the one that errors. Any idea on what I am doing incorrect? Just as a followup, I rebased my local git and received error messages relating to tools/Makefile.in. Forced a regit in the branch I had been working in and the builds are working again. Funny thing is that I did nothing to this file. James McKenzie

1 0

winscard: add pcsc-lite helpers for upcoming(?) implementation
by Joerg-Cyril.Hoehle＠t-systems.com Nov. 16, 2009

Nov. 16, 2009

Hi, looking for PCSC-card-reader support in Wine, I came across old mails from 2007. http://www.winehq.org/pipermail/wine-devel/2007-May/057052.html What's the current state of PCSC support in Wine? When I recently looked, winscard seemed full of stubs. OTOH, there's a company http://www.starmoney.de/index.php?id=243 that seems to use Wine (and Darwine?) with card readers to make its software available for Linux & Mac. Also seems ~2007. I believe that a winscard<->PCSC<->PCSC-Lite bridge would be much easier to achieve than USB support in Wine. Thanks for your help, Jörg Höhle

4 3

Interesting Problem Building Wine for Regression Test
by James McKenzie Nov. 16, 2009

Nov. 16, 2009

All: I continue to work with Tony Rollo's code as presented in bug 6254. I've found a problem with Wordpad's Print Preview between wine-1.1.10 and wine-1.1.11 and I attempted to run a regression test and end up with errors in makedep.c as follows: makedep.c:21:20: error: config.h: No such file or directory makedep.c:23:23: error: wine/port.h: No such file or directory makedep.c:35:23: error: wine/list.h: No such file or directory makedep.c:42: error: field ‘entry’ has incomplete type makedep.c:53: error: variable ‘sources’ has initializer but incomplete type makedep.c:53: error: ‘sources’ has an incomplete type makedep.c:54: error: variable ‘includes’ has initializer but incomplete type the list of errors continues but they are all related to the first three lines. These files exist in the include directory. What makes troubleshooting these errors difficult is that wine-1.1.10 AND wine-1.1.11 from the same git repository will build without these errors. What I did was: git bisect start git bisect good wine-1.1.10 git bisect bad wine-1.1.11 and I received the bisect message that there were 240 more changes to check. I do have an idea what commit caused the problem and attempted to manually backout the change, but the build also failed. I diffed the configure line and found no major differences between the configure on the build that finishes and the one that errors. Any idea on what I am doing incorrect? James McKenzie

1 0

[RFC] Extended Attributes for Dos Attributes, Creation Time, etc.
by Ben Peddell Nov. 16, 2009

Nov. 16, 2009

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 What are your thoughts on using Extended Attributes for items such as: * Dos Attributes (like samba's "store dos attributes = yes") * File Creation Times (like samba's proposed user.crtime) * An option for alternate storage of NT ACLs (like samba's "vfs object = acl-xattr") Are Extended Attributes acceptable? Or should they never touch the wine source? Where would the portability functions for Extended Attributes on Linux, Mac OS X, FreeBSD and Solaris belong? I would think in libport. Attached is a patch to add extended attribute portability functions for fgetxattr, fsetxattr and fremovexattr to libport. Please give me any comments on this patch, and the idea of using extended attributes. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAksAm/4ACgkQTHDAI68NsumFzwCbBDcRbB8kFXroLeskA+hzgswu i0UAn3NHbau8AjSgtoruggBH3py+orcZ =tEvP -----END PGP SIGNATURE----- >From 2ef84c7f8c849db18ce15366e72c6787fa83597d Mon Sep 17 00:00:00 2001 From: Benjamin Peddell <klightspeed(a)netspace.net.au> Date: Mon, 16 Nov 2009 01:23:28 +1000 Subject: [PATCH] Add Extended Attribute support to libport --- configure | 178 ++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 45 ++++++++++++ include/config.h.in | 39 ++++++++++ include/wine/port.h | 36 +++++++++ libs/port/Makefile.in | 3 + libs/port/fgetxattr.c | 96 +++++++++++++++++++++++++ libs/port/fremovexattr.c | 75 +++++++++++++++++++ libs/port/fsetxattr.c | 102 ++++++++++++++++++++++++++ 8 files changed, 574 insertions(+), 0 deletions(-) create mode 100644 libs/port/fgetxattr.c create mode 100644 libs/port/fremovexattr.c create mode 100644 libs/port/fsetxattr.c diff --git a/configure b/configure index 15652b4..c9322b3 100755 --- a/configure +++ b/configure @@ -5747,6 +5747,7 @@ for ac_header in \ sys/errno.h \ sys/event.h \ sys/exec_elf.h \ + sys/extattr.h \ sys/filio.h \ sys/inotify.h \ sys/ioctl.h \ @@ -5782,6 +5783,7 @@ for ac_header in \ sys/utsname.h \ sys/vm86.h \ sys/wait.h \ + sys/xattr.h \ syscall.h \ termios.h \ unistd.h \ @@ -12084,6 +12086,9 @@ for ac_func in \ chsize \ dlopen \ epoll_create \ + extattr_delete_fd \ + extattr_get_fd \ + extattr_set_fd \ ffs \ finite \ fnmatch \ @@ -12105,6 +12110,7 @@ for ac_func in \ lstat \ memmove \ mmap \ + openat \ pclose \ pipe2 \ poll \ @@ -12137,6 +12143,7 @@ for ac_func in \ tcgetattr \ thr_kill2 \ timegm \ + unlinkat \ usleep \ vsnprintf \ wait4 \ @@ -12262,6 +12269,81 @@ fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fgetxattr" >&5 +$as_echo_n "checking for library containing fgetxattr... " >&6; } +if test "${ac_cv_search_fgetxattr+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fgetxattr (); +int +main () +{ +return fgetxattr (); + ; + return 0; +} +_ACEOF +for ac_lib in '' attr; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_fgetxattr=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_fgetxattr+set}" = set; then : + break +fi +done +if test "${ac_cv_search_fgetxattr+set}" = set; then : + +else + ac_cv_search_fgetxattr=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fgetxattr" >&5 +$as_echo "$ac_cv_search_fgetxattr" >&6; } +ac_res=$ac_cv_search_fgetxattr +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + + +for ac_func in \ + fgetxattr \ + fremovexattr \ + fsetxattr \ + +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5 $as_echo_n "checking for library containing gethostbyname... " >&6; } if test "${ac_cv_search_gethostbyname+set}" = set; then : @@ -12616,6 +12698,102 @@ $as_echo "#define HAVE_ONE_ARG_MKDIR 1" >>confdefs.h fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fgetxattr takes six arguments" >&5 +$as_echo_n "checking whether fgetxattr takes six arguments... " >&6; } +if test "${wine_cv_six_arg_fgetxattr+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/xattr.h> +int +main () +{ +fgetxattr(0, "foo", "foo", 3, 0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + wine_cv_six_arg_fgetxattr=yes +else + wine_cv_six_arg_fgetxattr=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_six_arg_fgetxattr" >&5 +$as_echo "$wine_cv_six_arg_fgetxattr" >&6; } +if test "$wine_cv_six_arg_fgetxattr" = "yes" +then + +$as_echo "#define HAVE_SIX_ARG_FGETXATTR 1" >>confdefs.h + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fsetxattr takes six arguments" >&5 +$as_echo_n "checking whether fsetxattr takes six arguments... " >&6; } +if test "${wine_cv_six_arg_fsetxattr+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/xattr.h> +int +main () +{ +fsetxattr(0, "foo", "foo", 3, 0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + wine_cv_six_arg_fsetxattr=yes +else + wine_cv_six_arg_fsetxattr=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_six_arg_fsetxattr" >&5 +$as_echo "$wine_cv_six_arg_fsetxattr" >&6; } +if test "$wine_cv_six_arg_fsetxattr" = "yes" +then + +$as_echo "#define HAVE_SIX_ARG_FSETXATTR 1" >>confdefs.h + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fremovexattr takes three arguments" >&5 +$as_echo_n "checking whether fremovexattr takes three arguments... " >&6; } +if test "${wine_cv_three_arg_fremovexattr+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/xattr.h> +int +main () +{ +fremovexattr("foo", "foo", 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + wine_cv_three_arg_fremovexattr=yes +else + wine_cv_three_arg_fremovexattr=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_three_arg_fremovexattr" >&5 +$as_echo "$wine_cv_three_arg_fremovexattr" >&6; } +if test "$wine_cv_three_arg_fremovexattr" = "yes" +then + +$as_echo "#define HAVE_THREE_ARG_FREMOVEXATTR 1" >>confdefs.h + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } diff --git a/configure.ac b/configure.ac index a5f1b8a..c0f5380 100644 --- a/configure.ac +++ b/configure.ac @@ -384,6 +384,7 @@ AC_CHECK_HEADERS(\ sys/errno.h \ sys/event.h \ sys/exec_elf.h \ + sys/extattr.h \ sys/filio.h \ sys/inotify.h \ sys/ioctl.h \ @@ -419,6 +420,7 @@ AC_CHECK_HEADERS(\ sys/utsname.h \ sys/vm86.h \ sys/wait.h \ + sys/xattr.h \ syscall.h \ termios.h \ unistd.h \ @@ -1684,6 +1686,9 @@ AC_CHECK_FUNCS(\ chsize \ dlopen \ epoll_create \ + extattr_delete_fd \ + extattr_get_fd \ + extattr_set_fd \ ffs \ finite \ fnmatch \ @@ -1705,6 +1710,7 @@ AC_CHECK_FUNCS(\ lstat \ memmove \ mmap \ + openat \ pclose \ pipe2 \ poll \ @@ -1737,6 +1743,7 @@ AC_CHECK_FUNCS(\ tcgetattr \ thr_kill2 \ timegm \ + unlinkat \ usleep \ vsnprintf \ wait4 \ @@ -1757,6 +1764,16 @@ then AC_CHECK_LIB(poll,poll,[AC_DEFINE(HAVE_POLL,1) AC_SUBST(LIBPOLL,"-lpoll")]) fi +dnl Check for -lattr for the old attr package +AC_SEARCH_LIBS(fgetxattr,attr) + +dnl Check for xattr functions which may rely on -lattr on Linux +AC_CHECK_FUNCS(\ + fgetxattr \ + fremovexattr \ + fsetxattr \ +) + dnl Check for -lnsl for Solaris AC_SEARCH_LIBS(gethostbyname, nsl) @@ -1816,6 +1833,34 @@ then AC_DEFINE(HAVE_ONE_ARG_MKDIR, 1, [Define if mkdir takes only one argument]) fi +dnl Check xattr functions +AC_CACHE_CHECK([whether fgetxattr takes six arguments], + wine_cv_six_arg_fgetxattr, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/xattr.h>]],[[fgetxattr(0, "foo", "foo", 3, 0, 0);]])], + [wine_cv_six_arg_fgetxattr=yes],[wine_cv_six_arg_fgetxattr=no])) +if test "$wine_cv_six_arg_fgetxattr" = "yes" +then + AC_DEFINE(HAVE_SIX_ARG_FGETXATTR, 1, [Define if fgetxattr takes six arguments, as in Mac OS X]) +fi + +AC_CACHE_CHECK([whether fsetxattr takes six arguments], + wine_cv_six_arg_fsetxattr, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/xattr.h>]],[[fsetxattr(0, "foo", "foo", 3, 0, 0);]])], + [wine_cv_six_arg_fsetxattr=yes],[wine_cv_six_arg_fsetxattr=no])) +if test "$wine_cv_six_arg_fsetxattr" = "yes" +then + AC_DEFINE(HAVE_SIX_ARG_FSETXATTR, 1, [Define if fsetxattr takes six arguments, as in Mac OS X]) +fi + +AC_CACHE_CHECK([whether fremovexattr takes three arguments], + wine_cv_three_arg_fremovexattr, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/xattr.h>]],[[fremovexattr("foo", "foo", 0);]])], + [wine_cv_three_arg_fremovexattr=yes],[wine_cv_three_arg_fremovexattr=no])) +if test "$wine_cv_three_arg_fremovexattr" = "yes" +then + AC_DEFINE(HAVE_THREE_ARG_FREMOVEXATTR, 1, [Define if fremovexattr takes three arguments, as in Mac OS X]) +fi + dnl **** Check for types **** AC_C_CONST diff --git a/include/config.h.in b/include/config.h.in index 16b2e90..1c6ec57 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -93,9 +93,21 @@ /* Define if you have EsounD sound server */ #undef HAVE_ESD +/* Define to 1 if you have the `extattr_delete_fd' function. */ +#undef HAVE_EXTATTR_DELETE_FD + +/* Define to 1 if you have the `extattr_get_fd' function. */ +#undef HAVE_EXTATTR_GET_FD + +/* Define to 1 if you have the `extattr_set_fd' function. */ +#undef HAVE_EXTATTR_SET_FD + /* Define to 1 if you have the `ffs' function. */ #undef HAVE_FFS +/* Define to 1 if you have the `fgetxattr' function. */ +#undef HAVE_FGETXATTR + /* Define to 1 if you have the `finite' function. */ #undef HAVE_FINITE @@ -156,9 +168,15 @@ /* Define to 1 if you have the <freetype/tttables.h> header file. */ #undef HAVE_FREETYPE_TTTABLES_H +/* Define to 1 if you have the `fremovexattr' function. */ +#undef HAVE_FREMOVEXATTR + /* Define to 1 if the system has the type `fsblkcnt_t'. */ #undef HAVE_FSBLKCNT_T +/* Define to 1 if you have the `fsetxattr' function. */ +#undef HAVE_FSETXATTR + /* Define to 1 if the system has the type `fsfilcnt_t'. */ #undef HAVE_FSFILCNT_T @@ -561,6 +579,9 @@ /* Define to 1 if you have the <OpenAL/al.h> header file. */ #undef HAVE_OPENAL_AL_H +/* Define to 1 if you have the `openat' function. */ +#undef HAVE_OPENAT + /* Define if OpenGL is present on the system */ #undef HAVE_OPENGL @@ -699,6 +720,12 @@ /* Define to 1 if the system has the type `sigset_t'. */ #undef HAVE_SIGSET_T +/* Define if fgetxattr takes six arguments, as in Mac OS X */ +#undef HAVE_SIX_ARG_FGETXATTR + +/* Define if fsetxattr takes six arguments, as in Mac OS X */ +#undef HAVE_SIX_ARG_FSETXATTR + /* Define to 1 if the system has the type `size_t'. */ #undef HAVE_SIZE_T @@ -855,6 +882,9 @@ /* Define to 1 if you have the <sys/exec_elf.h> header file. */ #undef HAVE_SYS_EXEC_ELF_H +/* Define to 1 if you have the <sys/extattr.h> header file. */ +#undef HAVE_SYS_EXTATTR_H + /* Define to 1 if you have the <sys/filio.h> header file. */ #undef HAVE_SYS_FILIO_H @@ -984,12 +1014,18 @@ /* Define to 1 if you have the <sys/wait.h> header file. */ #undef HAVE_SYS_WAIT_H +/* Define to 1 if you have the <sys/xattr.h> header file. */ +#undef HAVE_SYS_XATTR_H + /* Define to 1 if you have the `tcgetattr' function. */ #undef HAVE_TCGETATTR /* Define to 1 if you have the <termios.h> header file. */ #undef HAVE_TERMIOS_H +/* Define if fremovexattr takes three arguments, as in Mac OS X */ +#undef HAVE_THREE_ARG_FREMOVEXATTR + /* Define to 1 if you have the `thr_kill2' function. */ #undef HAVE_THR_KILL2 @@ -1005,6 +1041,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the `unlinkat' function. */ +#undef HAVE_UNLINKAT + /* Define to 1 if you have the `usleep' function. */ #undef HAVE_USLEEP diff --git a/include/wine/port.h b/include/wine/port.h index 61c8399..6568dae 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -48,6 +48,9 @@ # include <unistd.h> #endif +#ifdef HAVE_SYS_XATTR_H +# include <sys/xattr.h> +#endif /**************************************************************** * Type definitions @@ -117,6 +120,18 @@ struct statvfs #define mkdir(path,mode) mkdir(path) #endif +#ifdef HAVE_SIX_ARG_FGETXATTR +#define fgetxattr(fd,name,val,size) fgetxattr(fd,name,val,size,0,0) +#endif + +#ifdef HAVE_SIX_ARG_FSETXATTR +#define fsetxattr(fd,name,val,size,opts) fsetxattr(fd,name,val,size,0,opts) +#endif + +#ifdef HAVE_THREE_ARG_FREMOVEXATTR +#define fremovexattr(fd,name) fremovexattr(fd,name,0) +#endif + #if !defined(HAVE_FTRUNCATE) && defined(HAVE_CHSIZE) #define ftruncate chsize #endif @@ -328,6 +343,21 @@ int symlink(const char *from, const char *to); int usleep (unsigned int useconds); #endif /* !defined(HAVE_USLEEP) */ +#ifndef HAVE_FGETXATTR +size_t fgetxattr (int fd, const char *name, void *value, size_t size); +#endif /* !defined(HAVE_FGETXATTR) */ + +#ifndef HAVE_FSETXATTR +#define XATTR_CREATE 1 +#define XATTR_REPLACE 2 +size_t fsetxattr (int fd, const char *name, const void *value, size_t size, + int opts); +#endif /* !defined(HAVE_FSETXATTR) */ + +#ifndef HAVE_FREMOVEXATTR +size_t fremovexattr (int fd, const char *name); +#endif /* !defined(HAVE_FREMOVEXATTR) */ + #ifdef __i386__ static inline void *memcpy_unaligned( void *dst, const void *src, size_t size ) { @@ -470,6 +500,12 @@ extern unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, #define strerror __WINE_NOT_PORTABLE(strerror) #define strncasecmp __WINE_NOT_PORTABLE(strncasecmp) #define usleep __WINE_NOT_PORTABLE(usleep) +#undef fgetxattr +#define fgetxattr __WINE_NOT_PORTABLE(fgetxattr) +#undef fsetxattr +#define fsetxattr __WINE_NOT_PORTABLE(fsetxattr) +#undef fremovexattr +#define fremovexattr __WINE_NOT_PORTABLE(fremovexattr) #endif /* NO_LIBWINE_PORT */ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index c4c0127..e046562 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -8,6 +8,9 @@ MODULE = libwine_port.a C_SRCS = \ ffs.c \ + fgetxattr.c \ + fremovexattr.c \ + fsetxattr.c \ fstatvfs.c \ futimes.c \ getopt.c \ diff --git a/libs/port/fgetxattr.c b/libs/port/fgetxattr.c new file mode 100644 index 0000000..196d11a --- /dev/null +++ b/libs/port/fgetxattr.c @@ -0,0 +1,96 @@ +/* + * fgetxattr function + * + * Copyright 2009 Benjamin Peddell + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#ifndef HAVE_FGETXATTR + +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#ifdef HAVE_SYS_EXTATTR_H +# include <sys/extattr.h> +#endif +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +#include <errno.h> + +size_t fgetxattr (int fd, const char *name, void *value, size_t size){ +/* Solaris openat(fd,path,O_XATTR) support */ +#ifdef defined(HAVE_OPENAT) && defined(O_XATTR) + int ret; + size_t attrsize = -1; + off_t pos; + struct stat statbuf; + int attrfd; + if (strchr(name, '/') != NULL){ + errno = EINVAL; + return -1; + } + attrfd = openat(fd, name, O_XATTR | O_RDONLY); + if (attrfd >= 0){ + ret = fstat(attrfd, &statbuf); + if (ret >= 0){ + attrsize = (size_t)statbuf.st_size; + if (attrsize >= 0 && attrsize <= size){ + pos = 0; + while (pos < attrsize){ + ret = read(attrfd, value + pos, attrsize - pos); + if (ret > 0){ + pos += ret; + } else { + attrsize = pos; + } + } + } else { + errno = ERANGE; + } + } + close(attrfd); + } + if (attrsize >= 0){ + return attrsize; + } else { + return (size_t)ret; + } +/* FreeBSD extattr_get_fd support */ +#elif defined(HAVE_EXTATTR_GET_FD) + int nameofs; + int namespace; + if (strncmp (name, "user.", 5) == 0){ + namespace = EXTATTR_NAMESPACE_USER; + nameofs = 5; + } else if (strncmp (name, "system.", 7) == 0){ + namespace = EXTATTR_NAMESPACE_SYSTEM; + nameofs = 7; + } else { + errno = ENOENT; + return -1; + } + return extattr_get_fd (fd, namespace, name + nameofs, value, size); +#else + errno = ENOSYS; + return -1; +#endif +} + +#endif /* HAVE_FGETXATTR */ diff --git a/libs/port/fremovexattr.c b/libs/port/fremovexattr.c new file mode 100644 index 0000000..b752fb8 --- /dev/null +++ b/libs/port/fremovexattr.c @@ -0,0 +1,75 @@ +/* + * fremovexattr function + * + * Copyright 2009 Benjamin Peddell + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#ifndef HAVE_FREMOVEXATTR + +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#ifdef HAVE_SYS_EXTATTR_H +# include <sys/extattr.h> +#endif +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +#include <errno.h> + +size_t fremovexattr (int fd, const char *name){ +/* Solaris openat(fd,path,O_XATTR) support */ +#ifdef defined(HAVE_UNLINKAT) && defined(HAVE_OPENAT) && defined(O_XATTR) + int ret; + int attrfd; + if (strchr(name, '/') != NULL){ + errno = EINVAL; + return -1; + } + attrfd = openat(fd, ".", O_RDONLY | O_XATTR); + if (attrfd >= 0){ + ret = unlinkat(attrfd, name, 0); + close(attrfd); + } else { + ret = attrfd; + } + return ret; +/* FreeBSD extattr_delete_fd support */ +#elif defined(HAVE_EXTATTR_SET_FD) + int nameofs; + int namespace; + if (strncmp (name, "user.", 5) == 0){ + namespace = EXTATTR_NAMESPACE_USER; + nameofs = 5; + } else if (strncmp (name, "system.", 7) == 0){ + namespace = EXTATTR_NAMESPACE_SYSTEM; + nameofs = 7; + } else { + errno = ENOENT; + return -1; + } + return extattr_delete_fd (fd, namespace, name + nameofs); +#else + errno = ENOSYS; + return -1; +#endif +} + +#endif /* HAVE_FREMOVEXATTR */ diff --git a/libs/port/fsetxattr.c b/libs/port/fsetxattr.c new file mode 100644 index 0000000..7640f81 --- /dev/null +++ b/libs/port/fsetxattr.c @@ -0,0 +1,102 @@ +/* + * fsetxattr function + * + * Copyright 2009 Benjamin Peddell + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#ifndef HAVE_FSETXATTR +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#ifdef HAVE_SYS_EXTATTR_H +# include <sys/extattr.h> +#endif +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +#include <errno.h> + +size_t fsetxattr (int fd, const char *name, const void *value, size_t size, + int opts){ +/* Solaris openat(fd,path,O_XATTR) support */ +#ifdef defined(HAVE_OPENAT) && defined(O_XATTR) + int ret; + size_t attrsize = -1; + off_t pos; + struct stat statbuf; + int attrfd; + int flags = O_XATTR | O_WRONLY | O_CREAT; + if (strchr(name, '/') != NULL){ + errno = EINVAL; + return -1; + } else if (strncmp (name, "SUNW", 4) == 0){ + errno = EINVAL; + return -1; + } else if (opts & XATTR_CREATE && opts & XATTR_REPLACE){ + errno = EINVAL; + return -1; + } else if (opts & XATTR_CREATE){ + flags |= O_EXCL; + } else if (opts & XATTR_REPLACE){ + flags &= ~O_CREAT; + } + attrfd = openat(fd, name, flags, 0666); + if (attrfd >= 0){ + pos = 0; + attrsize = size; + while (pos < attrsize){ + ret = write(attrfd, value + pos, attrsize - pos); + if (ret > 0){ + pos += ret; + } else { + attrsize = pos; + } + } + close(attrfd); + } else { + ret = attrfd; + } + if (attrsize >= 0){ + return attrsize; + } else { + return (size_t)ret; + } +/* FreeBSD extattr_set_fd support */ +#elif defined(HAVE_EXTATTR_SET_FD) + int nameofs; + int namespace; + if (strncmp (name, "user.", 5) == 0){ + namespace = EXTATTR_NAMESPACE_USER; + nameofs = 5; + } else if (strncmp (name, "system.", 7) == 0){ + namespace = EXTATTR_NAMESPACE_SYSTEM; + nameofs = 7; + } else { + errno = ENOENT; + return -1; + } + return extattr_set_fd (fd, namespace, name + nameofs, value, size); +#else + errno = ENOSYS; + return -1; +#endif +} + +#endif /* HAVE_FSETXATTR */ -- 1.6.4.4

1 0