January 2007 - Wine-devel - list.winehq.org

winebuild/DLLSPEC question
by Andrew Talbot 06 Jan '07

06 Jan '07

I was looking at Coverity bug report #CID294, and that has led me to ask about the "base" and "limit" values of the DLLSPEC structure. In winebuild/utils.c, we have: spec->base = MAX_ORDINALS; spec->limit = 0; Is that the correct way round? Thanks, -- Andy.

1 0

are trace timestamps possible?
by Robert Reif 06 Jan '07

06 Jan '07

Is there a way to get a time stamp in trace output kind of like we do now for thread id?

2 1

quartz help needed
by Robert Reif 06 Jan '07

06 Jan '07

I'm trying to get Windows Media Player 6.4 working again and am running into problems. At first it was crashing while trying to read wave files. I found 2 bugs that were preventing it from working: some minor memory corruption for questionable wave files and using a pointer before it was initialized. With these fixed (patch attached) you can now play files once but the program gets confused at the end of the file. There are a lot of fixmes and unimplemented stuff. This program was rated gold at one point so I'm not sure my fixes are completely correct. I have written dshow filters and programs in the past at work and it was an extremely frustrating experience so I would appreciate and help getting quarts working again. Index: dlls/quartz/waveparser.c =================================================================== RCS file: /home/wine/wine/dlls/quartz/waveparser.c,v retrieving revision 1.5 diff -p -u -r1.5 waveparser.c --- dlls/quartz/waveparser.c 13 Oct 2006 10:27:23 -0000 1.5 +++ dlls/quartz/waveparser.c 6 Jan 2007 13:09:25 -0000 @@ -63,6 +63,7 @@ static HRESULT WAVEParser_Sample(LPVOID long cbDstStream; long chunk_remaining_bytes = 0; long offset_src = 0; + TRACE("(%p)->(%p)\n", iface, pSample); hr = IMediaSample_GetPointer(pSample, &pbSrcStream); @@ -202,6 +203,8 @@ static HRESULT WAVEParser_Sample(LPVOID static HRESULT WAVEParser_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) { + TRACE("(%p)->(%p)\n", iface, pmt); + if (!IsEqualIID(&pmt->majortype, &MEDIATYPE_Stream)) return S_FALSE; if (IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_WAVE)) @@ -220,17 +223,21 @@ static HRESULT WAVEParser_InputPin_PreCo LONGLONG pos = 0; /* in bytes */ PIN_INFO piOutput; ALLOCATOR_PROPERTIES props; - AM_MEDIA_TYPE amt; + AM_MEDIA_TYPE * pmt; float fSamplesPerSec = 0.0f; DWORD dwSampleSize = 0; DWORD dwLength = 0; WAVEParserImpl * pWAVEParser = (WAVEParserImpl *)This->pin.pinInfo.pFilter; + LPWAVEFORMATEX pwfx; + TRACE("(%p)->(%p)\n", iface, pConnectPin); piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = (IBaseFilter *)This; lstrcpynW(piOutput.achName, wcsOutputPinName, sizeof(piOutput.achName) / sizeof(piOutput.achName[0])); hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); + if (hr != S_OK) + return E_FAIL; pos += sizeof(list); if (list.fcc != ckidRIFF) @@ -250,6 +257,8 @@ static HRESULT WAVEParser_InputPin_PreCo } hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(chunk), (BYTE *)&chunk); + if (hr != S_OK) + return E_FAIL; pos += sizeof(chunk); if (chunk.fcc != mmioFOURCC('f','m','t',' ')) { @@ -257,52 +266,79 @@ static HRESULT WAVEParser_InputPin_PreCo return E_FAIL; } - memcpy(&amt.majortype, &MEDIATYPE_Audio, sizeof(GUID)); - memcpy(&amt.formattype, &FORMAT_WaveFormatEx, sizeof(GUID)); - amt.cbFormat = chunk.cb; - amt.pbFormat = CoTaskMemAlloc(amt.cbFormat); - amt.pUnk = NULL; - hr = IAsyncReader_SyncRead(This->pReader, pos, amt.cbFormat, amt.pbFormat); - memcpy(&amt.subtype, &MEDIATYPE_Audio, sizeof(GUID)); - amt.subtype.Data1 = ((WAVEFORMATEX*)amt.pbFormat)->wFormatTag; - /* CopyMediaType(&((OutputPin*)pWAVEParser->ppPins[1])->pin.mtCurrent, &amt); */ - ((Parser_OutputPin*)pWAVEParser->Parser.ppPins[1])->pmt = (AM_MEDIA_TYPE*) CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); - - CopyMediaType(((Parser_OutputPin*)pWAVEParser->Parser.ppPins[1])->pmt, &amt); - - /* Update buffer alignment of media samples in output */ - ((Parser_OutputPin*)pWAVEParser->Parser.ppPins[1])->pin.allocProps.cbAlign = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; + pwfx = (LPWAVEFORMATEX)CoTaskMemAlloc(max(chunk.cb, sizeof(WAVEFORMATEX))); + if (!pwfx) + return E_FAIL; + hr = IAsyncReader_SyncRead(This->pReader, pos, chunk.cb, (BYTE *)pwfx); + if (hr != S_OK) { + CoTaskMemFree(pwfx); + return E_FAIL; + } pos += chunk.cb; + + if (pwfx->wFormatTag == WAVE_FORMAT_PCM) + pwfx->cbSize = 0; + + fSamplesPerSec = pwfx->nSamplesPerSec; + dwSampleSize = pwfx->nBlockAlign; + dwLength = 4096; + hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(chunk), (BYTE *)&chunk); + if (hr != S_OK) + { + CoTaskMemFree(pwfx); + return E_FAIL; + } if (chunk.fcc == mmioFOURCC('f','a','c','t')) { FIXME("'fact' chunk not supported yet\n"); pos += sizeof(chunk) + chunk.cb; hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(chunk), (BYTE *)&chunk); + if (hr != S_OK) + { + CoTaskMemFree(pwfx); + return E_FAIL; + } } if (chunk.fcc != mmioFOURCC('d','a','t','a')) { ERR("Expected 'data' chunk, but got %.04s\n", (LPSTR)&chunk.fcc); + CoTaskMemFree(pwfx); return E_FAIL; } - if (hr == S_OK) + pmt = CoTaskMemAlloc(sizeof(*pmt)); + if (!pmt) { - pWAVEParser->StartOfFile = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFCHUNK)); - pWAVEParser->EndOfFile = MEDIATIME_FROM_BYTES(pos + chunk.cb + sizeof(RIFFCHUNK)); + CoTaskMemFree(pwfx); + return E_FAIL; } - if (hr != S_OK) - return E_FAIL; + memcpy(&pmt->majortype, &MEDIATYPE_Audio, sizeof(GUID)); + memcpy(&pmt->subtype, &MEDIATYPE_Audio, sizeof(GUID)); + pmt->subtype.Data1 = pwfx->wFormatTag; + pmt->bFixedSizeSamples = TRUE; + pmt->bTemporalCompression = FALSE; + pmt->lSampleSize = pwfx->nBlockAlign; + memcpy(&pmt->formattype, &FORMAT_WaveFormatEx, sizeof(GUID)); + pmt->pUnk = NULL; + pmt->cbFormat = sizeof(*pwfx) + pwfx->cbSize; + pmt->pbFormat = (BYTE *)pwfx; + + pWAVEParser->StartOfFile = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFCHUNK)); + pWAVEParser->EndOfFile = MEDIATIME_FROM_BYTES(pos + chunk.cb + sizeof(RIFFCHUNK)); props.cbAlign = 1; props.cbPrefix = 0; props.cbBuffer = 4096; props.cBuffers = 2; - hr = Parser_AddPin(&(pWAVEParser->Parser), &piOutput, &props, &amt, fSamplesPerSec, dwSampleSize, dwLength); - + hr = Parser_AddPin(&(pWAVEParser->Parser), &piOutput, &props, pmt, fSamplesPerSec, dwSampleSize, dwLength); + + /* Update buffer alignment of media samples in output */ + ((Parser_OutputPin*)pWAVEParser->Parser.ppPins[1])->pin.allocProps.cbAlign = pwfx->nBlockAlign; + TRACE("WAVE File ok\n"); return hr;

