wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to fix crash in Gothic 1/2 with builtin directmusic caused by wrong return value.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-05-29 19:07:13 +02:00
parent 016e539659
commit 1b2fa6c6cb
5 changed files with 61 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
patches/dmstyle-IPersistStream_ParseReference/0001-dmstyle-Return-the-correct-variable.patch Normal file
View File

@@ -0,0 +1,25 @@
From f5fe63051ec417248b5bd263d05b99aa506a61c5 Mon Sep 17 00:00:00 2001
From: Bruno Jesus <00cpxxx@gmail.com>
Date: Fri, 29 May 2015 19:05:12 +0200
Subject: dmstyle: Return the correct variable.
---
dlls/dmstyle/dmutils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c
index 5008134..e551410 100644
--- a/dlls/dmstyle/dmutils.c
+++ b/dlls/dmstyle/dmutils.c
@@ -213,7 +213,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface,
}
TRACE("** DM Reference End of Load ***\n");
- return S_OK;
+ return hr;
}
/* FOURCC to string conversion for debug messages */
--
2.4.2

1
patches/dmstyle-IPersistStream_ParseReference/definition Normal file
View File

@@ -0,0 +1 @@
Fixes: [7425] Fix crash in Gothic 1/2 with builtin directmusic caused by wrong return value

43
patches/patchinstall.sh
View File

@@ -113,6 +113,7 @@ patch_enable_all ()
enable_ddraw_Hotpatch="$1"
enable_ddraw_d3d_execute_buffer="$1"
enable_dinput_Events="$1"
enable_dmstyle_IPersistStream_ParseReference="$1"
enable_dsound_EAX="$1"
enable_dsound_Fast_Mixer="$1"
enable_dxgi_GetDesc="$1"
@@ -400,6 +401,9 @@ patch_enable ()
dinput-Events)
enable_dinput_Events="$2"
;;
dmstyle-IPersistStream_ParseReference)
enable_dmstyle_IPersistStream_ParseReference="$2"
;;
dsound-EAX)
enable_dsound_EAX="$2"
;;
@@ -2543,6 +2547,21 @@ if test "$enable_dinput_Events" -eq 1; then
) >> "$patchlist"
fi
# Patchset dmstyle-IPersistStream_ParseReference
# |
# | This patchset fixes the following Wine bugs:
# | * [#7425] Fix crash in Gothic 1/2 with builtin directmusic caused by wrong return value
# |
# | Modified files:
# | * dlls/dmstyle/dmutils.c
# |
if test "$enable_dmstyle_IPersistStream_ParseReference" -eq 1; then
patch_apply dmstyle-IPersistStream_ParseReference/0001-dmstyle-Return-the-correct-variable.patch
(
echo '+ { "Bruno Jesus", "dmstyle: Return the correct variable.", 1 },';
) >> "$patchlist"
fi
# Patchset dsound-Fast_Mixer
# |
# | This patchset fixes the following Wine bugs:
@@ -2622,18 +2641,6 @@ if test "$enable_dxgi_GetDesc" -eq 1; then
) >> "$patchlist"
fi
# Patchset makedep-PARENTSPEC
# |
# | Modified files:
# | * tools/makedep.c
# |
if test "$enable_makedep_PARENTSPEC" -eq 1; then
patch_apply makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch
(
echo '+ { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },';
) >> "$patchlist"
fi
# Patchset ntdll-DllRedirects
# |
# | Modified files:
@@ -2654,6 +2661,18 @@ if test "$enable_ntdll_DllRedirects" -eq 1; then
) >> "$patchlist"
fi
# Patchset makedep-PARENTSPEC
# |
# | Modified files:
# | * tools/makedep.c
# |
if test "$enable_makedep_PARENTSPEC" -eq 1; then
patch_apply makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch
(
echo '+ { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-CSMT_Helper
# |
# | Modified files: