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

Re: New version of my test for bug 4543

by Charles Davis

Paul Vriens wrote: > On 11/19/2009 11:17 PM, Charles Davis wrote: >> 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 >> >> >> >> > I'll give it a try on some of my (VMware) boxes tomorrow. > Thanks. I almost forgot: some of the test is if(0)'d out because it crashes on Wine (right now). So, you may wish to un-if(0) the crashing test when you run on Windows. I'm particularly interested in the EMF that the test produces on Windows (it should dump it to the console if you run with WINETEST_DEBUG=1), so that would be really helpful. Chip

Nov. 19, 2009

Re: New version of my test for bug 4543

by Charles Davis

Ricardo Filipe wrote: > 2009/11/19 Charles Davis <cdavis(a)mymail.mines.edu>: >> 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 >> >> >> >> >> > it would really help you get some more tests if you just cross > compiled the dll, hosted it somewhere and gave the link on the email > ;) not all of us are on linux when we read the mail or have a compiler > ready on windows :) I told you, I can't cross-compile for Windows right now. See bug 20763. Chip

Nov. 19, 2009

Re: msi regression in today's git -- NEVER MIND

by Susan Cragin

I had a bad git. Re-did everything and now it works. Sorry about that. Susan -----Original Message----- >Installed Dragon NaturallySpeaking using clean prefix and today's git. >Instal went "without errors" but when I tried to open the program it said that the install hadn't completed correctly. >Specifically, iexplore.exe was missing. >I looked at the terminal output for the run but there wasn't anything interesting. > >Susan >

Nov. 19, 2009

Re: New version of my test for bug 4543

by Ricardo Filipe

2009/11/19 Charles Davis <cdavis(a)mymail.mines.edu>: > 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 > > > > > it would really help you get some more tests if you just cross compiled the dll, hosted it somewhere and gave the link on the email ;) not all of us are on linux when we read the mail or have a compiler ready on windows :)

Nov. 19, 2009

New version of my test for bug 4543

by Charles Davis

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

Nov. 19, 2009

Re: shell32/tests: Remove atime tests in ITEMIDLIST_format test.

by Austin Lund

2009/11/19 Paul Vriens <paul.vriens.wine(a)gmail.com>: > On 11/19/2009 01:23 PM, Austin Lund wrote: >> >> - ok (pFileStructA->uFileDate == pFileStructW->uDate2&& >> - pFileStructA->uFileTime == pFileStructW->uTime2, >> - "Last write time should match last access time!\n"); >> - > > Hi Austin, > > Is there no other way to get around this? I think it's a bit of a shame > having tests removed for that odd system that has a FAT filesystem on a NT4+ > box. > The date is always within 1 day (plus or minus). I guess it would be possible to implement a calendar addition and subtraction algorithm. Is there one already available somewhere that could be used with this bit packed structure in a test? The time could be anything, except perhaps the seconds. On my trials with this, it always seems to have the seconds as zero. I'm not sure if you can set a timezone that has a delta with non-zero seconds. On thinking about this, the way I'd do this is: if dates and times are equal then pass else check the rough rules as outlined But is it ok (or even sensible to do): if (date1 == date2 && time1 == time2) ok(TRUE, "Blah"); else { /* some other test */ } or would you leave out the ok()?

Nov. 19, 2009

Re: Write-past-end in FileMonikerImpl_DecomposePath()

by Dan Kegel

Filed as http://bugs.winehq.org/show_bug.cgi?id=20760 On Thu, Nov 19, 2009 at 9:11 AM, Dan Kegel <dank(a)kegel.com> wrote: > http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/diff-hlink_hlink.txt > http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/vg-hlink_hlink.txt > shows a new error thanks to the heap tail check. > > Looks like a level-of-indirection-during-allocation error, > 1039 strgtable = CoTaskMemAlloc(len*sizeof(WCHAR)); > should be > 1039 strgtable = CoTaskMemAlloc(len*sizeof(WCHAR *)); > > Ulrich, you were in there last, could you have a look? > > Invalid write of size 4 > at FileMonikerImpl_DecomposePath (filemoniker.c:1056) > by FileMonikerImpl_Construct (filemoniker.c:1375) > by CreateFileMoniker (filemoniker.c:1443) > by FileMoniker_CreateFromDisplayName (filemoniker.c:1484) > by MkParseDisplayName (moniker.c:1130) > by HlinkCreateFromString (hlink_main.c:124) > by test_persist (hlink.c:479) > by func_hlink (hlink.c:1122) > by run_test (test.h:535) > by main (test.h:585) > Address 0x7f04416c is 4 bytes inside a block of size 6 alloc'd > at notify_alloc (heap.c:279) > by RtlAllocateHeap (heap.c:1521) > by IMalloc_fnAlloc (ifs.c:186) > by CoTaskMemAlloc (ifs.c:562) > by FileMonikerImpl_DecomposePath (filemoniker.c:1039) > by FileMonikerImpl_Construct (filemoniker.c:1375) > by CreateFileMoniker (filemoniker.c:1443) > by FileMoniker_CreateFromDisplayName (filemoniker.c:1484) > by MkParseDisplayName (moniker.c:1130) > by HlinkCreateFromString (hlink_main.c:124) > by test_persist (hlink.c:479) >

Nov. 19, 2009

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 Detlef Riekenberg

