commit 7dbce65bb238819ce561350043e6ba288dbac431
author Michael Cardenas <michael.cardenas@lindows.com> Thu Mar 21 01:24:52 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Mar 21 01:24:52 2002 +0000
tree d93df43332299eb6f06106a948d0486cec6d36af
parent 8c45390a7f7a76dbc4c339f19586d34266c8c6ac

Changed registry handling in RegOpenKeyExA to behave like windows95
when winver==win95.

dlls/advapi32/registry.c

diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
index bb969e2..31f6815 100644
--- a/dlls/advapi32/registry.c
+++ b/dlls/advapi32/registry.c
@@ -42,11 +42,16 @@
 
 
 /* check if value type needs string conversion (Ansi<->Unicode) */
-static inline int is_string( DWORD type )
+inline static int is_string( DWORD type )
 {
     return (type == REG_SZ) || (type == REG_EXPAND_SZ) || (type == REG_MULTI_SZ);
 }
 
+/* check if current version is NT or Win95 */
+inline static int is_version_nt(void)
+{
+    return !(GetVersion() & 0x80000000);
+}
 
 /******************************************************************************
  *           RegCreateKeyExW   [ADVAPI32.@]
@@ -102,7 +107,8 @@
     NTSTATUS status;
 
     if (reserved) return ERROR_INVALID_PARAMETER;
-    if (!(access & KEY_ALL_ACCESS) || (access & ~KEY_ALL_ACCESS)) return ERROR_ACCESS_DENIED;
+    if (!is_version_nt()) access = KEY_ALL_ACCESS;  /* Win95 ignores the access mask */
+    else if (!(access & KEY_ALL_ACCESS) || (access & ~KEY_ALL_ACCESS)) return ERROR_ACCESS_DENIED;
 
     attr.Length = sizeof(attr);
     attr.RootDirectory = hkey;
@@ -195,6 +201,8 @@
     STRING nameA;
     NTSTATUS status;
 
+    if (!is_version_nt()) access = KEY_ALL_ACCESS;  /* Win95 ignores the access mask */
+
     attr.Length = sizeof(attr);
     attr.RootDirectory = hkey;
     attr.ObjectName = &NtCurrentTeb()->StaticUnicodeString;
@@ -445,8 +453,7 @@
     TRACE( "(0x%x,%p,%ld,%p,%p,%p,%p,%p,%p,%p,%p)\n", hkey, class, class_len ? *class_len : 0,
            reserved, subkeys, max_subkey, values, max_value, max_data, security, modif );
 
-    if (class && !class_len && !(GetVersion() & 0x80000000 /*NT*/))
-        return ERROR_INVALID_PARAMETER;
+    if (class && !class_len && is_version_nt()) return ERROR_INVALID_PARAMETER;
 
     status = NtQueryKey( hkey, KeyFullInformation, buffer, sizeof(buffer), &total_size );
     if (status && status != STATUS_BUFFER_OVERFLOW) goto done;
@@ -508,8 +515,7 @@
     TRACE( "(0x%x,%p,%ld,%p,%p,%p,%p,%p,%p,%p,%p)\n", hkey, class, class_len ? *class_len : 0,
            reserved, subkeys, max_subkey, values, max_value, max_data, security, modif );
 
-    if (class && !class_len && !(GetVersion() & 0x80000000 /*NT*/))
-        return ERROR_INVALID_PARAMETER;
+    if (class && !class_len && is_version_nt()) return ERROR_INVALID_PARAMETER;
 
     status = NtQueryKey( hkey, KeyFullInformation, buffer, sizeof(buffer), &total_size );
     if (status && status != STATUS_BUFFER_OVERFLOW) goto done;
@@ -647,7 +653,7 @@
 {
     UNICODE_STRING nameW;
 
-    if (GetVersion() & 0x80000000)  /* win95 */
+    if (!is_version_nt())  /* win95 */
     {
         if (type == REG_SZ) count = (strlenW( (WCHAR *)data ) + 1) * sizeof(WCHAR);
     }
@@ -674,7 +680,7 @@
     WCHAR *dataW = NULL;
     NTSTATUS status;
 
-    if (GetVersion() & 0x80000000)  /* win95 */
+    if (!is_version_nt())  /* win95 */
     {
         if (type == REG_SZ) count = strlen(data) + 1;
     }