From 5b2d5fd758416ad790a9a5046e51aa33acd247a0 Mon Sep 17 00:00:00 2001
From: Mike McCormack <mike@codeweavers.com>
Date: Fri, 17 Jun 2005 13:58:33 +0000
Subject: [PATCH] Use HANDLE instead of HKEY in the NT API.

---
 dlls/advapi32/registry.c    | 10 +++---
 dlls/kernel/computername.c  |  8 ++---
 dlls/kernel/cpu.c           |  2 +-
 dlls/kernel/except.c        |  2 +-
 dlls/kernel/locale.c        | 38 +++++++++++-----------
 dlls/kernel/oldconfig.c     | 22 ++++++-------
 dlls/kernel/path.c          |  2 +-
 dlls/kernel/process.c       |  6 ++--
 dlls/kernel/relay16.c       |  2 +-
 dlls/kernel/volume.c        |  2 +-
 dlls/ntdll/cdrom.c          |  1 -
 dlls/ntdll/critsection.c    |  1 -
 dlls/ntdll/debugbuffer.c    |  1 -
 dlls/ntdll/debugtools.c     |  1 -
 dlls/ntdll/directory.c      |  3 +-
 dlls/ntdll/env.c            |  1 -
 dlls/ntdll/error.c          |  1 -
 dlls/ntdll/exception.c      |  1 -
 dlls/ntdll/handletable.c    |  1 -
 dlls/ntdll/heap.c           |  1 -
 dlls/ntdll/large_int.c      |  1 -
 dlls/ntdll/loader.c         |  1 -
 dlls/ntdll/loadorder.c      | 15 +++++----
 dlls/ntdll/nt.c             |  1 -
 dlls/ntdll/om.c             |  1 -
 dlls/ntdll/process.c        |  1 -
 dlls/ntdll/reg.c            | 63 ++++++++++++++++++-------------------
 dlls/ntdll/relay.c          |  3 +-
 dlls/ntdll/resource.c       |  1 -
 dlls/ntdll/rtl.c            |  1 -
 dlls/ntdll/rtlbitmap.c      |  1 -
 dlls/ntdll/rtlstr.c         |  1 -
 dlls/ntdll/sec.c            |  1 -
 dlls/ntdll/signal_powerpc.c |  1 -
 dlls/ntdll/signal_sparc.c   |  1 -
 dlls/ntdll/string.c         |  1 -
 dlls/ntdll/time.c           |  3 +-
 dlls/ntdll/version.c        |  5 ++-
 dlls/ntdll/virtual.c        |  1 -
 dlls/ntdll/wcstring.c       |  1 -
 dlls/winedos/ioports.c      |  2 +-
 dlls/winedos/ppdev.c        |  2 +-
 include/winternl.h          | 38 +++++++++++-----------
 43 files changed, 111 insertions(+), 141 deletions(-)

diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
index d813cfb04a5..17e75c70c26 100644
--- a/dlls/advapi32/registry.c
+++ b/dlls/advapi32/registry.c
@@ -97,7 +97,7 @@ inline static int is_version_nt(void)
 }
 
 /* create one of the HKEY_* special root keys */
-static HKEY create_special_root_hkey( HKEY hkey, DWORD access )
+static HKEY create_special_root_hkey( HANDLE hkey, DWORD access )
 {
     HKEY ret = 0;
     int idx = (UINT)hkey - (UINT)HKEY_SPECIAL_ROOT_FIRST;
@@ -167,7 +167,7 @@ DWORD WINAPI RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPCWSTR c
     RtlInitUnicodeString( &nameW, name );
     RtlInitUnicodeString( &classW, class );
 
-    return RtlNtStatusToDosError( NtCreateKey( retkey, access, &attr, 0,
+    return RtlNtStatusToDosError( NtCreateKey( (PHANDLE)retkey, access, &attr, 0,
                                                &classW, options, dispos ) );
 }
 
@@ -223,7 +223,7 @@ DWORD WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPCSTR cla
     {
         if (!(status = RtlAnsiStringToUnicodeString( &classW, &classA, TRUE )))
         {
-            status = NtCreateKey( retkey, access, &attr, 0, &classW, options, dispos );
+            status = NtCreateKey( (PHANDLE)retkey, access, &attr, 0, &classW, options, dispos );
             RtlFreeUnicodeString( &classW );
         }
     }
@@ -286,7 +286,7 @@ DWORD WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, REGSAM acce
     attr.SecurityDescriptor = NULL;
     attr.SecurityQualityOfService = NULL;
     RtlInitUnicodeString( &nameW, name );
-    return RtlNtStatusToDosError( NtOpenKey( retkey, access, &attr ) );
+    return RtlNtStatusToDosError( NtOpenKey( (PHANDLE)retkey, access, &attr ) );
 }
 
 
@@ -331,7 +331,7 @@ DWORD WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, REGSAM acces
     if (!(status = RtlAnsiStringToUnicodeString( &NtCurrentTeb()->StaticUnicodeString,
                                                  &nameA, FALSE )))
     {
-        status = NtOpenKey( retkey, access, &attr );
+        status = NtOpenKey( (PHANDLE)retkey, access, &attr );
     }
     return RtlNtStatusToDosError( status );
 }
diff --git a/dlls/kernel/computername.c b/dlls/kernel/computername.c
index ae36d1dc64b..2c2af0d2a8b 100644
--- a/dlls/kernel/computername.c
+++ b/dlls/kernel/computername.c
@@ -203,7 +203,7 @@ static BOOL get_use_dns_option(void)
     static const WCHAR UseDNSW[] = {'U','s','e','D','n','s','C','o','m','p','u','t','e','r','N','a','m','e',0};
 
     char tmp[80];
-    HKEY root, hkey;
+    HANDLE root, hkey;
     DWORD dummy;
     OBJECT_ATTRIBUTES attr;
     UNICODE_STRING nameW;
@@ -235,7 +235,7 @@ static BOOL get_use_dns_option(void)
  */
 void COMPUTERNAME_Init (void)
 {
-    HKEY hkey = INVALID_HANDLE_VALUE, hsubkey = INVALID_HANDLE_VALUE;
+    HANDLE hkey = INVALID_HANDLE_VALUE, hsubkey = INVALID_HANDLE_VALUE;
     OBJECT_ATTRIBUTES attr;
     UNICODE_STRING nameW;
     char buf[offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ) + (MAX_COMPUTERNAME_LENGTH + 1) * sizeof( WCHAR )];
@@ -316,7 +316,7 @@ BOOL WINAPI GetComputerNameW(LPWSTR name,LPDWORD size)
 {
     UNICODE_STRING nameW;
     OBJECT_ATTRIBUTES attr;
-    HKEY hkey = INVALID_HANDLE_VALUE, hsubkey = INVALID_HANDLE_VALUE;
+    HANDLE hkey = INVALID_HANDLE_VALUE, hsubkey = INVALID_HANDLE_VALUE;
     char buf[offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ) + (MAX_COMPUTERNAME_LENGTH + 1) * sizeof( WCHAR )];
     DWORD len = sizeof( buf );
     LPWSTR theName = (LPWSTR) (buf + offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ));
@@ -574,7 +574,7 @@ BOOL WINAPI SetComputerNameW( LPCWSTR lpComputerName )
 {
     UNICODE_STRING nameW;
     OBJECT_ATTRIBUTES attr;
-    HKEY hkey = INVALID_HANDLE_VALUE, hsubkey = INVALID_HANDLE_VALUE;
+    HANDLE hkey = INVALID_HANDLE_VALUE, hsubkey = INVALID_HANDLE_VALUE;
     int plen = strlenW ( lpComputerName );
     int i;
     NTSTATUS st = STATUS_INTERNAL_ERROR;
diff --git a/dlls/kernel/cpu.c b/dlls/kernel/cpu.c
index 23ff05af3cf..951b7f35b12 100644
--- a/dlls/kernel/cpu.c
+++ b/dlls/kernel/cpu.c
@@ -119,7 +119,7 @@ static void create_registry_keys( const SYSTEM_INFO *info )
     /* static const WCHAR VenidAMDW[] = {'A','u','t','h','e','n','t','i','c','A','M','D',0}; */
 
     unsigned int i;
-    HKEY hkey, system_key, cpu_key;
+    HANDLE hkey, system_key, cpu_key;
     OBJECT_ATTRIBUTES attr;
     UNICODE_STRING nameW, valueW;
 
diff --git a/dlls/kernel/except.c b/dlls/kernel/except.c
index 976a8e941dc..bd10e010403 100644
--- a/dlls/kernel/except.c
+++ b/dlls/kernel/except.c
@@ -223,7 +223,7 @@ static BOOL	start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent)
     OBJECT_ATTRIBUTES attr;
     UNICODE_STRING nameW;
     char *cmdline, *env, *p;