On Do, 2009-11-19 at 13:18 +0000, Huw Davies wrote: > --- > dlls/winspool.drv/info.c | 8 +++++--- > 1 files changed, 5 insertions(+), 3 deletions(-) ANSI functions in winspool.drv have this behavior since w2k. We have already a test for EnumPrintersA/W [required by Outlook2003) I prefer to make such buffer size requirements also the default in Wine. We are able to simplify a lot of ANSI Functions, when we use this way. Alexandre, is this acceptable for you? -- By by ... Detlef

Nov. 19, 2009

Re: FAT32 support (was: [RFC] Handle process token groups in server/file.c::sd_to_mode)

by Ben Peddell

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Paul Chitescu wrote: > How should server/file.c sd_to_mode() deal with filesystems that don't support > full POSIX ownership and access permissions? It is quite popular to mount FAT > filesystems - either from a removable media or a partition shared with a > Windows installation. FAT32 support To support this, I think the following would need to be done: * Possibly split out and extended the filesystem type autodetection code in dlls/ntdll/file.c::get_device_info() to autodetect the filesystem's ability to hold ACLs * Implement NtQueryVolumeInformationFile(FileFsAttributeInformation) - this has flags such as: * FILE_PERSISTENT_ACLS: Persistent ACLs (NTFS vs FAT32), * FILE_CASE_SENSITIVE_SEARCH: case-sensitive search (POSIX) - this also has the name of the filesystem (e.g. NTFS, FAT32). * Implement the honouring of FILE_PERSISTENT_ACLS in NtQuerySecurityObject, NtSetSecurityObject * Possibly add a filesystem type configuration option to winecfg (separate to media type). * Possibly honour the media and filesystem type settings as configured by winecfg. > Furthermore, there could be symlinks to such files so filesystem capability > should be detected somehow from the file itself. Volume Mount Point support * Possibly extend dosdevices to include devices for Volume Mount Points. * Possibly implement detection of symbolic links leading to mount points as volume mount points - i.e. create \Device entries for mount points, and redirect Volume Mount Point targets to those devices. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAksFo3YACgkQTHDAI68NsunoigCfTQQQI6UpD8kCOBL5G83hzjgh ahMAniPZq9CsVOnZHyko/1Hucc362Wql =oWXW -----END PGP SIGNATURE-----

Nov. 19, 2009

Re: Problem to download git

by Paul Vriens

On 11/19/2009 07:43 PM, paulo lesgaz wrote: > I still have the same problem today > And I use Linux. Not a mac. > I have a very slow connection here (128kb/s) (French polynesia :D). > Could it be the culprit? > > D. Adam > I had issues a few hours ago and I have 20Mb/s. I don't use a proxy and on second try things worked. -- Cheers, Paul.

Nov. 19, 2009

Re: Problem to download git

by paulo lesgaz

I still have the same problem today And I use Linux. Not a mac. I have a very slow connection here (128kb/s) (French polynesia :D). Could it be the culprit? D. Adam dadam(a)analyst:~$ export http_proxy=”http://proxy.upf.pf:8080″ dadam(a)analyst:~$ git clone http://source.winehq.org/git/wine.git ~/wine Initialized empty Git repository in /home/dadam/wine/.git/ Getting alternates list for http://source.winehq.org/git/wine.git Getting pack list for http://source.winehq.org/git/wine.git Getting index for pack 0ece042377e5e1fe77ac71b065cf360c0244774e Getting index for pack 72c84da3f0d9b4fd0dad04f1ce7244dadce37a43 Getting index for pack 6c18f6d3a2d8e85a33e7981ead83b64e4c36bc8c Getting index for pack 7c2ab792c6e1c8f603b784f9dcb81f56f03bbf75 Getting pack 7c2ab792c6e1c8f603b784f9dcb81f56f03bbf75 which contains 7f5b24ed9186d457acd7803a97d4171f332c5fb2 walk 7f5b24ed9186d457acd7803a97d4171f332c5fb2 Getting pack 0ece042377e5e1fe77ac71b065cf360c0244774e which contains 30815a50ed6a1b7ede26a1f0685bf687bf56e0ed error: Unable to get pack file http://source.winehq.org/git/wine.git/objects/pack/pack-0ece042377e5e1fe77a… transfer closed with 110180858 bytes remaining to read error: Unable to find 30815a50ed6a1b7ede26a1f0685bf687bf56e0ed under http://source.winehq.org/git/wine.git Cannot obtain needed object 30815a50ed6a1b7ede26a1f0685bf687bf56e0ed while processing commit 7f5b24ed9186d457acd7803a97d4171f332c5fb2. --- En date de : Jeu 19.11.09, Juan Lang <juan.lang(a)gmail.com> a écrit : De: Juan Lang <juan.lang(a)gmail.com> Objet: Re: Problem to download git À: "paulo lesgaz" <jeremielapuree(a)yahoo.fr> Cc: "wine" <wine-devel(a)winehq.org> Date: Jeudi 19 Novembre 2009, 5h16 > error: Unable to get pack file http://source.winehq.org/git/wine.git/objects/pack/pack-7c2ab792c6e1c8f603b… 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. --Juan

Nov. 19, 2009

Re: New valgrind results, this time with overrun checks and lots of new errors.

by Dan Kegel

