November 2009 - Wine-Devel - list.winehq.org

Re: wined3d: Fix some typos
by Roderick Colenbrander Nov. 15, 2009

Nov. 15, 2009

Hi Anders, Your patch changes to two different dlls in one patch. In general a patch should only change one thing. It would be nice if you could separate it because else I'm not sure if it will be added. Roderick On Sun, Nov 15, 2009 at 9:12 PM, Anders Jonsson <anders.jonsson(a)norsjonet.se> wrote: > Fixes some typos in comctl32 and wined3d. > > >From 0656be69a97b7aae11b760fc4a436eb30191d527 Mon Sep 17 00:00:00 2001 > From: Anders Jonsson <anders.jonsson(a)norsjonet.se> > Date: Sun, 15 Nov 2009 21:05:22 +0100 > Subject: Fix some typos > > --- > dlls/comctl32/updown.c | 4 ++-- > dlls/wined3d/state.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c > index a212073..773d359 100644 > --- a/dlls/comctl32/updown.c > +++ b/dlls/comctl32/updown.c > @@ -550,7 +550,7 @@ UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) > * > * Sets bud as a new Buddy. > * Then, it should subclass the buddy > - * If window has the UDS_ARROWKEYS, it subcalsses the buddy window to > + * If window has the UDS_ARROWKEYS, it subclasses the buddy window to > * process the UP/DOWN arrow keys. > * If window has the UDS_ALIGNLEFT or UDS_ALIGNRIGHT style > * the size/pos of the buddy and the control are adjusted accordingly. > @@ -659,7 +659,7 @@ static HWND UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud) > * 'delta' amount according to the 'action' flag which can be a > * combination of FLAG_INCR and FLAG_DECR > * It notifies the parent as required. > - * It handles wraping and non-wraping correctly. > + * It handles wrapping and non-wrapping correctly. > * It is assumed that delta>0 > */ > static void UPDOWN_DoAction (UPDOWN_INFO *infoPtr, int delta, int action) > diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c > index 94fe19e..6df6e54 100644 > --- a/dlls/wined3d/state.c > +++ b/dlls/wined3d/state.c > @@ -1636,7 +1636,7 @@ static void state_wrap(DWORD state, IWineD3DStateBlockImpl *stateblock, struct w > stateblock->renderState[WINED3DRS_WRAP13] || > stateblock->renderState[WINED3DRS_WRAP14] || > stateblock->renderState[WINED3DRS_WRAP15] ) { > - FIXME("(WINED3DRS_WRAP0) Texture wraping not yet supported\n"); > + FIXME("(WINED3DRS_WRAP0) Texture wrapping not yet supported\n"); > } > } > > -- > 1.6.3.3 > > > > >

1 0

Implementing a cooling-off list in the heap
by Dan Kegel Nov. 15, 2009

Nov. 15, 2009

Valgrind has a nice option --freelist_vol which is the total size of blocks to hold on the freed block queue. It does this to help detect double free errors. Where in Wine's heap would one want to keep a free list like that? My first idea is to just add another element to the freeList array; rather than putting freed blocks into the normal element by size, they'd all go into the purgatory element until it filled up, after which they would be transferred to the normal free list according to their size. (Now off to ride the new light rail. In Los Angeles, any time they open a new one, it's cause for celebration... you kinda have to go there and see if some of the improbability will rub off on you.)

1 0

Re: ddraw/tests: Add test for refcounts of surface objects.
by Stefan Dösinger Nov. 15, 2009

Nov. 15, 2009

Am 15.11.2009 um 20:55 schrieb Vincent Povirk: > > > <0001-ddraw-tests-Add-test-for-refcounts-of-surface-object.txt> I think we already have tests for that - see IFaceRefCount() in dsurface.c

2 1

Re: shell32/tests: Fix Program Manager DDE Conformance Test Failues
by Greg Geldorp Nov. 15, 2009

Nov. 15, 2009

> I think you misunderstood me. The window is created but as you're > searching for a "Startup" window's title it fails on localized > systems. So the test is not completely correct and only work on > English system. That's why I proposed to skip the two tests on (and > only on) such systems. I haven't tested this, but perhaps it's possible to use SHGetSpecialFolderPath(..., CSIDL_STARTUP, ...) to obtain the (localized) file system location of the "Startup" folder, then use the last part of that path as the window title to search for. E.g. on English Windows the path retrieved by the call would be "C:\Documents and Settings\<username>\Start Menu\Programs\Startup", taking the last component would result in "Startup". On Dutch Windows the path would be "C:\Documents and Settings\<username>\Menu Start\Programma's\Opstarten", resulting in a last component of "Opstarten" which most likely is also the window title. Greg.

1 0

Re: shell32/tests: Fix Program Manager DDE Conformance Test Failures
by Nicolas Le Cam Nov. 15, 2009

Nov. 15, 2009

2009/11/14 Mikey Alexander <firesword14(a)yahoo.com>: > Fixes a memory leak, non connection to the progman dde on early windows, and timeout problems with the conformance tests. > > --- > dlls/shell32/tests/progman_dde.c | 25 +++++++++++++++++-------- > 1 files changed, 17 insertions(+), 8 deletions(-) > Hi Mikey, There's also a test failure on localized Windows (see http://test.winehq.org/data/8a17a028b73d1ccc5b7ebaa9e135a1bfbf159615/2000_w… for example) because the window doesn't have the expected title. I tried to skip the ShowGroupTest call at line 510 (before your patch) but then the next call fails. Is there a better solution than skipping those two calls ? If not I'll just send a skipping patch. -- Nicolas Le Cam

2 2

Working on avifil32, sudden "non enough memory" error
by Julius Schwartzenberg Nov. 15, 2009

Nov. 15, 2009

Hi, I'm working on fixing some things in avifil32. Several problems should be gone when using the attached four patches and most AVI files play back properly. With one file however (GOODTIME.AVI from the win95 cd) I get this error after about a second: err:heap:HEAP_ValidateInUseArena Heap 0x110000: in-use arena 0x184420 next block has PREV_FREE flag non enough memory I have no idea where this comes from and why it happens. (It appears to be unrelated to the memcpy call in avifile.c around line 1114.) With +heap I also get this before the error: HIGHPERF/GOODTIME.AVI: heap.c:403: HEAP_GetPtr: Controletest '0' faalt. (the assert fails) The whole output is here: http://haar.student.utwente.nl/~julius/avifile-heaperr.log.gz What could I try to figure out the cause of this problem? I can provide both the file and my test program if necessary. Note that on MS Windows XP it all works without problems. Thanks in advance, Julius >From a5fdf2316923e9b4fd254e571b5f70cb5a5ee87f Mon Sep 17 00:00:00 2001 From: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Sun, 8 Nov 2009 15:18:26 +0100 Subject: avifile: Fix header for audio stream --- dlls/avifil32/avifile.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 49e141f..4ecc6f6 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1816,7 +1816,15 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) if (FAILED(hr)) return hr; }; - + if (pStream->lpFormat != NULL && pStream->sInfo.fccType == streamtypeAUDIO) + { + WAVEFORMATEX *wfx = pStream->lpFormat; + wfx->nBlockAlign = wfx->nChannels * wfx->wBitsPerSample / 8; + pStream->sInfo.dwSampleSize = wfx->nBlockAlign; + TRACE("Block size reset to %u, chan=%u bpp=%u\n", wfx->nBlockAlign, wfx->nChannels, wfx->wBitsPerSample); + pStream->sInfo.dwScale = 1; + pStream->sInfo.dwRate = wfx->nSamplesPerSec; + } if (mmioAscend(This->hmmio, &ck, 0) != S_OK) return AVIERR_FILEREAD; } -- 1.6.3.3 >From 84a0ee0327569c91c74d99be3c124c09cfc45cb9 Mon Sep 17 00:00:00 2001 From: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Sun, 8 Nov 2009 15:28:19 +0100 Subject: avifile: Fix header suggested buffersize --- dlls/avifil32/avifile.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 4ecc6f6..c40cbd9 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1652,7 +1652,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) This->fInfo.dwCaps = AVIFILECAPS_CANREAD|AVIFILECAPS_CANWRITE; This->fInfo.dwLength = MainAVIHdr.dwTotalFrames; This->fInfo.dwStreams = MainAVIHdr.dwStreams; - This->fInfo.dwSuggestedBufferSize = MainAVIHdr.dwSuggestedBufferSize; + This->fInfo.dwSuggestedBufferSize = 0; This->fInfo.dwWidth = MainAVIHdr.dwWidth; This->fInfo.dwHeight = MainAVIHdr.dwHeight; LoadStringW(AVIFILE_hModule, IDS_AVIFILETYPE, This->fInfo.szFileType, @@ -1754,8 +1754,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) pStream->sInfo.dwRate = streamHdr.dwRate; pStream->sInfo.dwStart = streamHdr.dwStart; pStream->sInfo.dwLength = streamHdr.dwLength; - pStream->sInfo.dwSuggestedBufferSize = - streamHdr.dwSuggestedBufferSize; + pStream->sInfo.dwSuggestedBufferSize = 0; pStream->sInfo.dwQuality = streamHdr.dwQuality; pStream->sInfo.dwSampleSize = streamHdr.dwSampleSize; pStream->sInfo.rcFrame.left = streamHdr.rcFrame.left; @@ -1905,6 +1904,13 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) } } + for (nStream = 0; nStream < This->fInfo.dwStreams; nStream++) + { + DWORD sugbuf = This->ppStreams[nStream]->sInfo.dwSuggestedBufferSize; + if (This->fInfo.dwSuggestedBufferSize < sugbuf) + This->fInfo.dwSuggestedBufferSize = sugbuf; + } + /* find other chunks */ FindChunkAndKeepExtras(&This->fileextra, This->hmmio, &ck, &ckRIFF, 0); -- 1.6.3.3 >From c6437174e6c2241b95b0d9b30ae6d2cac8218cdc Mon Sep 17 00:00:00 2001 From: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Sun, 8 Nov 2009 15:32:33 +0100 Subject: avifile: Fix playback of fixed sample size audio stream --- dlls/avifil32/avifile.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index c40cbd9..5fa45ae 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1093,6 +1093,9 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start, /* convert samples to bytes */ samples *= This->sInfo.dwSampleSize; + if (!buffer) + buffersize = samples; + while (samples > 0 && buffersize > 0) { if (block != This->dwCurrentFrame) { hr = AVIFILE_ReadBlock(This, block, NULL, 0); @@ -1102,11 +1105,12 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start, size = min((DWORD)samples, (DWORD)buffersize); size = min(size, This->cbBuffer - offset); - memcpy(buffer, ((BYTE*)&This->lpBuffer[2]) + offset, size); - + if (buffer) + memcpy(buffer, ((BYTE*)&This->lpBuffer[2]) + offset, size); block++; offset = 0; - buffer = ((LPBYTE)buffer)+size; + if (buffer) + buffer = ((LPBYTE)buffer)+size; samples -= size; buffersize -= size; @@ -1117,7 +1121,9 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start, *samplesread += size / This->sInfo.dwSampleSize; } - if (samples == 0) + TRACE("Returning %d/%d\n", bytesread ? *bytesread : -1, samplesread ? *samplesread : -1); + + if (samples == 0 || !buffer) return AVIERR_OK; else return AVIERR_BUFFERTOOSMALL; -- 1.6.3.3 >From 9a429b3146f6718b3742816e2ff163e65e1ad748 Mon Sep 17 00:00:00 2001 From: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Sun, 15 Nov 2009 17:07:52 +0100 Subject: Fix ticking problem which occured when reading through a block --- dlls/avifil32/avifile.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 5fa45ae..88bf2ab 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1089,6 +1089,7 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start, /* convert start sample to block,offset pair */ AVIFILE_SamplesToBlock(This, &block, &offset); + TRACE("block=%d, offset=%d\n", block, offset); /* convert samples to bytes */ samples *= This->sInfo.dwSampleSize; @@ -1097,6 +1098,7 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start, buffersize = samples; while (samples > 0 && buffersize > 0) { + LONG blocksize; if (block != This->dwCurrentFrame) { hr = AVIFILE_ReadBlock(This, block, NULL, 0); if (FAILED(hr)) @@ -1104,7 +1106,10 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start, } size = min((DWORD)samples, (DWORD)buffersize); - size = min(size, This->cbBuffer - offset); + blocksize = (BYTE*)This->lpBuffer[1]; +/* blocksize = This->cbBuffer; */ + TRACE("blocksize = %u\n",blocksize); + size = min(size, blocksize - offset); if (buffer) memcpy(buffer, ((BYTE*)&This->lpBuffer[2]) + offset, size); block++; -- 1.6.3.3

1 0

avifile bugfixes
by Julius Schwartzenberg Nov. 15, 2009

Nov. 15, 2009

Here are some bugfixes for avifile that Maarten mainly did during WineConf. The behaviour corresponds to what native avifil32 does. I will add tests to show this and submit the patches then. (Maybe avifil32 does a few more hacks like these, I'll add those too when I find them when creating tests.) If anyone has any comments on the patches as they are now already, please let me know. Thanks! Julius >From 2e9c13211c0343fd59faf835a1d954416ab46203 Mon Sep 17 00:00:00 2001 From: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Sun, 8 Nov 2009 15:18:26 +0100 Subject: [PATCH 1/3] avifile: Fix header for audio stream --- dlls/avifil32/avifile.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 49e141f..4ecc6f6 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1816,7 +1816,15 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) if (FAILED(hr)) return hr; }; - + if (pStream->lpFormat != NULL && pStream->sInfo.fccType == streamtypeAUDIO) + { + WAVEFORMATEX *wfx = pStream->lpFormat; + wfx->nBlockAlign = wfx->nChannels * wfx->wBitsPerSample / 8; + pStream->sInfo.dwSampleSize = wfx->nBlockAlign; + TRACE("Block size reset to %u, chan=%u bpp=%u\n", wfx->nBlockAlign, wfx->nChannels, wfx->wBitsPerSample); + pStream->sInfo.dwScale = 1; + pStream->sInfo.dwRate = wfx->nSamplesPerSec; + } if (mmioAscend(This->hmmio, &ck, 0) != S_OK) return AVIERR_FILEREAD; } -- 1.6.3.3 >From 969620de75ae75d13cf5f443842cee8bf28c4362 Mon Sep 17 00:00:00 2001 From: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Sun, 8 Nov 2009 15:28:19 +0100 Subject: [PATCH 2/3] avifile: Fix header suggested buffersize --- dlls/avifil32/avifile.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 4ecc6f6..c40cbd9 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1652,7 +1652,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) This->fInfo.dwCaps = AVIFILECAPS_CANREAD|AVIFILECAPS_CANWRITE; This->fInfo.dwLength = MainAVIHdr.dwTotalFrames; This->fInfo.dwStreams = MainAVIHdr.dwStreams; - This->fInfo.dwSuggestedBufferSize = MainAVIHdr.dwSuggestedBufferSize; + This->fInfo.dwSuggestedBufferSize = 0; This->fInfo.dwWidth = MainAVIHdr.dwWidth; This->fInfo.dwHeight = MainAVIHdr.dwHeight; LoadStringW(AVIFILE_hModule, IDS_AVIFILETYPE, This->fInfo.szFileType, @@ -1754,8 +1754,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) pStream->sInfo.dwRate = streamHdr.dwRate; pStream->sInfo.dwStart = streamHdr.dwStart; pStream->sInfo.dwLength = streamHdr.dwLength; - pStream->sInfo.dwSuggestedBufferSize = - streamHdr.dwSuggestedBufferSize; + pStream->sInfo.dwSuggestedBufferSize = 0; pStream->sInfo.dwQuality = streamHdr.dwQuality; pStream->sInfo.dwSampleSize = streamHdr.dwSampleSize; pStream->sInfo.rcFrame.left = streamHdr.rcFrame.left; @@ -1905,6 +1904,13 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) } } + for (nStream = 0; nStream < This->fInfo.dwStreams; nStream++) + { + DWORD sugbuf = This->ppStreams[nStream]->sInfo.dwSuggestedBufferSize; + if (This->fInfo.dwSuggestedBufferSize < sugbuf) + This->fInfo.dwSuggestedBufferSize = sugbuf; + } + /* find other chunks */ FindChunkAndKeepExtras(&This->fileextra, This->hmmio, &ck, &ckRIFF, 0); -- 1.6.3.3 >From 39d6ecab76989b93d35a0568e105fd306fa32706 Mon Sep 17 00:00:00 2001 From: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Sun, 8 Nov 2009 15:32:33 +0100 Subject: [PATCH 3/3] avifile: Fix playback of fixed sample size audio stream --- dlls/avifil32/avifile.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index c40cbd9..5fa45ae 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1093,6 +1093,9 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start, /* convert samples to bytes */ samples *= This->sInfo.dwSampleSize; + if (!buffer) + buffersize = samples; + while (samples > 0 && buffersize > 0) { if (block != This->dwCurrentFrame) { hr = AVIFILE_ReadBlock(This, block, NULL, 0); @@ -1102,11 +1105,12 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start, size = min((DWORD)samples, (DWORD)buffersize); size = min(size, This->cbBuffer - offset); - memcpy(buffer, ((BYTE*)&This->lpBuffer[2]) + offset, size); - + if (buffer) + memcpy(buffer, ((BYTE*)&This->lpBuffer[2]) + offset, size); block++; offset = 0; - buffer = ((LPBYTE)buffer)+size; + if (buffer) + buffer = ((LPBYTE)buffer)+size; samples -= size; buffersize -= size; @@ -1117,7 +1121,9 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start, *samplesread += size / This->sInfo.dwSampleSize; } - if (samples == 0) + TRACE("Returning %d/%d\n", bytesread ? *bytesread : -1, samplesread ? *samplesread : -1); + + if (samples == 0 || !buffer) return AVIERR_OK; else return AVIERR_BUFFERTOOSMALL; -- 1.6.3.3

2 2

Re: user32/tests: Test edit control to WM_GETTEXT processing after WM_DESTROY
by Ilya Shpigor Nov. 15, 2009

Nov. 15, 2009

Please don't commit this test. Instead use or comment next try: user32: Destroy EDITSTATE structure in the WM_NCDESTROY message processing -- Best regards, Ilya Shpigor.

1 0

commit 70ae1ba4 caused regression in dinpu9
by Vitaliy Margolen Nov. 15, 2009

Nov. 15, 2009

Markus, You patch caused regression: http://bugs.winehq.org/show_bug.cgi?id=20711 Please take a look. Vitaliy.

1 0

Implementing FLG_HEAP_ENABLE_TAIL_CHECK
by Dan Kegel Nov. 15, 2009

Nov. 15, 2009

Running Chromium's test suite under valgrind+wine did find a handful of interesting Wine problems, and one or two Chromium problems, but it seems to miss a whole bunch of problems Purify catches. Thinking about it a bit, I realized that Valgrind replaces the linux heap with one that puts guard bytes before and after each allocation, and marks those guard bytes as inaccessible. Valgrind's replacement heap also keeps freed blocks out of circulation for a while, marking them completely inaccessible so that references to freed blocks are caught. At the moment, nothing does this when running win32 apps under wine+valgrind; sure, wine informs Valgrind about the allocations made by the NT heap, but it doesn't put any guard bytes around them. So, how can we achieve this on Wine? The Wine philosophy is to look for how Windows likes to do things, and sure enough, there are ways to tell the Windows kernel to do similar things. http://technet.microsoft.com/en-us/library/cc736347(WS.10).aspx describes the gflags utility, used to set registry flags that end up controlling the NtGlobalFlags field of each processes' PEB. FLG_HEAP_ENABLE_TAIL_CHECK tells the heap to add guard bytes at the end of each allocation. FLG_HEAP_PAGE_ALLOCS tells the heap to add a whole guard page at the end of each allocation. (The /backwards option to gflags modifies this to put the page at the beginning of the allocation, but I don't know what NtGlobalFlags value this corresponds to.) I don't see any option there for "keep newly freed blocks out of circulation for the moment"; FLG_HEAP_DISABLE_COALESCING is kind of close. I'm tempted to try implementing enough of this so Wine+Valgrind can catch more of the Chromium errors that Purify can. Thoughts? - Dan

1 0