mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Added patch to fix crash in Gothic 1/2 with builtin directmusic caused by wrong return value.
This commit is contained in:
Sebastian Lackner
parent
016e539659
commit
1b2fa6c6cb
@ -39,7 +39,7 @@ Wine. All those differences are also documented on the
|
||||
Included bug fixes and improvements
|
||||
-----------------------------------
|
||||
|
||||
**Bug fixes and features included in the next upcoming release [8]:**
|
||||
**Bug fixes and features included in the next upcoming release [9]:**
|
||||
|
||||
* Add shell32 placeholder icons to match offsets with Windows ([Wine Bug #30185](https://bugs.winehq.org/show_bug.cgi?id=30185))
|
||||
* Add stub for iphlpapi.ConvertInterfaceLuidToGuid ([Wine Bug #38576](https://bugs.winehq.org/show_bug.cgi?id=38576))
|
||||
@ -47,6 +47,7 @@ Included bug fixes and improvements
|
||||
* Allow to enable/disable InsertMode in wineconsole settings ([Wine Bug #36704](https://bugs.winehq.org/show_bug.cgi?id=36704))
|
||||
* Also handle '\r' as whitespace in wbemprox queries
|
||||
* Assign a drive serial number during prefix creation/update ([Wine Bug #17823](https://bugs.winehq.org/show_bug.cgi?id=17823))
|
||||
* Fix crash in Gothic 1/2 with builtin directmusic caused by wrong return value ([Wine Bug #7425](https://bugs.winehq.org/show_bug.cgi?id=7425))
|
||||
* Support for ws2_32.dll.WSAPoll ([Wine Bug #38601](https://bugs.winehq.org/show_bug.cgi?id=38601))
|
||||
* Use random names when caching very long urls in wininet
|
||||
|
||||
|
||||
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -8,6 +8,8 @@ wine-staging (1.7.44) UNRELEASED; urgency=low
|
||||
* Added patch for stub of iphlpapi.ConvertInterfaceLuidToGuid.
|
||||
* Added patch to use random names when caching very long urls (fixes Wine
|
||||
Staging Bug #266).
|
||||
* Added patch to fix crash in Gothic 1/2 with builtin directmusic caused by
|
||||
wrong return value.
|
||||
* Removed patch to reset device state in SysKeyboard*Impl_Acquire (accepted
|
||||
upstream).
|
||||
* Removed patch to avoid creating thread queues for foreign threads in
|
||||
|
||||
@ -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
1
patches/dmstyle-IPersistStream_ParseReference/definition
Normal file
@ -0,0 +1 @@
|
||||
Fixes: [7425] Fix crash in Gothic 1/2 with builtin directmusic caused by wrong return value
|
||||
@ -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:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user