September 2009 - Wine-devel

Re: [try 3] comctl32: Implement highlighting (marquee) selection support in listview
by Nikolay Sivov 21 Sep '09

21 Sep '09

Owen Rudge wrote: > Minor update, rename some potentially confusing comments/variables. > > --- > dlls/comctl32/listview.c | 135 > ++++++++++++++++++++++++++++++++++++++++----- > 1 files changed, 120 insertions(+), 15 deletions(-) + /* Draw focus rect if highlighting */ + if (infoPtr->bHighlighting) + DrawFocusRect(hdc, &infoPtr->marqueeRect); + :). Now we have 3 different names for a single thing.

2 1

Re: mshtml / shdocv / urlmon tests hanging?
by Dan Kegel 21 Sep '09

21 Sep '09

Without. Thanks, I'll rerun tonight. On Sep 21, 2009 8:05 AM, "Paul Vriens" <paul.vriens.wine(a)gmail.com> wrote: On 09/21/2009 04:32 PM, Dan Kegel wrote: > > Doing a full test with my xattr patches, I saw hangs > ... With or without Gecko installed? -- Cheers, Paul.

1 0

Re: [try 2] comctl32: Implement highlighting (marquee) selection support in listview
by Nikolay Sivov 21 Sep '09

21 Sep '09

Owen Rudge wrote: > This patch adds support for selecting multiple items in a > multi-selection listview using the mouse (by dragging and > highlighting). It has been reimplemented in a more efficient manner > compared to the previous patches. > > --- > dlls/comctl32/listview.c | 135 > ++++++++++++++++++++++++++++++++++++++++----- > 1 files changed, 120 insertions(+), 15 deletions(-) Hi again. Didn't test it actually but it looks definitely better without extra cycles and state caching, thanks for that. I suggest another simple naming improvement: you're mixing different things in comments and naming, it looks confusing now. --- + BOOL bHighlighting; + RECT highlightRect; --- I suggest something like marqueeRect name here cause item itself has a state flag called LVIS_DROPHILITED which has nothing to do with this rectangle obviously. --- + /* Cancel out the old focus rectangle and draw the new one */ + LISTVIEW_InvalidateRect(infoPtr, &infoPtr->highlightRect); --- Focus rectangle is an item focus bounds in current naming, so comment is a bit confusing here. --- + /* Draw focus rect if highlighting */ + if (infoPtr->bHighlighting) + DrawFocusRect(hdc, &infoPtr->highlightRect); ... + /* Remove the focus rectangle */ + if (infoPtr->bHighlighting) + LISTVIEW_InvalidateRect(infoPtr, &infoPtr->highlightRect); --- Same here, it isn't a focus rectangle. Regards.

2 1

mshtml / shdocv / urlmon tests hanging?
by Dan Kegel 21 Sep '09

21 Sep '09

Doing a full test with my xattr patches, I saw hangs on about seven tests, all in mshtml , shdocv, and urlmon. While doing a baseline test run without my xattr patches, I noticed that mshtml / dom tests were still hanging. Has anybody else seen these tests hang lately?

2 1

Re: oledb32: Implement CanConvert.
by Marcus Meissner 21 Sep '09

21 Sep '09