On Thu, Nov 19, 2009 at 7:37 AM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: >> http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/ >> is the first full run with the heap tail check enabled. > > So you use some private patches for that, why aren't they merged? 'Cause I just wrote it an hour before that message? I already posted it to wine-devel for the curious. I'll try to post to wine-patches today or so. In the meantime I've updated http://wiki.winehq.org/Valgrind to link to the patch. I'm not sure about the user (i.e. developer) interface for turning the heap check on. Should it be automatic when one does warn+heap? Or should it need an environment variable or registry setting to turn it on? How should the user control the size of the redzone (a feature Microsoft doesn't seem to offer)? For what it's worth, Windows seems to turn the debug heap on by default when running apps under a debugger, and lets you disable it by setting the environment variable _NO_DEBUG_HEAP=1. That makes me think we should turn this feature on automatically under warn+heap. For finer control, setting _NO_DEBUG_HEAP=1 would disable it, and setting WINE_HEAP_REDZONE would let you pick how big a redzone to use. (Usually 16 bytes is enough, but I've seen bugs that misses but 64 bytes catches.) - Dan

Nov. 19, 2009

Re: GdiplusAbort type needs to be translated from C++ to C

by Vincent Povirk

On Thu, Nov 19, 2009 at 11:05 AM, Frank Richter <frank.richter(a)gmail.com> wrote: >> Does this look correct? > > You forgot __stdcall on 'Abort' member of gpabort_vtable. WINAPI should be equivalent, but you're probably right. I should match the windows headers/documentation. -- Vincent Povirk

Nov. 19, 2009

Write-past-end in FileMonikerImpl_DecomposePath()

by Dan Kegel

http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/diff-hlink_hlink.txt http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/vg-hlink_hlink.txt shows a new error thanks to the heap tail check. Looks like a level-of-indirection-during-allocation error, 1039 strgtable = CoTaskMemAlloc(len*sizeof(WCHAR)); should be 1039 strgtable = CoTaskMemAlloc(len*sizeof(WCHAR *)); Ulrich, you were in there last, could you have a look? Invalid write of size 4 at FileMonikerImpl_DecomposePath (filemoniker.c:1056) by FileMonikerImpl_Construct (filemoniker.c:1375) by CreateFileMoniker (filemoniker.c:1443) by FileMoniker_CreateFromDisplayName (filemoniker.c:1484) by MkParseDisplayName (moniker.c:1130) by HlinkCreateFromString (hlink_main.c:124) by test_persist (hlink.c:479) by func_hlink (hlink.c:1122) by run_test (test.h:535) by main (test.h:585) Address 0x7f04416c is 4 bytes inside a block of size 6 alloc'd at notify_alloc (heap.c:279) by RtlAllocateHeap (heap.c:1521) by IMalloc_fnAlloc (ifs.c:186) by CoTaskMemAlloc (ifs.c:562) by FileMonikerImpl_DecomposePath (filemoniker.c:1039) by FileMonikerImpl_Construct (filemoniker.c:1375) by CreateFileMoniker (filemoniker.c:1443) by FileMoniker_CreateFromDisplayName (filemoniker.c:1484) by MkParseDisplayName (moniker.c:1130) by HlinkCreateFromString (hlink_main.c:124) by test_persist (hlink.c:479)

Nov. 19, 2009

msi regression in today's git

by Susan Cragin

Installed Dragon NaturallySpeaking using clean prefix and today's git. Instal went "without errors" but when I tried to open the program it said that the install hadn't completed correctly. Specifically, iexplore.exe was missing. I looked at the terminal output for the run but there wasn't anything interesting. Susan

Nov. 19, 2009

Re: GdiplusAbort type needs to be translated from C++ to C

by Frank Richter

On 19.11.2009 17:23, Vincent Povirk wrote: > The Windows SDK defines the following type: > > struct __declspec(novtable) GdiplusAbort > { > virtual HRESULT __stdcall Abort(void) = 0; > }; > > I don't think I can provide a proper C++ definition because the abi > depends on the compiler. Depends; with limitations this is possible. For cases like above - ie "interface" kind of structs with no members, only virtual methods and explicit calling convention specified - the resulting struct layout is the same between MSVC and g++ (at least on MinGW) and can be passed from binary code of one to another. If Linux g++ produces the same struct layout as it does on mingw it would be viable to keep the C++ version for, well, client sources written in C++. > Does this look correct? You forgot __stdcall on 'Abort' member of gpabort_vtable. -f.r.

Nov. 19, 2009

UMR in CRYPT_RemoveStringFromMultiString()

by Dan Kegel

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

Nov. 19, 2009

UMR in CertIsRDNAttrsInCertificateName()

by Dan Kegel

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

Nov. 19, 2009

GdiplusAbort type needs to be translated from C++ to C

by Vincent Povirk

The Windows SDK defines the following type: struct __declspec(novtable) GdiplusAbort { virtual HRESULT __stdcall Abort(void) = 0; }; I think that the following is a workable translation: diff --git a/include/gdiplustypes.h b/include/gdiplustypes.h index 4f97432..444123f 100644 --- a/include/gdiplustypes.h +++ b/include/gdiplustypes.h @@ -55,6 +55,18 @@ typedef BOOL (CALLBACK * ImageAbort)(VOID *); typedef ImageAbort DrawImageAbort; typedef ImageAbort GetThumbnailImageAbort; +struct GdiplusAbort; + +typedef struct gpabort_vtable +{ + HRESULT WINAPI (*Abort)(struct GdiplusAbort*); +} + +typedef struct GdiplusAbort +{ + struct gpabort_vtable *vtable_ptr; +} GdiplusAbort; + #ifdef __cplusplus } #endif I don't think I can provide a proper C++ definition because the abi depends on the compiler. Does this look correct? -- Vincent Povirk

Nov. 19, 2009

Re: Fedora users, please test mci patch about time-out/hanging machine

by Hin-Tak Leung

pulseaudio occasionally gets into a confusion by itself. I found I need to do pulseaudio --cleanup-shm from time to time. --- On Thu, 19/11/09, Joerg-Cyril.Hoehle(a)t-systems.com <Joerg-Cyril.Hoehle(a)t-systems.com> wrote: > Hi, > > Testhq.org results from 17th of November about winmm:mci > were striking: > All machines producing a timeout had "f11" in their name. > (Another day, some f11 machines passed the tests). > http://test.winehq.org/data/4990ca0ea342bd115a9a46047b3b2de599cb916e/index_… > > Please test whether the following patch correlates with > hanging machines. > Not checking waveoutwrite's return code for sure has the > potential to hang the > play loop, waiting for a buffer to come back that was never > sent out in case of error. > > But then, why did waveOutWrite fail? That's what I'd like > you to investigate. Why Fedora 11? > > Below patch only adds error reporting to the mciplay loop. > Feel free to add the same to the mcirecord loop. > > diff --git a/dlls/mciwave/mciwave.c > b/dlls/mciwave/mciwave.c > index cdf9146..fdb6b18 100644 > --- a/dlls/mciwave/mciwave.c > +++ b/dlls/mciwave/mciwave.c > @@ -882,6 +882,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID > wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, > > &waveHdr[whidx], waveHdr[whidx].dwBufferLength, > > waveHdr[whidx].dwBytesRecorded); > dwRet = waveOutWrite(wmw->hWave, > &waveHdr[whidx], sizeof(WAVEHDR)); > + if (dwRet) ERR("Write %d\n", dwRet); > left -= count; > wmw->dwPosition += count; > TRACE("after WODM_WRITE > dwPosition=%u\n", wmw->dwPosition); > @@ -893,7 +894,8 @@ static DWORD WAVE_mciPlay(MCIDEVICEID > wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, > WAVE_mciPlayWaitDone(wmw); /* to > balance first buffer */ > > /* just to get rid of some race > conditions between play, stop and pause */ > - waveOutReset(wmw->hWave); > + dwRet = waveOutReset(wmw->hWave); > + if (dwRet) ERR("Reset %d\n", dwRet); > > > waveOutUnprepareHeader(wmw->hWave, > &waveHdr[0], sizeof(WAVEHDR)); > > waveOutUnprepareHeader(wmw->hWave, > &waveHdr[1], sizeof(WAVEHDR)); > > A future patch will abort the loop in case of error. > However so far, when creating > situations that hung on my (non-Fedora) machine (cf. bug > #20664), the above ERR message > was never triggered. > So the cause of random mci time-out on test.winehq may as > well lay elsewhere. > > Thanks for your help, > Jörg Höhle > > >

Nov. 19, 2009

Re: Difficulties with Regression Testing

by James Mckenzie

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

Nov. 19, 2009

Re: Difficulties with Regression Testing

by Austin English

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. >>> 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. -- -Austin

Nov. 19, 2009

Re: Difficulties with Regression Testing

by James Mckenzie

>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

Nov. 19, 2009

Re: New valgrind results, this time with overrun checks and lots of new errors.

by Nikolay Sivov

Dan Kegel wrote: > http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/ > is the first full run with the heap tail check enabled. > So you use some private patches for that, why aren't they merged? > Here are the first few new problems it found. > > Somehow, it found a bunch of invalid reads in > http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/vg-advapi32_crypt.txt > all in a function called test_incorrect_api_usage(). > Offhand that seems like something to suppress. > > The invalid write I already posted about is in > http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/diff-advapi32_lsa.txt > http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/vg-advapi32_lsa.txt > > http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/diff-advpack_files.txt > http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/vg-advpack_files.txt > show an off-by-one buffer size issue (forgot to include space for nul char) > in advpack (fix should be easy, anybody can grab this): > Invalid write of size 2 > at strcpyW (unicode.h:224) > by lstrcpyW (string.c:104) > by AdvInstallFileW (files.c:283) > by AdvInstallFileA (files.c:216) > by test_AdvInstallFile (files.c:513) > Address 0x7f03d12e is 0 bytes after a block of size 30 alloc'd > at notify_alloc (heap.c:279) > by RtlAllocateHeap (heap.c:1521) > by AdvInstallFileW (files.c:282) > by AdvInstallFileA (files.c:216) > by test_AdvInstallFile (files.c:513) > > http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/diff-comctl32_tab.txt > http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/vg-comctl32_tab.txt > show a more inscrutable error: > Invalid write of size 4 > at TAB_SetCurSel (tab.c:255) > by TAB_WindowProc (tab.c:3367) > by ??? (library.h:159) > by call_window_proc (winproc.c:469) > by WINPROC_CallProcAtoW (winproc.c:1023) > by CallWindowProcA (winproc.c:2299) > by tabSubclassProcess (tab.c:404) > by ??? (library.h:159) > by call_window_proc (winproc.c:469) > by WINPROC_call_window (winproc.c:2223) > by call_window_proc (message.c:1635) > by send_message (message.c:2482) > by SendMessageA (message.c:2627) > by test_getters_setters (tab.c:752) > by func_tab (tab.c:1174) > by run_test (test.h:535) > by main (test.h:585) > Address 0x7f044098 is not stack'd, malloc'd or (recently) free'd > > Nikolay touched that code back in March, perhaps he should have a look. > Yeah, this one is pretty obvious, I'll send a patch for tomorrow commit set. > etc. etc. Lots of triage to do. It'd be nice if somebody could > volunteer to go through these, file bugs, and assign provision blame > using 'git blame'... > - Dan >

Nov. 19, 2009

Re: shell32: deal better with spaces in ASSOCSTR_COMMAND values

by Alexandre Julliard

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

Nov. 19, 2009

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

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

Nov. 19, 2009

Re: Difficulties with Regression Testing

by Austin English

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. > 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. -- -Austin

Nov. 19, 2009

New valgrind results, this time with overrun checks and lots of new errors.

by Dan Kegel

http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/ is the first full run with the heap tail check enabled. Here are the first few new problems it found. Somehow, it found a bunch of invalid reads in http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/vg-advapi32_crypt.txt all in a function called test_incorrect_api_usage(). Offhand that seems like something to suppress. The invalid write I already posted about is in http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/diff-advapi32_lsa.txt http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/vg-advapi32_lsa.txt http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/diff-advpack_files.txt http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/vg-advpack_files.txt show an off-by-one buffer size issue (forgot to include space for nul char) in advpack (fix should be easy, anybody can grab this): Invalid write of size 2 at strcpyW (unicode.h:224) by lstrcpyW (string.c:104) by AdvInstallFileW (files.c:283) by AdvInstallFileA (files.c:216) by test_AdvInstallFile (files.c:513) Address 0x7f03d12e is 0 bytes after a block of size 30 alloc'd at notify_alloc (heap.c:279) by RtlAllocateHeap (heap.c:1521) by AdvInstallFileW (files.c:282) by AdvInstallFileA (files.c:216) by test_AdvInstallFile (files.c:513) http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/diff-comctl32_tab.txt http://kegel.com/wine/valgrind/logs/2009-11-18-21.51/vg-comctl32_tab.txt show a more inscrutable error: Invalid write of size 4 at TAB_SetCurSel (tab.c:255) by TAB_WindowProc (tab.c:3367) by ??? (library.h:159) by call_window_proc (winproc.c:469) by WINPROC_CallProcAtoW (winproc.c:1023) by CallWindowProcA (winproc.c:2299) by tabSubclassProcess (tab.c:404) by ??? (library.h:159) by call_window_proc (winproc.c:469) by WINPROC_call_window (winproc.c:2223) by call_window_proc (message.c:1635) by send_message (message.c:2482) by SendMessageA (message.c:2627) by test_getters_setters (tab.c:752) by func_tab (tab.c:1174) by run_test (test.h:535) by main (test.h:585) Address 0x7f044098 is not stack'd, malloc'd or (recently) free'd Nikolay touched that code back in March, perhaps he should have a look. etc. etc. Lots of triage to do. It'd be nice if somebody could volunteer to go through these, file bugs, and assign provision blame using 'git blame'... - Dan

Nov. 19, 2009

Re: Wine Icons - final round

by Reece Dunn

2009/11/18 Joel Holdsworth <joel(a)airwebreathe.org.uk>: > Hi All, > > 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. Very nice! My only comment is that the monitor for mycomputer.ico in the large icon looks distorted; the borders look fuzzy as well (top left, especially the outer line, and mid right - just below the dark blue curve). - Reece

Nov. 19, 2009

Difficulties with Regression Testing

by James Mckenzie

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.

Nov. 19, 2009

Re: Problem to download git

by James Mckenzie

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

Nov. 19, 2009

Re: Problem to download git

by James Mckenzie

>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

Nov. 19, 2009

Re: Wine Icons - final round

by André Hentschel

Joel Holdsworth schrieb: > 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. I love it! The only thing disturbing is that wineglass of notepad is on the left, where all others are on the right. Winecfg and Winetest have centered/left glasses, which is ok as they are "special cases". I think we already had that discussion, but i cant remember the end of it. -- Best Regards, André Hentschel

Nov. 19, 2009

Re: shell32/tests: Remove atime tests in ITEMIDLIST_format test.

by Paul Vriens

On 11/19/2009 01:23 PM, Austin Lund wrote: > - ok (pFileStructA->uFileDate == pFileStructW->uDate2&& > - pFileStructA->uFileTime == pFileStructW->uTime2, > - "Last write time should match last access time!\n"); > - Hi Austin, Is there no other way to get around this? I think it's a bit of a shame having tests removed for that odd system that has a FAT filesystem on a NT4+ box. -- Cheers, Paul.

Nov. 19, 2009

Re: [PATCH 4/5] comctl32/tests: Add further tests for IImageList

by Nikolay Sivov