2 1

Re: ole32: OLE clipboard functions should fail if OLE hasn't been initialised.
by Alexandre Julliard 06 Jan '07

06 Jan '07

Robert Shearman <rob(a)codeweavers.com> writes: > Add a field to the TLS data to determine whether OLE has been > initialised for the current thread and use it in the OLE clipboard > functions. This breaks the richedit tests: ../../../tools/runtest -q -P wine -M riched20.dll -T ../../.. -p riched20_test.exe.so editor.c && touch editor.ok err:ole:OleSetClipboard OLE not initialised err:ole:OleSetClipboard OLE not initialised err:ole:OleSetClipboard OLE not initialised editor.c:860: Test failed: EM_SETUNDOLIMIT didn't allow the first undo with UNDOLIMIT set to 2 editor.c:863: Test failed: EM_SETUNDOLIMIT didn't allow a second undo with UNDOLIMIT set to 2 err:ole:OleSetClipboard OLE not initialised editor.c:1256: Test failed: EM_GETMODIFY returned zero, instead of non-zero when pasting identical text err:ole:OleSetClipboard OLE not initialised editor.c:1266: Test failed: EM_GETMODIFY returned zero, instead of non-zero when pasting different text err:ole:OleFlushClipboard OLE not initialised make: *** [editor.ok] Error 4 -- Alexandre Julliard julliard(a)winehq.org

2 1

[2/8] WineD3D: Catch NOP vertex declaration changes
by Christoph Bumiller 06 Jan '07

06 Jan '07

