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

Re: jscript: Don't release possible NULL pointer (coverity)
by Jacek Caban 18 Oct '12

18 Oct '12

Hi André, On 10/18/12 00:14, André Hentschel wrote: > CID 735258 > > --- > dlls/jscript/regexp.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c > index bdff445..71474c7 100644 > --- a/dlls/jscript/regexp.c > +++ b/dlls/jscript/regexp.c > @@ -3378,7 +3378,9 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D > last_match = jsstr_alloc_len(str, len); > if(!last_match) > return E_OUTOFMEMORY; > - jsstr_release(ctx->last_match); > + > + if(ctx->last_match) > + jsstr_release(ctx->last_match); > ctx->last_match = last_match; ctx->last_match should always be a valid string. I guess coverity is confused by earlier compare to NULL, which is a leftover after string representation change. We should use jsstr_t here to avoid allocation anyway, I will send a patch. Thanks, Jacek

1 0

Re: (resend) programs/winemenubuilder: scale 64x64 classic icons to 48x48 for Icns format
by Ken Thomases 18 Oct '12

18 Oct '12

On Oct 16, 2012, at 2:15 PM, Aric Stewart wrote: > @@ -1052,6 +1079,7 @@ static inline int size_to_slot(int size) > case 16: return 0; > case 32: return 1; > case 48: return 2; > + case 64: return 2; /* Classic Mode */ > case 128: return 3; > case 256: return 4; > case 512: return 5; If an ICO has both a 48x48 and a 64x64 entry (improbable, I know), then the 48x48 should be preferred. So, you need additional logic to pick the best index for a slot in platform_write_icon(). Track the best-so-far's width and prefer the smaller. Beyond that, perhaps the scaling should be put into the ICNS encoder rather than convert_to_native_icon(). That is, if it's handed a size that doesn't fit properly into one of the predefined slots, it would scale down to the next lower size. Although it might be better to synthesize a 32x32 rather than a 48x48 from a 64x64. *shrug* -Ken

5 6

Re: advapi32: Only require a domain in the username for CRED_PERSIST_ENTERPRISE credentials.
by Marvin 18 Oct '12

18 Oct '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=22306 Your paranoid android. === WXPPROSP3 (32 bit cred) === cred.c:128: Test failed: CredWriteA failed with error 2202 cred.c:131: Test failed: CredDeleteA failed with error 1168 cred.c:135: Test failed: CredWriteA failed with error 1312 cred.c:138: Test failed: CredDeleteA failed with error 1168 cred.c:149: Test failed: CredWriteA failed with error 2202 cred.c:152: Test failed: CredDeleteA failed with error 1168 === W2K3R2SESP2 (32 bit cred) === cred.c:128: Test failed: CredWriteA failed with error 2202 cred.c:131: Test failed: CredDeleteA failed with error 1168 cred.c:135: Test failed: CredWriteA failed with error 1312 cred.c:138: Test failed: CredDeleteA failed with error 1168 cred.c:149: Test failed: CredWriteA failed with error 2202 cred.c:152: Test failed: CredDeleteA failed with error 1168

1 0

Re: msvcp: free facet and _Locimp in Locimp dtor
by Piotr Caban 18 Oct '12

18 Oct '12

On 10/17/12 02:35, Daniel Lehman wrote: @@ -7241,10 +7241,11 @@ void __thiscall locale__Locimp_dtor(locale__Locimp *this) MSVCP_size_t i; for(i=0; i<this->facet_cnt; i++) if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i])) - call_locale_facet_vector_dtor(this->facetvec[i], 0); + call_locale_facet_vector_dtor(this->facetvec[i], 1); MSVCRT_operator_delete(this->facetvec); MSVCP_basic_string_char_dtor(&this->name); + MSVCRT_operator_delete(this); } } Memory allocated for locale__Locimp object should be freed in locale class (locale_dtor function). You can't delete it here. Cheers, Piotr

2 4

Re: gdiplus: fix font test when liberation fonts are installed
by Dmitry Timoshkov 18 Oct '12

18 Oct '12

Austin English <austinenglish(a)gmail.com> wrote: > + ok(!lstrcmp(lf.lfFaceName, "Arial") || > + !lstrcmp(lf.lfFaceName, "Liberation Sans"), "wrong face name %s\n", lf.lfFaceName); The tests are supposed to reflect Windows behaviour, what Windows version does return "Liberation Sans" in this test? -- Dmitry.

2 2

re: [PATCH 4/6] [cmd] Add for /f parsingkeyword parsing, add support for skip=
by Dan Kegel 17 Oct '12

17 Oct '12

Jason wrote: >>It's clearly time to start splitting WCMD_for into several helper functions. > > I completely agree, and it was definitely on my radar to do... its really > ugly code in there (I take responsibility for a lot of that!) as it has > been a slow incremental increase in what we actually supported... I was > aiming to get a set of working /f tests before I did such a reshuffle as > that is the last of the functionality that for was missing (ie I could > ensure I keep it all working), but will prioritize it if you want it before > that. Seems like it makes sense to add as many tests as possible before refactoring, but if they're messy to submit without also fixing the problems they find, go ahead and keep them local for now... just don't forget to submit them asap. I must say, it's awesome how you're tearing into the cmd problems! - Dan

