November 2012 - Wine-devel - list.winehq.org

Re: msvcp60: Remove superfluous semicolons
by Jacek Caban 27 Nov '12

27 Nov '12

On 11/26/12 8:42 PM, Andrew Talbot wrote: > Changelog: > msvcp60: Remove superfluous semicolons. > > diff --git a/dlls/msvcp60/exception.c b/dlls/msvcp60/exception.c > index 761075e..b8c6921 100644 > --- a/dlls/msvcp60/exception.c > +++ b/dlls/msvcp60/exception.c > @@ -137,7 +137,7 @@ void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flag > } > > DEFINE_RTTI_DATA0(exception, 0, ".?AVexception(a)std@@"); > -DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor); > +DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor) It's probably better to change the macro to require the semicolon. Jacek

2 2

Re: winex11: Add a few 'fall through' comments.
by Dmitry Timoshkov 27 Nov '12

27 Nov '12

Huw Davies <huw(a)codeweavers.com> wrote: > case DirectColor: > X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_VIRTUAL; > - case GrayScale: > + case GrayScale: /* fall through */ case DirectColor: X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_VIRTUAL; /* fall through */ case GrayScale: would be more clear IMHO. Right now it's not obvious to which case statement 'fall through' belongs to. Same for other changes. -- Dmitry.

2 1

Explicit fall-through in switch statements?
by Frédéric Delanoy 27 Nov '12

27 Nov '12

For every wine version, static checkers (like coverity) detect cases where a switch case automatically falls-through to the next case. Shouldn't be there a rule that such cases are always marked with a "fall-through comment"? With the possible exception of case with no statement? like 'case FOO: case BAR: do_something();...'? This would probably help IMHO, especially when people refactor old code. Frédéric

4 5

Re: ntdll/tests: Mark win8 behaviour as broken
by Dmitry Timoshkov 27 Nov '12

27 Nov '12

André Hentschel <nerv(a)dawncrow.de> wrote: > diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c > index c670731..f66d858 100644 > --- a/dlls/ntdll/tests/info.c > +++ b/dlls/ntdll/tests/info.c > @@ -1336,7 +1336,8 @@ static void test_mapprotection(void) > status = pNtQueryVirtualMemory( GetCurrentProcess(), addr, MemoryBasicInformation, &info, sizeof(info), &retlen ); > ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); > ok( retlen == sizeof(info), "Expected STATUS_SUCCESS, got %08x\n", status); > - ok(info.Protect == PAGE_READWRITE, "addr.Protect is not PAGE_READWRITE, but 0x%x\n", info.Protect); > + ok(info.Protect == PAGE_READWRITE || broken(info.Protect == PAGE_NOCACHE | PAGE_READWRITE /* win8 */), > + "addr.Protect is not PAGE_READWRITE, but 0x%x\n", info.Protect); This is not broken. You should either mask PAGE_NOCACHE out before the comparison, or accept both values. Same applies to other your patches. -- Dmitry.

1 0

Re: [PATCH 1/5] advapi: Implement SetNamedSecurityInfoW on top of SetSecurityInfo (try 2).
by Alexandre Julliard 26 Nov '12

26 Nov '12

"Erich E. Hoover" <ehoover(a)mymail.mines.edu> writes: > This particular patch implements SetNamedSecurityInfoW by layering it > on top of SetSecurityInfo, which permits the creation of tests for > part 2 (GetNamedSecurityInfoW). This version has been updated to fix > a bad return value and includes a test indicating the correct value > (ERROR_FILE_NOT_FOUND). That doesn't mean you can hardcode that specific error. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/2] ole32: Add helper for string table memory freeing
by Nikolay Sivov 26 Nov '12

26 Nov '12

On 11/26/2012 01:01, Frédéric Delanoy wrote: > --- > dlls/ole32/filemoniker.c | 44 ++++++++++++++++++-------------------------- > 1 file changed, 18 insertions(+), 26 deletions(-) > > diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c > index b3a5cc2..688f6b8 100644 > --- a/dlls/ole32/filemoniker.c > +++ b/dlls/ole32/filemoniker.c > @@ -657,6 +657,16 @@ FileMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar, > return MK_S_REDUCED_TO_SELF; > } > > +static void > +FileMonikerImpl_FreeStringTable(LPOLESTR* stringTable) > +{ > + int i; > + > + for (i=0; stringTable[i]!=NULL; i++) > + CoTaskMemFree(stringTable[i]); > + CoTaskMemFree(stringTable); > +} > + Could you please adjust a naming for that to something like free_stringtable() cause it doesn't really access file moniker in this helper. Also stringTable[i]!=NULL could be shortened to stringTable[i]. > > > CoTaskMemFree(str1); > CoTaskMemFree(str2); > @@ -1004,17 +1010,9 @@ FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** p > { > for(i=0;i<sameIdx;i++) > strcatW(commonPath,stringTable1[i]); > - > - for(i=0;i<nb1;i++) > - CoTaskMemFree(stringTable1[i]); > - > - CoTaskMemFree(stringTable1); > - > - for(i=0;i<nb2;i++) > - CoTaskMemFree(stringTable2[i]); > - > - CoTaskMemFree(stringTable2); > - > + > + FileMonikerImpl_FreeStringTable(stringTable1); > + FileMonikerImpl_FreeStringTable(stringTable2); You sure it's an equivalent change? I mean regarding index boundaries above. Also while you're at it FileMonikerImpl_DecomposePath() needs to be properly fixed - it returns HRESULT, not it. And surrounding code relies on FAILED() mask to get this index boundary from return value, this is really broken.

2 1

re: [PATCH 5/5] winex11: Detect broken NVIDIA RandR setups.
by Dan Kegel 24 Nov '12

24 Nov '12

Henri wrote: >+ /* Recent (304.64, possibly earlier) versions of the nvidia driver only >+ * report a DFP's native mode through RandR 1.2 / 1.3. Standard DMT modes >+ * are only listed through RandR 1.0 / 1.1. This is completely useless, >+ * but NVIDIA considers this a feature, so it's unlikely to change Do you happen to have a link to discussion about this, or an nvidia bug number? Thanks!

2 1

Re: [1/2] widl: Fix enum entries output based on previous entry value
by Alexandre Julliard 23 Nov '12

23 Nov '12

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > Apparently this is how midl works I'm not sure that's an improvement, it makes it harder to figure out the actual value. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [02/10] windowscodecs: Reimplement QueryCapability of the BMP decoder.
by Vincent Povirk 23 Nov '12

23 Nov '12

Does QueryCapability really initialize the decoder? Can you get a frame out of it? I guess it never occurred to me to try. I was OK with this for the other implementations because I figured it'd be easy enough to invalidate the decoder after successfully calling Initialize, if that turned out to be a problem.

2 1

Wine Gecko 1.9-beta1
by Jacek Caban 22 Nov '12

22 Nov '12

Hi all, Firefox 17 was released lately, meaning that Firefox 18 goes to beta channel and it's the next target for out Gecko package update. I've uploaded new Gecko builds to SourceForge [1]. To test them, you need recent Wine Git version with the attached patch. As usually, grab the build from SourceForge, put it in the right place [2] and run patched Wine. All help with testing is appreciated! Thanks, Jacek [1] http://sourceforge.net/projects/wine/files/Wine%20Gecko/1.9-beta1/ [2] http://wiki.winehq.org/Gecko

1 0