wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against a8b5fdda3214e4fd52682aefaa093cd45766580e.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-07-18 11:29:09 +02:00
parent e2dbf3ab7e
commit d9d149f369
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/winex11-DefaultDisplayFrequency/0001-winex11.drv-Allow-to-select-default-display-frequenc.patch
View File

@@ -1,4 +1,4 @@
From 535b46a3a7a24b603897fdb5d24e0fb704026ec1 Mon Sep 17 00:00:00 2001
From 695882d5939c00095d4ff903316dc56cc94b44f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 5 Nov 2015 14:33:48 +0100
Subject: winex11.drv: Allow to select default display frequency in registry
@@ -17,7 +17,7 @@ HKCU\Software\Wine\X11 Driver\DefaultDisplayFrequency
3 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c
index afa26cf..33bcddc 100644
index afa26cf5433..33bcddc35c6 100644
--- a/dlls/winex11.drv/settings.c
+++ b/dlls/winex11.drv/settings.c
@@ -342,7 +342,7 @@ static const char * _DM_fields(DWORD fields)
@@ -99,22 +99,22 @@ index afa26cf..33bcddc 100644
+ return DISP_CHANGE_SUCCESSFUL;
}
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index d622468..2452986 100644
index 721c082ed10..0e31c337212 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -383,6 +383,7 @@ extern BOOL private_color_map DECLSPEC_HIDDEN;
@@ -393,6 +393,7 @@ extern BOOL private_color_map DECLSPEC_HIDDEN;
extern int primary_monitor DECLSPEC_HIDDEN;
extern int copy_default_colors DECLSPEC_HIDDEN;
extern int alloc_system_colors DECLSPEC_HIDDEN;
+extern int default_display_frequency DECLSPEC_HIDDEN;
extern int xrender_error_base DECLSPEC_HIDDEN;
extern HMODULE x11drv_module DECLSPEC_HIDDEN;
extern Display *clipboard_display DECLSPEC_HIDDEN;
extern char *process_name DECLSPEC_HIDDEN;
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index 41097f4..c6421a3 100644
index 65ef59b0c1b..8244abf1bef 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -81,6 +81,7 @@ BOOL client_side_with_render = TRUE;
@@ -82,6 +82,7 @@ BOOL client_side_with_render = TRUE;
BOOL shape_layered_windows = TRUE;
int copy_default_colors = 128;
int alloc_system_colors = 256;
@@ -122,7 +122,7 @@ index 41097f4..c6421a3 100644
DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES;
int xrender_error_base = 0;
HMODULE x11drv_module = 0;
@@ -413,6 +414,9 @@ static void setup_options(void)
@@ -412,6 +413,9 @@ static void setup_options(void)
if (!get_config_key( hkey, appkey, "AllocSystemColors", buffer, sizeof(buffer) ))
alloc_system_colors = atoi(buffer);
@@ -133,5 +133,5 @@ index 41097f4..c6421a3 100644
if (appkey) RegCloseKey( appkey );
--
2.9.0
2.13.1