Owen Rudge wrote: >> Owen, also please use more reasonable names for particular tests - >> dotest means nothing. > > I agree that the test names are not particularly descriptive. However, > I chose those names to indicate that the tests match the existing > DoTest functions. Perhaps both sets of functions should ideally given > more descriptive names. > Sure. Also existing DoTest could be merged to a single function maybe, so some simplification could be done here. > Cheers, > > Owen > > >

Nov. 19, 2009

Re: Test for Bug 4543: Testers needed

by Dmitry Timoshkov

"Charles Davis" <cdavis(a)mymail.mines.edu> wrote: >>>> Why don't you use the same way of comparing EMFs as other tests do, >>>> compare_emf_bits()/dump_emf_bits()/dump_emf_records()? >>>> >>> Because I didn't look. I guess I'll rewrite the tests to use these >>> functions. >> OK, here's a version that uses the same method of comparing EMFs as the >> other tests. It passes on Wine (at least on my system). >> >> Chip >> > Sorry, that last version had some issues. Here's one that fixes them. I fail to see an improvement. -- Dmitry.

Nov. 19, 2009

Re: Fedora users, please test mci patch about time-out/hanging machine

by Michael Stefaniuc

Hello! Joerg-Cyril.Hoehle(a)t-systems.com wrote: > Testhq.org results from 17th of November about winmm:mci were striking: > All machines producing a timeout had "f11" in their name. > (Another day, some f11 machines passed the tests). > http://test.winehq.org/data/4990ca0ea342bd115a9a46047b3b2de599cb916e/index_… > > Please test whether the following patch correlates with hanging machines. > Not checking waveoutwrite's return code for sure has the potential to hang the > play loop, waiting for a buffer to come back that was never sent out in case of error. > > But then, why did waveOutWrite fail? That's what I'd like you to investigate. Why Fedora 11? > > Below patch only adds error reporting to the mciplay loop. Feel free to add the same to the mcirecord loop. > > diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c > index cdf9146..fdb6b18 100644 > --- a/dlls/mciwave/mciwave.c > +++ b/dlls/mciwave/mciwave.c > @@ -882,6 +882,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, > &waveHdr[whidx], waveHdr[whidx].dwBufferLength, > waveHdr[whidx].dwBytesRecorded); > dwRet = waveOutWrite(wmw->hWave, &waveHdr[whidx], sizeof(WAVEHDR)); > + if (dwRet) ERR("Write %d\n", dwRet); > left -= count; > wmw->dwPosition += count; > TRACE("after WODM_WRITE dwPosition=%u\n", wmw->dwPosition); > @@ -893,7 +894,8 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, > WAVE_mciPlayWaitDone(wmw); /* to balance first buffer */ > > /* just to get rid of some race conditions between play, stop and pause */ > - waveOutReset(wmw->hWave); > + dwRet = waveOutReset(wmw->hWave); > + if (dwRet) ERR("Reset %d\n", dwRet); > > waveOutUnprepareHeader(wmw->hWave, &waveHdr[0], sizeof(WAVEHDR)); > waveOutUnprepareHeader(wmw->hWave, &waveHdr[1], sizeof(WAVEHDR)); > > A future patch will abort the loop in case of error. However so far, when creating > situations that hung on my (non-Fedora) machine (cf. bug #20664), the above ERR message > was never triggered. > So the cause of random mci time-out on test.winehq may as well lay elsewhere. Like in PulseAudio? That may well be. PA in F11 made sound be more broken in Wine. bye michael

Nov. 19, 2009

Fedora users, please test mci patch about time-out/hanging machine

by Joerg-Cyril.Hoehle＠t-systems.com

Hi, Testhq.org results from 17th of November about winmm:mci were striking: All machines producing a timeout had "f11" in their name. (Another day, some f11 machines passed the tests). http://test.winehq.org/data/4990ca0ea342bd115a9a46047b3b2de599cb916e/index_… Please test whether the following patch correlates with hanging machines. Not checking waveoutwrite's return code for sure has the potential to hang the play loop, waiting for a buffer to come back that was never sent out in case of error. But then, why did waveOutWrite fail? That's what I'd like you to investigate. Why Fedora 11? Below patch only adds error reporting to the mciplay loop. Feel free to add the same to the mcirecord loop. diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index cdf9146..fdb6b18 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -882,6 +882,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, &waveHdr[whidx], waveHdr[whidx].dwBufferLength, waveHdr[whidx].dwBytesRecorded); dwRet = waveOutWrite(wmw->hWave, &waveHdr[whidx], sizeof(WAVEHDR)); + if (dwRet) ERR("Write %d\n", dwRet); left -= count; wmw->dwPosition += count; TRACE("after WODM_WRITE dwPosition=%u\n", wmw->dwPosition); @@ -893,7 +894,8 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, WAVE_mciPlayWaitDone(wmw); /* to balance first buffer */ /* just to get rid of some race conditions between play, stop and pause */ - waveOutReset(wmw->hWave); + dwRet = waveOutReset(wmw->hWave); + if (dwRet) ERR("Reset %d\n", dwRet); waveOutUnprepareHeader(wmw->hWave, &waveHdr[0], sizeof(WAVEHDR)); waveOutUnprepareHeader(wmw->hWave, &waveHdr[1], sizeof(WAVEHDR)); A future patch will abort the loop in case of error. However so far, when creating situations that hung on my (non-Fedora) machine (cf. bug #20664), the above ERR message was never triggered. So the cause of random mci time-out on test.winehq may as well lay elsewhere. Thanks for your help, Jörg Höhle

