June 2011 - Wine-devel - list.winehq.org

Re: strmbase: Don't use list_count() to check that a list is not empty.
by Michael Stefaniuc 16 Jun '11

16 Jun '11

Please ignore this one. I was too excited about this easy task for coccinelle that I missed Joerg's second patch. bye michael On 06/16/2011 01:39 PM, Michael Stefaniuc wrote: > --- > Thanks to Joerg for the inspiration to this sort coccinelle script: > > @@ > expression E; > @@ > ( > - list_count(E) == 0 > + list_empty(E) > | > - list_count(E)> 0 > + !list_empty(E) > ) > > > > > dlls/strmbase/outputqueue.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c > index 4f4ecf8..c8c268f 100644 > --- a/dlls/strmbase/outputqueue.c > +++ b/dlls/strmbase/outputqueue.c > @@ -190,7 +190,7 @@ VOID WINAPI OutputQueue_SendAnyway(OutputQueue *pOutputQueue) > if (pOutputQueue->hThread) > { > EnterCriticalSection(&pOutputQueue->csQueue); > - if (list_count(pOutputQueue->SampleList)> 0) > + if (!list_empty(pOutputQueue->SampleList)) > { > pOutputQueue->bSendAnyway = TRUE; > SetEvent(pOutputQueue->hProcessQueue); > @@ -235,14 +235,14 @@ DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue) > do > { > EnterCriticalSection(&pOutputQueue->csQueue); > - if (list_count(pOutputQueue->SampleList)> 0&& > + if (!list_empty(pOutputQueue->SampleList)&& > (!pOutputQueue->bBatchExact || > list_count(pOutputQueue->SampleList)>= pOutputQueue->lBatchSize || > pOutputQueue->bSendAnyway > ) > ) > { > - while (list_count(pOutputQueue->SampleList)> 0) > + while (!list_empty(pOutputQueue->SampleList)) > { > IMediaSample **ppSamples; > LONG nSamples; > @@ -278,7 +278,7 @@ DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue) > HeapFree(GetProcessHeap(),0,ppSamples); > > /* Process Non-Samples */ > - if (list_count(pOutputQueue->SampleList)> 0) > + if (!list_empty(pOutputQueue->SampleList)) > { > LIST_FOR_EACH_SAFE(cursor, cursor2, pOutputQueue->SampleList) > { -- Michael Stefaniuc Tel.: +49-711-96437-199 Consulting Communications Engineer Fax.: +49-711-96437-111 -------------------------------------------------------------------- Reg. Adresse: Red Hat GmbH, Otto-Hahn-Strasse 20, 85609 Dornach Handelsregister: Amtsgericht Muenchen HRB 153243 Geschäftsführer: Brendan Lane, Charlie Peters, Michael Cunningham, Charles Cachera

1 0

Re: [PATCH 2/2] wineboot: Split prefix updating into two parts.
by Alexandre Julliard 16 Jun '11

16 Jun '11

David Hedberg <dhedberg(a)codeweavers.com> writes: > On initial prefix creation, services.exe is started before the > environment is properly set up. This leads to calls to > ExpandEnvironmentStrings failing, in turn breaking at least one > installer. This splits the creation/update process into two parts, and > sets up the environment before starting services. That's ugly, we shouldn't have to worry about the order of service registrations and things like that. Most likely we need to setup a minimal environment before calling wineboot. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [2/3] cmd/tests: Add support for todo_wine constructions (try 3)
by Octavian Voicu 16 Jun '11

16 Jun '11

