commit 705686e24e45f4c3a3c597d79c315fb41a252251
author Alexandre Julliard <julliard@winehq.org> Wed Nov 24 19:34:32 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Nov 24 19:34:32 1999 +0000
tree 568ee53c8460f5ce5289d8a9b7dd77ac2eb6e044
parent 53f3a831c2e54616c03569d0525f5ff2e8fc613b

Added wine.conf option for new format registry files.
Added optional periodic saving of the registry.

misc/registry.c

diff --git a/misc/registry.c b/misc/registry.c
index fbbe7e8..cf0b15d 100644
--- a/misc/registry.c
+++ b/misc/registry.c
@@ -47,6 +47,7 @@
 #include "winreg.h"
 #include "winversion.h"
 #include "server.h"
+#include "services.h"
 
 DEFAULT_DEBUG_CHANNEL(reg)
 
@@ -333,6 +334,7 @@
     /* set saving level (0 for saving everything, 1 for saving only modified keys) */
     req->current = 1;
     req->saving  = !all;
+    req->version = PROFILE_GetWineIniBool( "registry", "UseNewFormat", 0 ) ? 2 : 1;
     server_call( REQ_SET_REGISTRY_LEVELS );
 
     SHELL_SaveRegistryBranch(HKEY_CURRENT_USER);
@@ -340,6 +342,11 @@
     SHELL_SaveRegistryBranch(HKEY_USERS);
 }
 
+/* Periodic save callback */
+static void CALLBACK periodic_save( ULONG_PTR dummy )
+{
+    SHELL_SaveRegistry();
+}
 
 /************************ LOAD Registry Function ****************************/
 
@@ -1275,6 +1282,7 @@
 void SHELL_LoadRegistry( void )
 {
   struct set_registry_levels_request *req = get_req_buffer();
+  int save_timeout;
   char	      *fn, *home;
   HKEY		    hkey;
 
@@ -1285,6 +1293,7 @@
   /* set level to 0 for loading system files */
   req->current = 0;
   req->saving  = 0;
+  req->version = 1;
   server_call( REQ_SET_REGISTRY_LEVELS );
 
   if (PROFILE_GetWineIniBool ("registry", "LoadWindowsRegistryFiles", 1)) 
@@ -1313,6 +1322,7 @@
   /* set level to 1 for loading user files */
   req->current = 1;
   req->saving  = 0;
+  req->version = 1;
   server_call( REQ_SET_REGISTRY_LEVELS );
 
   /*
@@ -1442,6 +1452,11 @@
 
     RegCloseKey(hkey);
   }
+
+  if ((save_timeout = PROFILE_GetWineIniInt( "registry", "PeriodicSave", 0 )))
+  {
+      SERVICE_AddTimer( save_timeout * 1000000, periodic_save, 0 );
+  }
 }