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

Re: wined3d: Add some 'fall through' comments (coverity)
by Henri Verbeet 30 Nov '12

30 Nov '12

On 29 November 2012 17:04, Frédéric Delanoy <frederic.delanoy(a)gmail.com> wrote: > case WINED3D_TOP_BUMPENVMAP_LUMINANCE: > lum_map |= 1 << stage; > + /* fall through */ > case WINED3D_TOP_BUMPENVMAP: > bump_map |= 1 << stage; > + /* fall through */ > case WINED3D_TOP_BLEND_TEXTURE_ALPHA: > case WINED3D_TOP_BLEND_TEXTURE_ALPHA_PM: > tex_map |= 1 << stage; I'm not opposed to these if they make it easier to find real bugs inside the noise with Coverity, but I would also note that it should be pretty obvious to anyone actually touching this code that the fall through is intentional.

2 1

Re: [PATCH] ntdll: Fix existing conftests for nanosecond precision time fields.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Charles Davis <cdavis5x(a)gmail.com> writes: > From: Charles Davis <cdavis(a)mymail.mines.edu> > > Autoconf checks for a field of a struct by using it in an if() > expression. Of course, you can't do this for an aggregate field, so you > must instead check a field of that aggregate instead. Up until now, the > conftests for the st_?tim fields were all failing, even on systems that > had them, because of this. It does a sizeof, which should work just fine. On what system do you see a problem? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 1/6] jscript: Alias arguments properties to real values
by Alexandre Julliard 29 Nov '12

29 Nov '12

