Re: [PATCH 03/10] ddraw/tests: Add test for NULL/bad size of surface caps in CreateSurface. (try 3)

[Alexandre Julliard]

Oldřich Jedlička <oldium.pro(a)seznam.cz> writes:
> +    __TRY
> +    {
> +        hr = IDirectDraw_CreateSurface(lpDD, NULL, &surf, NULL);
> +        todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw_CreateSurface didn't return 0x%08x, but 0x%08x\n",
> +           DDERR_INVALIDPARAMS, hr);
> +    }
> +    __EXCEPT_PAGE_FAULT
> +    {
> +        todo_wine ok(FALSE, "IDirectDraw_CreateSurface dereferenced NULL pointer\n");
> +    }
> +    __ENDTRY

You can't use Wine exception macros in tests.

-- 
Alexandre Julliard
julliard(a)winehq.org

[PATCH 03/10] ddraw/tests: Add test for NULL/bad size of surface caps in CreateSurface. (try 3)

[Stefan Dösinger]

Am 04.08.2010 um 12:29 schrieb Alexandre Julliard:
> Oldřich Jedlička <oldium.pro(a)seznam.cz> writes:
> > +    __TRY
> > +    {
> > +        hr = IDirectDraw_CreateSurface(lpDD, NULL, &surf, NULL);
> > +        todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw_CreateSurface didn't return 0x%08x, but 0x%08x\n",
> > +           DDERR_INVALIDPARAMS, hr);
> > +    }
> > +    __EXCEPT_PAGE_FAULT
> > +    {
> > +        todo_wine ok(FALSE, "IDirectDraw_CreateSurface dereferenced NULL pointer\n");
> > +    }
> > +    __ENDTRY
>
> You can't use Wine exception macros in tests.
> In this case it is better not to include the NULL pointer tests in this patch and add them in the patch that adds the NULL pointer checks in ddraw.

@Alexandre: I didn't know about that either, otherwise I'd have caught it when looking at the patch.

[PATCH 03/10] ddraw/tests: Add test for NULL/bad size of surface caps in CreateSurface. (try 3)

[Oldrich Jedlicka]

Hi Stefan,

4.8.2010 13:04:43, Stefan Dösinger <stefandoesinger(a)gmx.at>:
> Am 04.08.2010 um 12:29 schrieb Alexandre Julliard:
> > Oldřich Jedlička <oldium.pro(a)seznam.cz> writes:
> > > +    __TRY
> > > +    {
> > > +        hr = IDirectDraw_CreateSurface(lpDD, NULL, &surf, NULL);
> > > +        todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw_CreateSurface
> > > didn't return 0x%08x, but 0x%08x\n",
> > > +           DDERR_INVALIDPARAMS, hr);
> > > +    }
> > > +    __EXCEPT_PAGE_FAULT
> > > +    {
> > > +        todo_wine ok(FALSE, "IDirectDraw_CreateSurface dereferenced NULL
> > > pointer\n");
> > > +    }
> > > +    __ENDTRY
> >
> > You can't use Wine exception macros in tests.
> > In this case it is better not to include the NULL pointer tests in this patch
> > and add them in the patch that adds the NULL pointer checks in ddraw.

Ok, otherwise there would be a page fault in the test, which is not good. I will send updated patchset in the evening.

Oldřich.
> @Alexandre: I didn't know about that either, otherwise I'd have caught it when
> looking at the patch.

[PATCH 03/10] ddraw/tests: Add test for NULL/bad size of surface caps in CreateSurface. (try 3)

[GOUJON Alexandre]

On 08/04/2010 12:29 PM, Alexandre Julliard wrote:
> You can't use Wine exception macros in tests.

I guess my patch [1] was rejected for the same reason but then how to 
handle it ?

The test only crashes on NT4 but is needed because some programs use a 
NULL descriptor [2]

I'm not allowed to check the windows version the test is currently 
running on.
And I can't use __TRY on tests.

Any idea how I could handle that case ?
---
[1] : http://source.winehq.org/patches/data/64667
[2] : relevant +relay log
001f:Call advapi32.GetNamedSecurityInfoA(0064e3bc "C:\\Program 
Files\\Typing Pal
  5\\Games",00000001,00000004,00000000,00000000,0064e3a4,00000000,00000000) ret=1
00013c8
001f:Ret  advapi32.GetNamedSecurityInfoA() retval=00000057 ret=100013c8
001f:Call KERNEL32.GetLastError() ret=100013d2
001f:Ret  KERNEL32.GetLastError() retval=00000578 ret=100013d2
001f:Call shlwapi.wvnsprintfA(0064df54,00000400,100023e8 "Cannot read 
access control list.\r\nError code: %d",0064e36c) ret=100010dc
001f:Ret  shlwapi.wvnsprintfA() retval=00000032 ret=100010dc
001f:Call user32.MessageBoxA(00010064,0064df54 "Cannot read access 
control list.\r\nError code: 1400",00000000,00040010) ret=100010f6