[Bug 40488] New: Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

Bug ID: 40488
           Summary: Revenant crashes when starting a new game
           Product: Wine
           Version: 1.9.6
          Hardware: x86
                OS: Linux
            Status: NEW
          Keywords: regression
          Severity: normal
          Priority: P2
         Component: directx-d3d
          Assignee: [e-mail]
          Reporter: [e-mail]
                CC: [e-mail]
            Blocks: 37070
   Regression SHA1: aeefbdffba9ea77310759956007f1348920b4477
      Distribution: ---

Created attachment 54261
  --> https://bugs.winehq.org/attachment.cgi?id=54261
terminal output

Graphical issues are present in the game as reported in bug #37070.
Since Wine 1.9.6 the game crashes when starting a new game from the main menu:
'DirectX Error: DDERR_SURFACEBUSY'.

Tested with the GOG.com version of the game. Demo version is available on
Fileplanet, but the website has been marked as malicious site by Chrome and
Firefox, so I didn't check whether the demo has the same problem.

Regression introduced by

commit aeefbdffba9ea77310759956007f1348920b4477
Author: Stefan Dösinger 
Date:   Fri Mar 11 16:01:43 2016 +0100

wined3d: Merge wined3d_surface_map() and wined3d_volume_map().

Wine 1.9.8
OpenGL vendor string: nouveau
OpenGL renderer string: Gallium 0.4 on NV92
OpenGL core profile version string: 3.3 (Core Profile) Mesa 11.3.0-devel
OpenGL core profile shading language version string: 3.30

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

Sebastian Lackner  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail],
                   |                            |[e-mail]

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #1 from Bruno Jesus  ---
You can try the demo from: http://alexa.pro.br/~bruno/revenant.zip

For me it crashes much earlier (does not start).

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

joaopa  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail]

--- Comment #2 from joaopa  ---
The demo shows the problem (no problem to download it)

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #3 from joaopa  ---
And I confirm the problem.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #4 from Henri Verbeet  ---
Created attachment 54273
  --> https://bugs.winehq.org/attachment.cgi?id=54273
hack

Does the attached hack make it any better? I suspect this is just an existing
issue, with the difference that the call actually fails now.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #5 from Béla Gyebrószki  ---
(In reply to Henri Verbeet from comment #4)
> Created attachment 54273 [details]
> hack
>
> Does the attached hack make it any better? I suspect this is just an
> existing issue, with the difference that the call actually fails now.

The patch fixes the crash in the GOG.com version (haven't tried the demo).

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

tt_1  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail]

--- Comment #6 from tt_1  ---
Created attachment 55866
  --> https://bugs.winehq.org/attachment.cgi?id=55866
compressed build.log

This bug, or regression, also breaks Medieval Total War. I spent two days to
find the bad commit, and appereantly it is the same one. The hack solves the
problem for wine-1.9.6 up to wine-1.9.10. From then on there is a bigger
wined3d-patchset merged into the 1.9.x branch, which you can see here

http://source.winehq.org/git/wine.git/?a=search&h=HEAD&st=commit&...

so that, if I rebase the patch, the compile fails! I will add my build.log from
wine-1.9.20 in the hope it may be helpfull.

The stable 1.8.x branch is not affected.

P.S. if someone would like to test Medieval Total War, you have to apply the
amstream patchset starting at
source.winehq.org/git/wine.git/commit/04c3a9bad2585c4b93d23e856dad3d8ab0557885
, for your information only.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

Olivier F. R. Dierick  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail]

--- Comment #7 from Olivier F. R. Dierick  ---
I tried Medieval Total War Demo with wine-1.9.22.

The crash from this bug did not happen, but there is a graphical glitch
in-game:
The view flickers, does not redraw properly and eventually get completely
screwed.
The hack from bug 37070 does fix the graphical glitch.

However, I was stuck at the tutorial step "left click at the base of the flag
to move your troops" because left-clicking the ground or the flag did nothing.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #8 from Olivier F. R. Dierick  ---
My bad, it is the wine-staging patch referenced in bug 40569 that fixes the
graphical glitch in Medieval Total War Demo.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #9 from tt_1  ---
Can you please give a direct link to the patch you propose to solve the
graphical glitches?