-    HKEY		hDbgConf;
+    HANDLE		hDbgConf;
     DWORD		bAuto = FALSE;
     PROCESS_INFORMATION	info;
     STARTUPINFOA	startup;
diff --git a/dlls/kernel/locale.c b/dlls/kernel/locale.c
index 906b7124fad..0dee9b803e3 100644
--- a/dlls/kernel/locale.c
+++ b/dlls/kernel/locale.c
@@ -54,8 +54,8 @@ static const union cptable *oem_cptable;
 static const union cptable *mac_cptable;
 static const union cptable *unix_cptable;  /* NULL if UTF8 */
 
-static HKEY NLS_RegOpenKey(HKEY hRootKey, LPCWSTR szKeyName);
-static HKEY NLS_RegOpenSubKey(HKEY hRootKey, LPCWSTR szKeyName);
+static HANDLE NLS_RegOpenKey(HANDLE hRootKey, LPCWSTR szKeyName);
+static HANDLE NLS_RegOpenSubKey(HANDLE hRootKey, LPCWSTR szKeyName);
 
 static const WCHAR szNlsKeyName[] = {
     'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\',
@@ -219,13 +219,13 @@ static const union cptable *get_codepage_table( unsigned int codepage )
  *
  * Create the Control Panel\\International registry key.
  */
-inline static HKEY create_registry_key(void)
+inline static HANDLE create_registry_key(void)
 {
     static const WCHAR intlW[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\',
                                   'I','n','t','e','r','n','a','t','i','o','n','a','l',0};
     OBJECT_ATTRIBUTES attr;
     UNICODE_STRING nameW;
-    HKEY hkey;
+    HANDLE hkey;
 
     if (RtlOpenCurrentUser( KEY_ALL_ACCESS, &hkey ) != STATUS_SUCCESS) return 0;
 
@@ -292,7 +292,7 @@ void LOCALE_InitRegistry(void)
     char buffer[20];
     WCHAR bufferW[80];
     DWORD count, i;
-    HKEY hkey;
+    HANDLE hkey;
     LCID lcid = GetUserDefaultLCID();
 
     if (!(hkey = create_registry_key()))
@@ -782,7 +782,7 @@ static INT get_registry_locale_info( LPCWSTR value, LPWSTR buffer, INT len )
 {
     DWORD size;
     INT ret;
-    HKEY hkey;
+    HANDLE hkey;
     NTSTATUS status;
     UNICODE_STRING nameW;
     KEY_VALUE_PARTIAL_INFORMATION *info;
@@ -1101,7 +1101,7 @@ BOOL WINAPI SetLocaleInfoW( LCID lcid, LCTYPE lctype, LPCWSTR data )
     static const WCHAR intlW[] = {'i','n','t','l',0 };
     UNICODE_STRING valueW;
     NTSTATUS status;
-    HKEY hkey;
+    HANDLE hkey;
 
     lcid = ConvertDefaultLocale(lcid);
 
@@ -2585,11 +2585,11 @@ void LOCALE_Init(void)
            mac_cptable->info.codepage, unix_cp );
 }
 
-static HKEY NLS_RegOpenKey(HKEY hRootKey, LPCWSTR szKeyName)
+static HANDLE NLS_RegOpenKey(HANDLE hRootKey, LPCWSTR szKeyName)
 {
     UNICODE_STRING keyName;
     OBJECT_ATTRIBUTES attr;
-    HKEY hkey;
+    HANDLE hkey;
 
     RtlInitUnicodeString( &keyName, szKeyName );
     InitializeObjectAttributes(&attr, &keyName, 0, hRootKey, NULL);
@@ -2600,9 +2600,9 @@ static HKEY NLS_RegOpenKey(HKEY hRootKey, LPCWSTR szKeyName)
     return hkey;
 }
 
-static HKEY NLS_RegOpenSubKey(HKEY hRootKey, LPCWSTR szKeyName)
+static HANDLE NLS_RegOpenSubKey(HANDLE hRootKey, LPCWSTR szKeyName)
 {
-    HKEY hKey = NLS_RegOpenKey(hRootKey, szKeyName);
+    HANDLE hKey = NLS_RegOpenKey(hRootKey, szKeyName);
 
     if (hRootKey)
         NtClose( hRootKey );
@@ -2610,7 +2610,7 @@ static HKEY NLS_RegOpenSubKey(HKEY hRootKey, LPCWSTR szKeyName)
     return hKey;
 }
 
-static BOOL NLS_RegEnumSubKey(HKEY hKey, UINT ulIndex, LPWSTR szKeyName,
+static BOOL NLS_RegEnumSubKey(HANDLE hKey, UINT ulIndex, LPWSTR szKeyName,
                               ULONG keyNameSize)
 {
     BYTE buffer[80];
@@ -2633,7 +2633,7 @@ static BOOL NLS_RegEnumSubKey(HKEY hKey, UINT ulIndex, LPWSTR szKeyName,
     return TRUE;
 }
 
-static BOOL NLS_RegEnumValue(HKEY hKey, UINT ulIndex,
+static BOOL NLS_RegEnumValue(HANDLE hKey, UINT ulIndex,
                              LPWSTR szValueName, ULONG valueNameSize,
                              LPWSTR szValueData, ULONG valueDataSize)
 {
@@ -2660,7 +2660,7 @@ static BOOL NLS_RegEnumValue(HKEY hKey, UINT ulIndex,
     return TRUE;
 }
 
-static BOOL NLS_RegGetDword(HKEY hKey, LPCWSTR szValueName, DWORD *lpVal)
+static BOOL NLS_RegGetDword(HANDLE hKey, LPCWSTR szValueName, DWORD *lpVal)
 {
     BYTE buffer[128];
     const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer;
@@ -2749,7 +2749,7 @@ typedef struct
 static BOOL NLS_EnumSystemLanguageGroups(ENUMLANGUAGEGROUP_CALLBACKS *lpProcs)
 {
     WCHAR szNumber[10], szValue[4];
-    HKEY hKey;
+    HANDLE hKey;
     BOOL bContinue = TRUE;
     ULONG ulIndex = 0;
 
@@ -2898,7 +2898,7 @@ BOOL WINAPI IsValidLanguageGroup(LGRPID lgrpid, DWORD dwFlags)
     static const WCHAR szFormat[] = { '%','x','\0' };
     WCHAR szValueName[16], szValue[2];
     BOOL bSupported = FALSE, bInstalled = FALSE;
-    HKEY hKey;
+    HANDLE hKey;
 
 
     switch (dwFlags)
@@ -2951,7 +2951,7 @@ static BOOL NLS_EnumLanguageGroupLocales(ENUMLANGUAGEGROUPLOCALE_CALLBACKS *lpPr
       'A','l','t','e','r','n','a','t','e',' ','S','o','r','t','s','\0'
     };
     WCHAR szNumber[10], szValue[4];
-    HKEY hKey;
+    HANDLE hKey;
     BOOL bContinue = TRUE, bAlternate = FALSE;
     LGRPID lgrpid;
     ULONG ulIndex = 1;  /* Ignore default entry of 1st key */
@@ -3104,7 +3104,7 @@ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID reserved, GEO_ENUMPROC pGeo
       'C','o','u','n','t','r','y','C','o','d','e','\0'
     };
     WCHAR szNumber[10];
-    HKEY hKey;
+    HANDLE hKey;
     ULONG ulIndex = 0;
 
     TRACE("(0x%08lX,0x%08lX,%p)\n", geoclass, reserved, pGeoEnumProc);
@@ -3121,7 +3121,7 @@ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID reserved, GEO_ENUMPROC pGeo
     {
         BOOL bContinue = TRUE;
         DWORD dwGeoId;
-        HKEY hSubKey = NLS_RegOpenKey( hKey, szNumber );
+        HANDLE hSubKey = NLS_RegOpenKey( hKey, szNumber );
 
         if (hSubKey)
         {
diff --git a/dlls/kernel/oldconfig.c b/dlls/kernel/oldconfig.c
index 8588b6fcd9b..6ae69b8376c 100644
--- a/dlls/kernel/oldconfig.c
+++ b/dlls/kernel/oldconfig.c
@@ -71,7 +71,7 @@ static int create_drives( int devices_only )
     char dest[1024];
     char *buffer;
     WCHAR *p, name[3];
-    HKEY hkey;
+    HANDLE hkey;
     DWORD dummy;
     int i, count = 0;
 
@@ -176,7 +176,7 @@ static void create_dos_devices(void)
 
     if (!mkdir( buffer, 0777 ))  /* we created it, so now create the devices */
     {
-        HKEY hkey;
+        HANDLE hkey;
         DWORD dummy;
         OBJECT_ATTRIBUTES attr;
         UNICODE_STRING nameW;
@@ -306,7 +306,7 @@ static void convert_drive_types(void)
     UNICODE_STRING nameW;
     DWORD dummy;
     ULONG disp;
-    HKEY hkey_old, hkey_new;
+    HANDLE hkey_old, hkey_new;
     int i;
 
     attr.Length = sizeof(attr);
@@ -350,7 +350,7 @@ static void convert_drive_types(void)
 
 
 /* convert the environment variable entries from the old format to the new one */
-static void convert_environment( HKEY hkey_current_user )
+static void convert_environment( HANDLE hkey_current_user )
 {
     static const WCHAR wineW[] = {'M','a','c','h','i','n','e','\\',
                                   'S','o','f','t','w','a','r','e','\\',
@@ -374,7 +374,7 @@ static void convert_environment( HKEY hkey_current_user )
     UNICODE_STRING nameW;
     DWORD dummy;
     ULONG disp;
-    HKEY hkey_old, hkey_env;
+    HANDLE hkey_old, hkey_env;
 
     attr.Length = sizeof(attr);
     attr.RootDirectory = 0;
@@ -485,7 +485,7 @@ static ULONG allocate_default_keys(void)
     static const WCHAR ConfigManagerW[] = {'D','y','n','D','a','t','a','\\',
                                            'C','o','n','f','i','g',' ','M','a','n','a','g','e','r','\\',
                                             'E','n','u','m',0};
-    HKEY hkey;
+    HANDLE hkey;
     ULONG dispos;
     OBJECT_ATTRIBUTES attr;
     UNICODE_STRING nameW;
@@ -527,10 +527,10 @@ static void init_cdrom_registry( HANDLE handle )
     char buffer[40];
     DWORD value;
     const char *data;
-    HKEY scsiKey;
-    HKEY portKey;
-    HKEY busKey;
-    HKEY targetKey;
+    HANDLE scsiKey;
+    HANDLE portKey;
+    HANDLE busKey;
+    HANDLE targetKey;
     DWORD disp;
     IO_STATUS_BLOCK io;
     SCSI_ADDRESS scsi_addr;
@@ -673,7 +673,7 @@ static void create_hardware_branch(void)
  */
 void convert_old_config(void)
 {
-    HKEY hkey_current_user;
+    HANDLE hkey_current_user;
 
     if (allocate_default_keys() == REG_OPENED_EXISTING_KEY)
         return; /* someone else already loaded the registry */
diff --git a/dlls/kernel/path.c b/dlls/kernel/path.c
index 96db4ec34da..d61d5a09ed6 100644
--- a/dlls/kernel/path.c
+++ b/dlls/kernel/path.c
@@ -133,7 +133,7 @@ static BOOL add_boot_rename_entry( LPCWSTR source, LPCWSTR dest, DWORD flags )
     UNICODE_STRING nameW, source_name, dest_name;
     KEY_VALUE_PARTIAL_INFORMATION *info;
     BOOL rc = FALSE;
-    HKEY Reboot = 0;
+    HANDLE Reboot = 0;
     DWORD len1, len2;
     DWORD DataSize = 0;
     BYTE *Buffer = NULL;
diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c
index 1fd53e385fc..43449fbce25 100644
--- a/dlls/kernel/process.c
+++ b/dlls/kernel/process.c
@@ -416,7 +416,7 @@ static BOOL build_initial_environment( char **environ )
  * helper for set_registry_environment().
  * Note that Windows happily truncates the value if it's too big.
  */
-static void set_registry_variables( HKEY hkey, ULONG type )
+static void set_registry_variables( HANDLE hkey, ULONG type )
 {
     UNICODE_STRING env_name, env_value;
     NTSTATUS status;
@@ -481,7 +481,7 @@ static void set_registry_environment(void)
 
     OBJECT_ATTRIBUTES attr;
     UNICODE_STRING nameW;
-    HKEY hkey;
+    HANDLE hkey;
 
     attr.Length = sizeof(attr);
     attr.RootDirectory = 0;
@@ -500,7 +500,7 @@ static void set_registry_environment(void)
     }
 
     /* then the ones for the current user */
-    if (RtlOpenCurrentUser( KEY_ALL_ACCESS, (HKEY *)&attr.RootDirectory ) != STATUS_SUCCESS) return;
+    if (RtlOpenCurrentUser( KEY_ALL_ACCESS, &attr.RootDirectory ) != STATUS_SUCCESS) return;
     RtlInitUnicodeString( &nameW, envW );
     if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr ) == STATUS_SUCCESS)
     {
diff --git a/dlls/kernel/relay16.c b/dlls/kernel/relay16.c
index e7ac9f818ef..bec9d1e4c02 100644
--- a/dlls/kernel/relay16.c
+++ b/dlls/kernel/relay16.c
@@ -109,7 +109,7 @@ void RELAY16_InitDebugLists(void)
     OBJECT_ATTRIBUTES attr;
     UNICODE_STRING name;
     char buffer[1024];
-    HKEY root, hkey;
+    HANDLE root, hkey;
     DWORD count;
     WCHAR *str;
     static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\',
diff --git a/dlls/kernel/volume.c b/dlls/kernel/volume.c
index 3c108fe674e..0d040b3230b 100644
--- a/dlls/kernel/volume.c
+++ b/dlls/kernel/volume.c
@@ -172,7 +172,7 @@ static UINT get_registry_drive_type( const WCHAR *root )
                                              'D','r','i','v','e','s',0 };
     OBJECT_ATTRIBUTES attr;
     UNICODE_STRING nameW;
-    HKEY hkey;
+    HANDLE hkey;
     DWORD dummy;
     UINT ret = DRIVE_UNKNOWN;
     char tmp[32 + sizeof(KEY_VALUE_PARTIAL_INFORMATION)];
diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c
index e151ac18241..2798ef4391e 100644
--- a/dlls/ntdll/cdrom.c
+++ b/dlls/ntdll/cdrom.c
@@ -80,7 +80,6 @@
 #include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "winioctl.h"
 #include "ntddstor.h"
diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c
index 2fbb27d68a5..34534e8c8b1 100644
--- a/dlls/ntdll/critsection.c
+++ b/dlls/ntdll/critsection.c
@@ -28,7 +28,6 @@
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/debug.h"
 #include "ntdll_misc.h"
diff --git a/dlls/ntdll/debugbuffer.c b/dlls/ntdll/debugbuffer.c
index 18fde9d07fc..77a761840b1 100644
--- a/dlls/ntdll/debugbuffer.c
+++ b/dlls/ntdll/debugbuffer.c
@@ -28,7 +28,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winnt.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "ntdll_misc.h"
 #include "wine/debug.h"
diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c
index 8c6db4c8691..38d430b7140 100644
--- a/dlls/ntdll/debugtools.c
+++ b/dlls/ntdll/debugtools.c
@@ -37,7 +37,6 @@
 #include "ntstatus.h"
 #include "winbase.h"
 #include "winnt.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "excpt.h"
 #include "ntdll_misc.h"
diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c
index 3eb206c76ef..ded45000607 100644
--- a/dlls/ntdll/directory.c
+++ b/dlls/ntdll/directory.c
@@ -59,7 +59,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winnt.h"
-#include "winreg.h"
 #include "ntstatus.h"
 #include "winternl.h"
 #include "ntdll_misc.h"
@@ -503,7 +502,7 @@ static void init_options(void)
     static const WCHAR ShowDotFilesW[] = {'S','h','o','w','D','o','t','F','i','l','e','s',0};
     static const WCHAR ShowDirSymlinksW[] = {'S','h','o','w','D','i','r','S','y','m','l','i','n','k','s',0};
     char tmp[80];
-    HKEY hkey;
+    HANDLE hkey;
     DWORD dummy;
     OBJECT_ATTRIBUTES attr;
     UNICODE_STRING nameW;
diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c
index d34ac6b8e85..559006c85e0 100644
--- a/dlls/ntdll/env.c
+++ b/dlls/ntdll/env.c
@@ -25,7 +25,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c
index 68a83db3ef7..965fd777061 100644
--- a/dlls/ntdll/error.c
+++ b/dlls/ntdll/error.c
@@ -26,7 +26,6 @@
 #include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "winerror.h"
 #include "wine/debug.h"
diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index b560ddb1e77..bbedca47efa 100644
--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c
@@ -29,7 +29,6 @@
 #include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/exception.h"
 #include "wine/server.h"
diff --git a/dlls/ntdll/handletable.c b/dlls/ntdll/handletable.c
index 3c23705a525..d0f446f8024 100644
--- a/dlls/ntdll/handletable.c
+++ b/dlls/ntdll/handletable.c
@@ -22,7 +22,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/debug.h"
 #include "ntdll_misc.h"
diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index d9f3b9a1723..04e1cab4759 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -35,7 +35,6 @@
 #include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "winerror.h"
 #include "winnt.h"
diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c
index bf80ca33396..48aa3348ba8 100644
--- a/dlls/ntdll/large_int.c
+++ b/dlls/ntdll/large_int.c
@@ -24,7 +24,6 @@
 #include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 
 /*
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 937a0a965d5..9108c77a230 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -31,7 +31,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winnt.h"
-#include "winreg.h"
 #include "winternl.h"
 
 #include "module.h"
diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c
index db3763d8bba..ada0a13b610 100644
--- a/dlls/ntdll/loadorder.c
+++ b/dlls/ntdll/loadorder.c
@@ -30,7 +30,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "ntdll_misc.h"
 #include "module.h"
@@ -382,11 +381,11 @@ static inline BOOL get_default_load_order( const WCHAR *module, enum loadorder_t
  *
  * Open the registry key to the app-specific DllOverrides list.
  */
-static HKEY open_app_key( const WCHAR *app_name, const WCHAR *module )
+static HANDLE open_app_key( const WCHAR *app_name, const WCHAR *module )
 {
     OBJECT_ATTRIBUTES attr;
     UNICODE_STRING nameW;
-    HKEY root, hkey;
+    HANDLE root, hkey;
     WCHAR *str;
     static const WCHAR AppDefaultsW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\',
                                          'A','p','p','D','e','f','a','u','l','t','s','\\',0};
@@ -424,7 +423,7 @@ static HKEY open_app_key( const WCHAR *app_name, const WCHAR *module )
  *
  * Load the registry loadorder value for a given module.
  */
-static BOOL get_registry_value( HKEY hkey, const WCHAR *module, enum loadorder_type lo[] )
+static BOOL get_registry_value( HANDLE hkey, const WCHAR *module, enum loadorder_type lo[] )
 {
     UNICODE_STRING valueW;
     char buffer[80];
@@ -481,9 +480,9 @@ void MODULE_GetLoadOrderW( enum loadorder_type loadorder[], const WCHAR *app_nam
     static const WCHAR DllOverridesW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\',
                                           'D','l','l','O','v','e','r','r','i','d','e','s',0};
 
-    static HKEY std_key = (HKEY)-1;  /* key to standard section, cached */
+    static HANDLE std_key = (HANDLE)-1;  /* key to standard section, cached */
 
-    HKEY app_key = 0;
+    HANDLE app_key = 0;
     WCHAR *module, *basename;
     UNICODE_STRING path_str;
     int len;
@@ -531,11 +530,11 @@ void MODULE_GetLoadOrderW( enum loadorder_type loadorder[], const WCHAR *app_nam
     }
 
     /* then explicit module name in standard section */
-    if (std_key == (HKEY)-1)
+    if (std_key == (HANDLE)-1)
     {
         OBJECT_ATTRIBUTES attr;
         UNICODE_STRING nameW;
-        HKEY root;
+        HANDLE root;
 
         RtlOpenCurrentUser( KEY_ALL_ACCESS, &root );
         attr.Length = sizeof(attr);
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index b4107afb076..3455498c73a 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -31,7 +31,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "ntdll_misc.h"
 #include "wine/server.h"
diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c
index 13dc023ce98..8765e5fb9cc 100644
--- a/dlls/ntdll/om.c
+++ b/dlls/ntdll/om.c
@@ -33,7 +33,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "ntdll_misc.h"
 #include "wine/server.h"
diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
index d11628bd66b..0f724faa175 100644
--- a/dlls/ntdll/process.c
+++ b/dlls/ntdll/process.c
@@ -30,7 +30,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "ntdll_misc.h"
 #include "wine/server.h"
diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c
index 0035896eea7..b57492374d2 100644
--- a/dlls/ntdll/reg.c
+++ b/dlls/ntdll/reg.c
@@ -35,7 +35,6 @@
 
 #include "winerror.h"
 #include "wine/library.h"
-#include "winreg.h"
 #include "ntdll_misc.h"
 #include "wine/debug.h"
 #include "wine/unicode.h"
@@ -49,7 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg);
  * NtCreateKey [NTDLL.@]
  * ZwCreateKey [NTDLL.@]
  */
-NTSTATUS WINAPI NtCreateKey( PHKEY retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr,
+NTSTATUS WINAPI NtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr,
                              ULONG TitleIndex, const UNICODE_STRING *class, ULONG options,
                              PULONG dispos )
 {
@@ -86,7 +85,7 @@ NTSTATUS WINAPI NtCreateKey( PHKEY retkey, ACCESS_MASK access, const OBJECT_ATTR
  *
  *  See NtCreateKey.
  */
-NTSTATUS WINAPI RtlpNtCreateKey( PHKEY retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr,
+NTSTATUS WINAPI RtlpNtCreateKey( PHANDLE retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr,
                                  ULONG TitleIndex, const UNICODE_STRING *class, ULONG options,
                                  PULONG dispos )
 {
@@ -100,11 +99,11 @@ NTSTATUS WINAPI RtlpNtCreateKey( PHKEY retkey, ACCESS_MASK access, OBJECT_ATTRIB
  * NtOpenKey [NTDLL.@]
  * ZwOpenKey [NTDLL.@]
  *
- *   OUT	PHKEY			retkey (returns 0 when failure)
+ *   OUT	HANDLE			retkey (returns 0 when failure)
  *   IN		ACCESS_MASK		access
  *   IN		POBJECT_ATTRIBUTES 	attr
  */
-NTSTATUS WINAPI NtOpenKey( PHKEY retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr )
+NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr )
 {
     NTSTATUS ret;
     DWORD len = attr->ObjectName->Length;
@@ -133,7 +132,7 @@ NTSTATUS WINAPI NtOpenKey( PHKEY retkey, ACCESS_MASK access, const OBJECT_ATTRIB
  *
  * See NtOpenKey.
  */
-NTSTATUS WINAPI RtlpNtOpenKey( PHKEY retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr )
+NTSTATUS WINAPI RtlpNtOpenKey( PHANDLE retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr )
 {
     if (attr)
         attr->Attributes &= ~(OBJ_PERMANENT|OBJ_EXCLUSIVE);
@@ -144,7 +143,7 @@ NTSTATUS WINAPI RtlpNtOpenKey( PHKEY retkey, ACCESS_MASK access, OBJECT_ATTRIBUT
  * NtDeleteKey [NTDLL.@]
  * ZwDeleteKey [NTDLL.@]
  */
-NTSTATUS WINAPI NtDeleteKey( HKEY hkey )
+NTSTATUS WINAPI NtDeleteKey( HANDLE hkey )
 {
     NTSTATUS ret;
 
@@ -164,7 +163,7 @@ NTSTATUS WINAPI NtDeleteKey( HKEY hkey )
  *
  *  See NtDeleteKey.
  */
-NTSTATUS WINAPI RtlpNtMakeTemporaryKey( HKEY hkey )
+NTSTATUS WINAPI RtlpNtMakeTemporaryKey( HANDLE hkey )
 {
     return NtDeleteKey(hkey);
 }
@@ -173,7 +172,7 @@ NTSTATUS WINAPI RtlpNtMakeTemporaryKey( HKEY hkey )
  * NtDeleteValueKey [NTDLL.@]
  * ZwDeleteValueKey [NTDLL.@]
  */
-NTSTATUS WINAPI NtDeleteValueKey( HKEY hkey, const UNICODE_STRING *name )
+NTSTATUS WINAPI NtDeleteValueKey( HANDLE hkey, const UNICODE_STRING *name )
 {
     NTSTATUS ret;
 
@@ -196,7 +195,7 @@ NTSTATUS WINAPI NtDeleteValueKey( HKEY hkey, const UNICODE_STRING *name )
  *
  * Implementation of NtQueryKey and NtEnumerateKey
  */
-static NTSTATUS enumerate_key( HKEY handle, int index, KEY_INFORMATION_CLASS info_class,
+static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS info_class,
                                void *info, DWORD length, DWORD *result_len )
 
 {
@@ -286,7 +285,7 @@ static NTSTATUS enumerate_key( HKEY handle, int index, KEY_INFORMATION_CLASS inf
  * NOTES
  *  the name copied into the buffer is NOT 0-terminated
  */
-NTSTATUS WINAPI NtEnumerateKey( HKEY handle, ULONG index, KEY_INFORMATION_CLASS info_class,
+NTSTATUS WINAPI NtEnumerateKey( HANDLE handle, ULONG index, KEY_INFORMATION_CLASS info_class,
                                 void *info, DWORD length, DWORD *result_len )
 {
     /* -1 means query key, so avoid it here */
@@ -299,7 +298,7 @@ NTSTATUS WINAPI NtEnumerateKey( HKEY handle, ULONG index, KEY_INFORMATION_CLASS
  * RtlpNtEnumerateSubKey [NTDLL.@]
  *
  */
-NTSTATUS WINAPI RtlpNtEnumerateSubKey( HKEY handle, UNICODE_STRING *out, ULONG index )
+NTSTATUS WINAPI RtlpNtEnumerateSubKey( HANDLE handle, UNICODE_STRING *out, ULONG index )
 {
   KEY_BASIC_INFORMATION *info;
   DWORD dwLen, dwResultLen;
@@ -346,7 +345,7 @@ NTSTATUS WINAPI RtlpNtEnumerateSubKey( HKEY handle, UNICODE_STRING *out, ULONG i
  * NtQueryKey [NTDLL.@]
  * ZwQueryKey [NTDLL.@]
  */
-NTSTATUS WINAPI NtQueryKey( HKEY handle, KEY_INFORMATION_CLASS info_class,
+NTSTATUS WINAPI NtQueryKey( HANDLE handle, KEY_INFORMATION_CLASS info_class,
                             void *info, DWORD length, DWORD *result_len )
 {
     return enumerate_key( handle, -1, info_class, info, length, result_len );
@@ -401,7 +400,7 @@ static void copy_key_value_info( KEY_VALUE_INFORMATION_CLASS info_class, void *i
  *  NtEnumerateValueKey	[NTDLL.@]
  *  ZwEnumerateValueKey [NTDLL.@]
  */
-NTSTATUS WINAPI NtEnumerateValueKey( HKEY handle, ULONG index,
+NTSTATUS WINAPI NtEnumerateValueKey( HANDLE handle, ULONG index,
                                      KEY_VALUE_INFORMATION_CLASS info_class,
                                      void *info, DWORD length, DWORD *result_len )
 {
@@ -449,7 +448,7 @@ NTSTATUS WINAPI NtEnumerateValueKey( HKEY handle, ULONG index,
  * NOTES
  *  the name in the KeyValueInformation is never set
  */
-NTSTATUS WINAPI NtQueryValueKey( HKEY handle, const UNICODE_STRING *name,
+NTSTATUS WINAPI NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name,
                                  KEY_VALUE_INFORMATION_CLASS info_class,
                                  void *info, DWORD length, DWORD *result_len )
 {
@@ -502,7 +501,7 @@ NTSTATUS WINAPI NtQueryValueKey( HKEY handle, const UNICODE_STRING *name,
  * RtlpNtQueryValueKey [NTDLL.@]
  *
  */
-NTSTATUS WINAPI RtlpNtQueryValueKey( HKEY handle, ULONG *result_type, PBYTE dest,
+NTSTATUS WINAPI RtlpNtQueryValueKey( HANDLE handle, ULONG *result_type, PBYTE dest,
                                      DWORD *result_len )
 {
     KEY_VALUE_PARTIAL_INFORMATION *info;
@@ -538,7 +537,7 @@ NTSTATUS WINAPI RtlpNtQueryValueKey( HKEY handle, ULONG *result_type, PBYTE dest
  *  NtFlushKey	[NTDLL.@]
  *  ZwFlushKey  [NTDLL.@]
  */
-NTSTATUS WINAPI NtFlushKey(HKEY key)
+NTSTATUS WINAPI NtFlushKey(HANDLE key)
 {
     NTSTATUS ret;
 
@@ -589,7 +588,7 @@ NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *fil
  *  ZwNotifyChangeKey   [NTDLL.@]
  */
 NTSTATUS WINAPI NtNotifyChangeKey(
-	IN HKEY KeyHandle,
+	IN HANDLE KeyHandle,
 	IN HANDLE Event,
 	IN PIO_APC_ROUTINE ApcRoutine OPTIONAL,
 	IN PVOID ApcContext OPTIONAL,
@@ -644,7 +643,7 @@ NTSTATUS WINAPI NtNotifyChangeKey(
  */
 
 NTSTATUS WINAPI NtQueryMultipleValueKey(
-	HKEY KeyHandle,
+	HANDLE KeyHandle,
 	PKEY_MULTIPLE_VALUE_INFORMATION ListOfValuesToQuery,
 	ULONG NumberOfItems,
 	PVOID MultipleValueInformation,
@@ -663,7 +662,7 @@ NTSTATUS WINAPI NtQueryMultipleValueKey(
  */
 NTSTATUS WINAPI NtReplaceKey(
 	IN POBJECT_ATTRIBUTES ObjectAttributes,
-	IN HKEY Key,
+	IN HANDLE Key,
 	IN POBJECT_ATTRIBUTES ReplacedObjectAttributes)
 {
 	FIXME("(%p),stub!\n", Key);
@@ -676,7 +675,7 @@ NTSTATUS WINAPI NtReplaceKey(
  * ZwRestoreKey [NTDLL.@]
  */
 NTSTATUS WINAPI NtRestoreKey(
-	HKEY KeyHandle,
+	HANDLE KeyHandle,
 	HANDLE FileHandle,
 	ULONG RestoreFlags)
 {
@@ -688,7 +687,7 @@ NTSTATUS WINAPI NtRestoreKey(
  * NtSaveKey [NTDLL.@]
  * ZwSaveKey [NTDLL.@]
  */
-NTSTATUS WINAPI NtSaveKey(IN HKEY KeyHandle, IN HANDLE FileHandle)
+NTSTATUS WINAPI NtSaveKey(IN HANDLE KeyHandle, IN HANDLE FileHandle)
 {
     NTSTATUS ret;
 
@@ -709,7 +708,7 @@ NTSTATUS WINAPI NtSaveKey(IN HKEY KeyHandle, IN HANDLE FileHandle)
  * ZwSetInformationKey [NTDLL.@]
  */
 NTSTATUS WINAPI NtSetInformationKey(
-	IN HKEY KeyHandle,
+	IN HANDLE KeyHandle,
 	IN const int KeyInformationClass,
 	IN PVOID KeyInformation,
 	IN ULONG KeyInformationLength)
@@ -728,7 +727,7 @@ NTSTATUS WINAPI NtSetInformationKey(
  *   win95 does not care about count for REG_SZ and finds out the len by itself (js)
  *   NT does definitely care (aj)
  */
-NTSTATUS WINAPI NtSetValueKey( HKEY hkey, const UNICODE_STRING *name, ULONG TitleIndex,
+NTSTATUS WINAPI NtSetValueKey( HANDLE hkey, const UNICODE_STRING *name, ULONG TitleIndex,
                                ULONG type, const void *data, ULONG count )
 {
     NTSTATUS ret;
@@ -754,7 +753,7 @@ NTSTATUS WINAPI NtSetValueKey( HKEY hkey, const UNICODE_STRING *name, ULONG Titl
  * RtlpNtSetValueKey [NTDLL.@]
  *
  */
-NTSTATUS WINAPI RtlpNtSetValueKey( HKEY hkey, ULONG type, const void *data,
+NTSTATUS WINAPI RtlpNtSetValueKey( HANDLE hkey, ULONG type, const void *data,
                                    ULONG count )
 {
     UNICODE_STRING name;
@@ -767,7 +766,7 @@ NTSTATUS WINAPI RtlpNtSetValueKey( HKEY hkey, ULONG type, const void *data,
  * NtUnloadKey [NTDLL.@]
  * ZwUnloadKey [NTDLL.@]
  */
-NTSTATUS WINAPI NtUnloadKey(IN HKEY KeyHandle)
+NTSTATUS WINAPI NtUnloadKey(IN HANDLE KeyHandle)
 {
     NTSTATUS ret;
 
@@ -812,7 +811,7 @@ NTSTATUS WINAPI RtlFormatCurrentUserKeyPath( IN OUT PUNICODE_STRING KeyPath)
  */
 DWORD WINAPI RtlOpenCurrentUser(
 	IN ACCESS_MASK DesiredAccess, /* [in] */
-	OUT PHKEY KeyHandle)	      /* [out] handle of HKEY_CURRENT_USER */
+	OUT PHANDLE KeyHandle)	      /* [out] handle of HKEY_CURRENT_USER */
 {
 	OBJECT_ATTRIBUTES ObjectAttributes;
 	UNICODE_STRING ObjectName;
@@ -986,7 +985,7 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo,
 }
 
 
-static NTSTATUS RTL_GetKeyHandle(ULONG RelativeTo, PCWSTR Path, PHKEY handle)
+static NTSTATUS RTL_GetKeyHandle(ULONG RelativeTo, PCWSTR Path, PHANDLE handle)
 {
     UNICODE_STRING KeyString;
     OBJECT_ATTRIBUTES regkey;
@@ -1078,7 +1077,7 @@ NTSTATUS WINAPI RtlQueryRegistryValues(IN ULONG RelativeTo, IN PCWSTR Path,
                                        IN PVOID Environment OPTIONAL)
 {
     UNICODE_STRING Value;
-    HKEY handle, topkey;
+    HANDLE handle, topkey;
     PKEY_VALUE_FULL_INFORMATION pInfo = NULL;
     ULONG len, buflen = 0;
     NTSTATUS status=STATUS_SUCCESS, ret = STATUS_SUCCESS;
@@ -1251,7 +1250,7 @@ out:
  */
 NTSTATUS WINAPI RtlCheckRegistryKey(IN ULONG RelativeTo, IN PWSTR Path)
 {
-    HKEY handle;
+    HANDLE handle;
     NTSTATUS status;
 
     TRACE("(%ld, %s)\n", RelativeTo, debugstr_w(Path));
@@ -1283,7 +1282,7 @@ NTSTATUS WINAPI RtlCheckRegistryKey(IN ULONG RelativeTo, IN PWSTR Path)
 NTSTATUS WINAPI RtlDeleteRegistryValue(IN ULONG RelativeTo, IN PCWSTR Path, IN PCWSTR ValueName)
 {
     NTSTATUS status;
-    HKEY handle;
+    HANDLE handle;
     UNICODE_STRING Value;
 
     TRACE("(%ld, %s, %s)\n", RelativeTo, debugstr_w(Path), debugstr_w(ValueName));
@@ -1291,7 +1290,7 @@ NTSTATUS WINAPI RtlDeleteRegistryValue(IN ULONG RelativeTo, IN PCWSTR Path, IN P
     RtlInitUnicodeString(&Value, ValueName);
     if(RelativeTo == RTL_REGISTRY_HANDLE)
     {
-        return NtDeleteValueKey((HKEY)Path, &Value);
+        return NtDeleteValueKey((HANDLE)Path, &Value);
     }
     status = RTL_GetKeyHandle(RelativeTo, Path, &handle);
     if (status) return status;
diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c
index 2579b7f2fd6..2cd06cd7db2 100644
--- a/dlls/ntdll/relay.c
+++ b/dlls/ntdll/relay.c
@@ -29,7 +29,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "excpt.h"
 #include "wine/exception.h"
@@ -113,7 +112,7 @@ void RELAY_InitDebugLists(void)
     OBJECT_ATTRIBUTES attr;
     UNICODE_STRING name;
     char buffer[1024];
-    HKEY root, hkey;
+    HANDLE root, hkey;
     DWORD count;
     WCHAR *str;
     static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\',
diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c
index 78ca03f3448..6ab19ef4714 100644
--- a/dlls/ntdll/resource.c
+++ b/dlls/ntdll/resource.c
@@ -39,7 +39,6 @@
 #include "winbase.h"
 #include "winnls.h"
 #include "winnt.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "winerror.h"
 #include "excpt.h"
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index 668756d6eb6..f71f2c86b23 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -33,7 +33,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/debug.h"
 #include "ntdll_misc.h"
diff --git a/dlls/ntdll/rtlbitmap.c b/dlls/ntdll/rtlbitmap.c
index 4ed95bac003..bd1b1747ce6 100644
--- a/dlls/ntdll/rtlbitmap.c
+++ b/dlls/ntdll/rtlbitmap.c
@@ -33,7 +33,6 @@
 #include <string.h>
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/debug.h"
 
diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c
index 8e59da17428..18d2f5c985b 100644
--- a/dlls/ntdll/rtlstr.c
+++ b/dlls/ntdll/rtlstr.c
@@ -29,7 +29,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
index 81ffcbd2f7a..7457fb119db 100644
--- a/dlls/ntdll/sec.c
+++ b/dlls/ntdll/sec.c
@@ -35,7 +35,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wine/exception.h"
-#include "winreg.h"
 #include "ntdll_misc.h"
 #include "excpt.h"
 #include "wine/library.h"
diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c
index 781611e0816..25d41df223f 100644
--- a/dlls/ntdll/signal_powerpc.c
+++ b/dlls/ntdll/signal_powerpc.c
@@ -52,7 +52,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/library.h"
 #include "wine/exception.h"
diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c
index 64f977015e0..b17fbdd515c 100644
--- a/dlls/ntdll/signal_sparc.c
+++ b/dlls/ntdll/signal_sparc.c
@@ -33,7 +33,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "winnt.h"
 
diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c
index 769f16fd6ed..be9c9ec5640 100644
--- a/dlls/ntdll/string.c
+++ b/dlls/ntdll/string.c
@@ -28,7 +28,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 
 
diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c
index 86c95e25466..d60231ef286 100644
--- a/dlls/ntdll/time.c
+++ b/dlls/ntdll/time.c
@@ -41,7 +41,6 @@
 #define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
@@ -848,7 +847,7 @@ static int TIME_GetTimeZoneInfoFromReg(LPTIME_ZONE_INFORMATION tzinfo)
     BYTE buf[90];
     KEY_VALUE_PARTIAL_INFORMATION * KpInfo =
         (KEY_VALUE_PARTIAL_INFORMATION *) buf;
-    HKEY hkey;
+    HANDLE hkey;
     DWORD size;
     OBJECT_ATTRIBUTES attr;
     UNICODE_STRING nameW;
diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c
index 85d54428f69..7bb7934fc32 100644
--- a/dlls/ntdll/version.c
+++ b/dlls/ntdll/version.c
@@ -31,7 +31,6 @@
 #include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
 #include "ntdll_misc.h"
@@ -190,7 +189,7 @@ static WINDOWS_VERSION forcedWinVersion; /* init value irrelevant */
  *
  * Parse the contents of the Version key.
  */
-static BOOL parse_win_version( HKEY hkey )
+static BOOL parse_win_version( HANDLE hkey )
 {
     static const WCHAR WindowsW[] = {'W','i','n','d','o','w','s',0};
 
@@ -247,7 +246,7 @@ void VERSION_Init( const WCHAR *appname )
 {
     OBJECT_ATTRIBUTES attr;
     UNICODE_STRING nameW;
-    HKEY hkey, config_key;
+    HANDLE hkey, config_key;
     static const WCHAR configW[] = {'M','a','c','h','i','n','e','\\',
                                     'S','o','f','t','w','a','r','e','\\',
                                     'W','i','n','e','\\',
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index b3689ceaca5..f3360d02888 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -44,7 +44,6 @@
 #include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "winioctl.h"
 #include "wine/library.h"
diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c
index 93ba2b6eeb3..f235501418d 100644
--- a/dlls/ntdll/wcstring.c
+++ b/dlls/ntdll/wcstring.c
@@ -31,7 +31,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
diff --git a/dlls/winedos/ioports.c b/dlls/winedos/ioports.c
index 37b8b6e2957..5193ff43924 100644
--- a/dlls/winedos/ioports.c
+++ b/dlls/winedos/ioports.c
@@ -254,7 +254,7 @@ static inline void outl( DWORD value, WORD port )
 static void IO_port_init(void)
 {
     char tmp[1024];
-    HKEY hkey;
+    HANDLE hkey;
     DWORD dummy;
     OBJECT_ATTRIBUTES attr;
     UNICODE_STRING nameW;
diff --git a/dlls/winedos/ppdev.c b/dlls/winedos/ppdev.c
index 20fd16b773f..80359ed55eb 100644
--- a/dlls/winedos/ppdev.c
+++ b/dlls/winedos/ppdev.c
@@ -75,7 +75,7 @@ char IO_pp_init(void)
 {
     char name[80];
     char buffer[256];
-    HKEY hkey;
+    HANDLE hkey;
     int i,idx=0,fd,res,userbase,nports=0;
     char * timeout;
     char ret=1;
diff --git a/include/winternl.h b/include/winternl.h
index 4b894e576be..319bc784590 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -1608,7 +1608,7 @@ NTSTATUS  WINAPI NtCreateDirectoryObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES)
 NTSTATUS  WINAPI NtCreateEvent(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *,BOOLEAN,BOOLEAN);
 NTSTATUS  WINAPI NtCreateFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,PLARGE_INTEGER,ULONG,ULONG,ULONG,ULONG,PVOID,ULONG);
 NTSTATUS  WINAPI NtCreateIoCompletion(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,ULONG);
-NTSTATUS  WINAPI NtCreateKey(PHKEY,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,PULONG);
+NTSTATUS  WINAPI NtCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,PULONG);
 NTSTATUS  WINAPI NtCreateMailslotFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG,ULONG,PLARGE_INTEGER);
 NTSTATUS  WINAPI NtCreateMutant(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,BOOLEAN);
 NTSTATUS  WINAPI NtCreateNamedPipeFile(PHANDLE,ULONG,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,PLARGE_INTEGER);
@@ -1621,18 +1621,18 @@ NTSTATUS  WINAPI NtCreateTimer(HANDLE*, ACCESS_MASK, const OBJECT_ATTRIBUTES*, T
 NTSTATUS  WINAPI NtDelayExecution(BOOLEAN,const LARGE_INTEGER*);
 NTSTATUS  WINAPI NtDeleteAtom(RTL_ATOM);
 NTSTATUS  WINAPI NtDeleteFile(POBJECT_ATTRIBUTES);
-NTSTATUS  WINAPI NtDeleteKey(HKEY);
-NTSTATUS  WINAPI NtDeleteValueKey(HKEY,const UNICODE_STRING *);
+NTSTATUS  WINAPI NtDeleteKey(HANDLE);
+NTSTATUS  WINAPI NtDeleteValueKey(HANDLE,const UNICODE_STRING *);
 NTSTATUS  WINAPI NtDeviceIoControlFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,PVOID,ULONG,PVOID,ULONG);
 NTSTATUS  WINAPI NtDisplayString(PUNICODE_STRING); 
 NTSTATUS  WINAPI NtDuplicateObject(HANDLE,HANDLE,HANDLE,PHANDLE,ACCESS_MASK,ULONG,ULONG);
 NTSTATUS  WINAPI NtDuplicateToken(HANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE);
-NTSTATUS  WINAPI NtEnumerateKey(HKEY,ULONG,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *);
-NTSTATUS  WINAPI NtEnumerateValueKey(HKEY,ULONG,KEY_VALUE_INFORMATION_CLASS,PVOID,ULONG,PULONG);
+NTSTATUS  WINAPI NtEnumerateKey(HANDLE,ULONG,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *);
+NTSTATUS  WINAPI NtEnumerateValueKey(HANDLE,ULONG,KEY_VALUE_INFORMATION_CLASS,PVOID,ULONG,PULONG);
 NTSTATUS  WINAPI NtFindAtom(const WCHAR*,ULONG,RTL_ATOM*);
 NTSTATUS  WINAPI NtFlushBuffersFile(HANDLE,IO_STATUS_BLOCK*);
 NTSTATUS  WINAPI NtFlushInstructionCache(HANDLE,LPCVOID,ULONG);
-NTSTATUS  WINAPI NtFlushKey(HKEY);
+NTSTATUS  WINAPI NtFlushKey(HANDLE);
 NTSTATUS  WINAPI NtFlushVirtualMemory(HANDLE,LPCVOID*,ULONG*,ULONG);
 NTSTATUS  WINAPI NtFreeVirtualMemory(HANDLE,PVOID*,ULONG*,ULONG);
 NTSTATUS  WINAPI NtFsControlFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,PVOID,ULONG,PVOID,ULONG);
@@ -1641,18 +1641,18 @@ NTSTATUS  WINAPI NtImpersonateAnonymousToken(HANDLE);
 NTSTATUS  WINAPI NtImpersonateClientOfPort(HANDLE,PPORT_MESSAGE);
 NTSTATUS  WINAPI NtImpersonateThread(HANDLE,HANDLE,PSECURITY_QUALITY_OF_SERVICE);
 NTSTATUS  WINAPI NtInitiatePowerAction(POWER_ACTION,SYSTEM_POWER_STATE,ULONG,BOOLEAN);
-NTSTATUS  WINAPI NtListenPort(HANDLE,PLPC_MESSAGE); 
+NTSTATUS  WINAPI NtListenPort(HANDLE,PLPC_MESSAGE);
 NTSTATUS  WINAPI NtLoadDriver(const UNICODE_STRING *);
 NTSTATUS  WINAPI NtLoadKey(const OBJECT_ATTRIBUTES *,OBJECT_ATTRIBUTES *);
 NTSTATUS  WINAPI NtLockFile(HANDLE,HANDLE,PIO_APC_ROUTINE,void*,PIO_STATUS_BLOCK,PLARGE_INTEGER,PLARGE_INTEGER,ULONG*,BOOLEAN,BOOLEAN);
 NTSTATUS  WINAPI NtLockVirtualMemory(HANDLE,PVOID*,ULONG*,ULONG);
 NTSTATUS  WINAPI NtMapViewOfSection(HANDLE,HANDLE,PVOID*,ULONG,ULONG,const LARGE_INTEGER*,ULONG*,SECTION_INHERIT,ULONG,ULONG);
-NTSTATUS  WINAPI NtNotifyChangeKey(HKEY,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN);
+NTSTATUS  WINAPI NtNotifyChangeKey(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN);
 NTSTATUS  WINAPI NtOpenDirectoryObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES);
 NTSTATUS  WINAPI NtOpenEvent(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *);
 NTSTATUS  WINAPI NtOpenFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG);
 NTSTATUS  WINAPI NtOpenIoCompletion(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES);
-NTSTATUS  WINAPI NtOpenKey(PHKEY,ACCESS_MASK,const OBJECT_ATTRIBUTES *);
+NTSTATUS  WINAPI NtOpenKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *);
 NTSTATUS  WINAPI NtOpenMutant(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*);
 NTSTATUS  WINAPI NtOpenProcessToken(HANDLE,DWORD,HANDLE *);
 NTSTATUS  WINAPI NtOpenSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*);
@@ -1680,8 +1680,8 @@ NTSTATUS  WINAPI NtQueryInformationProcess(HANDLE,PROCESSINFOCLASS,PVOID,ULONG,P
 NTSTATUS  WINAPI NtQueryInformationThread(HANDLE,THREADINFOCLASS,PVOID,ULONG,PULONG);
 NTSTATUS  WINAPI NtQueryInformationToken(HANDLE,DWORD,LPVOID,DWORD,LPDWORD);
 NTSTATUS  WINAPI NtQueryInstallUILanguage(LANGID*);
-NTSTATUS  WINAPI NtQueryKey(HKEY,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *);
-NTSTATUS  WINAPI NtQueryMultipleValueKey(HKEY,PKEY_MULTIPLE_VALUE_INFORMATION,ULONG,PVOID,ULONG,PULONG);
+NTSTATUS  WINAPI NtQueryKey(HANDLE,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *);
+NTSTATUS  WINAPI NtQueryMultipleValueKey(HANDLE,PKEY_MULTIPLE_VALUE_INFORMATION,ULONG,PVOID,ULONG,PULONG);
 NTSTATUS  WINAPI NtQueryMutant(HANDLE,MUTANT_INFORMATION_CLASS,PVOID,ULONG,PULONG); 
 NTSTATUS  WINAPI NtQueryObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG, PULONG);
 NTSTATUS  WINAPI NtQueryPerformanceCounter(PLARGE_INTEGER, PLARGE_INTEGER);
@@ -1693,7 +1693,7 @@ NTSTATUS  WINAPI NtQuerySystemInformation(SYSTEM_INFORMATION_CLASS,PVOID,ULONG,P
 NTSTATUS  WINAPI NtQuerySystemTime(PLARGE_INTEGER);
 NTSTATUS  WINAPI NtQueryTimer(HANDLE,TIMER_INFORMATION_CLASS,PVOID,ULONG,PULONG);
 NTSTATUS  WINAPI NtQueryTimerResolution(PULONG,PULONG,PULONG);
-NTSTATUS  WINAPI NtQueryValueKey(HKEY,const UNICODE_STRING *,KEY_VALUE_INFORMATION_CLASS,void *,DWORD,DWORD *);
+NTSTATUS  WINAPI NtQueryValueKey(HANDLE,const UNICODE_STRING *,KEY_VALUE_INFORMATION_CLASS,void *,DWORD,DWORD *);
 NTSTATUS  WINAPI NtQueryVirtualMemory(HANDLE,LPCVOID,MEMORY_INFORMATION_CLASS,PVOID,ULONG,ULONG*);
 NTSTATUS  WINAPI NtQueryVolumeInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS);
 void      WINAPI NtRaiseException(PEXCEPTION_RECORD,PCONTEXT,BOOL);
@@ -1703,21 +1703,21 @@ NTSTATUS  WINAPI NtRegisterThreadTerminatePort(HANDLE);
 NTSTATUS  WINAPI NtReleaseMutant(HANDLE,PLONG);
 NTSTATUS  WINAPI NtReleaseSemaphore(HANDLE,ULONG,PULONG);
 NTSTATUS  WINAPI NtRemoveIoCompletion(HANDLE,PULONG,PULONG,PIO_STATUS_BLOCK,PLARGE_INTEGER);
-NTSTATUS  WINAPI NtReplaceKey(POBJECT_ATTRIBUTES,HKEY,POBJECT_ATTRIBUTES);
+NTSTATUS  WINAPI NtReplaceKey(POBJECT_ATTRIBUTES,HANDLE,POBJECT_ATTRIBUTES);
 NTSTATUS  WINAPI NtReplyWaitReceivePort(HANDLE,PULONG,PLPC_MESSAGE,PLPC_MESSAGE);
 NTSTATUS  WINAPI NtReplyWaitReplyPort(HANDLE,PLPC_MESSAGE);
 NTSTATUS  WINAPI NtRequestWaitReplyPort(HANDLE,PLPC_MESSAGE,PLPC_MESSAGE);
 NTSTATUS  WINAPI NtResetEvent(HANDLE,PULONG);
-NTSTATUS  WINAPI NtRestoreKey(HKEY,HANDLE,ULONG);
+NTSTATUS  WINAPI NtRestoreKey(HANDLE,HANDLE,ULONG);
 NTSTATUS  WINAPI NtResumeThread(HANDLE,PULONG);
-NTSTATUS  WINAPI NtSaveKey(HKEY,HANDLE);
+NTSTATUS  WINAPI NtSaveKey(HANDLE,HANDLE);
 NTSTATUS  WINAPI NtSetContextThread(HANDLE,const CONTEXT*);
 NTSTATUS  WINAPI NtSetDefaultLocale(BOOLEAN,LCID);
 NTSTATUS  WINAPI NtSetDefaultUILanguage(LANGID);
 NTSTATUS  WINAPI NtSetEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG);
 NTSTATUS  WINAPI NtSetEvent(HANDLE,PULONG);
 NTSTATUS  WINAPI NtSetInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FILE_INFORMATION_CLASS);
-NTSTATUS  WINAPI NtSetInformationKey(HKEY,const int,PVOID,ULONG);
+NTSTATUS  WINAPI NtSetInformationKey(HANDLE,const int,PVOID,ULONG);
 NTSTATUS  WINAPI NtSetInformationObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG);
 NTSTATUS  WINAPI NtSetInformationProcess(HANDLE,PROCESS_INFORMATION_CLASS,PVOID,ULONG);
 NTSTATUS  WINAPI NtSetInformationThread(HANDLE,THREADINFOCLASS,LPCVOID,ULONG);
@@ -1728,7 +1728,7 @@ NTSTATUS  WINAPI NtSetSecurityObject(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCR
 NTSTATUS  WINAPI NtSetSystemTime(const LARGE_INTEGER*,LARGE_INTEGER*);
 NTSTATUS  WINAPI NtSetTimer(HANDLE, const LARGE_INTEGER*, PTIMER_APC_ROUTINE, PVOID, BOOLEAN, ULONG, BOOLEAN*);
 NTSTATUS  WINAPI NtSetTimerResolution(ULONG,BOOLEAN,PULONG); 
-NTSTATUS  WINAPI NtSetValueKey(HKEY,const UNICODE_STRING *,ULONG,ULONG,const void *,ULONG);
+NTSTATUS  WINAPI NtSetValueKey(HANDLE,const UNICODE_STRING *,ULONG,ULONG,const void *,ULONG);
 NTSTATUS  WINAPI NtSetVolumeInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS);
 NTSTATUS  WINAPI NtSignalAndWaitForSingleObject(HANDLE,HANDLE,BOOLEAN,const LARGE_INTEGER*);
 NTSTATUS  WINAPI NtShutdownSystem(SHUTDOWN_ACTION); 
@@ -1736,7 +1736,7 @@ NTSTATUS  WINAPI NtSuspendThread(HANDLE,PULONG);
 NTSTATUS  WINAPI NtTerminateProcess(HANDLE,LONG);
 NTSTATUS  WINAPI NtTerminateThread(HANDLE,LONG);
 NTSTATUS  WINAPI NtUnloadDriver(const UNICODE_STRING *);
-NTSTATUS  WINAPI NtUnloadKey(HKEY);
+NTSTATUS  WINAPI NtUnloadKey(HANDLE);
 NTSTATUS  WINAPI NtUnlockFile(HANDLE,PIO_STATUS_BLOCK,PLARGE_INTEGER,PLARGE_INTEGER,PULONG);
 NTSTATUS  WINAPI NtUnlockVirtualMemory(HANDLE,PVOID*,ULONG*,ULONG);
 NTSTATUS  WINAPI NtUnmapViewOfSection(HANDLE,PVOID);
@@ -1941,7 +1941,7 @@ ULONG     WINAPI RtlNumberOfClearBits(PCRTL_BITMAP);
 UINT      WINAPI RtlOemStringToUnicodeSize(const STRING*);
 NTSTATUS  WINAPI RtlOemStringToUnicodeString(UNICODE_STRING*,const STRING*,BOOLEAN);
 NTSTATUS  WINAPI RtlOemToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD);
-DWORD     WINAPI RtlOpenCurrentUser(ACCESS_MASK,PHKEY);
+DWORD     WINAPI RtlOpenCurrentUser(ACCESS_MASK,PHANDLE);
 
 NTSTATUS  WINAPI RtlPinAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM);
 BOOLEAN   WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN);