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 c76c7d85d0be45edf72e63ae7eae51c018383070.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-09-27 18:14:12 +02:00
parent b52328c75a
commit 78c9cb74ff
5 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 564a5198eae9dc64f53c1507aa823cd4f73266da Mon Sep 17 00:00:00 2001
From 535b46a3a7a24b603897fdb5d24e0fb704026ec1 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
@@ -99,19 +99,19 @@ index afa26cf..33bcddc 100644
+ return DISP_CHANGE_SUCCESSFUL;
}
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 2694d23..e3176f3 100644
index d622468..2452986 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -378,6 +378,7 @@ extern BOOL private_color_map DECLSPEC_HIDDEN;
@@ -383,6 +383,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;
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index d4f5c84..a8f4b4e 100644
index 41097f4..c6421a3 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;
@@ -122,7 +122,7 @@ index d4f5c84..a8f4b4e 100644
DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES;
int xrender_error_base = 0;
HMODULE x11drv_module = 0;
@@ -411,6 +412,9 @@ static void setup_options(void)
@@ -413,6 +414,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 d4f5c84..a8f4b4e 100644
if (appkey) RegCloseKey( appkey );
--
2.6.2
2.9.0