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

Re: [PATCH 1/3] gdi32/tests: Test BitBlt() to an enhanced metafile.
by Charles Davis 22 Nov '09

22 Nov '09

Austin English wrote: > On Sat, Nov 21, 2009 at 11:15 PM, Charles Davis <cdavis(a)mymail.mines.edu> wrote: >> Dmitry Timoshkov wrote: >>> "Charles Davis" <cdavis(a)mymail.mines.edu> wrote: >>> >>>>> You forgot to remove if (1). >>>>> >>>> It goes away in patch #3. I thought I already had this discussion with >>>> Paul. >>>> >>>> There's a reason it's there. EMF_BITBLT contains two BitBlt() records, >>>> but the EMF we're comparing it to only has one. That's because one of >>>> them is if(0)'d out because it crashes on Wine. So, if we try to compare >>>> the EMF we produced to the EMF we expect, it will fail. Last I checked, >>>> Alexandre doesn't like it when tests fail. All tests must pass on his >>>> box. >>> There are 2 solutions for that: >>> 1. use todo_wine in the test, and remove it in a patch with the fix >> The test will fail on Windows if I do that. > > That won't affect windows. It will only fail on wine if it passes. > You don't understand. The expected EMF bits contain TWO BitBlt() records, but the EMF produced by the test contains only one. It will contain only one on both Wine and Windows, because one of the calls to BitBlt() is if(0)'d out. So the test will fail on Windows if the call to compare_emf_bits() is marked todo_wine. Oh, and you didn't reply to all. Was that intentional?

2 1

Someone please update the german translation of Ubuntu download page
by Scott Ritchie 22 Nov '09

22 Nov '09

My German is inadequate and there are no instructions for Karmic users there at the moment. Thanks, Scott Ritchie

2 1

Re: [PATCH 1/3] gdi32/tests: Test BitBlt() to an enhanced metafile.
by Dmitry Timoshkov 22 Nov '09

22 Nov '09

"Charles Davis" <cdavis(a)mymail.mines.edu> wrote: > + if(1 || compare_emf_bits(hMetafile, EMF_BITBLT, sizeof(EMF_BITBLT), > + "emf_BitBlt", FALSE) != 0) > + { > + dump_emf_bits(hMetafile, "emf_BitBlt"); > + dump_emf_records(hMetafile, "emf_BitBlt"); > + } You forgot to remove if (1). -- Dmitry.

2 3

Next step: detect double-frees and use-after-free
by Dan Kegel 22 Nov '09

22 Nov '09

Now that the heap tail check is more or less working, I'm on to implementing protection against double frees and use-after-free for recently freed blocks. The idea is that HEAP_MakeInUseBlockFree() will take the block it's called with, push it onto a FIFO, pull an old block off the FIFO, and mark that old block free. The blocks languishing in the FIFO will be marked inaccessible. If you try to free one, realloc one, or even get its size, you'll get an immediate error; if you write to one, you'll get an error when it comes out of the FIFO or when the heap is validated; and if you're running Valgrind, you'll get an immediate error on read or write to the freed block. The FIFO will be drained when the heap is destroyed. It will be implemented using a standard wine list in an optional fixed-sized block at the tail of each allocation. Remind me again why we didn't do this years ago...

1 0

Re: Difficulties with Regression Testing
by James Mckenzie 21 Nov '09

21 Nov '09

>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. >> 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. James McKenzie

3 2

UMR in CertIsRDNAttrsInCertificateName()
by Dan Kegel 20 Nov '09

20 Nov '09

http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/vg-crypt32_cert.txt shows a new UMR (purify-speak for uninitialized memory read) error Conditional jump or move depends on uninitialised value(s) at strncmp (mc_replace_strmem.c:386) by find_matching_rdn_attr (cert.c:1877) by CertIsRDNAttrsInCertificateName (cert.c:1907) by testIsRDNAttrsInCertificateName (cert.c:2698) Uninitialised value was created by a client request at mark_block_uninitialized (heap.c:192) by RtlAllocateHeap (heap.c:1526) by HeapAlloc (heap.c:276) by GlobalAlloc (heap.c:369) by LocalAlloc (heap.c:969) by CRYPT_DecodeEnsureSpace (decode.c:218) by CRYPT_AsnDecodeName (decode.c:1918) by CryptDecodeObjectEx (decode.c:5909) by CertIsRDNAttrsInCertificateName (cert.c:1901) by testIsRDNAttrsInCertificateName (cert.c:2698) Juan, I think that's yours, could you have a look? - Dan

