kernel32: [2/2] Rename functions for volatile registry

[Detlef Riekenberg]

Changelog:
kernel32: Rename functions for volatile registry

The old name "convert_old_config()" has nothing
to do with the remaining code.




-- 
 
By by ... Detlef

-------------- next part --------------
>From a263d223eabcabe0872f725c278ab3b2a2e159e9 Mon Sep 17 00:00:00 2001
From: Detlef Riekenberg <wine.dev at web.de>
Date: Sun, 25 Feb 2007 23:43:48 +0100
Subject: [PATCH] kernel32: Rename functions for volatile registry
---
 dlls/kernel32/kernel_private.h |    4 ++--
 dlls/kernel32/process.c        |    6 +++---
 dlls/kernel32/registry.c       |   28 ++++++++++++++++++----------
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h
index 4796e62..6563e8f 100644
--- a/dlls/kernel32/kernel_private.h
+++ b/dlls/kernel32/kernel_private.h
@@ -125,8 +125,8 @@ extern void COMPUTERNAME_Init(void);
 extern void LOCALE_Init(void);
 extern void LOCALE_InitRegistry(void);
 
-/* oldconfig.c */
-extern void convert_old_config(void);
+/* registry.c */
+extern void create_volatile_registry(void);
 
 extern struct winedos_exports
 {
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index 8cdcd72..bfb6e38 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -738,12 +738,12 @@ static BOOL process_init(void)
 
     if (!params->Environment)
     {
+        /* create volatile and RAM-only registry entries*/
+        create_volatile_registry();
+
         /* Copy the parent environment */
         if (!build_initial_environment( __wine_main_environ )) return FALSE;
 
-        /* convert old configuration to new format */
-        convert_old_config();
-
         set_registry_environment();
     }
 
diff --git a/dlls/kernel32/registry.c b/dlls/kernel32/registry.c
index c386450..b201b15 100644
--- a/dlls/kernel32/registry.c
+++ b/dlls/kernel32/registry.c
@@ -1,5 +1,5 @@
 /*
- * Support for converting from old configuration format
+ * Support for creating volatile registry entries
  *
  * Copyright 2005 Alexandre Julliard
  *
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
- * NOTES
- *   This file should be removed after a suitable transition period.
  */
 
 #include "config.h"
@@ -56,7 +54,12 @@ #include "kernel_private.h"
 WINE_DEFAULT_DEBUG_CHANNEL(reg);
 
 
-/* registry initialisation, allocates some default keys. */
+/******************************************************************
+ * allocate_default_keys (internal)
+ * 
+ * initialize registry keys, which are not saved to Disk
+ *
+ */
 static ULONG allocate_default_keys(void)
 {
     static const WCHAR StatDataW[] = {'D','y','n','D','a','t','a','\\',
@@ -331,8 +334,13 @@ static int SCSI_getprocentry( FILE * pro
 }
 
 
-/* create the hardware registry branch */
-static void create_hardware_branch(void)
+/******************************************************************
+ * create_scsi_branch (internal)
+ *
+ * create the hardware registry branch for: Harddisk and CDROM
+ *
+ */
+static void create_scsi_branch(void)
 {
     /* The following mostly will work on Linux, but should not cause
      * problems on other systems. */
@@ -455,13 +463,13 @@ static void create_hardware_branch(void)
 
 
 /***********************************************************************
- *              convert_old_config
+ *              create_volatile_registry
  */
-void convert_old_config(void)
+void create_volatile_registry(void)
 {
     if (allocate_default_keys() == REG_OPENED_EXISTING_KEY)
         return; /* someone else already loaded the registry */
 
-    /* create some hardware keys (FIXME: should not be done here) */
-    create_hardware_branch();
+    /* create the hardware keys for Harddisks / CDROM */
+    create_scsi_branch();
 }
-- 
1.4.1