commit 81bdcf126f5e11ae5ec5f2ebd3ba9b352c08d6a4
author Alexandre Julliard <julliard@winehq.org> Fri Sep 13 17:47:44 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Sep 13 17:47:44 2002 +0000
tree 0f3cd374ce19fd73abf0f48e5bad9e2145a2b4d1
parent c227edc5c3c92a32016a1dd52d3cc6019c3c6dfd

Removed references to advapi32 registry functions from some of the
kernel functions.

files/profile.c

diff --git a/files/profile.c b/files/profile.c
index e5a1ecf..1ade178 100644
--- a/files/profile.c
+++ b/files/profile.c
@@ -40,7 +40,6 @@
 #include "winerror.h"
 #include "winternl.h"
 #include "wine/winbase16.h"
-#include "winreg.h"
 #include "drive.h"
 #include "file.h"
 #include "heap.h"
@@ -972,19 +971,34 @@
 int PROFILE_GetWineIniString( LPCWSTR section, LPCWSTR key_name,
                               LPCWSTR def, LPWSTR buffer, int len )
 {
-    WCHAR tmp[PROFILE_MAX_LINE_LEN];
     HKEY hkey;
-    DWORD err;
+    NTSTATUS err;
+    OBJECT_ATTRIBUTES attr;
+    UNICODE_STRING nameW;
 
-    if (!(err = RegOpenKeyW( wine_profile_key, section, &hkey )))
+    attr.Length = sizeof(attr);
+    attr.RootDirectory = wine_profile_key;
+    attr.ObjectName = &nameW;
+    attr.Attributes = 0;
+    attr.SecurityDescriptor = NULL;
+    attr.SecurityQualityOfService = NULL;
+    RtlInitUnicodeString( &nameW, section );
+    if (!(err = NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )))
     {
-        DWORD type;
-        DWORD count = sizeof(tmp);
-        err = RegQueryValueExW( hkey, key_name, 0, &type, (LPBYTE)tmp, &count );
-        RegCloseKey( hkey );
+        char tmp[PROFILE_MAX_LINE_LEN*sizeof(WCHAR) + sizeof(KEY_VALUE_PARTIAL_INFORMATION)];
+        DWORD count;
+
+        RtlInitUnicodeString( &nameW, key_name );
+        if (!(err = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation,
+                                     tmp, sizeof(tmp), &count )))
+        {
+            WCHAR *str = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)tmp)->Data;
+            PROFILE_CopyEntry( buffer, str, len, TRUE, TRUE );
+        }
+        NtClose( hkey );
     }
 
-    PROFILE_CopyEntry( buffer, err ? def : tmp, len, TRUE, TRUE );
+    if (err) PROFILE_CopyEntry( buffer, def, len, TRUE, TRUE );
     TRACE( "(%s,%s,%s): returning %s\n", debugstr_w(section),
            debugstr_w(key_name), debugstr_w(def), debugstr_w(buffer) );
     return strlenW(buffer);