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

UMR in CRYPT_RemoveStringFromMultiString()
by Dan Kegel 19 Nov '09

19 Nov '09

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 19 Nov '09

19 Nov '09

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 19 Nov '09

19 Nov '09

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 19 Nov '09

19 Nov '09

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 19 Nov '09

19 Nov '09

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 19 Nov '09

19 Nov '09

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 19 Nov '09

19 Nov '09

> >> 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 19 Nov '09

19 Nov '09

>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 19 Nov '09

19 Nov '09

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 19 Nov '09

19 Nov '09

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