Regression after ddraw surface locking patch

[Paul Vriens]

Hi,

ZooTycoon 1 demo 'crashes' with:

trace:ddraw:DIB_DirectDrawSurface_Blt (0x77e3b9e8)->((nil),(nil),(nil),01000400,0x80f510)
trace:ddraw:DIB_DirectDrawSurface_Blt   flags: DDBLT_COLORFILL DDBLT_WAIT
First chance exception: page fault on read access to 0x00000294 in 32-bit code (0x17d7b350).

This is because src = NULL and we do (line 517):

if (This->locked || ((IDirectDrawSurfaceImpl *)src)->locked) {
        WARN(" Surface is busy, returning DDERR_SURFACEBUSY\n");
        return DDERR_SURFACEBUSY;
    }

Can I just surround this by:

if (NULL != src)

This fixes my problem. There is another potential problem around line 993.

I've attached a patch, if it's correct I will send it to wine-patches.

Cheers,

Paul.

[Tom Wickline]

On Wed, 09 Mar 2005 14:13:38 +0100, Paul Vriens  wrote:
> Hi,
>
> ZooTycoon 1 demo 'crashes' with:

May I ask where in the game its crashing?

[tom2@nc-mtairy-terayoncmts1a-208 tom2]$ cd
/home/tom2/.wine/drive_c/Program\ Files/Microsoft\ Games/Zoo\ Tycoon\
Demo
[tom2@nc-mtairy-terayoncmts1a-208 Zoo Tycoon Demo]$ wine zoodemo
err:wave:OSS_WaveOutInit /dev/mixer1: No such device
err:wave:OSS_WaveInInit /dev/mixer1: No such device
fixme:ddraw:Main_DirectDraw_SetCooperativeLevel
(0x40240230)->(00010022,00000011)
fixme:ddraw:Main_DirectDrawClipper_Initialize
(0x40241380)->(0x4024023c,0x00000000),stub!
fixme:ddraw:Main_DirectDraw_SetCooperativeLevel
(0x402f32b8)->(00010028,00000008)
fixme:ddraw:Main_DirectDrawClipper_Initialize
(0x4026dd68)->(0x402f32c4,0x00000000),stub!
fixme:ddraw:Main_DirectDraw_GetScanLine (0x402f32b8)->(0x46710070) semi-stub
fixme:ddraw:DIB_DirectDrawSurface_Blt dwFlags DDBLT_WAIT and/or
DDBLT_ASYNC: can't handle right now.
fixme:mmtime:timeBeginPeriod Stub; we set our timer resolution at minimum
fixme:dsound:IDirectSoundImpl_SetCooperativeLevel level=DSSCL_PRIORITY
not fully supported
err:ddraw:set_render_state Unhandled dwRenderStateType
D3DRENDERSTATE_LINEPATTERN (0000000a) value : 00000000 !
err:ddraw:set_render_state Unhandled dwRenderStateType
D3DRENDERSTATE_MONOENABLE (0000000b) value : 00000000 !
err:ddraw:set_render_state Unhandled dwRenderStateType
D3DRENDERSTATE_ROP2 (0000000c) value : 0000000d !
err:ddraw:set_render_state Unhandled dwRenderStateType
D3DRENDERSTATE_PLANEMASK (0000000d) value : ffffffff !
err:ddraw:set_render_state Unhandled dwRenderStateType
D3DRENDERSTATE_LASTPIXEL (00000010) value : 00000001 !
err:ddraw:set_render_state Unhandled dwRenderStateType
D3DRENDERSTATE_ZVISIBLE (0000001e) value : 00000000 !
err:ddraw:set_render_state Unhandled dwRenderStateType
D3DRENDERSTATE_EDGEANTIALIAS (00000028) value : 00000000 !
err:ddraw:set_render_state Unhandled dwRenderStateType
D3DRENDERSTATE_RANGEFOGENABLE (00000030) value : 00000000 !
err:ddraw:set_render_state Unhandled dwRenderStateType
D3DRENDERSTATE_EXTENTS (0000008a) value : 00000000 !
err:ddraw:set_render_state Unhandled dwRenderStateType
D3DRENDERSTATE_VERTEXBLEND (00000097) value : 00000000 !
err:ddraw:d3ddevice_lock_update Wrong surface type for locking !
err:ddraw:d3ddevice_unlock_update Wrong surface type for locking !
err:ddraw:d3ddevice_lock_update Wrong surface type for locking !
err:ddraw:d3ddevice_unlock_update Wrong surface type for locking !

ect.........................

But no crash

Tom

[Paul Vriens]

On Wed, 2005-03-09 at 15:26, Tom Wickline wrote:
> On Wed, 09 Mar 2005 14:13:38 +0100, Paul Vriens  wrote:
> > Hi,
> >
> > ZooTycoon 1 demo 'crashes' with:
>
> May I ask where in the game its crashing?

I have to get back to you about this. I've 2 changes from a clean
tools/wineinstall with current CVS:

- zoodemo.exe runs in Desktop mode (800x600)
- Copied ir50_32.dll to windows/system and registered it.

The dll is needed to show the initial AVI.

Cheers,

Paul.

[Tom Wickline]

On Wed, 09 Mar 2005 15:32:25 +0100, Paul Vriens  wrote:
> On Wed, 2005-03-09 at 15:26, Tom Wickline wrote:
> > On Wed, 09 Mar 2005 14:13:38 +0100, Paul Vriens  wrote:
> > > Hi,
> > >
> > > ZooTycoon 1 demo 'crashes' with:
> >
> > May I ask where in the game its crashing?
>
> I have to get back to you about this. I've 2 changes from a clean
> tools/wineinstall with current CVS:

Okay I see what your talking about now...
> - zoodemo.exe runs in Desktop mode (800x600)
> - Copied ir50_32.dll to windows/system and registered it.

Did you get it from:
http://downloadfinder.intel.com/scripts-df/download.asp?url=/2846/eng/codins...

Tom
> The dll is needed to show the initial AVI.
>
> Cheers,
>
> Paul.

[Paul Vriens]

On Wed, 2005-03-09 at 15:53, Tom Wickline wrote:
> On Wed, 09 Mar 2005 15:32:25 +0100, Paul Vriens  wrote:
> > On Wed, 2005-03-09 at 15:26, Tom Wickline wrote:
> > > On Wed, 09 Mar 2005 14:13:38 +0100, Paul Vriens  wrote:
> > > > Hi,
> > > >
> > > > ZooTycoon 1 demo 'crashes' with:
> > >
> > > May I ask where in the game its crashing?
> >
> > I have to get back to you about this. I've 2 changes from a clean
> > tools/wineinstall with current CVS:
>
> Okay I see what your talking about now...

Does this mean you have the same problem ? If Yes, I will send the patch
to wine-patches.
> > - zoodemo.exe runs in Desktop mode (800x600)
> > - Copied ir50_32.dll to windows/system and registered it.
>
> Did you get it from:
> http://downloadfinder.intel.com/scripts-df/download.asp?url=/2846/eng/codins...

I can't remember. I've got a dll directory for that purpose and have no
clue where I got it from or when.

Paul.

[Tom Wickline]

On Wed, 09 Mar 2005 16:06:21 +0100, Paul Vriens  wrote:
> I can't remember. I've got a dll directory for that purpose and have no
> clue where I got it from or when.

If you set your win version to win2k the intro movie is skipped .

Is the intro video green? it is here.....

Can you try this when you have a chance

set the demo to play at 800x600  "Managed" = "N"
and see if you only get a black window

Then try it at  "820x620" and see if it works.

Thats what im getting here

[AppDefaults\zoodemo.exe\x11drv]
"Desktop" = "820x620"
"Managed" = "N"

Oh Nascar2003 works in OpenGL mode btw just incase
anyone wants to know... Back to hitting the wall

Tom
> Paul.

[Paul Vriens]

On Wed, 2005-03-09 at 16:17, Tom Wickline wrote:
> On Wed, 09 Mar 2005 16:06:21 +0100, Paul Vriens  wrote:
> > I can't remember. I've got a dll directory for that purpose and have no
> > clue where I got it from or when.
>
> If you set your win version to win2k the intro movie is skipped .

The intro is always a black screen (without ir50_32.dll). I then have to
click in the windows to get further.
> Is the intro video green? it is here.....

Nope it's black (without the dll)
> Can you try this when you have a chance
>
> set the demo to play at 800x600  "Managed" = "N"
> and see if you only get a black window

It was already black :-)
> Then try it at  "820x620" and see if it works.
>
> Thats what im getting here
>
> [AppDefaults\zoodemo.exe\x11drv]
> "Desktop" = "820x620"
> "Managed" = "N"

No difference on what ever combination of the above.
> Oh Nascar2003 works in OpenGL mode btw just incase
> anyone wants to know... Back to hitting the wall
>
> Tom

The crash is always there so I'll send it of the wine-patches.

Cheers,

Paul.

[Christoph Frick]

On Wed, Mar 09, 2005 at 10:17:40AM -0500, Tom Wickline wrote:
> Oh Nascar2003 works in OpenGL mode btw just incase anyone wants to
> know... Back to hitting the wall

it works since day0[1] - but i had to apply a no-cd-crack. is this still
needed? if not also the GTP mod would run even if i had some strange
problems with the loader (they highjack the keyboard handler).

[1] http://zefix.tv/gpl_linux

[Henning Gerhardt]

Hello Paul, you wrote;
> ZooTycoon 1 demo 'crashes' with:
>
> trace:ddraw:DIB_DirectDrawSurface_Blt
> (0x77e3b9e8)->((nil),(nil),(nil),01000400,0x80f510)
> trace:ddraw:DIB_DirectDrawSurface_Blt   flags: DDBLT_COLORFILL DDBLT_WAIT
> First chance exception: page fault on read access to 0x00000294 in 32-bit
> code (0x17d7b350).
>
> This is because src = NULL and we do (line 517):
> if (This->locked || ((IDirectDrawSurfaceImpl *)src)->locked) {
>    WARN(" Surface is busy, returning DDERR_SURFACEBUSY\n");
>    return DDERR_SURFACEBUSY;
>
> }
>
> Can I just surround this by:
>
> if (NULL != src)
>
> This fixes my problem. There is another potential problem around line 993.
>
> I've attached a patch, if it's correct I will send it to wine-patches.

I did try your patch, but it doesn't help me by the demo of Beyond
Divinity. But I discovered which patch from Oliver Stieber caused the
regression http://cvs.winehq.org/patch.py?id=16392 (and the two following
must also be reverted to get the demo of Beyond Divinity get back to work:
http://cvs.winehq.org/patch.py?id=16399 and 
http://cvs.winehq.org/patch.py?id=16406 ).

I have no idea or the programming skills to discover the source of this bug
:(

Regards

Henning

[Paul Vriens]

On Wed, 2005-03-09 at 18:42, Henning Gerhardt wrote:
> Hello Paul, you wrote;
> > ZooTycoon 1 demo 'crashes' with:
> >
> > trace:ddraw:DIB_DirectDrawSurface_Blt
> > (0x77e3b9e8)->((nil),(nil),(nil),01000400,0x80f510)
> > trace:ddraw:DIB_DirectDrawSurface_Blt   flags: DDBLT_COLORFILL DDBLT_WAIT
> > First chance exception: page fault on read access to 0x00000294 in 32-bit
> > code (0x17d7b350).
> >
> > This is because src = NULL and we do (line 517):
> > if (This->locked || ((IDirectDrawSurfaceImpl *)src)->locked) {
> >    WARN(" Surface is busy, returning DDERR_SURFACEBUSY\n");
> >    return DDERR_SURFACEBUSY;
> >
> > }
> >
> > Can I just surround this by:
> >
> > if (NULL != src)
> >
> > This fixes my problem. There is another potential problem around line 993.
> >
> > I've attached a patch, if it's correct I will send it to wine-patches.
>
> I did try your patch, but it doesn't help me by the demo of Beyond
> Divinity. But I discovered which patch from Oliver Stieber caused the
> regression http://cvs.winehq.org/patch.py?id=16392 (and the two following
> must also be reverted to get the demo of Beyond Divinity get back to work:
> http://cvs.winehq.org/patch.py?id=16399 and 
> http://cvs.winehq.org/patch.py?id=16406 ).

That's basically everything that was committed regarding d3d9/wined3d !

Oliver, can you comment on the status of d3d9/wined3d?

Paul.