On Mon, Sep 21, 2009 at 01:50:51PM +0100, Huw Davies wrote: > --- > dlls/oledb32/convert.c | 231 +++++++++++++++++++++++++++++++++++++++++- > dlls/oledb32/tests/convert.c | 10 -- > 2 files changed, 228 insertions(+), 13 deletions(-) > diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c > index 458abb5..a2385f0 100644 > --- a/dlls/oledb32/convert.c > +++ b/dlls/oledb32/convert.c > @@ -126,13 +126,238 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, > return E_NOTIMPL; > } > > +static inline WORD get_dbtype_class(DBTYPE type) > +{ > + switch(type) > + { > + case DBTYPE_I2: > + case DBTYPE_R4: > + case DBTYPE_R8: > + case DBTYPE_I1: > + case DBTYPE_UI1: > + case DBTYPE_UI2: > + return DBTYPE_I2; > + > + case DBTYPE_I4: > + case DBTYPE_UI4: > + return DBTYPE_I4; > + > + case DBTYPE_I8: > + case DBTYPE_UI8: > + return DBTYPE_I8; > + > + case DBTYPE_BSTR: > + case DBTYPE_STR: > + case DBTYPE_WSTR: > + return DBTYPE_BSTR; > + > + case DBTYPE_DBDATE: > + case DBTYPE_DBTIME: > + case DBTYPE_DBTIMESTAMP: > + return DBTYPE_DBDATE; > + } > + return type; > +} > + > +/* Many src types will convert to this group of dst types */ > +static inline BOOL common_class(WORD dst_class) > +{ > + switch(dst_class) > + { > + case DBTYPE_EMPTY: > + case DBTYPE_NULL: > + case DBTYPE_I2: > + case DBTYPE_I4: > + case DBTYPE_BSTR: > + case DBTYPE_BOOL: > + case DBTYPE_VARIANT: > + case DBTYPE_I8: > + case DBTYPE_CY: > + case DBTYPE_DECIMAL: > + case DBTYPE_NUMERIC: > + return TRUE; > + } > + return FALSE; > +} > + > +static inline BOOL array_type(DBTYPE type) > +{ > + return (type >= DBTYPE_I2 && type <= DBTYPE_UI4); > +} > + > static HRESULT WINAPI convert_CanConvert(IDataConvert* iface, > - DBTYPE wSrcType, DBTYPE wDstType) > + DBTYPE src_type, DBTYPE dst_type) > { > convert *This = impl_from_IDataConvert(iface); > - FIXME("(%p)->(%d, %d): stub\n", This, wSrcType, wDstType); > + DBTYPE src_base_type = src_type & 0x1ff; > + DBTYPE dst_base_type = dst_type & 0x1ff; > + WORD dst_class = get_dbtype_class(dst_base_type); > > - return E_NOTIMPL; > + TRACE("(%p)->(%d, %d)\n", This, src_type, dst_type); > + > + if(src_type & DBTYPE_VECTOR || dst_type & DBTYPE_VECTOR) return S_FALSE; I think this needs brackets... Ciao, Marcus

3 3

Wine in Tango
by Joel Holdsworth 21 Sep '09

21 Sep '09

Hi All, If anyone's interested I've published a working version of my Tango graphics for wine to Gitorious... http://gitorious.org/wine-tango/wine-tango clone: git clone git://gitorious.org/wine-tango/wine-tango.git branch: public-beta-1 This branch features Roderick Colenbrander's as-yet unmerged XRender patches, some patches from me for 32-bit support in the areas of icons, image lists and toolbars, and a partial set of patches to apply the tango graphics for shell32, user32 and comdlg32. Graphics for other apps/dlls are excluded, as well as the few tests I've produced. The work is most clear to see if you open a file dialog, or a message box. The full set of Tango graphics can be seen here: http://www.airwebreathe.org.uk/wine-icon/ . There are still a few graphical things to fix: dxdiag, certwatermark.bmp. Comments and criticisms are welcome! Best Regards Joel Holdsworth

9 15

Re: cppcheck Sept 18
by James Mckenzie 21 Sep '09

21 Sep '09

-----Original Message----- >From: Henri Verbeet <hverbeet(a)gmail.com> >Sent: Sep 20, 2009 12:19 PM >To: Pauli Nieminen <suokkos(a)gmail.com> >Cc: wine-devel(a)winehq.org, Joris Huizer <joris_huizer(a)yahoo.com> >Subject: Re: cppcheck Sept 18 > >2009/9/20 Pauli Nieminen <suokkos(a)gmail.com> >> >> On Sat, Sep 19, 2009 at 1:59 PM, Joris Huizer <joris_huizer(a)yahoo.com> wrote: >>> >>> [/home/cahrendt/wine-git/dlls/rpcrt4/tests/server.c:1189]: (possible >>> error) Array index out of bounds >>> >>> This one is a false positive, it uses FIELD_OFFSET(cs_t, ca[5]), >>> and it found an array: >>> int ca[5]; >>> >> int ca[5]; >> has only entries up to ca[4] (0-4) so to me it looks like bug. >> >Not quite. For one, the ca[5] that's being used here isn't the local >variable ca[5], but the field ca[1] of the cs_t structure. The >expression is used as a way to calculate the size of a cs_t structure >with 5 elements. > But what is the real size of ca[]? Is it five, fifty or five-hundred? Maybe that is why the cppcheck is declaring it out-of-bounds. James McKenzie

2 1

Re: [PATCH 4/6] d3d9: Limit "NumSimultaneousRTs" to 4.
by Stefan Dösinger 20 Sep '09

20 Sep '09

Am Sunday 20 September 2009 20:09:25 schrieb Henri Verbeet: > pCaps->MaxVertexShaderConst = min(D3D9_MAX_VERTEX_SHADER_CONSTANTF, > pCaps->MaxVertexShaderConst); + pCaps->NumSimultaneousRTs = > min(D3D9_MAX_SIMULTANEOUS_RENDERTARGETS, pCaps->NumSimultaneousRTs); } I think you also have to make sure RTs > 3 can't be used in SetRenderTarget and GetRenderTarget

1 0

cppcheck Sept 18
by Joris Huizer 20 Sep '09

20 Sep '09

[/home/cahrendt/wine-git/dlls/ntdll/server.c:802]: (error) Resource leak: fd [/home/cahrendt/wine-git/dlls/ntdll/server.c:882]: (error) Resource leak: fd_cwd These two are false positives, as the process ends (calling exit(1) [/home/cahrendt/wine-git/dlls/rpcrt4/tests/server.c:1189]: (possible error) Array index out of bounds This one is a false positive, it uses FIELD_OFFSET(cs_t, ca[5]), and it found an array: int ca[5]; [/home/cahrendt/wine-git/dlls/wineps.drv/init.c:270]: (error) Possible null pointer dereference: dmW - otherwise it is redundant to check if dmW is null at line 272 That is a bug, sent a patch HTH, Joris

4 3

Re: dlls/comctl32/tests/tab.c: Transform CheckSize from a macro to a function.
by Nikolay Sivov 20 Sep '09

20 Sep '09

Gerald Pfeifer wrote: > This not only avoids a 12+ line macro, it also sheds a couple of > compiler warnings with GCC 4.4 (though not the forthcoming 4.5). > > Gerald > > > ChangeLog: > Transform CheckSize from a macro to a function. > Hi, Gerald. This patch breaks line trace for tests. You should pass __LINE__ to your helper to work this as before.

1 0