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

Re: [PATCH] cryptui: check NULL ptr differently (Coverity)

by Paul Vriens

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.

Feb. 5, 2009

Re: Stub DDE interface for Progman.exe

by Dmitry Timoshkov

"Jeremiah Flerchinger" <jeremiah.flerchinger(a)gmail.com> wrote: >> > Stubs basic DDE interface of Progman.exe. Similar to Progman stub in >> > shell32.dll. Both will need to be extended and a 3rd progman interface >> > will need to be added in user32. >> >> Progman DDE interface should be implemented by shell32.dll, nowhere else. >> > The shell32.dll DDE callback isn't always initialized & handling Progman > calls for all apps. I've seen Progman calls pass through the DDE_client > and DDE_server of user32.dll instead and never go through shell32.dll. progman.exe in Windows is an empty stub. > We can have the actual Progman functions in shell32.dll, but at least > user32.dll will have to be able to call & be called by these. I think a > separate progman.c/progman.h in /dlls/user32 to handle calls from all > locations may be preferred. Probably you need to write some tests first which actually use the progman DDE interface. -- Dmitry.

Feb. 4, 2009

Re: New Wine Gecko package

by Scott Ritchie

Jacek Caban wrote: > Hi all, > > The last release of Wine Gecko caused a few regressions. Thanks to > Alexandre, we've found the reason. The bad news is that the fix requires > a new package. I've uploaded RC build to: > > http://gerwazy.lo3.wroc.pl/~jcaban/wine/wine_gecko-0.9.1.cab > > I'd appreciate if people that observe the regression (mostly strange > crashed) could retest bugs with this build. To do so, you will need the > new package and the attached patch. Also quick tests with random apps > would be nice. This is a bugfix release based on the same codebase as > 0.9.0 version so I don't expect any new regressions with it. > Is this version compatible with Wine 1.0.1 by chance? Thanks, Scott Ritchie

Feb. 4, 2009

Re: ideas and questions for implementation of MessageMode in Named Pipes

by Juan Lang

Hi Luke, > how about: ripping out the use of unix-pipes altogether, and replacing > them with tdb (trivial database) in a mmap'd file? the nice thing > about tdb is that it's LGPL'd. the messages could be saved and > transferred via shared memory; tdb is multi-readable / > multi-writeable, and it would save a bitch-awful job of implementing a > shared memory sockets emulation layer (which i _have_ seen done, > once). The usual response around here is, show us some patches, and we'll let you know ;-) Some test cases showing us where we're deficient would be a great start, btw. --Juan

Feb. 4, 2009

New Wine Gecko package

by Jacek Caban

Hi all, The last release of Wine Gecko caused a few regressions. Thanks to Alexandre, we've found the reason. The bad news is that the fix requires a new package. I've uploaded RC build to: http://gerwazy.lo3.wroc.pl/~jcaban/wine/wine_gecko-0.9.1.cab I'd appreciate if people that observe the regression (mostly strange crashed) could retest bugs with this build. To do so, you will need the new package and the attached patch. Also quick tests with random apps would be nice. This is a bugfix release based on the same codebase as 0.9.0 version so I don't expect any new regressions with it. Also the last debug version was accidentally stripped. It will be fixed in this release. I'm planning to do the release tomorrow, so it will be in Git on Friday. Thanks, Jacek >From 35f651d05f04dc80dd85451d48428d5c6174dac2 Mon Sep 17 00:00:00 2001 From: Jacek Caban <jacek(a)codeweavers.com> Date: Thu, 5 Feb 2009 00:17:09 +0100 Subject: [PATCH] mshtml: Wine Gecko 0.9.1 release. To: wine-patches <wine-patches(a)winehq.org> --- dlls/mshtml/htmldoc.c | 4 +++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mutation.c | 15 +++++++++++++++ dlls/mshtml/nsembed.c | 4 +++- dlls/mshtml/nsiface.idl | 3 ++- 5 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 32da2e0..a6aa73f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -214,8 +214,10 @@ static ULONG WINAPI HTMLDocument_Release(IHTMLDocument2 *iface) ConnectionPointContainer_Destroy(&This->cp_container); - if(This->nsdoc) + if(This->nsdoc) { + remove_mutation_observer(This->nscontainer, This->nsdoc); nsIDOMHTMLDocument_Release(This->nsdoc); + } if(This->nscontainer) NSContainer_Release(This->nscontainer); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e4c98a7..b67c485 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -510,6 +510,7 @@ void NSContainer_Release(NSContainer*); void init_mutation(NSContainer*); void set_mutation_observer(NSContainer*,nsIDOMHTMLDocument*); +void remove_mutation_observer(NSContainer*,nsIDOMHTMLDocument*); void HTMLDocument_LockContainer(HTMLDocument*,BOOL); void show_context_menu(HTMLDocument*,DWORD,POINT*,IDispatch*); diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index ea61d5a..ab9649c 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -55,6 +55,21 @@ void set_mutation_observer(NSContainer *nscontainer, nsIDOMHTMLDocument *nshtmld nsIDOMNSDocument_Release(nsdoc); } +void remove_mutation_observer(NSContainer *nscontainer, nsIDOMHTMLDocument *nshtmldoc) +{ + nsIDOMNSDocument *nsdoc; + nsresult nsres; + + nsres = nsIDOMHTMLDocument_QueryInterface(nshtmldoc, &IID_nsIDOMNSDocument, (void**)&nsdoc); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNSDocument: %08x\n", nsres); + return; + } + + nsIDOMNSDocument_WineRemoveObserver(nsdoc, NSDOCOBS(nscontainer)); + nsIDOMNSDocument_Release(nsdoc); +} + #define IE_MAJOR_VERSION 7 #define IE_MINOR_VERSION 0 diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index ee386ac..16ac21e 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -857,8 +857,10 @@ void update_nsdocument(HTMLDocument *doc) return; } - if(doc->nsdoc) + if(doc->nsdoc) { + remove_mutation_observer(doc->nscontainer, doc->nsdoc); nsIDOMHTMLDocument_Release(doc->nsdoc); + } doc->nsdoc = nsdoc; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 219ac0c..ef64145 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -23,7 +23,7 @@ * compatible with XPCOM, usable in C code. */ -cpp_quote("#define GECKO_VERSION \"0.9.0\"") +cpp_quote("#define GECKO_VERSION \"0.9.1\"") cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION") import "wtypes.idl"; @@ -873,6 +873,7 @@ interface nsIDOMNSDocument : nsISupports /* Wine extensions */ nsresult WineAddObserver(nsIDocumentObserver *aObserver); + nsresult WineRemoveObserver(nsIDocumentObserver *aObserver); nsresult WineAddScriptRunner(nsIRunnable *aRunnable); } -- 1.6.0.6

