Rebase against 288a40d05c8cddf62d0b12524a90d2d4f5ce114d.

patches/ntdll_reg_flush/0002-ntdll-Implement-NtFlushKey.patch

@@ -1,4 +1,4 @@
-From e1f8622b3b787ca19ca1cfc149492c517e5833c4 Mon Sep 17 00:00:00 2001
+From 034ac695e2f8f6bdd5f610f00b85e5bce08f86a4 Mon Sep 17 00:00:00 2001
 From: Paul Gofman <pgofman@codeweavers.com>
 Date: Tue, 20 Jun 2023 11:54:06 -0600
 Subject: [PATCH] ntdll: Implement NtFlushKey().
@@ -10,7 +10,7 @@ Subject: [PATCH] ntdll: Implement NtFlushKey().
  3 files changed, 247 insertions(+), 14 deletions(-)
 
 diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c
-index 88ad7e569a1..492dd00d67a 100644
+index e6b0d40c875..3b6bb9d817a 100644
 --- a/dlls/ntdll/unix/registry.c
 +++ b/dlls/ntdll/unix/registry.c
 @@ -29,6 +29,8 @@
@@ -210,10 +210,10 @@ index 88ad7e569a1..492dd00d67a 100644
  }
  
 diff --git a/server/protocol.def b/server/protocol.def
-index 1117e3b797a..910960285a0 100644
+index 4e3e2885240..6bed72d380c 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -1834,6 +1834,18 @@ struct process_info
+@@ -2023,6 +2023,18 @@ struct process_info
  /* Flush a registry key */
  @REQ(flush_key)
      obj_handle_t hkey;         /* handle to the key */
@@ -233,7 +233,7 @@ index 1117e3b797a..910960285a0 100644
  
  
 diff --git a/server/registry.c b/server/registry.c
-index ec1ca27be80..6ec1202cf7a 100644
+index 73b75147850..dd6735fdce9 100644
 --- a/server/registry.c
 +++ b/server/registry.c
 @@ -90,6 +90,7 @@ struct key
@@ -290,7 +290,7 @@ index ec1ca27be80..6ec1202cf7a 100644
  }
  
  /* go through all the notifications and send them if necessary */
-@@ -1995,6 +2001,7 @@ void init_registry(void)
+@@ -2009,6 +2015,7 @@ void init_registry(void)
  /* save a registry branch to a file */
  static void save_all_subkeys( struct key *key, FILE *f )
  {
@@ -298,7 +298,7 @@ index ec1ca27be80..6ec1202cf7a 100644
      fprintf( f, "WINE REGISTRY Version 2\n" );
      fprintf( f, ";; All keys relative to " );
      dump_path( key, NULL, f );
-@@ -2179,7 +2186,7 @@ static int save_branch( struct key *key, const char *filename )
+@@ -2193,7 +2200,7 @@ static int save_branch( struct key *key, const char *filename )
      }
  
  done:
@@ -307,8 +307,8 @@ index ec1ca27be80..6ec1202cf7a 100644
      return ret;
  }
  
-@@ -2227,6 +2234,36 @@ static int is_wow64_thread( struct thread *thread )
-     return (is_machine_64bit( native_machine ) && !is_machine_64bit( thread->process->machine ));
+@@ -2235,6 +2242,36 @@ void flush_registry(void)
+     if (fchdir( server_dir_fd ) == -1) fatal_error( "chdir to server dir: %s\n", strerror( errno ));
  }
  
 +/* find all the branches inside the specified key or the branch containing the key */
@@ -344,7 +344,7 @@ index ec1ca27be80..6ec1202cf7a 100644
  
  /* create a registry key */
  DECL_HANDLER(create_key)
-@@ -2291,15 +2328,56 @@ DECL_HANDLER(delete_key)
+@@ -2303,15 +2340,56 @@ DECL_HANDLER(delete_key)
      }
  }
  
@@ -406,5 +406,5 @@ index ec1ca27be80..6ec1202cf7a 100644
  
  /* enumerate registry subkeys */
 -- 
-2.43.0
+2.50.1
 

staging/upstream-commit

@@ -1 +1 @@
-2e4974af42a96dfcd426be5e40faecd9853401d1
+288a40d05c8cddf62d0b12524a90d2d4f5ce114d