mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Rebase against c3e6ecde36692d03dc360200c7a7044a02c4a392.
This commit is contained in:
Sebastian Lackner
parent
e745798070
commit
b19d0ea3ca
@ -1,25 +0,0 @@
|
||||
From 2bec406f8c9a80d8bb7beef2a9cb39455be6b125 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 14 Jan 2017 23:06:28 +0100
|
||||
Subject: dsound: Respect return value of callback in DirectSoundEnumerateA/W.
|
||||
|
||||
---
|
||||
dlls/dsound/dsound_main.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
|
||||
index db2ca506bda..2e12fe7a40d 100644
|
||||
--- a/dlls/dsound/dsound_main.c
|
||||
+++ b/dlls/dsound/dsound_main.c
|
||||
@@ -522,7 +522,7 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids,
|
||||
}
|
||||
|
||||
if(device != defdev){
|
||||
- send_device(device, &guids[n], cb, user);
|
||||
+ keep_going = send_device(device, &guids[n], cb, user);
|
||||
++n;
|
||||
}
|
||||
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [42163] Respect return value of callback in DirectSoundEnumerateA/W
|
||||
@ -1,27 +0,0 @@
|
||||
From 607d3969a3b2633ce4dd4f99f96d1666c15cd98d Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 15 Jan 2017 22:52:09 +0100
|
||||
Subject: include: Avoid duplicate definition of REFERENCE_TIME.
|
||||
|
||||
---
|
||||
include/dmdls.h | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/include/dmdls.h b/include/dmdls.h
|
||||
index b40ef88bf8d..ea7dcf00946 100644
|
||||
--- a/include/dmdls.h
|
||||
+++ b/include/dmdls.h
|
||||
@@ -30,7 +30,10 @@ typedef LONG PCENT;
|
||||
typedef LONG PERCENT;
|
||||
typedef LONG TCENT;
|
||||
|
||||
+#ifndef REFERENCE_TIME_DEFINED
|
||||
+#define REFERENCE_TIME_DEFINED
|
||||
typedef LONGLONG REFERENCE_TIME, *LPREFERENCE_TIME;
|
||||
+#endif
|
||||
|
||||
/*****************************************************************************
|
||||
* FOURCC definition
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [42211] Avoid duplicate definition of REFERENCE_TIME
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "3c54d4fb6926195e43a1163b0a243d2614a5951f"
|
||||
echo "c3e6ecde36692d03dc360200c7a7044a02c4a392"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -147,7 +147,6 @@ patch_enable_all ()
|
||||
enable_dsound_EAX="$1"
|
||||
enable_dsound_Fast_Mixer="$1"
|
||||
enable_dsound_Revert_Cleanup="$1"
|
||||
enable_dsound_enumerate_mmdevices="$1"
|
||||
enable_dxdiagn_Display_Information="$1"
|
||||
enable_dxdiagn_Enumerate_DirectSound="$1"
|
||||
enable_dxdiagn_GetChildContainer_Leaf_Nodes="$1"
|
||||
@ -170,7 +169,6 @@ patch_enable_all ()
|
||||
enable_imagehlp_Cleanup="$1"
|
||||
enable_imagehlp_ImageLoad="$1"
|
||||
enable_imm32_IMMDisableLegacyIME="$1"
|
||||
enable_include_Duplicate_Typedef="$1"
|
||||
enable_inseng_Implementation="$1"
|
||||
enable_iphlpapi_System_Ping="$1"
|
||||
enable_iphlpapi_TCP_Table="$1"
|
||||
@ -395,7 +393,6 @@ patch_enable_all ()
|
||||
enable_wined3d_Accounting="$1"
|
||||
enable_wined3d_CSMT_Helper="$1"
|
||||
enable_wined3d_CSMT_Main="$1"
|
||||
enable_wined3d_DDCAPS_ALIGNBOUNDARYSRC="$1"
|
||||
enable_wined3d_DXTn="$1"
|
||||
enable_wined3d_GTX_560M="$1"
|
||||
enable_wined3d_Limit_Vram="$1"
|
||||
@ -653,9 +650,6 @@ patch_enable ()
|
||||
dsound-Revert_Cleanup)
|
||||
enable_dsound_Revert_Cleanup="$2"
|
||||
;;
|
||||
dsound-enumerate_mmdevices)
|
||||
enable_dsound_enumerate_mmdevices="$2"
|
||||
;;
|
||||
dxdiagn-Display_Information)
|
||||
enable_dxdiagn_Display_Information="$2"
|
||||
;;
|
||||
@ -722,9 +716,6 @@ patch_enable ()
|
||||
imm32-IMMDisableLegacyIME)
|
||||
enable_imm32_IMMDisableLegacyIME="$2"
|
||||
;;
|
||||
include-Duplicate_Typedef)
|
||||
enable_include_Duplicate_Typedef="$2"
|
||||
;;
|
||||
inseng-Implementation)
|
||||
enable_inseng_Implementation="$2"
|
||||
;;
|
||||
@ -1397,9 +1388,6 @@ patch_enable ()
|
||||
wined3d-CSMT_Main)
|
||||
enable_wined3d_CSMT_Main="$2"
|
||||
;;
|
||||
wined3d-DDCAPS_ALIGNBOUNDARYSRC)
|
||||
enable_wined3d_DDCAPS_ALIGNBOUNDARYSRC="$2"
|
||||
;;
|
||||
wined3d-DXTn)
|
||||
enable_wined3d_DXTn="$2"
|
||||
;;
|
||||
@ -3988,21 +3976,6 @@ if test "$enable_dsound_EAX" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset dsound-enumerate_mmdevices
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#42163] Respect return value of callback in DirectSoundEnumerateA/W
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/dsound/dsound_main.c
|
||||
# |
|
||||
if test "$enable_dsound_enumerate_mmdevices" -eq 1; then
|
||||
patch_apply dsound-enumerate_mmdevices/0001-dsound-Respect-return-value-of-callback-in-DirectSou.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "dsound: Respect return value of callback in DirectSoundEnumerateA/W.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset dxdiagn-Display_Information
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -4402,21 +4375,6 @@ if test "$enable_imm32_IMMDisableLegacyIME" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset include-Duplicate_Typedef
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#42211] Avoid duplicate definition of REFERENCE_TIME
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * include/dmdls.h
|
||||
# |
|
||||
if test "$enable_include_Duplicate_Typedef" -eq 1; then
|
||||
patch_apply include-Duplicate_Typedef/0001-include-Avoid-duplicate-definition-of-REFERENCE_TIME.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "include: Avoid duplicate definition of REFERENCE_TIME.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset inseng-Implementation
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -8335,21 +8293,6 @@ if test "$enable_wined3d_CSMT_Helper" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wined3d-DDCAPS_ALIGNBOUNDARYSRC
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#28672] Do not set DDCAPS_ALIGNBOUNDARYSRC as cap for ddraw
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/wined3d/directx.c
|
||||
# |
|
||||
if test "$enable_wined3d_DDCAPS_ALIGNBOUNDARYSRC" -eq 1; then
|
||||
patch_apply wined3d-DDCAPS_ALIGNBOUNDARYSRC/0001-wined3d-Do-not-set-DDCAPS_ALIGNBOUNDARYSRC-as-cap-fo.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "wined3d: Do not set DDCAPS_ALIGNBOUNDARYSRC as cap for ddraw.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wined3d-GTX_560M
|
||||
# |
|
||||
# | Modified files:
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 14c8ab57c3147379cdfee828f9e12a2210978e65 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sun, 15 Jan 2017 01:16:26 +0100
|
||||
Subject: wined3d: Do not set DDCAPS_ALIGNBOUNDARYSRC as cap for ddraw.
|
||||
|
||||
---
|
||||
dlls/wined3d/directx.c | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
|
||||
index edd640a507c..8616277dd2b 100644
|
||||
--- a/dlls/wined3d/directx.c
|
||||
+++ b/dlls/wined3d/directx.c
|
||||
@@ -5820,8 +5820,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
|
||||
WINEDDCAPS_CANCLIP |
|
||||
WINEDDCAPS_CANCLIPSTRETCHED |
|
||||
WINEDDCAPS_COLORKEY |
|
||||
- WINEDDCAPS_COLORKEYHWASSIST |
|
||||
- WINEDDCAPS_ALIGNBOUNDARYSRC;
|
||||
+ WINEDDCAPS_COLORKEYHWASSIST;
|
||||
|
||||
/* Fill the ddraw caps structure */
|
||||
caps->ddraw_caps.caps = WINEDDCAPS_GDI |
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [28672] Do not set DDCAPS_ALIGNBOUNDARYSRC as cap for ddraw
|
||||
Loading…
x
Reference in New Issue
Block a user