wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against e796002ee61bf5dfb2718e8f4fb8fa928ccdc236.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2023-03-04 09:11:01 +11:00
parent cd22a0fb15
commit 9929ac3038
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
patches/explorer-Video_Registry_Key/0001-explorer-Create-CurrentControlSet-Control-Video-regi.patch
View File

@ -1,4 +1,4 @@
From b332f5a5dd03b7d71515a2fddefa787da3fb7b5e Mon Sep 17 00:00:00 2001
From 9e4371e8d0aaf8b4c5578c41adf8e1dd4436b1f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 9 Jan 2016 16:57:49 +0100
Subject: [PATCH] explorer: Create CurrentControlSet\Control\Video registry key
@ -14,7 +14,7 @@ Signed-off-by: Michael Müller <michael@fds-team.de>
2 files changed, 16 insertions(+)
diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
index dfadd13ea8c..b3e5888da92 100644
index 480e96ef6ee..49aacc905b1 100644
--- a/dlls/advapi32/tests/registry.c
+++ b/dlls/advapi32/tests/registry.c
@@ -1318,6 +1318,13 @@ static void test_reg_create_key(void)
@ -32,12 +32,12 @@ index dfadd13ea8c..b3e5888da92 100644
hkey1 = NULL;
ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, KEY_READ|KEY_WOW64_32KEY, NULL, &hkey1, NULL);
diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c
index 94d178880a8..95f06e50b7d 100644
index 81eb0d1d01b..f742cd6d30b 100644
--- a/programs/explorer/desktop.c
+++ b/programs/explorer/desktop.c
@@ -792,6 +792,11 @@ static BOOL get_default_enable_shell( const WCHAR *name )
@@ -878,6 +878,11 @@ static BOOL get_default_enable_shell( const WCHAR *name )
static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid )
static HMODULE load_graphics_driver( const WCHAR *driver, GUID *guid )
{
+ static const WCHAR video_keyW[] = {
+ 'S','y','s','t','e','m','\\',
@ -47,7 +47,7 @@ index 94d178880a8..95f06e50b7d 100644
static const WCHAR device_keyW[] = {
'S','y','s','t','e','m','\\',
'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',
@@ -859,6 +864,10 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid )
@@ -947,6 +952,10 @@ static HMODULE load_graphics_driver( const WCHAR *driver, GUID *guid )
TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(libname) );
@ -59,5 +59,5 @@ index 94d178880a8..95f06e50b7d 100644
guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] );
--
2.30.2
2.39.2

2
staging/upstream-commit
View File

@ -1 +1 @@
10765f2956d6f9fc2d16bb2bec476b12a31786f6
e796002ee61bf5dfb2718e8f4fb8fa928ccdc236