2011/6/15 Frédéric Delanoy <frederic.delanoy(a)gmail.com>: > + if(err == out_nl) { > + if (!is_todo_wine) > + ok(0, "unexpected end of line %d (got '%.*s', wanted '%.*s')\n", > + line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); > + else > + todo_wine > + ok(0, "unexpected end of line %d (got '%.*s', wanted '%.*s')\n", > + line, (int)(out_nl-out_ptr), out_ptr, > + (int)(exp_nl-exp_ptr-sizeof(todo_wine_cmd)), exp_ptr+sizeof(todo_wine_cmd)); > + }else if(err) { > + if (!is_todo_wine) > + ok(0, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", > + *err, (int)(err-out_ptr), line, (int)(out_nl-out_ptr), > + out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); > + else > + todo_wine > + ok(0, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", > + *err, (int)(err-out_ptr), line, (int)(out_nl-out_ptr), out_ptr, > + (int)(exp_nl-exp_ptr-sizeof(todo_wine_cmd)), exp_ptr+sizeof(todo_wine_cmd)); > + }else { > + if(is_todo_wine) > + todo_wine ok(TRUE, "match at line %d\n", line); > + } > Hello, I think Jacek was suggesting something among these lines, which does look prettier imho (replace quoted text with following): + if(err == out_nl) { + if (!is_todo_wine) + ok(0, "unexpected end of line %d (got '%.*s', wanted '%.*s')\n", + line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + else + todo_wine + ok(0, "unexpected end of line %d (got '%.*s', wanted '%.*s')\n", + line, (int)(out_nl-out_ptr), out_ptr, + (int)(exp_nl-exp_ptr-sizeof(todo_wine_cmd)), exp_ptr+sizeof(todo_wine_cmd)); + }else { + if (!is_todo_wine) + ok(!err, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", + *err, (int)(err-out_ptr), line, (int)(out_nl-out_ptr), + out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + else + todo_wine + ok(!err, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", + *err, (int)(err-out_ptr), line, (int)(out_nl-out_ptr), out_ptr, + (int)(exp_nl-exp_ptr-sizeof(todo_wine_cmd)), exp_ptr+sizeof(todo_wine_cmd)); + } There is also another difference from your code: the code above also counts the succeeded tests, whereas your code doesn't. Octavian

2 1

Re: [PATCH 4/5] d3d9/tests: Add some tests for IDirect3DDevice9::UpdateSurface().
by Alexandre Julliard 15 Jun '11

15 Jun '11

Henri Verbeet <hverbeet(a)codeweavers.com> writes: > --- > dlls/d3d9/tests/visual.c | 188 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 188 insertions(+), 0 deletions(-) I'm seeing occasional failures with this one: ../../../../wine/tools/runtest -q -P wine -M d3d9.dll -T ../../.. -p d3d9_test.exe.so ../../../../wine/dlls/d3d9/tests/visual.c && touch visual.ok visual.c:8909: Tests skipped: D3DFMT_G16R16 textures not supported as render targets. visual.c:7503: Tests skipped: Card has unconditional pow2 support, skipping conditional NP2 tests visual.c:12255: Test failed: Update surface returned 0x8876086c for test 5, expected 0. make: *** [visual.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/5] shell32: Add IKnownFolderManager::RegisterFolder implementation
by Vincent Povirk 15 Jun '11

15 Jun '11

Won't Wine pass the test only the first time it's run? 2011/6/15 Mariusz Pluciński <vshader(a)gmail.com>: > To not break currently working applications/tests, I decided to implement > known folders using following schema: > 1. implement infrastructure of known folders without breaking currently > working CSIDL-based way. New code is used only for folders registered using > RegisterFolder(). For all others, the older code using CSIDL_Data array is > used. > 2. move all folders from CSIDL_Data array to registry and remove old way of > accessing them. > --- > dlls/shell32/shellpath.c | 70 > ++++++++++++++++++++++++++++++++++++++- > dlls/shell32/tests/shellpath.c | 1 - > 2 files changed, 68 insertions(+), 3 deletions(-) > > > > > >

1 0

Re: [6/7] user32: Test that QS_HOTKEY is properly set and cleared.
by Marvin 15 Jun '11

15 Jun '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=11760 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [2/7] server: Post WM_HOTKEY when a hotkey is pressed.
by Marvin 15 Jun '11

15 Jun '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=11759 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [1/7] server: Implement RegisterHotKey/UnregisterHotKey.
by Marvin 15 Jun '11

15 Jun '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=11758 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [PATCH 3/5] shell32: Add support of registry-registered folders to IKnownFolderManager::GetFolder
by Marvin 15 Jun '11

15 Jun '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=11756 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [PATCH 2/5] shell32: Add IKnownFolderManager::UnregisterFolder implementation
by Marvin 15 Jun '11

15 Jun '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=11755 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0