Feb. 4, 2009

Re: Quick and dirty testcases for MS-DOS API?

by Dan Kegel

On Wed, Feb 4, 2009 at 3:24 PM, Detlef Riekenberg <wine.dev(a)web.de> wrote: > On Do, 2009-01-29 at 14:30 -0800, Dan Kegel wrote: >> but that requires the Watcom C compiler, and >> "apt-cache search watcom" still comes up empty > > There is a package with an installer: > > http://www.openwatcom.org/ftp/open-watcom-c-linux-1.8RC3 That doesn't look like a .deb. Are they going to provide .deb's and .rpm's, too?

Feb. 4, 2009

Re: Quick and dirty testcases for MS-DOS API?

by Detlef Riekenberg

On Do, 2009-01-29 at 14:30 -0800, Dan Kegel wrote: > but that requires the Watcom C compiler, and > "apt-cache search watcom" still comes up empty There is a package with an installer: http://www.openwatcom.org/ftp/open-watcom-c-linux-1.8RC3 THe release link in the near feature might be: http://www.openwatcom.org/ftp/open-watcom-c-linux-1.8 -- By by ... Detlef

Feb. 4, 2009

Re: Fixing AppDB once and for all

by nicholas.g.lawrence＠mainroads.qld.gov.au

How about determining how well an individual app is represented by the test suite? The better the test suite replicates the behaviour of the app, the more likely wine is to support the app. nick *********************************************************************** WARNING: This e-mail (including any attachments) may contain legally privileged, confidential or private information and may be protected by copyright. You may only use it if you are the person(s) it was intended to be sent to and if you use it in an authorised way. No one is allowed to use, review, alter, transmit, disclose, distribute, print or copy this e-mail without appropriate authority. If this e-mail was not intended for you and was sent to you by mistake, please telephone or e-mail me immediately, destroy any hardcopies of this e-mail and delete it and any copies of it from your computer system. Any right which the sender may have under copyright law, and any legal privilege and confidentiality attached to this e-mail is not waived or destroyed by that mistake. It is your responsibility to ensure that this e-mail does not contain and is not affected by computer viruses, defects or interference by third parties or replication problems (including incompatibility with your computer system). Opinions contained in this e-mail do not necessarily reflect the opinions of the Queensland Department of Main Roads, Queensland Transport or Maritime Safety Queensland, or endorsed organisations utilising the same infrastructure. ***********************************************************************

Feb. 4, 2009

Re: [PATCH] mshtml: fixed second buffer argument to MultiByteToWideChar

by Marcus Meissner

On Wed, Feb 04, 2009 at 02:15:04PM -0600, Austin English wrote: > 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? No, I spotted this problem while debugging something, and just looked through the sourcecode for all occurences. I think I got all of them now. CIao, Marcus

Feb. 4, 2009

Re: [PATCH] mshtml: fixed second buffer argument to MultiByteToWideChar

by Austin English

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

Feb. 4, 2009