Jacek Caban <jacek(a)codeweavers.com> writes: > --- > dlls/jscript/dispex.c | 36 ++++++++++++++-- > dlls/jscript/function.c | 98 > ++++++++++++++++++++++++++++++++----------- > dlls/jscript/jscript.h | 3 + > dlls/jscript/tests/lang.js | 8 ++++ > 4 files changed, 116 insertions(+), 29 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M ieframe.dll -T ../../.. -p ieframe_test.exe.so webbrowser.c && touch webbrowser.ok wine: Unhandled page fault on read access to 0x06c238cc at address 0x564c09e3 (thread 003a), starting debugger... Unhandled exception: page fault on read access to 0x06c238cc in 32-bit code (0x564c09e3). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:564c09e3 ESP:0032d1d0 EBP:0032d218 EFLAGS:00210246( R- -- I Z- -P- ) EAX:0214bdec EBX:564f89dc ECX:02a7d2f0 EDX:02a7d2f0 ESI:02c8ef58 EDI:012b5eb8 Stack dump: 0x0032d1d0: 00000008 00000000 00000000 00000004 0x0032d1e0: 00000000 02c8ef58 4d430003 020cf1b0 0x0032d1f0: 00000000 00000001 00000030 00000060 0x0032d200: 00000000 00000003 0000006c 564f89dc 0x0032d210: 020cf210 02c8ef58 0032d278 564b3397 0x0032d220: 02c8ef58 012b5eb8 02a7d2f0 02a7d2f0 Backtrace: =>0 0x564c09e3 Arguments_idx_get+0x73(jsdisp=0x2c8ef58, idx=0x12b5eb8, res=0x2a7d2f0) [/home/julliard/wine/wine/dlls/jscript/function.c:108] in jscript (0x0032d218) 1 0x564b3397 prop_get+0xd6(This=0x2c8ef58, prop=0x20cf210, dp=0x32d2a8, r=0x2a7d2f0, caller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:450] in jscript (0x0032d278) 2 0x564b72aa jsdisp_get_idx+0xc9(obj=0x2c8ef58, idx=0, r=0x2a7d2f0) [/home/julliard/wine/wine/dlls/jscript/dispex.c:1399] in jscript (0x0032d2e8) 3 0x564c1c48 Function_apply+0x2e7(ctx=0x1fe13f0, jsthis=0x32d388, flags=0x1, argc=0x2, argv=0x2ab0f00, r=0x32d568) [/home/julliard/wine/wine/dlls/jscript/function.c:411] in jscript (0x0032d348) 4 0x564b5f1c invoke_prop_func+0x1ab(This=0x1fd66f8, jsthis=<is not available>, prop=0x1fdbeb8, flags=0x1, argc=0x2, argv=0x2ab0f00, r=0x32d568, caller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:384] in jscript (0x0032d3a8) 5 0x564b5f78 invoke_prop_func+0x207(This=<is not available>, jsthis=<is not available>, prop=0x2d7cce0, flags=0x1, argc=0x2, argv=0x2ab0f00, r=0x32d568, caller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:393] in jscript (0x0032d408) 6 0x564b63a7 disp_call+0xe6(ctx=0x1fe13f0, disp=0x2a7d2a8, id=0x4, flags=0x1, argc=0x2, argv=0x2ab0f00, ret=0x32d568) [/home/julliard/wine/wine/dlls/jscript/dispex.c:1103] in jscript (0x0032d518) 7 0x564b8a48 interp_call_member+0x117(ctx=<is not available>) [/home/julliard/wine/wine/dlls/jscript/engine.c:1032] in jscript (0x0032d588) 8 0x564beee9 exec_source+0x1d8(ctx=<is not available>, code=<is not available>, func=<is not available>, from_eval=<is not available>, ret=<is not available>) [/home/julliard/wine/wine/dlls/jscript/engine.c:2485] in jscript (0x0032d628) 9 0x564c12d0 invoke_source+0x3cf() in jscript (0x0032d6c8) 10 0x564c1a0c Function_apply+0xab(ctx=0x1fe13f0, jsthis=0x32d768, flags=0x1, argc=0x2, argv=0x2ab1c78, r=0x32d948) [/home/julliard/wine/wine/dlls/jscript/function.c:470] in jscript (0x0032d728) 11 0x564b5f1c invoke_prop_func+0x1ab(This=0x1fd66f8, jsthis=<is not available>, prop=0x1fdbeb8, flags=0x1, argc=0x2, argv=0x2ab1c78, r=0x32d948, caller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:384] in jscript (0x0032d788) 12 0x564b5f78 invoke_prop_func+0x207(This=<is not available>, jsthis=<is not available>, prop=0x2a96888, flags=0x1, argc=0x2, argv=0x2ab1c78, r=0x32d948, caller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:393] in jscript (0x0032d7e8) 13 0x564b63a7 disp_call+0xe6(ctx=0x1fe13f0, disp=0x2a96800, id=0x2, flags=0x1, argc=0x2, argv=0x2ab1c78, ret=0x32d948) [/home/julliard/wine/wine/dlls/jscript/dispex.c:1103] in jscript (0x0032d8f8) 14 0x564b8a48 interp_call_member+0x117(ctx=<is not available>) [/home/julliard/wine/wine/dlls/jscript/engine.c:1032] in jscript (0x0032d968) 15 0x564beee9 exec_source+0x1d8(ctx=<is not available>, code=<is not available>, func=<is not available>, from_eval=<is not available>, ret=<is not available>) [/home/julliard/wine/wine/dlls/jscript/engine.c:2485] in jscript (0x0032da08) 16 0x564c12d0 invoke_source+0x3cf() in jscript (0x0032daa8) 17 0x564c1f3a Function_invoke+0xb9(func_this=0x2aa4268, jsthis=(nil), flags=0x1, argc=0x1, argv=0x32dbd0, r=0x32dbc8) [/home/julliard/wine/wine/dlls/jscript/function.c:346] in jscript (0x0032db08) 18 0x564b60f5 invoke_prop_func+0x384(This=0x2aa4268, jsthis=<is not available>, prop=0x2aa42b0, flags=0x1, argc=0x1, argv=0x32dbd0, r=0x32dbc8, caller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:388] in jscript (0x0032db68) 19 0x564b6b69 DispatchEx_InvokeEx+0x398(iface=0x2aa4268, id=0, lcid=0x409, wFlags=0x1, pdp=0x32dd30, pvarRes=0x32dd10, pei=0x32dc60, pspCaller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:693] in jscript (0x0032dc18) 20 0x55bb08d6 call_disp_func+0xf5(disp=<is not available>, dp=0x32dd30, retv=0x32dd10) [/home/julliard/wine/wine/dlls/mshtml/../../include/dispex.h:299] in mshtml (0x0032dc98) 21 0x55bb0cd3 call_event_handlers.isra+0x1d2() in mshtml (0x0032dd68) 22 0x55bb165b fire_event_obj+0x35a(doc=0x1fdb738, eid=EVENTID_LOAD, event_obj=0x1f51d28, target=0x2bc32fc, script_this=0x1fd2700) [/home/julliard/wine/wine/dlls/mshtml/htmlevent.c:1073] in mshtml (0x0032ddf8) 23 0x55bb1c8d fire_event+0x8c(doc=0x1fdb738, eid=EVENTID_LOAD, set_event=0x1, target=0x2bc32fc, nsevent=0x2c6ef48, script_this=0x1fd2700) [/home/julliard/wine/wine/dlls/mshtml/htmlevent.c:1188] in mshtml (0x0032de28) 24 0x55bfe7cb handle_load+0xda(iface=0x1fdb958, event=0x2c6ef48) [/home/julliard/wine/wine/dlls/mshtml/nsevents.c:274] in mshtml (0x0032de98) 25 0x6a6184f8 in xul (+0x9d84f7) (0x01fdb978) 26 0x00000002 (0x6af902f8) 27 0x6a61a05c in xul (+0x9da05b) (0x6a61a078) 0x564c09e3 Arguments_idx_get+0x73 [/home/julliard/wine/wine/dlls/jscript/function.c:108] in jscript: movl 0x0(%eax,%edi,4),%eax 108 return jsdisp_propget_name(arguments->var_obj, arguments->function->func_code->params[idx], res); -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 6/6] jscript: Added support for indexed string access
by Marvin 29 Nov '12