Yet the application (NFS:MW) page faults right at startup at the address of pDecl + 4 so something's amiss ... maybe this will get fixed automatically in one of the next patches or is due to some other weird thing that affects my sources (eh?) ... as long as no one else complains, lets leave it at this. Just look again at the SetPixelShader function, this is how it looks in my current GIT (I didn't touch this one) : 3758 /* Handle recording of state blocks */ 3759 if (This->isRecordingState) { 3760 TRACE("Recording... not performing anything\n"); 3761 } 3762 3763 if (NULL != pShader) { 3764 IWineD3DPixelShader_AddRef(pShader); 3765 } 3766 if (NULL != oldShader) { 3767 IWineD3DPixelShader_Release(oldShader); 3768 } 3769 3770 if (This->isRecordingState) { 3771 TRACE("Recording... not performing anything\n"); 3772 return WINED3D_OK; 3773 } 3774 3775 if(pShader == oldShader) { 3776 TRACE("App is setting the old pixel shader over, nothing to do\n"); 3777 return WINED3D_OK; 3778 }

2 2

re: Instructions for creating the tests directory
by Dan Kegel 06 Jan '07

06 Jan '07

Bill wrote: > Is there any documentation on how to set up the tests directory for an > existing dll? Good question. Last time this came up, the answer was recorded here: http://kerneltraffic.osmirror.nl/wine/wn20021011_139.html#3 I don't know if that's correct still, but it's a start. Can you update the doc once you get it worked out? Thanks, Dan

4 3

Re: msacm32: Fix greater than vs. less than typo in comparison. (Coverity)
by Alex Villacís Lasso 05 Jan '07

05 Jan '07

Kai Blin escribió: > --- > dlls/msacm32/driver.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > ------------------------------------------------------------------------ > > diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c > index d4ad644..06e6614 100644 > --- a/dlls/msacm32/driver.c > +++ b/dlls/msacm32/driver.c > @@ -430,7 +430,7 @@ LRESULT WINAPI acmDriverMessage(HACMDRIV > /* This verification is required because DRVCONFIGINFO is 12 bytes > long, yet native msacm reports a 16-byte structure to codecs. > */ > - if (iStructSize < sizeof(DRVCONFIGINFO)) iStructSize = sizeof(DRVCONFIGINFO); > + if (iStructSize > sizeof(DRVCONFIGINFO)) iStructSize = sizeof(DRVCONFIGINFO); > pConfigInfo = HeapAlloc(MSACM_hHeap, 0, iStructSize); > if (!pConfigInfo) { > ERR("OOM while supplying DRVCONFIGINFO for DRV_CONFIGURE, using NULL\n"); > > ------------------------------------------------------------------------ > > > This is not a typo, but rather an unnecessary verification, from when I didn't know the true size of a DRVCONFIGINFO. The struct size should be *exactly 16 bytes*, even though only the first 12 bytes are used. This patch might even introduce a bug, where the struct info assumed by the codec to be 16 bytes when only 12 are allocated, and some smart-ass codec tries to use the last 4 bytes of the struct for its own purposes, which with this patch are now past the end of the allocated array. A more correct patch would fix the comment to indicate that exactly 16 bytes are allocated for a 12-byte struct, and remove the conditional assignment altogether. Alex Villacís Lasso -- perl -e '$x = 2.4; print sprintf("%.0f + %.0f = %.0f\n", $x, $x, $x + $x);'

2 1

Is Evolution the pile of .... it seems to be!
by Bill Medland 05 Jan '07

05 Jan '07

Does anyone doing OSS use evolution? I'm trying to submit a patch but can I get Evolution to not wrap it? No. I swapped from kmail to Evolution on the basis that it seemed to be being pushed as the 'real' linux mail program but I just keep being infuriated by the basic things it doesn't do and its refusal to let me have any control. Is it just me or is it the program? (and can anyone tell me how to stop it wrapping and if not then the patch will have to wait until monday :-( ) -- Bill Medland <billmedland(a)shaw.ca>

3 2

Re: appdb rating inflation
by Remco 05 Jan '07

05 Jan '07

What about a checklist of problems it doesn't have, and basing the rating on that. Something like: Installation: (_) Installs correctly. (_) No installation nessecary to run. (_) Preinstalled on Windows. (x) Doesn't install. [_] Works without an unofficially patched Wine. [_] Works without a compatibility mode different from XP. [_] Works without a registry setting. [_] Works without a crack. [_] Works without a setting in winecfg. (_) Works without glitches. (_) Has minor graphical glitches. (_) Minor Functional problems (_) Doesn't work as expected. Execution: [_] Works without an unofficially patched Wine. [_] Works without a compatibility mode different from XP. [_] Works without a registry setting. [_] Works without a crack. [_] Works without a setting in winecfg. (_) Works without glitches. (_) Has minor graphical glitches. (_) Minor Functional problems (x) Doesn't work as expected. If any isn't answered satisfactorily, it isn't Platina anymore. It is set up so that if you don't take the time to read it through, it will rate as Garbage. __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

1 0

Instructions for creating the tests directory
by Bill Medland 05 Jan '07

05 Jan '07

Is there any documentation on how to set up the tests directory for an existing dll? I couldn't see anything about the tests directory in the wiki and the stuff in the developer's guide presupposes that the test directory exists. I would rather follow instructions than have to reverse-engineer the process. -- Bill Medland <billmedland(a)shaw.ca>

3 2