1 0

Re: shell32/tests: Test ShellExecute()'s URL handling.
by Marvin 17 Oct '12

17 Oct '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=22302 Your paranoid android. === WNT4WSSP6 (32 bit shlexec) === shlexec.c:1800: Test failed: ShellExecute(file="notaproto://foo") succeeded: rc=2 shlexec.c:1803: Test failed: ShellExecute(file="fakeproto://foo/bar") expected SE_ERR_ACCESSDENIED got rc=2 shlexec.c:152: Test failed: ShellExecute(file="shlproto://foo/bar") Got different return value with empty string: 42 2 shlexec.c:152: Test failed: ShellExecute(file="shlproto://foo/bar.lnk") Got different return value with empty string: 42 2 shlexec.c:137: Test failed: ShellExecute(file="file://shlproto://foo/bar") WaitForSingleObject returned 258 shlexec.c:152: Test failed: ShellExecute(file="file://shlproto://foo/bar") Got different return value with empty string: 42 2 shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=42 === W2KPROSP4 (32 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=5 === WVISTAADM (32 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === W2K8SE (32 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === W7PRO (32 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === W7PROX64 (32 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === TEST64_W7SP1 (32 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === W7PROX64 (64 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === TEST64_W7SP1 (64 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2

1 0

Re: [PATCH] winmm: Load winealsa if winepulse is found
by Austin English 17 Oct '12

17 Oct '12

On Tue, Oct 16, 2012 at 5:10 AM, Maarten Lankhorst <m.b.lankhorst(a)gmail.com> wrote: > From: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> > > Fixes midi on winepulse > --- > dlls/winmm/lolvldrv.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c > index f387323..3b1be27 100644 > --- a/dlls/winmm/lolvldrv.c > +++ b/dlls/winmm/lolvldrv.c > @@ -543,7 +543,10 @@ static void MMDRV_Init(void) > drvA = HeapAlloc(GetProcessHeap(), 0, size); > WideCharToMultiByte(CP_ACP, 0, pv.u.pwszVal, -1, drvA, size, NULL, NULL); > > - MMDRV_Install(drvA, drvA, FALSE); > + if (!strcasecmp(drvA, "winepulse.drv")) > + MMDRV_Install("winealsa.drv", "winealsa.drv", 0); > + else > + MMDRV_Install(drvA, drvA, FALSE); > > HeapFree(GetProcessHeap(), 0, drvA); > PropVariantClear(&pv); > -- > 1.7.11.3 Shouldn't this be part of the winepulse patch itself? It will never get used in Wine, as is... -- -Austin

2 1

Re: d3dx9_36 [patch 1/3]: Fix the case out = in for D3DXSHRotateZ
by Nozomi Kodama 17 Oct '12

17 Oct '12

My bad. My patch pass the tests but not yours. Can you check these facts? Nozomi >Hi Nozomi, > >the huge arrays, the loop, it looks a bit ugly. Your implementation makes the D3DXSHRotateZ function a >bit more compatible. What comes into my mind is: >D3DXSHRotateZ(out, y, 1,25f, in); >D3DXSHRotateZ(out, y, 1,25f, out); >D3DXSHRotateZ(out, y, 1,25f, &out[x]); // x ... 1 - y * y >D3DXSHRotateZ(&out[x], y, 1,25f, out); // x ... 1 - y * y > >Do the last 2 also work and are they producing the same values as native? > >Attached is a simple hack to succeed your test, it has some major stuff which needs to be fixed first, but >nevertheless, please have a look. I think the implementation could be a lot smaller and faster. What do you >think? I'd like to hear your opinion, before you try to send a patch. >+FLOAT * WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, CONST FLOAT *in) >There is a double space after "order,". > >Cheers >Rico

2 2

Re: (try 3) programs/winemenubuilder: scale 64x64 classic icons to 48x48 for Icns format
by Ken Thomases 17 Oct '12

17 Oct '12

On Oct 17, 2012, at 9:50 AM, Aric Stewart wrote: > - if (iconDirEntries[i].wBitCount >= best[slot].maxBits) > + if (((best[slot].maxBits && !scaled) || (!best[slot].maxBits) || (scaled && best[slot].scaled)) && (iconDirEntries[i].wBitCount >= best[slot].maxBits || (!scaled && best[slot].scaled))) This could be more clearly written as: if ((!scaled || !best[slot].maxBits || best[slot].scaled) && (iconDirEntries[i].wBitCount >= best[slot].maxBits || (!scaled && best[slot].scaled))) or even: if (scaled && best[slot].maxBits && !best[slot].scaled) continue; /* don't replace unscaled with scaled */ if (iconDirEntries[i].wBitCount >= best[slot].maxBits || (!scaled && best[slot].scaled)) That is, your left side of the outer && has redundancies and all the negatives make it hard to penetrate. -Ken

1 0