Nov. 19, 2009

Re: Wineconf?

by Austin English

On Thu, Nov 19, 2009 at 1:50 AM, Tom Wickline <twickline(a)gmail.com> wrote: > > > On Thu, Nov 19, 2009 at 3:44 PM, Austin English <austinenglish(a)gmail.com> > wrote: >> >> On Thu, Nov 19, 2009 at 1:39 AM, Tom Wickline <twickline(a)gmail.com> wrote: >> > On Thu, Nov 19, 2009 at 3:21 PM, Austin English >> > <austinenglish(a)gmail.com> >> > wrote: >> >> >> >> On Wed, Nov 18, 2009 at 4:18 AM, Tom Wickline <twickline(a)gmail.com> >> >> wrote: >> >> > Scott posted about Wineconf 2009 on his blog :) >> >> > I have shamelessly reposted it to my site with a link back to his >> >> > original >> >> > post. >> >> > >> >> > A brief summary of Wineconf 2009 by Scott Ritchie : >> >> > >> >> > >> >> > >> >> > http://www.wine-reviews.net/wine-reviews/news/a-brief-summary-of-wineconf-2… >> >> >> >> Very good summary, but it was missing a bit, at least, I noticed the >> >> CxTest presentation was missing (and my impromptu talk about >> >> Appinstall). I wasn't too worried about bringing it up, but with the >> >> big push to do more gui testing, figured it should be mentioned... >> >> >> >> -- >> >> -Austin >> > >> > >> > Can you write up a summery of what you think is missing?, the CxTest >> > presentation >> > and your presentation / talk about Appinstall isn't on the wiki page as >> > well. What other presentations >> > were given? and the speaker? anyone have any PPT slides or PDF files >> > they >> > want to share? >> >> The CxTest presentation was pretty neat, with PPT slides and >> everything, whereas mine was quite impromptu...to be honest, it was >> mostly http://wiki.winehq.org/Appinstall_Testing repeated from memory. >> There was some discussion afterward about how to leverage it for >> greater regression prevention and adding more tests, but not anything >> groundbreaking. >> >> > I can edit my post and revise it with the new information, so others who >> > couldn't make it to the >> > conference can know more about what actually took place at Wineconf 2009 >> >> Would probably be better to watch those videos that were recorded for >> parts of it (or were they usable?). >> >> -- >> -Austin > > Videos would be nice, do you know how we can contact the person who recorded > them and ask them to put > them up on youtube or have a mp4 download hosted somewhere? I believe Roderick and/or Julius were in charge of that, or would at least know the right person to ask. -- -Austin

Nov. 19, 2009

Re: switching to redmine?

by Kai Blin

On Thursday 19 November 2009 06:39:27 Dan Kegel wrote: > I'm highly skeptical of these newfangled wiki+bugzilla+scm+mailinglist > thingies. It's really hard to do all those jobs well. I think that was the general consensus on this suggestion. Most developers don't seem to think the current set-up is broken enough to make this change worth all the trouble it'll cause. IIRC Scott decided to go and give it a try anyway, so at least one of us could have an informed opinion. Cheers, Kai -- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin Samba team member http://www.samba.org/samba/team/ -- Will code for cotton.

Nov. 19, 2009

Re: Wineconf?

by Tom Wickline

On Thu, Nov 19, 2009 at 3:44 PM, Austin English <austinenglish(a)gmail.com>wrote: > On Thu, Nov 19, 2009 at 1:39 AM, Tom Wickline <twickline(a)gmail.com> wrote: > > On Thu, Nov 19, 2009 at 3:21 PM, Austin English <austinenglish(a)gmail.com > > > > wrote: > >> > >> On Wed, Nov 18, 2009 at 4:18 AM, Tom Wickline <twickline(a)gmail.com> > wrote: > >> > Scott posted about Wineconf 2009 on his blog :) > >> > I have shamelessly reposted it to my site with a link back to his > >> > original > >> > post. > >> > > >> > A brief summary of Wineconf 2009 by Scott Ritchie : > >> > > >> > > >> > > http://www.wine-reviews.net/wine-reviews/news/a-brief-summary-of-wineconf-2… > >> > >> Very good summary, but it was missing a bit, at least, I noticed the > >> CxTest presentation was missing (and my impromptu talk about > >> Appinstall). I wasn't too worried about bringing it up, but with the > >> big push to do more gui testing, figured it should be mentioned... > >> > >> -- > >> -Austin > > > > > > Can you write up a summery of what you think is missing?, the CxTest > > presentation > > and your presentation / talk about Appinstall isn't on the wiki page as > > well. What other presentations > > were given? and the speaker? anyone have any PPT slides or PDF files they > > want to share? > > The CxTest presentation was pretty neat, with PPT slides and > everything, whereas mine was quite impromptu...to be honest, it was > mostly http://wiki.winehq.org/Appinstall_Testing repeated from memory. > There was some discussion afterward about how to leverage it for > greater regression prevention and adding more tests, but not anything > groundbreaking. > > > I can edit my post and revise it with the new information, so others who > > couldn't make it to the > > conference can know more about what actually took place at Wineconf 2009 > > Would probably be better to watch those videos that were recorded for > parts of it (or were they usable?). > > -- > -Austin > Videos would be nice, do you know how we can contact the person who recorded them and ask them to put them up on youtube or have a mp4 download hosted somewhere? -- Tom

