commit e5565ff049e3aeaa036947c6bb57437e621822d6
author Huw D M Davies <h.davies1@physics.ox.ac.uk> Fri May 05 18:19:03 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri May 05 18:19:03 2000 +0000
tree 9f5de5729b7ddf524613bffe3bbbf9a8a301928a
parent 2be78d412ff1f0766a172d3b71b31e7bb49546bb

Strip the $$$PROTO.HIV bit from win2k SYSTEM and SOFTWARE hives.

misc/registry.c

diff --git a/misc/registry.c b/misc/registry.c
index 684eff5..48320bb 100644
--- a/misc/registry.c
+++ b/misc/registry.c
@@ -1534,13 +1534,21 @@
       *  map HLM\System\ControlSet001 to HLM\System\CurrentControlSet
       */
 
-      strcpy(path, windir);
-      strncat(path, "\\system32\\config\\system", MAX_PATHNAME_LEN - strlen(path) - 1);
-      NativeRegLoadKey(HKEY_LOCAL_MACHINE, path, 0);
+      if (!RegCreateKeyA(HKEY_LOCAL_MACHINE, "SYSTEM", &hkey))
+      {
+	strcpy(path, windir);
+	strncat(path, "\\system32\\config\\system", MAX_PATHNAME_LEN - strlen(path) - 1);
+	NativeRegLoadKey(hkey, path, 1);
+        RegCloseKey(hkey);
+      }
 
-      strcpy(path, windir);
-      strncat(path, "\\system32\\config\\software", MAX_PATHNAME_LEN - strlen(path) - 1);
-      NativeRegLoadKey(HKEY_LOCAL_MACHINE, path, 0);
+      if (!RegCreateKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE", &hkey))
+      {
+	strcpy(path, windir);
+	strncat(path, "\\system32\\config\\software", MAX_PATHNAME_LEN - strlen(path) - 1);
+	NativeRegLoadKey(hkey, path, 1);
+        RegCloseKey(hkey);
+      }
 
       strcpy(path, windir);
       strncat(path, "\\system32\\config\\sam", MAX_PATHNAME_LEN - strlen(path) - 1);