I can confirm that mouse clicks on the battlefield don't work as expected,
which makes things a bit hacky. It is still possible to delegate them by
left-clicking on the minimap - which works quite well as it is possible to
enlarge this window. Guess it would be the best to open a new bug for this
problem, don't you think?

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

[e-mail] changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail]

--- Comment #10 from [e-mail] ---
(In reply to tt_1 from comment #9)
> Can you please give a direct link to the patch you propose to solve the
> graphical glitches?
>
> I can confirm that mouse clicks on the battlefield don't work as expected,
> which makes things a bit hacky. It is still possible to delegate them by
> left-clicking on the minimap - which works quite well as it is possible to
> enlarge this window. Guess it would be the best to open a new bug for this
> problem, don't you think?

Here you go:

https://bugs.winehq.org/attachment.cgi?id=54476&action=edit

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #11 from tt_1  ---
Thanks. To make things a bit more clear, you need to apply this patch from
staging

https://github.com/wine-compholio/wine-staging/blob/master/patches/ddraw-Ren...

before the hack from wine bug #40569?

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #12 from [e-mail] ---
(In reply to tt_1 from comment #11)
> Thanks. To make things a bit more clear, you need to apply this patch from
> staging
>
> https://github.com/wine-compholio/wine-staging/blob/master/patches/ddraw-
> Rendering_Targets/0001-ddraw-Create-rendering-targets-in-video-memory-if-po.
> patch
>
> before the hack from wine bug #40569?

I think so but I would re-read the comment in that bug report just to be sure
:)

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #13 from tt_1  ---
The comment #1 in #40569 sounds ambiguous to me, which is why I am asking here
to be sure!

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #14 from Olivier F. R. Dierick  ---
Yes, I applied both the patch and hack from bug 40569, in that order.

The mouse issue was already reported (bug 16929) but it is closed invalid.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #15 from tt_1  ---
Well, I have to say that it doesn't work for me with wine-1.9.20 and both
patches from bug 40569. The 2d-campaign map works, but the ingame battles not,
the graphics have a lot of glitches which makes it unplayable.

I get a ton of those errors (from the console output)

fixme:d3d:surface_load_location Unimplemented copy from
WINED3D_LOCATION_TEXTURE_RGB to WINED3D_LOCATION_SYSMEM for depth/stencil
buffers.
err:d3d:texture_resource_sub_resource_map Failed to prepare location.

I have a Nvidia card and am using it with the binary drivers from nvidia if
that matters.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #16 from Olivier F. R. Dierick  ---
(In reply to tt_1 from comment #15)
> Well, I have to say that it doesn't work for me with wine-1.9.20 and both
> patches from bug 40569. The 2d-campaign map works, but the ingame battles
> not, the graphics have a lot of glitches which makes it unplayable.

I reverted to wine-1.9.18 and got the same result as you, so I suggest to
upgrade to wine 1.9.22 and try again. I'm also using proprietary drivers from
NVidia.

Let's keep this bug about the crash at startup and discuss the graphical glitch
in bug 40569.

Does MTW crash at startup anymore?

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #17 from tt_1  ---
MTW needs the amstream patchset to not to crash at startup. It got backported
to the stable branch, so from 1.8.4 I guess it works mostly but for the
mousclicks in the battle mode. I agree to continue to talk about those
graphical glitches in bug 40569

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #18 from Olivier F. R. Dierick  ---
Created attachment 56019
  --> https://bugs.winehq.org/attachment.cgi?id=56019
Updated hack for wine >=1.9.16

Based on the hack from comment #4 by Henri Verbeet.

As said before the former hack does not apply cleanly anymore.

This one does apply cleanly and works around the crash in Revenant and also
helps with Medieval Total War Demo graphical glitch for me.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #19 from tt_1  ---
The attached updated hack works for me with 1.9.22 for Medieval Total War, do
you have plans to send it to either upstream or stagging by any chance?

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #20 from Olivier F. R. Dierick  ---
(In reply to tt_1 from comment #19)
> The attached updated hack works for me with 1.9.22 for Medieval Total War,
> do you have plans to send it to either upstream or stagging by any chance?

I don't have any plans to submit this. It's only a hack. It does not fix the
actual issue.

A proper fix would be to implement copying of depth/stencil buffers in system
memory.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

Sergey Isakov  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail]

--- Comment #21 from Sergey Isakov  ---
Bug 34906 is the same? It contains more advanced hack.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #22 from Olivier F. R. Dierick  ---
(In reply to Sergey Isakov from comment #21)
> Bug 34906 is the same? It contains more advanced hack.

The patch from bug 34906 is the one from bug 40569 I've been speaking about in
comment 8.

It is required for the game to run but does not fix this bug.

It is also required for bug 40569 but another patch is needed, so they are not
same bug either.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

Olivier F. R. Dierick  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
  Attachment #56019|0                           |1
        is obsolete|                            |

--- Comment #23 from Olivier F. R. Dierick  ---
Created attachment 57094
  --> https://bugs.winehq.org/attachment.cgi?id=57094
Updated hack for wine >2.0

Because surface_load_ds_location is no longer needed.

No ill effect detected while testing this updated hack with the affected apps.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #24 from tt_1  ---
The hack needs an update for 2.2 , adjusting the lines is not difficult but
insufficent as it leads to a compile error, unfortunately.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

Olivier F. R. Dierick  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
  Attachment #57094|0                           |1
        is obsolete|                            |

--- Comment #25 from Olivier F. R. Dierick  ---
Created attachment 57411
  --> https://bugs.winehq.org/attachment.cgi?id=57411
Updated hack for wine 2.2

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #26 from Olivier F. R. Dierick  ---
Incidentally, while updating the hack I noticed that the mouse-click on the
battlefield bug in Medieval Total War is fixed for me with Wine 2.2.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #27 from tt_1  ---
thanks for the update.

Is there any chance to find out how the mouse click issue was solved and to
maybe backport it in the end?

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #28 from Olivier F. R. Dierick  ---
(In reply to tt_1 from comment #27)
> thanks for the update.
>
> Is there any chance to find out how the mouse click issue was solved and to
> maybe backport it in the end?

bisecting shows that the commit that fixes the mouse click issue is:
https://www.winehq.org/pipermail/wine-cvs/2017-February/118492.html

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #29 from tt_1  ---
thanks for pointing out the commit id which fixed this

to backport this to the stable branch seems to be non trivial as there are a
handfull of commits to surface.c and most of those affect more files than just
surface.c , not to mention the changes in texture.c

any ideas?

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #30 from Olivier F. R. Dierick  ---
The commit I pointed out is already included in the stable branch.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #31 from Olivier F. R. Dierick  ---
My bad, it's not in the stable branch yet.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #32 from Olivier F. R. Dierick  ---
(In reply to tt_1 from comment #29)
> thanks for pointing out the commit id which fixed this
>
> to backport this to the stable branch seems to be non trivial as there are a
> handfull of commits to surface.c and most of those affect more files than
> just surface.c , not to mention the changes in texture.c
>
> any ideas?

I got MTW to play without mouse bug with the wine-2.0 stable branch, patched
with this minimal set of patches:

http://source.winehq.org/git/wine.git/?a=commit;h=1bd56b6ca5638cdf026938eb89...

http://source.winehq.org/git/wine.git/?a=commit;h=35e651caf130e1370c3fa7866c...

http://source.winehq.org/git/wine.git/?a=commit;h=25188eb71fed2540e2a8c828f6...

+ the updated hack from this bug.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #33 from Henri Verbeet  ---
Does the issue this bug was originally about still happen? Commits
5895f77474d39ab0506323bf038837b7d07b6c4b and
cc65b9045112c19054a75f4d31cff77e5d5e4746 in particular may have made a
difference. If not, please attach a new log with current git.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #34 from tt_1  ---
(In reply to Olivier F. R. Dierick from comment #32)
> (In reply to tt_1 from comment #29)
> > thanks for pointing out the commit id which fixed this
> >
> > to backport this to the stable branch seems to be non trivial as there are a
> > handfull of commits to surface.c and most of those affect more files than
> > just surface.c , not to mention the changes in texture.c
> >
> > any ideas?
>
> I got MTW to play without mouse bug with the wine-2.0 stable branch, patched
> with this minimal set of patches:
>
> http://source.winehq.org/git/wine.git/?a=commit;
> h=1bd56b6ca5638cdf026938eb89fac0ccfd24874b
>
> http://source.winehq.org/git/wine.git/?a=commit;
> h=35e651caf130e1370c3fa7866ce0e1d29aa2aacd
>
> http://source.winehq.org/git/wine.git/?a=commit;
> h=25188eb71fed2540e2a8c828f642837e3e32e747
> - the updated hack from this bug.

Have you done some adjustment of the patches? To me only the first commit
1bd56b6ca5638cdf026938eb89fac0ccfd24874b applies cleanly on top of the stable
branch.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

Béla Gyebrószki  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
         Resolution|---                         |FIXED
             Status|NEW                         |RESOLVED

--- Comment #35 from Béla Gyebrószki  ---
(In reply to Henri Verbeet from comment #33)
> Does the issue this bug was originally about still happen? Commits
> 5895f77474d39ab0506323bf038837b7d07b6c4b and
> cc65b9045112c19054a75f4d31cff77e5d5e4746 in particular may have made a
> difference. If not, please attach a new log with current git.

I can't reproduce the problem in wine-2.2-183-gadedebf and with Nvidia 378.13.
Starting a new game from the menu does work.

Now there is a different issue when using nouveau and mesa 13.0.4: the screen
remains black (screen not refreshing) after starting a new game. This is not
the same issue as the originally reported problem, it could be an upstream
(nouveau/mesa) thing.

Marking fixed.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #36 from [e-mail] ---
(In reply to Béla Gyebrószki from comment #35)
> (In reply to Henri Verbeet from comment #33)
> > Does the issue this bug was originally about still happen? Commits
> > 5895f77474d39ab0506323bf038837b7d07b6c4b and
> > cc65b9045112c19054a75f4d31cff77e5d5e4746 in particular may have made a
> > difference. If not, please attach a new log with current git.
>
> I can't reproduce the problem in wine-2.2-183-gadedebf and with Nvidia
> 378.13.
> Starting a new game from the menu does work.
>
> Now there is a different issue when using nouveau and mesa 13.0.4: the
> screen remains black (screen not refreshing) after starting a new game. This
> is not the same issue as the originally reported problem, it could be an
> upstream (nouveau/mesa) thing.
>
> Marking fixed.

I have a slightly different issue with Revenant (GOG version) when using the
official drivers so I will file a new bug report for that.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #37 from Olivier F. R. Dierick  ---
(In reply to Henri Verbeet from comment #33)
> Does the issue this bug was originally about still happen? Commits
> 5895f77474d39ab0506323bf038837b7d07b6c4b and
> cc65b9045112c19054a75f4d31cff77e5d5e4746 in particular may have made a
> difference. If not, please attach a new log with current git.

Tried one commit at a time.
Commit 5895f77474d39ab0506323bf038837b7d07b6c4b is the fix.

Revenant Demo does not crash anymore.
It also fix the graphical glitch in Medieval Total War Demo.

Tested with plain wine-2.2-166-g5895f77 with no patch or hack.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #38 from tt_1  ---
commit 35e651caf130e1370c3fa7866ce0e1d29aa2aacd has a few strange symbols in
some of the comments on the code such as ⊇ , which my browser didn't liked to
render properly, which is why the patch failed to apply in the end. Copy and
paste error.

it would be great to get those three commits officially cherry picked for the
stable branch.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

Austin English  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|---                         |2.0.x

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

Michael Stefaniuc  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
      Fixed by SHA1|                            |5895f77474d39ab0506323bf038
                   |                            |837b7d07b6c4b
                 CC|                            |[e-mail]

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

Anthony Jagers  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail]

--- Comment #39 from Anthony Jagers  ---
Is this the game we are talking about ?

https://www.gog.com/game/revenant

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

Alexandre Julliard  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|RESOLVED                    |CLOSED

--- Comment #40 from Alexandre Julliard  ---
Closing bugs fixed in 2.3.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

--- Comment #41 from Olivier F. R. Dierick  ---
(In reply to Anthony Jagers from comment #39)
> Is this the game we are talking about ?
>
> https://www.gog.com/game/revenant

Yes.

[Bug 40488] Revenant crashes when starting a new game

https://bugs.winehq.org/show_bug.cgi?id=40488

Michael Stefaniuc  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|2.0.x                       |---

--- Comment #42 from Michael Stefaniuc  ---
Remove 2.0.x milestone.