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

Re: [PATCH] cryptui: check NULL ptr differently (Coverity)
by Paul Vriens 05 Feb '09

05 Feb '09

Marcus Meissner wrote: > Hi, > > CID 829, cryptui fails to handle data being NULL > correctly after the if (data) branch. > > Since it is a allocation error, just return on failure. > > Ciao, Marcus > --- > dlls/cryptui/main.c | 35 +++++++++++++++++------------------ > 1 files changed, 17 insertions(+), 18 deletions(-) > > diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c > index 498c158..1fe2ed0 100644 > --- a/dlls/cryptui/main.c > +++ b/dlls/cryptui/main.c > @@ -1076,25 +1076,24 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, > HWND tab = GetDlgItem(hwnd, IDC_MGR_STORES); > > data = HeapAlloc(GetProcessHeap(), 0, sizeof(struct CertMgrData)); > - if (data) > + if (!data) > + return 0; > + data->imageList = ImageList_Create(16, 16, ILC_COLOR4 | ILC_MASK, 2, 0); > + if (data->imageList) > { > - data->imageList = ImageList_Create(16, 16, ILC_COLOR4 | ILC_MASK, > - 2, 0); > - if (data->imageList) > - { > - HBITMAP bmp; > - COLORREF backColor = RGB(255, 0, 255); > + HBITMAP bmp; > + COLORREF backColor = RGB(255, 0, 255); > + > + bmp = LoadBitmapW(hInstance, MAKEINTRESOURCEW(IDB_SMALL_ICONS)); > + ImageList_AddMasked(data->imageList, bmp, backColor); > + DeleteObject(bmp); > + ImageList_SetBkColor(data->imageList, CLR_NONE); > + SendMessageW(GetDlgItem(hwnd, IDC_MGR_CERTS), LVM_SETIMAGELIST, > + LVSIL_SMALL, (LPARAM)data->imageList); > + } > + SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); > + data->title = pCryptUICertMgr->pwszTitle; > > - bmp = LoadBitmapW(hInstance, MAKEINTRESOURCEW(IDB_SMALL_ICONS)); > - ImageList_AddMasked(data->imageList, bmp, backColor); > - DeleteObject(bmp); > - ImageList_SetBkColor(data->imageList, CLR_NONE); > - SendMessageW(GetDlgItem(hwnd, IDC_MGR_CERTS), LVM_SETIMAGELIST, > - LVSIL_SMALL, (LPARAM)data->imageList); > - } > - SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); > - data->title = pCryptUICertMgr->pwszTitle; > - } > initialize_purpose_selection(hwnd); > add_cert_columns(hwnd); > if (pCryptUICertMgr->pwszTitle) You are mixing tabs and spaces in this one. -- Cheers, Paul.

1 0

Quick and dirty testcases for MS-DOS API?
by Dan Kegel 04 Feb '09

04 Feb '09

Looking at http://bugs.winehq.org/show_bug.cgi?id=17181 I get a feeling that we really need some testcases to verify we conform to the 16 bit MS-DOS API. Yeah, even though 16 bit is on the way out, there's still some use for a few win16 programs, and they use MS-DOS for file I/O. We could merge in http://win16test.googlecode.com, but that requires the Watcom C compiler, and "apt-cache search watcom" still comes up empty (unless you're on Ark Linux, see http://www.openwatcom.org/index.php/Installing_Open_Watcom_on_Linux ) And the Linux build had problems building DOS apps last time I tried anyway. But "apt-get install nasm" works great, so let's use it to run just a few crucial testcases, in particular, the one that keeps DOS apps from recursively deleting directories. What I'm thinking is to add a configure check for nasm. If it's present, and the target is 32 bit Intel, dlls/winedos/tests would use it to assemble a few simple assembly testcases. The test cases would be run from a normal test case (so no deep integration), and only when running on a machine capable of running 16 bit code. I'll probably have an include file for routines to print PASS and FAIL, but otherwise it'll be very, very bare bones. 'Course, I have no idea when I'll have time to do this, but I imagine it won't be too complicated. It wouldn't bother me at all if somebody beat me to it. - Dan