2 1

Re: [PATCH 2/2] mshtml: Also search by node name attribute in IHTMLDocument3::getElementById
by Jacek Caban 20 Nov '09

20 Nov '09

Hi Andrew, Andrew Eikum wrote: > --- > dlls/mshtml/htmldoc3.c | 58 > +++++++++++++++++++++++++++++++++++++++++++--- > dlls/mshtml/nsiface.idl | 33 ++++++++++++++++++++++++++ > dlls/mshtml/tests/dom.c | 29 ++++++++++++++++++++++- > 3 files changed, 115 insertions(+), 5 deletions(-) [ object, + uuid(29fb2a18-1dd2-11b2-8dd9-a6fd5d5ad12f), + local + /* FROZEN */ +] This interface is not frozen, please change the comment to NOT_FROZEN so that I we will know that we have to check it for changes on the next Gecko update. + hres = IHTMLElement_get_tagName(elem2, &str); + ok(hres == S_OK, "IHTMLElement_get_tagName failed: 0x%08x\n", hres); + ok(!strcmp_wa(str, "A"), "Got wrong tag: %s\n", wine_dbgstr_w(str)); + SysFreeString(str); There is generic test_elem_tag that is meant for this. + /* getElementById with node name attributes */ + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); + ok(hres == S_OK, "Unable to get IHTMLDocument3: 0x%08x\n", hres); + if(FAILED(hres)) + return; + bstr = a2bstr("nm1"); + hres = IHTMLDocument3_getElementById(doc3, bstr, &elem); + SysFreeString(bstr); + IHTMLDocument3_Release(doc3); + ok(hres == S_OK, "getElementById failed: 0x%08x\n", hres); + if(FAILED(hres)) + return; Same here for get_doc_elem_by_id. + + hres = IHTMLElement_get_id(elem, &bstr); + ok(hres == S_OK, "IHTMLElement_get_id failed: 0x%08x\n", hres); + ok(!strcmp_wa(bstr, "fr1"), "Found ID should have been \"fr1\", was: %s", wine_dbgstr_w(bstr)); + SysFreeString(bstr); Same here for test_elem_id. Thanks, Jacek

2 1

re: Running server applications under Wine?
by Dan Kegel 20 Nov '09

20 Nov '09

임은지 wrote: > Is there anyone who uses Wine for server applications (game server, web server, etc.)? It's been done. See e.g. http://www.fpsadmin.com/forum/showthread.php?t=16481 for how one fellow ran a game server in wine. > Performance is very important issue for such applications. A server should serve a large number of clients at reasonable speeds. Yes, it would be interesting to run ab or dkftpbench against an http or ftp server running on wine. > What do you think about implementing wineserver kernel module or handling only performance critical items in kernel? There has long been talk of doing that. Linus is even willing to take patches to implement win32 APIs in the linux kernel. But it turns out to not be what most people need. If you want to do some server performance stress testing and file bugs for problems you find, by all means, go ahead! - Dan

2 3

New version of my test for bug 4543
by Charles Davis 20 Nov '09

20 Nov '09