Nov. 19, 2009

Re: switching to redmine?

by Luke Benstead

2009/11/19 Dan Kegel <dank(a)kegel.com>: > 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 > > > You might well be pleasantly surprised. We've been using Redmine where I work for about 6-8 months and I'm really impressed with it, I'd definitely say it was better than Google Code, Trac and SF. The Redmine website is actually a Redmine tracker ( http://www.redmine.org/projects/redmine ) so you can get a fair idea how it works. I don't think it's set in stone that we're switching to Redmine, I think Scott's just setting it up as an experiment to get feedback. Luke.

Nov. 19, 2009

Re: Wineconf?

by Austin English

On Thu, Nov 19, 2009 at 1:39 AM, Tom Wickline <twickline(a)gmail.com> wrote: > On Thu, Nov 19, 2009 at 3:21 PM, Austin English <austinenglish(a)gmail.com> > wrote: >> >> On Wed, Nov 18, 2009 at 4:18 AM, Tom Wickline <twickline(a)gmail.com> wrote: >> > Scott posted about Wineconf 2009 on his blog :) >> > I have shamelessly reposted it to my site with a link back to his >> > original >> > post. >> > >> > A brief summary of Wineconf 2009 by Scott Ritchie : >> > >> > >> > http://www.wine-reviews.net/wine-reviews/news/a-brief-summary-of-wineconf-2… >> >> Very good summary, but it was missing a bit, at least, I noticed the >> CxTest presentation was missing (and my impromptu talk about >> Appinstall). I wasn't too worried about bringing it up, but with the >> big push to do more gui testing, figured it should be mentioned... >> >> -- >> -Austin > > > Can you write up a summery of what you think is missing?, the CxTest > presentation > and your presentation / talk about Appinstall isn't on the wiki page as > well. What other presentations > were given? and the speaker? anyone have any PPT slides or PDF files they > want to share? The CxTest presentation was pretty neat, with PPT slides and everything, whereas mine was quite impromptu...to be honest, it was mostly http://wiki.winehq.org/Appinstall_Testing repeated from memory. There was some discussion afterward about how to leverage it for greater regression prevention and adding more tests, but not anything groundbreaking. > I can edit my post and revise it with the new information, so others who > couldn't make it to the > conference can know more about what actually took place at Wineconf 2009 Would probably be better to watch those videos that were recorded for parts of it (or were they usable?). -- -Austin

Nov. 19, 2009

Re: Wineconf?

by Tom Wickline

On Thu, Nov 19, 2009 at 3:21 PM, Austin English <austinenglish(a)gmail.com>wrote: > On Wed, Nov 18, 2009 at 4:18 AM, Tom Wickline <twickline(a)gmail.com> wrote: > > Scott posted about Wineconf 2009 on his blog :) > > I have shamelessly reposted it to my site with a link back to his > original > > post. > > > > A brief summary of Wineconf 2009 by Scott Ritchie : > > > > > http://www.wine-reviews.net/wine-reviews/news/a-brief-summary-of-wineconf-2… > > Very good summary, but it was missing a bit, at least, I noticed the > CxTest presentation was missing (and my impromptu talk about > Appinstall). I wasn't too worried about bringing it up, but with the > big push to do more gui testing, figured it should be mentioned... > > -- > -Austin > Can you write up a summery of what you think is missing?, the CxTest presentation and your presentation / talk about Appinstall isn't on the wiki page as well. What other presentations were given? and the speaker? anyone have any PPT slides or PDF files they want to share? I can edit my post and revise it with the new information, so others who couldn't make it to the conference can know more about what actually took place at Wineconf 2009 Thanks! Tom

Nov. 19, 2009

Re: Wineconf?

by Austin English

On Wed, Nov 18, 2009 at 4:18 AM, Tom Wickline <twickline(a)gmail.com> wrote: > Scott posted about Wineconf 2009 on his blog :) > I have shamelessly reposted it to my site with a link back to his original > post. > > A brief summary of Wineconf 2009 by Scott Ritchie : > > http://www.wine-reviews.net/wine-reviews/news/a-brief-summary-of-wineconf-2… Very good summary, but it was missing a bit, at least, I noticed the CxTest presentation was missing (and my impromptu talk about Appinstall). I wasn't too worried about bringing it up, but with the big push to do more gui testing, figured it should be mentioned... -- -Austin

Nov. 19, 2009

Buffer overrun in LsaLookupNames2() found with valgrind+wine+new heap patch

by Dan Kegel

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

Nov. 19, 2009

switching to redmine?

by Dan Kegel

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

Nov. 18, 2009

Re: Problem to download git

by John Klehm

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.

Nov. 18, 2009

re: Problem to download git

by Dan Kegel

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

Nov. 18, 2009

Re: Problem to download git

by Juan Lang

> error: Unable to get pack file http://source.winehq.org/git/wine.git/objects/pack/pack-7c2ab792c6e1c8f603b… 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. --Juan

Nov. 18, 2009