7 13

Re: [PATCH] mshtml: fixed second buffer argument to MultiByteToWideChar
by Austin English 04 Feb '09

04 Feb '09

On Wed, Feb 4, 2009 at 2:11 PM, Marcus Meissner <marcus(a)jet.franken.de> wrote: > Hi, > > Targetbuffer length must not be -1. > > Ciao, Marcus > --- > dlls/mshtml/editor.c | 2 +- > dlls/mshtml/navigate.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c > index 7cbdf2e..e92cf96 100644 > --- a/dlls/mshtml/editor.c > +++ b/dlls/mshtml/editor.c > @@ -588,7 +588,7 @@ static HRESULT exec_fontname(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, > > len = MultiByteToWideChar(CP_ACP, 0, stra, -1, NULL, 0); > strw = heap_alloc(len*sizeof(WCHAR)); > - MultiByteToWideChar(CP_ACP, 0, stra, -1, strw, -1); > + MultiByteToWideChar(CP_ACP, 0, stra, -1, strw, len); > nsfree(stra); > > V_BSTR(out) = SysAllocString(strw); > diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c > index 188cdd7..6e41699 100644 > --- a/dlls/mshtml/navigate.c > +++ b/dlls/mshtml/navigate.c > @@ -657,7 +657,7 @@ static void parse_post_data(nsIInputStream *post_data_stream, LPWSTR *headers_re > else > headers = heap_alloc((len+1)*sizeof(WCHAR)); > > - len = MultiByteToWideChar(CP_ACP, 0, ptr2, ptr-ptr2, headers+headers_len, -1); > + len = MultiByteToWideChar(CP_ACP, 0, ptr2, ptr-ptr2, headers+headers_len, len); > headers_len += len; > > ptr2 = ptr; > -- > 1.5.6 > > > Are these coverity fixes? -- -Austin

2 1

Re: mshtml: Implement IHTMLStyle_put_backgroundColor
by Alistair Leslie-Hughes 04 Feb '09

04 Feb '09

Hi Ricardo, > hi alistair, > you say it implements the put method but the patch has only the get > method... typo? > Thanks for picking this up. It's a typo, Ill resend shortly. Best Regards Alistair Leslie-Hughes

1 0

Re: [PATCH] mshtml: call install_cab_file() with name directly on non-Wine
by Steven Edwards 04 Feb '09

04 Feb '09

On Wed, Feb 4, 2009 at 1:11 PM, Marcus Meissner <marcus(a)jet.franken.de> wrote: > Hi, > > A ReactOS developer told me that if the wine_get_dos_file_name() does > not return a function, we should just pass in the current filename > to install_cab_file. > > So I coded it, but the non-UNIX path is untested. > <snip> > Wonder why he does not send a patch himself. Heh maybe his Julliard ranking is not high enough. ;) > + } else { /* ReactOS mode. */ Maybe this should say Windows mode or Mingw mode. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

1 0

messagemode named pipes investigation: blocking-reads block writers indefinitely
by Luke Kenneth Casson Leighton 04 Feb '09

04 Feb '09

fascinatingly strange observation came out of writing the latest test (threadwrites) to do namedpipe interoperability testing. main process: blocking-read on namedpipe. 5 threads: write to same named pipe the writes NEVER return (this is with xp). so that WOULD indicate that there IS a per-pipe mutex (and that there are bugs in nt!) l.

1 1

X11DRV_XRandR_Cleanup() is not used
by Francois Gouget 04 Feb '09

04 Feb '09

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

2 1

Re: [2/3] Add initial "write text" support for VGA graphic modes. Requires mode info unify patch
by Alexandre Julliard 04 Feb '09

04 Feb '09

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

1 0

Re: comctl32: Save and restore colours when adding masked images
by Hans Leidekker 04 Feb '09

04 Feb '09

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

2 1

Re: mshtml: Implement IHTMLStyle_put_backgroundColor
by ricardo_barbano＠hotmail.com 04 Feb '09

04 Feb '09

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

1 0