wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to implement semi-stub for d3d8 swapchain effect D3DSWAPEFFECT_COPY_VSYNC.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-09-26 17:23:36 +02:00
parent 0182014bed
commit 2f4c5ae81e
5 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -39,10 +39,11 @@ Wine. All those differences are also documented on the
Included bug fixes and improvements
-----------------------------------
**Bug fixes and features included in the next upcoming release [3]:**
**Bug fixes and features included in the next upcoming release [4]:**
* Add implementation for msidb commandline tool
* Codepage conversion should fail when destination length is < 0
* Implement semi-stub for d3d8 swapchain effect D3DSWAPEFFECT_COPY_VSYNC ([Wine Bug #37587](https://bugs.winehq.org/show_bug.cgi?id=37587))
* Return STATUS_INVALID_DEVICE_REQUEST when trying to call NtReadFile on directory

2
debian/changelog vendored
View File

@ -6,6 +6,8 @@ wine-staging (1.7.52) UNRELEASED; urgency=low
* Added patch to ensure codepage conversion fails when destination length is
smaller than zero.
* Added patches for msidb commandline utility (to read and write *.msi files).
* Added patch to implement semi-stub for d3d8 swapchain effect
D3DSWAPEFFECT_COPY_VSYNC.
* Removed patch to fix possible memory leak in netprofm init_networks (fixed
upstream).
* Removed patch for stub of dwmapi.DwmUpdateThumbnailProperties (accepted

33
patches/d3d8-D3DSWAPEFFECT_COPY_VSYNC/0001-d3d8-Handle-D3DSWAPEFFECT_COPY_VSYNC-swapchain-effec.patch Normal file
View File

@ -0,0 +1,33 @@
From d65c501e946415d47bb6fc7f084233ac8de43dec Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 26 Sep 2015 17:21:22 +0200
Subject: d3d8: Handle D3DSWAPEFFECT_COPY_VSYNC swapchain effect like
D3DSWAPEFFECT_COPY.
---
dlls/d3d8/device.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index e899b34..d006c12 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -191,13 +191,13 @@ static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS
static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc,
const D3DPRESENT_PARAMETERS *present_parameters)
{
- if (!present_parameters->SwapEffect || present_parameters->SwapEffect > D3DSWAPEFFECT_COPY)
+ if (!present_parameters->SwapEffect || present_parameters->SwapEffect > D3DSWAPEFFECT_COPY_VSYNC)
{
WARN("Invalid swap effect %u passed.\n", present_parameters->SwapEffect);
return FALSE;
}
if (present_parameters->BackBufferCount > 3
- || (present_parameters->SwapEffect == D3DSWAPEFFECT_COPY
+ || (present_parameters->SwapEffect >= D3DSWAPEFFECT_COPY
&& present_parameters->BackBufferCount > 1))
{
WARN("Invalid backbuffer count %u.\n", present_parameters->BackBufferCount);
--
2.5.1

1
patches/d3d8-D3DSWAPEFFECT_COPY_VSYNC/definition Normal file
View File

@ -0,0 +1 @@
Fixes: [37587] Implement semi-stub for d3d8 swapchain effect D3DSWAPEFFECT_COPY_VSYNC

19
patches/patchinstall.sh
View File

@ -97,6 +97,7 @@ patch_enable_all ()
enable_configure_Absolute_RPATH="$1"
enable_crypt32_CMS_Certificates="$1"
enable_crypt32_CryptUnprotectMemory="$1"
enable_d3d8_D3DSWAPEFFECT_COPY_VSYNC="$1"
enable_d3d9_DesktopWindow="$1"
enable_d3d9_Skip_Tests="$1"
enable_d3d9_Surface_Refcount="$1"
@ -384,6 +385,9 @@ patch_enable ()
crypt32-CryptUnprotectMemory)
enable_crypt32_CryptUnprotectMemory="$2"
;;
d3d8-D3DSWAPEFFECT_COPY_VSYNC)
enable_d3d8_D3DSWAPEFFECT_COPY_VSYNC="$2"
;;
d3d9-DesktopWindow)
enable_d3d9_DesktopWindow="$2"
;;
@ -2354,6 +2358,21 @@ if test "$enable_crypt32_CryptUnprotectMemory" -eq 1; then
) >> "$patchlist"
fi
# Patchset d3d8-D3DSWAPEFFECT_COPY_VSYNC
# |
# | This patchset fixes the following Wine bugs:
# | * [#37587] Implement semi-stub for d3d8 swapchain effect D3DSWAPEFFECT_COPY_VSYNC
# |
# | Modified files:
# | * dlls/d3d8/device.c
# |
if test "$enable_d3d8_D3DSWAPEFFECT_COPY_VSYNC" -eq 1; then
patch_apply d3d8-D3DSWAPEFFECT_COPY_VSYNC/0001-d3d8-Handle-D3DSWAPEFFECT_COPY_VSYNC-swapchain-effec.patch
(
echo '+ { "Sebastian Lackner", "d3d8: Handle D3DSWAPEFFECT_COPY_VSYNC swapchain effect like D3DSWAPEFFECT_COPY.", 1 },';
) >> "$patchlist"
fi
# Patchset d3d9-DesktopWindow
# |
# | Modified files: