September 2011 - Wine-devel

Re: [PATCH 2/5] ddraw: Use offscreen backbuffers.
by Stefan Dösinger 16 Sep '11

16 Sep '11

On Thursday 15 September 2011 20:01:50 Henri Verbeet wrote: > In principle this allows us to use more than one backbuffer in ddraw. It's > also a requirement for the next patch. I think this, and the next patch should be implemented in wined3d by handling D3DSWAPEFFECT_FLIP in essentially the same way you're handling them in ddraw in your patches. d3d8 and d3d9 apps can request multiple backbuffers and access them explicitly just like ddraw apps can. In patch 3 I'm not sure what happens when the app draws to the frontbuffer directly. Maybe I'm a bit too tired to see it, but doesn't that result in a blit of the surface onto itself?

2 3

ubuntu ppa -- nice to have on development version too
by Susan Cragin 16 Sep '11

16 Sep '11

There was discussion about putting a daily wine build on the ubuntu ppa. I'd like to put in a word for having it on the development version (currently oneiric) as well as the stable version (natty). Right now wine only seems to have a natty ppa.

2 2

Re: [PATCH] rpcrt4/rpc_transport.c: the named pipe can be used for multiple operations at the same time, so use overlapped operations for ReadFile and WriteFile
by Jérôme Gardou 15 Sep '11

15 Sep '11

Le 14/09/2011 14:19, Bernhard Loos a écrit : > --- > dlls/rpcrt4/rpc_transport.c | 53 +++++++++++++++++++++++------------------- > 1 files changed, 29 insertions(+), 24 deletions(-) > > Hi! I had a quite similar patch, but you beat me! Anyway, aren't those funtions susceptible to be called in a multithreaded environment? If so, having an unique event for all the read or write operations seems dangerous to me. Regards. Jérôme.

1 0

Re: [PATCH] oleaut32: OLEPictureImpl_Load uses Seek(STREAM_SEEK_END) to find the stream length
by Bernhard Loos 15 Sep '11

15 Sep '11

On Thu, Sep 15, 2011 at 08:28:53AM, Marcus Meissner wrote: > On Thu, Sep 15, 2011 at 02:09:56PM +0200, Bernhard Loos wrote: > > --- > > dlls/oleaut32/olepicture.c | 148 +++++++++++++------------------------- > > dlls/oleaut32/tests/olepicture.c | 16 ++--- > > 2 files changed, 54 insertions(+), 110 deletions(-) > > Did make check work for you even? Marvin does not like it at least. > > This will break NonStatable streams, also seekability of streams can > not be assumed. > > Ciao, Marcus Windows never calls Stat on the stream, and it bails out, if Seek doesn't work, it certainly never reads until the end of the stream. Thats at least what happens on XP. This only breaks on jpeg images, so I suspect the difference is in the actual image rendering code. Wine always reads the complete image into memory and then creates the image from this memory buffer with IWICStream_InitializeFromMemory for example, while windows probably calls IWICStream_InitializeFromIStream. And this method reads a 4096 bytes chunk at first and depends on Read checking for the end of the stream. Bernhard

1 0

Re: msxml3: Move and Register xmlparser.idl in msxml3
by Austin English 15 Sep '11

15 Sep '11