29 Nov '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=23153 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 4/6] jscript: Added support for DontDelete attribute and use it for arguments object
by Marvin 29 Nov '12

29 Nov '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=23152 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/6] jscript: Alias arguments properties to real values
by Marvin 29 Nov '12

29 Nov '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=23151 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: wshom.ocx: Properly update typeinfo refcount
by Alexandre Julliard 28 Nov '12

28 Nov '12

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > @@ -137,8 +137,13 @@ static HRESULT WINAPI WshCollection_GetTypeInfoCount(IWshCollection *iface, UINT > static HRESULT WINAPI WshCollection_GetTypeInfo(IWshCollection *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) > { > WshCollection *This = impl_from_IWshCollection(iface); > + HRESULT hr; > + > TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); > - return get_typeinfo(IWshCollection_tid, ppTInfo); > + > + hr = get_typeinfo(IWshCollection_tid, ppTInfo); > + ITypeInfo_AddRef(*ppTInfo); > + return hr; You'd need to check for error first, but the AddRef should really be in get_typeinfo(). -- Alexandre Julliard julliard(a)winehq.org

2 4

Wine Gecko versioning
by Jacek Caban 27 Nov '12

27 Nov '12

Hi all, Since Wine Gecko 1.9 branching, the tip should bump to 1.10, but I think it's time to clean up the situation a bit. Such things usually don't bring much attention, but it should be decided in public. Right now we have three versioning schemes involved in Wine Gecko: - Wine version that applies to Gecko - Gecko version (since Firefox 5 and Mozilla's rapid releases it's the same as Firefox version) - Wine Gecko version, which is just a growing number, not really connected with any of above. These numbers currently have no meaning other that being different for different Wine Gecko releases. The idea is that Wine Gecko version could be just something based on other versions, that are more informative. It's not really possible to use Wine version, because the first version of Wine that will use new Gecko is not ultimately when Wine Gecko branches. Also multiple Wine versions use the same Wine Gecko. That leaves us with Gecko (Firefox version). We don't release on every Firefox release (every 6 weeks), so if we just used Firefox version, that would look strange (like Wine Gecko 18 followed by Wine Gecko 20). That can be mitigated by using it as a minor version. So the next few release would look like: - 1.9 (that's already in beta and will be the last release using old scheme) - 2.20 (assuming the next update will be 3 months from 1.9, which means Firefox 20) - 2.22 (assuming another 3 moths for the update). Any suggestions/comments welcomed. Cheers, Jacek

4 6

Re: [PATCH] d3dx9_36/tests: Fix broken line test
by Matteo Bruni 27 Nov '12

27 Nov '12

2012/11/27 Detlef Riekenberg <wine.dev(a)web.de>: > While inspecting a test failure, i found only > 3 possible results for the line test: > - d3dx9_36.dll not present > - all tests skipped > line.c:146: Tests skipped: Failed to create IDirect3DDevice9 object 0x8876086c > - refcount test failed > line.c:113: Test failed: Got 5 references to device 0023EA60, expected 2 > (of course with different device pointer) > > See: http://test.winehq.org/data/tests/d3dx9_36:line.html > > I prefer to mark the refcount as implementation detail and remove the refcount test. > > My second way to fix the test failure is the attached patch. > Since the test was accepted to wine, there must be a machine somewhere > with a refcount of 2, so i marked that result as broken. > I think the test was accepted simply because it passed on Wine while it wasn't actually executed on WineTestBot. So yeah, removing the refcount test or adding a todo_wine is probably the way to go, adding a broken(ref == 2) doesn't seem to make much sense. Thanks for bringing this up. > d3d is not my area, so please comment. > > -- > By by ... Detlef > --- > dlls/d3dx9_36/tests/line.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c > index dc0c747..6ed508b 100644 > --- a/dlls/d3dx9_36/tests/line.c > +++ b/dlls/d3dx9_36/tests/line.c > @@ -110,7 +110,9 @@ static void test_create_line(IDirect3DDevice9* device) > expect_mat(&world, &result); > > ref = IDirect3DDevice9_Release(return_device); > - ok(ref == 2, "Got %x references to device %p, expected 2\n", ref, return_device); > + todo_wine > + ok(broken(ref == 2) || ref == 5, > + "Got %x references to device %p, expected 5\n", ref, return_device); > > ref = ID3DXLine_Release(line); > ok(ref == 0, "Got %x references to line %p, expected 0\n", ref, line); > -- > 1.7.5.4 > > >

1 0

Re: [PATCH] cabinet: Turn some ERR into WARN and improved or fix messages.
by Nikolay Sivov 27 Nov '12

27 Nov '12

On 11/27/2012 11:14, Christian Costa wrote: > --- > dlls/cabinet/fdi.c | 15 ++++++--------- > 1 file changed, 6 insertions(+), 9 deletions(-) > > diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c > index 0690b38..809a5c0 100644 > --- a/dlls/cabinet/fdi.c > +++ b/dlls/cabinet/fdi.c > @@ -710,7 +710,7 @@ static BOOL FDI_read_entries( > } > > /*********************************************************************** > - * FDIIsCabinet (CABINET.21) > + * FDIIsCabinet (CABINET.21) > * > * Informs the caller as to whether or not the provided file handle is > * really a cabinet or not, filling out the provided PFDICABINETINFO > @@ -725,7 +725,7 @@ static BOOL FDI_read_entries( > * be filled out with information about the cabinet > * file indicated by hf if, indeed, it is determined > * to be a cabinet. > - * > + * > * RETURNS > * TRUE if the file is a cabinet. The info pointed to by pfdici will > * be provided. > @@ -736,10 +736,7 @@ static BOOL FDI_read_entries( > * INCLUDES > * fdi.c > */ > -BOOL __cdecl FDIIsCabinet( > - HFDI hfdi, > - INT_PTR hf, > - PFDICABINETINFO pfdici) > +BOOL __cdecl FDIIsCabinet(HFDI hfdi, INT_PTR hf, PFDICABINETINFO pfdici) > { > BOOL rv; > FDI_Int *fdi = get_fdi_ptr( hfdi ); > @@ -749,13 +746,13 @@ BOOL __cdecl FDIIsCabinet( > if (!fdi) return FALSE; > > if (!hf) { > - ERR("(!hf)!\n"); > + WARN("No file handle\n"); > SetLastError(ERROR_INVALID_HANDLE); > return FALSE; > } > > if (!pfdici) { > - ERR("(!pfdici)!\n"); > + WARN("No cab info pointer\n"); > SetLastError(ERROR_BAD_ARGUMENTS); > return FALSE; > } This call already has a TRACE earlier, I don't see a point in tracing input parameters multiple times. > @@ -2532,7 +2529,7 @@ BOOL __cdecl FDICopy( > > /* check if it's really a cabfile. Note that this doesn't implement the bug */ > if (!FDI_read_entries(fdi, cabhf, &fdici, &(CAB(mii)))) { > - ERR("FDIIsCabinet failed: %u.\n", fdi->perf->erfOper); > + WARN("FDI_read_entries failed: %u\n", fdi->perf->erfOper); > fdi->free(decomp_state); > fdi->close(cabhf); > return FALSE; > > > >

2 1