Rebase against 1d281c620d3062c2f30cdf533fe4ac06905a07b8.

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

@@ -1,4 +1,4 @@
-From 9e4371e8d0aaf8b4c5578c41adf8e1dd4436b1f7 Mon Sep 17 00:00:00 2001
+From 221afbcd2a31e7df7e8eddcf7380e4448f420888 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
@@ -10,14 +10,14 @@ Content-Transfer-Encoding: 8bit
 Signed-off-by: Michael Müller <michael@fds-team.de>
 ---
  dlls/advapi32/tests/registry.c | 7 +++++++
- programs/explorer/desktop.c    | 9 +++++++++
- 2 files changed, 16 insertions(+)
+ programs/explorer/desktop.c    | 5 +++++
+ 2 files changed, 12 insertions(+)
 
 diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
-index 480e96ef6ee..49aacc905b1 100644
+index 9e051056eed..1f710f6ee04 100644
 --- a/dlls/advapi32/tests/registry.c
 +++ b/dlls/advapi32/tests/registry.c
-@@ -1318,6 +1318,13 @@ static void test_reg_create_key(void)
+@@ -1329,6 +1329,13 @@ static void test_reg_create_key(void)
      RegDeleteKeyA(hkey1, "");
      RegCloseKey(hkey1);
  
@@ -32,22 +32,18 @@ index 480e96ef6ee..49aacc905b1 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 81eb0d1d01b..f742cd6d30b 100644
+index 9945f689313..d996108c145 100644
 --- a/programs/explorer/desktop.c
 +++ b/programs/explorer/desktop.c
-@@ -878,6 +878,11 @@ static BOOL get_default_enable_shell( const WCHAR *name )
- 
+@@ -844,6 +844,7 @@ static BOOL get_default_enable_shell( const WCHAR *name )
  static HMODULE load_graphics_driver( const WCHAR *driver, GUID *guid )
  {
-+    static const WCHAR video_keyW[] = {
-+        'S','y','s','t','e','m','\\',
-+        'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',
-+        'C','o','n','t','r','o','l','\\',
-+        'V','i','d','e','o',0};
-     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','\\',
-@@ -947,6 +952,10 @@ static HMODULE load_graphics_driver( const WCHAR *driver, GUID *guid )
+     static const WCHAR device_keyW[] = L"System\\CurrentControlSet\\Control\\Video\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\0000";
++    static const WCHAR video_keyW[]  = L"System\\CurrentControlSet\\Control\\Video\\0000";
+ 
+     WCHAR buffer[MAX_PATH], libname[32], *name, *next;
+     WCHAR key[ARRAY_SIZE( device_keyW ) + 39];
+@@ -900,6 +901,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 +55,5 @@ index 81eb0d1d01b..f742cd6d30b 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.39.2
+2.40.1
 

staging/upstream-commit

@@ -1 +1 @@
-c13e7ae474d9b9b1c7c8af1f7a78928571ecb855
+1d281c620d3062c2f30cdf533fe4ac06905a07b8