On Thu, Sep 15, 2011 at 07:35, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Hi, > > > Changelog: > msxml3: Move and Register xmlparser.idl in msxml3 > > > Best Regards > Alistair Leslie-Hughes Howdy Alistair, You forgot to remove the include from include/Makefile.in, causing a build failure here: make[1]: Entering directory `/home/austin/wine-git/include' ../tools/makedep -C. -S.. -T.. activaut.idl activdbg.idl activscp.idl amstream.idl amvideo.idl asptlb.idl atliface.idl audioclient.idl audiopolicy.idl austream.idl bits.idl bits1_5.idl comcat.idl commoncontrols.idl control.idl cor.idl ctfutb.idl ctxtcall.idl d3d10.idl d3d10_1.idl d3d11.idl d3dcommon.idl ddstream.idl devicetopology.idl dimm.idl dispex.idl docobj.idl docobjectservice.idl downloadmgr.idl dxgi.idl endpointvolume.idl exdisp.idl fusion.idl gameux.idl hlink.idl htiframe.idl httprequest.idl iads.idl icftypes.idl iextag.idl imnact.idl imnxport.idl indexsrv.idl mediaobj.idl metahost.idl mimeinfo.idl mimeole.idl mlang.idl mmdeviceapi.idl mmstream.idl mscoree.idl msctf.idl msdadc.idl mshtmhst.idl mshtml.idl msinkaut.idl mstask.idl msxml.idl msxml2.idl msxml6.idl netcon.idl netfw.idl oaidl.idl objectarray.idl objidl.idl objsafe.idl ocidl.idl ocmm.idl oleacc.idl oledb.idl oleidl.idl optary.idl perhist.idl propidl.idl propsys.idl pstore.idl qedit.idl richole.idl sensevts.idl servprov.idl shdeprecated.idl shldisp.idl shobjidl.idl shtypes.idl strmif.idl structuredquerycondition.idl textstor.idl tom.idl unknwn.idl urlhist.idl urlmon.idl vmr9.idl wbemcli.idl wia_lh.idl wia_xp.idl wincodec.idl wine/itss.idl wine/svcctl.idl winsxs.idl wpcapi.idl wtypes.idl wuapi.idl xmllite.idl xmlparser.idl wine/winedxgi.idl stdole2.idl stdole2.tlb xmlparser.idl: No such file or directory make[1]: *** [depend] Error 1 make[1]: Leaving directory `/home/austin/wine-git/include' -- -Austin

1 0

re: [PATCH 13/19] vbscript: Added class functions parser implementation
by Dan Kegel 15 Sep '11

15 Sep '11

Fails here under WINEDEBUG=warn-heap: ../../../tools/runtest -q -P wine -M vbscript.dll -T ../../.. -p vbscript_test.exe.so run.c && touch run.ok wine: Unhandled page fault on read access to 0x55555555 at address 0x4004c1e4 (thread 0019), starting debugger... Backtrace: =>0 0x4004c1e4 add_class_function+0x29(ctx=0x33fad8, class_decl=0x151dd4, decl=0x151dbc) [dlls/vbscript/parser.y:638] 1 0x4004b63e parser_parse+0xee6(ctx=0x33fad8) [dlls/vbscript/parser.y:294] 2 0x4004c3a2 parse_script+0xae(ctx=0x33fad8, code="...", ret=0x33fbe8) [dlls/vbscript/compile.c:961] 4 0x40049685 VBScriptParse_ParseScriptText+0x12d(iface=0x125e5c, pstrCode="...", pstrItemName=0x0(nil), punkContext=(nil), pstrDelimiter=0x0(nil), dwSourceContextCookie=0, ulStartingLine=0, dwFlags=0, pvarResult=(nil), pexcepinfo=(nil)) [dlls/vbscript/vbscript.c:554] 5 0x684b796d parse_script+0x32c(flags=0x8, script_str="...") [dlls/vbscript/tests/run.c:683] 6 0x684b7e99 run_from_res+0x15b(name="lang.vbs") [dlls/vbscript/tests/run.c:784] 7 0x684b845c run_tests+0x4eb() [dlls/vbscript/tests/run.c:841] 8 0x684b854c func_run+0x7a() [dlls/vbscript/tests/run.c:871] 9 0x684bb2d3 run_test+0x9e(name="run.c") [dlls/vbscript/tests/../../../include/wine/test.h:556] 0x4004c1e4 add_class_function+0x29 [dlls/vbscript/parser.y:638] in vbscript: movl 0x0(%eax),%eax 638 if(!strcmpiW(iter->name, decl->name)) { On Thu, Sep 15, 2011 at 8:16 AM, <buildbot(a)kegel.com> wrote: > This is an experimental automated build and test service. > Please feel free to ignore this email while we work the kinks out. > > For more info about this message, see http://wiki.winehq.org/BuildBot > > The Buildbot has detected a failed build on builder runtests-heaptest while building Wine. > Full details are available at: http://buildbot.kegel.com/builders/runtests-heaptest/builds/92 (though maybe not for long, as I'm still reinstalling the buildbot periodically while experimenting) > BUILD FAILED: failed shell_3 > > Errors: > make: *** [run.ok] Error 5 > >

2 1

Re: ole32/tests: Fix compilation on systems that don't support nameless unions.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Dan Kegel <dank(a)kegel.com> writes: > Also be a bit more uniform about using U() instead of .u when accessing LowPart. .u is better. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] oleaut32: OLEPictureImpl_Load uses Seek(STREAM_SEEK_END) to find the stream length
by Marcus Meissner 15 Sep '11

15 Sep '11

On Thu, Sep 15, 2011 at 02:09:56PM +0200, Bernhard Loos wrote: > --- > dlls/oleaut32/olepicture.c | 148 +++++++++++++------------------------- > dlls/oleaut32/tests/olepicture.c | 16 ++--- > 2 files changed, 54 insertions(+), 110 deletions(-) Did make check work for you even? Marvin does not like it at least. This will break NonStatable streams, also seekability of streams can not be assumed. Ciao, Marcus > diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c > index 8081785..725207f 100644 > --- a/dlls/oleaut32/olepicture.c > +++ b/dlls/oleaut32/olepicture.c > @@ -1324,15 +1324,13 @@ static HRESULT OLEPictureImpl_LoadAPM(OLEPictureImpl *This, > */ > static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) { > HRESULT hr; > - BOOL headerisdata; > - BOOL statfailed = FALSE; > - ULONG xread, toread; > - ULONG headerread; > + ULONG xread, toread = 0; > BYTE *xbuf; > DWORD header[2]; > WORD magic; > - STATSTG statstg; > OLEPictureImpl *This = impl_from_IPersistStream(iface); > + ULARGE_INTEGER end, start; > + LARGE_INTEGER offset; > > TRACE("(%p,%p)\n",This,pStm); > > @@ -1348,104 +1346,56 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) > * At least in Visual Basic 6, resource streams, valid headers are > * header[0] == "lt\0\0", > * header[1] == length_of_stream. > - * > - * Also handle streams where we do not have a working "Stat" method by > - * reading all data until the end of the stream. > */ > - hr = IStream_Stat(pStm,&statstg,STATFLAG_NONAME); > - if (hr != S_OK) { > - TRACE("stat failed with hres %x, proceeding to read all data.\n",hr); > - statfailed = TRUE; > - /* we will read at least 8 byte ... just right below */ > - statstg.cbSize.QuadPart = 8; > - } > + offset.QuadPart = 0; > > - toread = 0; > - headerread = 0; > - headerisdata = FALSE; > do { > - hr = IStream_Read(pStm, header, 8, &xread); > - if (hr != S_OK || xread!=8) { > - ERR("Failure while reading picture header (hr is %x, nread is %d).\n",hr,xread); > - return (hr?hr:E_FAIL); > - } > - headerread += xread; > - xread = 0; > - > - if (!memcmp(&(header[0]),"lt\0\0", 4) && (statfailed || (header[1] + headerread <= statstg.cbSize.QuadPart))) { > - if (toread != 0 && toread != header[1]) > - FIXME("varying lengths of image data (prev=%u curr=%u), only last one will be used\n", > - toread, header[1]); > - toread = header[1]; > - if (toread == 0) break; > - } else { > - if (!memcmp(&(header[0]), "GIF8", 4) || /* GIF header */ > - !memcmp(&(header[0]), "BM", 2) || /* BMP header */ > - !memcmp(&(header[0]), "\xff\xd8", 2) || /* JPEG header */ > - (header[0] == EMR_HEADER) || /* EMF header */ > - (header[1] > statstg.cbSize.QuadPart)|| /* invalid size */ > - (header[1]==0) > - ) {/* Found start of bitmap data */ > - headerisdata = TRUE; > - if (toread == 0) > - toread = statstg.cbSize.QuadPart-8; > - else toread -= 8; > - xread = 8; > - } else { > - FIXME("Unknown stream header magic: %08x\n", header[0]); > - toread = header[1]; > - } > - } > - } while (!headerisdata); > - > - if (statfailed) { /* we don't know the size ... read all we get */ > - int sizeinc = 4096; > - int origsize = sizeinc; > - ULONG nread = 42; > - > - TRACE("Reading all data from stream.\n"); > - xbuf = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, origsize); > - if (headerisdata) > - memcpy (xbuf, header, 8); > - while (1) { > - while (xread < origsize) { > - hr = IStream_Read(pStm,xbuf+xread,origsize-xread,&nread); > - xread += nread; > - if (hr != S_OK || !nread) > - break; > - } > - if (!nread || hr != S_OK) /* done, or error */ > - break; > - if (xread == origsize) { > - origsize += sizeinc; > - sizeinc = 2*sizeinc; /* exponential increase */ > - xbuf = HeapReAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, xbuf, origsize); > - } > - } > - if (hr != S_OK) > - TRACE("hr in no-stat loader case is %08x\n", hr); > - TRACE("loaded %d bytes.\n", xread); > - This->datalen = xread; > - This->data = xbuf; > - } else { > - This->datalen = toread+(headerisdata?8:0); > - xbuf = This->data = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, This->datalen); > - if (!xbuf) > - return E_OUTOFMEMORY; > - > - if (headerisdata) > - memcpy (xbuf, header, 8); > - > - while (xread < This->datalen) { > - ULONG nread; > - hr = IStream_Read(pStm,xbuf+xread,This->datalen-xread,&nread); > - xread += nread; > - if (hr != S_OK || !nread) > - break; > - } > - if (xread != This->datalen) > - ERR("Could only read %d of %d bytes out of stream?\n",xread,This->datalen); > + hr = IStream_Seek(pStm, offset, STREAM_SEEK_CUR, &start); > + if (FAILED(hr)) > + return hr; > + > + hr = IStream_Read(pStm, header, 8, &xread); > + if (FAILED(hr) || xread!=8) { > + ERR("Failure while reading picture header (hr is %x, nread is %d).\n",hr,xread); > + return (FAILED(hr)?hr:E_FAIL); > + } > + > + if (memcmp(&(header[0]),"lt", 2)) { > + if (!toread) { > + hr = IStream_Seek(pStm, offset, STREAM_SEEK_END, &end); > + if (FAILED(hr)) > + return hr; > + toread = end.QuadPart - start.QuadPart; > + } > + offset.QuadPart = start.QuadPart; > + hr = IStream_Seek(pStm, offset, STREAM_SEEK_SET, NULL); > + if (FAILED(hr)) > + return hr; > + break; > + } > + else { > + toread = header[1]; > + if (toread == 0) > + break; > + } > + } while (1); > + > + This->datalen = toread; > + xbuf = This->data = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, This->datalen); > + if (!xbuf) > + return E_OUTOFMEMORY; > + > + xread = 0; > + while (xread < This->datalen) { > + ULONG nread; > + hr = IStream_Read(pStm,xbuf+xread,This->datalen-xread,&nread); > + xread += nread; > + if (FAILED(hr) || !nread) > + break; > } > + if (xread != This->datalen) > + ERR("Could only read %d of %d bytes out of stream?\n",xread,This->datalen); > + > if (This->datalen == 0) { /* Marks the "NONE" picture */ > This->desc.picType = PICTYPE_NONE; > return S_OK; > diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c > index 54de1cb..b1fad94 100644 > --- a/dlls/oleaut32/tests/olepicture.c > +++ b/dlls/oleaut32/tests/olepicture.c > @@ -1063,20 +1063,14 @@ static HRESULT WINAPI NoStatStreamImpl_Read( > { > NoStatStreamImpl* const This = impl_from_IStream(iface); > void* supportBuffer; > - ULONG bytesReadBuffer; > - ULONG bytesToReadFromBuffer; > > - if (pcbRead==0) > - pcbRead = &bytesReadBuffer; > - bytesToReadFromBuffer = min( This->streamSize.u.LowPart - This->currentPosition.u.LowPart, cb); > supportBuffer = GlobalLock(This->supportHandle); > - memcpy(pv, (char *) supportBuffer+This->currentPosition.u.LowPart, bytesToReadFromBuffer); > - This->currentPosition.u.LowPart+=bytesToReadFromBuffer; > - *pcbRead = bytesToReadFromBuffer; > + memcpy(pv, (char *) supportBuffer+This->currentPosition.u.LowPart, cb); > + This->currentPosition.u.LowPart+=cb; > GlobalUnlock(This->supportHandle); > - if(*pcbRead == cb) > - return S_OK; > - return S_FALSE; > + if(pcbRead) > + *pcbRead = cb; > + return S_OK; > } > > static HRESULT WINAPI NoStatStreamImpl_Write( > -- Working, but not speaking, for the following german company: SUSE LINUX Products GmbH, HRB 16746 (AG Nuernberg) Geschaeftsfuehrer: Jeff Hawn, Jennifer Guild, Felix Imendoerffer

1 0

Re: [PATCH 19/19] vbscript: Added stop statement semi-stub implementation
by Marvin 15 Sep '11

15 Sep '11

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=14271 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 === W7PROX64 (64 bit) === No test summary line found

1 0

Re: [PATCH 18/19] vbscript: Added this object to identifier lookup chanin
by Marvin 15 Sep '11

15 Sep '11

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=14270 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 === W7PROX64 (64 bit) === No test summary line found

1 0