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

X11DRV_XRandR_Cleanup() is not used

by Francois Gouget

dlls/x11drv/xrandr.c defines a X11DRV_XRandR_Cleanup() function but it is not actually used anywhere. If I remember correctly past wine-devel emails, restoring the right XRandR mode when an application exits can be tricky (especially in case of a crash). So maybe this is why the function is not called, though I'm not sure it's even related. So my question is: should this function be removed? Or should I simply send a patch calling it from x11drv_main.c:process_detach(), enclosed with the appropriate SONAME_LIBXRANDR? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Good judgment comes from experience, and experience comes from bad judgment -- Barry LePatner

Feb. 4, 2009

Re: Fixing AppDB once and for all

by Zachary Goldberg

If you have interest in the future of the AppDB please make sure your ideas are in or referenced by the agenda on the wiki. I think things will go much smoother if we discuss line items from the agenda one by one rather than a random chaos. http://wiki.winehq.org/AppDBUpgrades

Feb. 4, 2009

Re: [2/3] Add initial "write text" support for VGA graphic modes. Requires mode info unify patch

by Alexandre Julliard

Jeremiah Flerchinger <jeremiah.flerchinger(a)gmail.com> writes: > else > { > - FIXME("Write %c at (%i,%i) - not yet supported in graphic modes.\n", (char)ascii, x, y); > + dat = vga_fb_window_data; > + /* get attribute values */ > + fgColor = attr & 0x0F; > + bgColor = (attr & 0x70)>>4; > + /* Create DC to draw font on */ > + hDC = CreateCompatibleDC(NULL); > + if (hDC == 0) > + { > + ERR("CreateCompatibleDC FAILED. \n"); > + } > + /* Create bitmap to draw font on > + * define bitmap info {size, width, height, planes, bits, compression, sizeimage} > + * origin defaults to top left. negative height makes origin at bottom left. > + */ > + hTempBmp = CreateDIBSection( hDC, &bmi, DIB_RGB_COLORS, (void**)&pSrcData, NULL, 0 ); > + if (hTempBmp == NULL) > + { > + ERR("CreateDIBSection FAILED. \n"); > + } You should actually handle the errors, not just print an ERR and go on using invalid data. > + /* get a font compatable to old IBM ROM (IBM extended character set) */ > + IBM_hFont = (HFONT) GetStockObject( OEM_FIXED_FONT ); > + GetObjectA ( IBM_hFont, sizeof(LOGFONTA), & IBM_lFont ); > + /* scale character & set attributes - FIXME tweak or make better font for smaller sizes */ > + IBM_lFont.lfWidth = ModeInfo->CharWidth; > + IBM_lFont.lfHeight = ModeInfo->CharHeight; > + /* create new font with desired properties */ > + ModIBM_hFont = CreateFontIndirectA ( & IBM_lFont ); > + if (ModIBM_hFont == NULL) > + { > + ERR("CreateFontIndirectA FAILED. \n"); > + } > + SelectObject(hDC, hTempBmp); > + SelectObject(hDC, ModIBM_hFont); > + SetTextColor(hDC, fgColor<<16); /* set text color 0x00bbggrr */ > + SetBkColor(hDC, bgColor<<16); /* set text color 0x00bbggrr */ > + /* define where char is drawn on bitmap */ > + rect.left = 0; > + rect.top = 0; > + rect.bottom = ModeInfo->CharHeight-1; > + rect.right = ModeInfo->CharWidth-1; > + /* draw char onto temporary bitmap */ > + DrawTextHeight = DrawTextA(hDC, (char *)&ascii, 1, &rect, DT_LEFT); > + if (DrawTextHeight == 0) > + { > + ERR("DrawTextA FAILED. \n"); > + } > + /* translate from TextRow & TextCol to PixelRow & PixelCol */ > + x = x * ModeInfo->CharWidth; > + y = y * ModeInfo->CharHeight; > + /* translate & copy char into display buffer */ > + for (ih = 0; ih < ModeInfo->CharHeight; ih = ih+1) Please cut down on the number of comments, there's no need to explain what each line of code is doing, that's adding more noise than information. -- Alexandre Julliard julliard(a)winehq.org

Feb. 4, 2009

Re: comctl32: Save and restore colours when adding masked images

by Peter Urbanec

Hans Leidekker wrote: > Some lines in this patch were wrapped, please attach it like you do in > your other mails. Hans, thanks for alerting me to the problem. I resent the patch as an attachment - hopefully all is well now. Best regards, Peter Urbanec

Feb. 4, 2009

Re: comctl32: Save and restore colours when adding masked images

by Hans Leidekker

Hi Peter, > This patch will save and restore the colours when adding a masked image > to ImageList. Some lines in this patch were wrapped, please attach it like you do in your other mails. -Hans

Feb. 4, 2009

Re: mshtml: Implement IHTMLStyle_put_backgroundColor

by ricardo_barbano＠hotmail.com

hi alistair, you say it implements the put method but the patch has only the get method... typo? regards, ricardo -------------------------------------------------- From: "Alistair Leslie-Hughes" <leslie_alistair(a)hotmail.com> Sent: Wednesday, February 04, 2009 5:02 AM To: <wine-patches(a)winehq.org> Subject: mshtml: Implement IHTMLStyle_put_backgroundColor > Hi, > > Changelog: > mshtml: Implement IHTMLStyle_put_backgroundColor > > Best Regards > Alistair Leslie-Hughes > > > > > From fde0238571c3eca78527600d846ff88add6510b0 Mon Sep 17 00:00:00 2001 > From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > Date: Wed, 4 Feb 2009 16:01:05 +1100 > Subject: [PATCH] Implement IHTMLStyle_put_backgroundColor > To: wine-patches <wine-patches(a)winehq.org> > > --- > dlls/mshtml/htmlstyle.c | 6 ++++-- > dlls/mshtml/tests/dom.c | 6 ++++++ > 2 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c > index ad9d095..4964c10 100644 > --- a/dlls/mshtml/htmlstyle.c > +++ b/dlls/mshtml/htmlstyle.c > @@ -743,8 +743,10 @@ static HRESULT WINAPI > HTMLStyle_put_backgroundColor(IHTMLStyle *iface, VARIANT v > static HRESULT WINAPI HTMLStyle_get_backgroundColor(IHTMLStyle *iface, > VARIANT *p) > { > HTMLStyle *This = HTMLSTYLE_THIS(iface); > - FIXME("(%p)->(%p)\n", This, p); > - return E_NOTIMPL; > + TRACE("(%p)->(%p)\n", This, p); > + > + V_VT(p) = VT_BSTR; > + return get_style_attr(This, STYLEID_BACKGROUND_COLOR, &V_BSTR(p)); > } > > static HRESULT WINAPI HTMLStyle_put_backgroundImage(IHTMLStyle *iface, > BSTR v) > diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c > index 62a07bc..77075fb 100644 > --- a/dlls/mshtml/tests/dom.c > +++ b/dlls/mshtml/tests/dom.c > @@ -2906,6 +2906,12 @@ static void test_default_style(IHTMLStyle *style) > test_border_styles(style, str); > SysFreeString(str); > > + hres = IHTMLStyle_get_backgroundColor(style, &v); > + ok(hres == S_OK, "get_backgroundColor: %08x\n", hres); > + ok(V_VT(&v) == VT_BSTR, "type failed: %d\n", V_VT(&v)); > + ok(!V_BSTR(&v), "str=%s\n", dbgstr_w(V_BSTR(&v))); > + VariantClear(&v); > + > hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, > (void**)&style2); > ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); > if(SUCCEEDED(hres)) { > -- > 1.5.4.3 > > > >

Feb. 4, 2009

Need help for D3DXComputeSphereBounding

by paulo lesgaz

Hello, I am trying to implement D3DXComputerSphereBounding. The attached test cases success with a native d3dx9 but fail with a native d3dx8. Can anyone could explain why? Thanks in advance

Feb. 4, 2009

Happy user says: "You’ve done the impossible, and it is good."

by Dan Kegel

A user is declaring that Wine has succeeded: http://loobin.wordpress.com/2009/01/13/wine-ascendant/ http://loobin.wordpress.com/2009/02/03/wine-going-production/

Feb. 4, 2009

Re: MSVCRT: Still problems in ASCII Mode

by Dan Kegel

Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> wrote: > Appended a changed test case, writing one single line. It starts to fail > when the file, including CR and LF gets bigger then 512 bytes. This hits > probably > /* in text mode, strip \r if followed by \n. > * BUG: should save state across calls somehow, so CR LF that > * straddles buffer boundary gets recognized properly? > */ So it turns out all 'a' obscures the problem. Here's a better test case. We're seeking to one byte too far in the file, and in this test, the last 510 bytes returned are off by one.

Feb. 4, 2009

Re: MSVCRT: Still problems in ASCII Mode

by Uwe Bonnes

>>>>> "Dan" == Dan Kegel <dank(a)kegel.com> writes: Dan> Thanks. Please don't use rand() in testcases, though. Would a Dan> constant 'a' suffice in this case? Dan> Which app did you find this in, btw? It the application that can be downloaded for free after registration on http://forms.analog.com/form_pages/rfcomms/adisimpll.asp?ref=ASC-PR-067 running the tutorial Appended a changed test case, writing one single line. It starts to fail when the file, including CR and LF gets bigger then 512 bytes. This hits probably /* in text mode, strip \r if followed by \n. * BUG: should save state across calls somehow, so CR LF that * straddles buffer boundary gets recognized properly? */ It is not clear, if this is the real cause for the simpll.exe failure. Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ---------- diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 9032e51..cd377af 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -306,7 +306,7 @@ static void test_asciimode(void) { FILE *fp; char buf[64]; - int c, i, j; + int c, i, j, done, count1, count2; /* Simple test of CR CR LF handling. Test both fgets and fread code paths, they're different! */ fp = fopen("ascii.tst", "wb"); @@ -372,6 +372,44 @@ static void test_asciimode(void) ok((c = fgetc(fp)) == '1', "fgetc fails to read next char when positioned on \\r\n"); fclose(fp); + fp= fopen("ascii.tst","wb"); + for (i=0; i<511; i++) + { + fputc('a', fp); + } + fputs("\r\n", fp); + fclose(fp); + + done = 0; + count1 = 0; + + fp = fopen("ascii.tst", "r"); + while (!done) + { + c= fgetc(fp); + if (c == EOF) + done = 1; + else if (isgraph(c)) + count1 ++; + } + fclose(fp); + + done = 0; + count2 = 0; + + fp = fopen("ascii.tst", "r"); + while (!done) + { + c= fgetc(fp); + fseek(fp, 0, SEEK_CUR); + if (c == EOF) + done = 1; + else if (isgraph(c)) + count2 ++; + } + fclose(fp); + todo_wine ok((count1 == count2), "fseek caused short read %d vs %d\n", count2, count1); + unlink("ascii.tst"); }

Feb. 3, 2009