Hi, This is a new version of my test for bug 4543. This time, I followed Dmitry's suggestion of using the existing functions for comparing the contents of EMFs. I can't build tests for Windows both due to bug 20763 and due to the fact that I don't have any Windows boxes, so once again I need people to run this test on Windows to make sure it's an accurate representation of Windows' behavior. The test currently succeeds on Wine. Thanks in advance. Chip >From 574bb4f7b2b90a209b1693b7f8048a2eb271ada8 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 an enhanced metafile. To: wine-patches <wine-patches(a)winehq.org> Reply-To: wine-devel <wine-devel(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 125 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 125 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index b559901..3bd413b 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1030,6 +1030,63 @@ static const unsigned char EMF_LINETO_MM_TEXT_BITS[] = { 0x14, 0x00, 0x00, 0x00 }; +static const unsigned char EMF_BITBLT[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x94, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0xa0, 0x01, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x38, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0xc0, 0xc2, 0x04, 0x00, 0x4c, 0x00, 0x00, 0x00, + 0xbc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, + 0x8c, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0xc4, 0x0e, 0x00, 0x00, 0xc4, 0x0e, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4c, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x62, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 +}; + + /* For debugging or dumping the raw metafiles produced by * new test functions. */ @@ -1382,6 +1439,73 @@ static int compare_emf_bits(const HENHMETAFILE mf, const unsigned char *bits, return 0; } + +/* tests blitting to an EMF */ +static void test_emf_BitBlt(void) +{ + HDC hdcDisplay, hdcMetafile, hdcBitmap; + HBITMAP hBitmap, hOldBitmap; + HENHMETAFILE hMetafile; +#define BMP_DIM 4 + BITMAPINFOHEADER bmih = + { + sizeof(BITMAPINFOHEADER), + BMP_DIM,/* biWidth */ + BMP_DIM,/* biHeight */ + 1, /* biPlanes */ + 24, /* biBitCount */ + BI_RGB, /* biCompression */ + 0, /* biXPelsPerMeter */ + 0, /* biYPelsPerMeter */ + 0, /* biClrUsed */ + 0, /* biClrImportant */ + }; + void *bits; + BOOL ret; + + hdcDisplay = CreateDCA("DISPLAY", NULL, NULL, NULL); + ok( hdcDisplay != 0, "CreateDCA error %d\n", GetLastError() ); + + hdcBitmap = CreateCompatibleDC(hdcDisplay); + ok( hdcBitmap != 0, "CreateCompatibleDC failed\n" ); + bmih.biXPelsPerMeter = MulDiv(GetDeviceCaps(hdcDisplay, LOGPIXELSX), 100, 3937); + bmih.biYPelsPerMeter = MulDiv(GetDeviceCaps(hdcDisplay, LOGPIXELSY), 100, 3937); + hBitmap = CreateDIBSection(hdcDisplay, (const BITMAPINFO *)&bmih, + DIB_RGB_COLORS, &bits, NULL, 0); + hOldBitmap = SelectObject(hdcBitmap, hBitmap); + + hdcMetafile = CreateEnhMetaFileA(hdcBitmap, NULL, NULL, NULL); + ok( hdcMetafile != 0, "CreateEnhMetaFileA failed\n" ); + + /* First fill the bitmap DC with something recognizable, like BLACKNESS */ + ret = BitBlt(hdcBitmap, 0, 0, BMP_DIM, BMP_DIM, 0, 0, 0, BLACKNESS); + ok( ret, "BitBlt(BLACKNESS) failed\n" ); + + ret = BitBlt(hdcMetafile, 0, 0, BMP_DIM, BMP_DIM, hdcBitmap, 0, 0, SRCCOPY); + ok( ret, "BitBlt(SRCCOPY) failed\n" ); + if(0) /* Crashes on wine */ + { + ret = BitBlt(hdcMetafile, 0, 0, BMP_DIM, BMP_DIM, 0, 0, 0, WHITENESS); + ok( ret, "BitBlt(WHITENESS) failed\n" ); + } + + hMetafile = CloseEnhMetaFile(hdcMetafile); + ok( hMetafile != 0, "CloseEnhMetaFile failed\n" ); + + if(1 || compare_emf_bits(hMetafile, EMF_BITBLT, sizeof(EMF_BITBLT), + "emf_BitBlt", FALSE) != 0) + { + dump_emf_bits(hMetafile, "emf_BitBlt"); + dump_emf_records(hMetafile, "emf_BitBlt"); + } + + SelectObject(hdcBitmap, hOldBitmap); + DeleteObject(hBitmap); + DeleteDC(hdcBitmap); + DeleteDC(hdcDisplay); +#undef BMP_DIM +} + /* Test a blank metafile. May be used as a template for new tests. */ static void test_mf_Blank(void) @@ -2628,6 +2752,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

3 5

Re: [PATCH 1/3] gdi32/tests: Test BitBlt() to an enhanced metafile.
by Paul Vriens 20 Nov '09

20 Nov '09

On 11/20/2009 04:21 PM, Charles Davis wrote: > + if(1 || compare_emf_bits(hMetafile, EMF_BITBLT, sizeof(EMF_BITBLT), > + "emf_BitBlt", FALSE) != 0) Shouldn't you get rid of that '1 ||' ? -- Cheers, Paul.

1 1