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 fix context backup window handling.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-07-24 18:58:35 +02:00
parent e866c7f3e1
commit f47fa538c5
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patches/patchinstall.sh
View File

@ -436,6 +436,7 @@ patch_enable_all ()
enable_winecfg_Unmounted_Devices="$1"
enable_wined3d_1DTextures="$1"
enable_wined3d_Accounting="$1"
enable_wined3d_Backup_Window="$1"
enable_wined3d_CSMT_Helper="$1"
enable_wined3d_CSMT_Main="$1"
enable_wined3d_Copy_Resource_Typeless="$1"
@ -1572,6 +1573,9 @@ patch_enable ()
wined3d-Accounting)
enable_wined3d_Accounting="$2"
;;
wined3d-Backup_Window)
enable_wined3d_Backup_Window="$2"
;;
wined3d-CSMT_Helper)
enable_wined3d_CSMT_Helper="$2"
;;
@ -9307,6 +9311,18 @@ if test "$enable_wined3d_Accounting" -eq 1; then
) >> "$patchlist"
fi
# Patchset wined3d-Backup_Window
# |
# | Modified files:
# | * dlls/wined3d/context.c
# |
if test "$enable_wined3d_Backup_Window" -eq 1; then
patch_apply wined3d-Backup_Window/0001-wined3d-Fix-context-backup-window-handling.patch
(
printf '%s\n' '+ { "Sebastian Lackner", "wined3d: Fix context backup window handling.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-Copy_Resource_Typeless
# |
# | This patchset has the following (direct or indirect) dependencies:

25
patches/wined3d-Backup_Window/0001-wined3d-Fix-context-backup-window-handling.patch Normal file
View File

@ -0,0 +1,25 @@
From b80174a0a4cb6ebd18b236681127f0c5da4e9073 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 24 Jul 2017 18:57:29 +0200
Subject: wined3d: Fix context backup window handling.
---
dlls/wined3d/context.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index be7650003cc..036e8c261f8 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -1109,7 +1109,7 @@ static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, BO
if (dc == context->hdc && context->hdc_is_private && context->hdc_has_format)
return TRUE;
- if (dc == context->hdc && !context->hdc_is_private && WindowFromDC(dc) != context->win_handle)
+ if (dc == context->hdc && !private && WindowFromDC(dc) != context->win_handle)
return FALSE;
current = gl_info->gl_ops.wgl.p_wglGetPixelFormat(dc);
--
2.13.1