wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

winmm-Delay_Import_Depends: Remove patch set.

Browse Source 
This was fixed upstream at some point.
This commit is contained in:
Zebediah Figura 2021-03-24 11:27:50 -05:00
parent d2102728fe
commit a644c49d6d
3 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patches/patchinstall.sh
View File

@ -292,7 +292,6 @@ patch_enable_all ()
enable_winex11_drv_Query_server_position="$1"
enable_winex11_drv_mouse_coorrds="$1"
enable_wininet_Cleanup="$1"
enable_winmm_Delay_Import_Depends="$1"
enable_winmm_mciSendCommandA="$1"
enable_wintab32_improvements="$1"
enable_wintrust_WTHelperGetProvCertFromChain="$1"
@ -941,9 +940,6 @@ patch_enable ()
wininet-Cleanup)
enable_wininet_Cleanup="$2"
;;
winmm-Delay_Import_Depends)
enable_winmm_Delay_Import_Depends="$2"
;;
winmm-mciSendCommandA)
enable_winmm_mciSendCommandA="$2"
;;
@ -4525,18 +4521,6 @@ if test "$enable_wininet_Cleanup" -eq 1; then
patch_apply wininet-Cleanup/0005-wininet-Replacing-header-fields-should-fail-if-they-.patch
fi
# Patchset winmm-Delay_Import_Depends
# |
# | This patchset fixes the following Wine bugs:
# | * [#37983] Jedi Knight: Dark Forces II crashes with winmm set to native
# |
# | Modified files:
# | * dlls/winmm/Makefile.in
# |
if test "$enable_winmm_Delay_Import_Depends" -eq 1; then
patch_apply winmm-Delay_Import_Depends/0001-winmm-Delay-import-ole32-msacm32-to-workaround-bug-w.patch
fi
# Patchset winmm-mciSendCommandA
# |
# | Modified files:

27
patches/winmm-Delay_Import_Depends/0001-winmm-Delay-import-ole32-msacm32-to-workaround-bug-w.patch
View File

@ -1,27 +0,0 @@
From 62f86ec9c49ad942bec43d99299d12ee0834fc93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 31 Jan 2015 06:00:38 +0100
Subject: [PATCH] winmm: Delay import ole32 msacm32 to workaround bug when
loading multiple winmm versions.
---
dlls/winmm/Makefile.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in
index d003a53afe4..80fd74201d6 100644
--- a/dlls/winmm/Makefile.in
+++ b/dlls/winmm/Makefile.in
@@ -1,7 +1,8 @@
EXTRADEFS = -D_WINMM_ -DWINE_NO_NAMELESS_EXTENSION
MODULE = winmm.dll
IMPORTLIB = winmm
-IMPORTS = uuid user32 advapi32 ole32 msacm32
+IMPORTS = uuid user32 advapi32
+DELAYIMPORTS = ole32 msacm32
EXTRADLLFLAGS = -mno-cygwin
--
2.30.2

1
patches/winmm-Delay_Import_Depends/definition
View File

@ -1 +0,0 @@
Fixes: [37983] Jedi Knight: Dark Forces II crashes with winmm set to native