ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use HANDLE instead of HKEY in the NT API.

This commit is contained in:
Mike McCormack 2005-06-17 13:58:33 +00:00 committed by Alexandre Julliard
parent a5abe264c9
commit 5b2d5fd758
43 changed files with 111 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/advapi32/registry.c
View File

@ -97,7 +97,7 @@ inline static int is_version_nt(void)
} }
/* create one of the HKEY_* special root keys */ /* 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; HKEY ret = 0;
int idx = (UINT)hkey - (UINT)HKEY_SPECIAL_ROOT_FIRST; 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( &nameW, name );
RtlInitUnicodeString( &classW, class ); RtlInitUnicodeString( &classW, class );
return RtlNtStatusToDosError( NtCreateKey( retkey, access, &attr, 0, return RtlNtStatusToDosError( NtCreateKey( (PHANDLE)retkey, access, &attr, 0,
&classW, options, dispos ) ); &classW, options, dispos ) );
} }
@ -223,7 +223,7 @@ DWORD WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPCSTR cla
{ {
if (!(status = RtlAnsiStringToUnicodeString( &classW, &classA, TRUE ))) 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 ); RtlFreeUnicodeString( &classW );
} }
} }
@ -286,7 +286,7 @@ DWORD WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, REGSAM acce
attr.SecurityDescriptor = NULL; attr.SecurityDescriptor = NULL;
attr.SecurityQualityOfService = NULL; attr.SecurityQualityOfService = NULL;
RtlInitUnicodeString( &nameW, name ); 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, if (!(status = RtlAnsiStringToUnicodeString( &NtCurrentTeb()->StaticUnicodeString,
&nameA, FALSE ))) &nameA, FALSE )))
{ {
status = NtOpenKey( retkey, access, &attr ); status = NtOpenKey( (PHANDLE)retkey, access, &attr );
} }
return RtlNtStatusToDosError( status ); return RtlNtStatusToDosError( status );
} }

8
dlls/kernel/computername.c
View File

@ -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}; 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]; char tmp[80];
HKEY root, hkey; HANDLE root, hkey;
DWORD dummy; DWORD dummy;
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW; UNICODE_STRING nameW;
@ -235,7 +235,7 @@ static BOOL get_use_dns_option(void)
*/ */
void COMPUTERNAME_Init (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; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW; UNICODE_STRING nameW;
char buf[offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ) + (MAX_COMPUTERNAME_LENGTH + 1) * sizeof( WCHAR )]; 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; UNICODE_STRING nameW;
OBJECT_ATTRIBUTES attr; 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 )]; char buf[offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ) + (MAX_COMPUTERNAME_LENGTH + 1) * sizeof( WCHAR )];
DWORD len = sizeof( buf ); DWORD len = sizeof( buf );
LPWSTR theName = (LPWSTR) (buf + offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data )); LPWSTR theName = (LPWSTR) (buf + offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ));
@ -574,7 +574,7 @@ BOOL WINAPI SetComputerNameW( LPCWSTR lpComputerName )
{ {
UNICODE_STRING nameW; UNICODE_STRING nameW;
OBJECT_ATTRIBUTES attr; 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 plen = strlenW ( lpComputerName );
int i; int i;
NTSTATUS st = STATUS_INTERNAL_ERROR; NTSTATUS st = STATUS_INTERNAL_ERROR;

2
dlls/kernel/cpu.c
View File

@ -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}; */ /* static const WCHAR VenidAMDW[] = {'A','u','t','h','e','n','t','i','c','A','M','D',0}; */
unsigned int i; unsigned int i;
HKEY hkey, system_key, cpu_key; HANDLE hkey, system_key, cpu_key;
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW, valueW; UNICODE_STRING nameW, valueW;

2
dlls/kernel/except.c
View File

@ -223,7 +223,7 @@ static BOOL start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent)
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW; UNICODE_STRING nameW;
char *cmdline, *env, *p; char *cmdline, *env, *p;
HKEY hDbgConf; HANDLE hDbgConf;
DWORD bAuto = FALSE; DWORD bAuto = FALSE;
PROCESS_INFORMATION info; PROCESS_INFORMATION info;
STARTUPINFOA startup; STARTUPINFOA startup;

38
dlls/kernel/locale.c
View File

@ -54,8 +54,8 @@ static const union cptable *oem_cptable;
static const union cptable *mac_cptable; static const union cptable *mac_cptable;
static const union cptable *unix_cptable; /* NULL if UTF8 */ static const union cptable *unix_cptable; /* NULL if UTF8 */
static HKEY NLS_RegOpenKey(HKEY hRootKey, LPCWSTR szKeyName); static HANDLE NLS_RegOpenKey(HANDLE hRootKey, LPCWSTR szKeyName);
static HKEY NLS_RegOpenSubKey(HKEY hRootKey, LPCWSTR szKeyName); static HANDLE NLS_RegOpenSubKey(HANDLE hRootKey, LPCWSTR szKeyName);
static const WCHAR szNlsKeyName[] = { static const WCHAR szNlsKeyName[] = {
'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', '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. * 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','\\', 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}; 'I','n','t','e','r','n','a','t','i','o','n','a','l',0};
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW; UNICODE_STRING nameW;
HKEY hkey; HANDLE hkey;
if (RtlOpenCurrentUser( KEY_ALL_ACCESS, &hkey ) != STATUS_SUCCESS) return 0; if (RtlOpenCurrentUser( KEY_ALL_ACCESS, &hkey ) != STATUS_SUCCESS) return 0;
@ -292,7 +292,7 @@ void LOCALE_InitRegistry(void)
char buffer[20]; char buffer[20];
WCHAR bufferW[80]; WCHAR bufferW[80];
DWORD count, i; DWORD count, i;
HKEY hkey; HANDLE hkey;
LCID lcid = GetUserDefaultLCID(); LCID lcid = GetUserDefaultLCID();
if (!(hkey = create_registry_key())) if (!(hkey = create_registry_key()))
@ -782,7 +782,7 @@ static INT get_registry_locale_info( LPCWSTR value, LPWSTR buffer, INT len )
{ {
DWORD size; DWORD size;
INT ret; INT ret;
HKEY hkey; HANDLE hkey;
NTSTATUS status; NTSTATUS status;
UNICODE_STRING nameW; UNICODE_STRING nameW;
KEY_VALUE_PARTIAL_INFORMATION *info; 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 }; static const WCHAR intlW[] = {'i','n','t','l',0 };
UNICODE_STRING valueW; UNICODE_STRING valueW;
NTSTATUS status; NTSTATUS status;
HKEY hkey; HANDLE hkey;
lcid = ConvertDefaultLocale(lcid); lcid = ConvertDefaultLocale(lcid);
@ -2585,11 +2585,11 @@ void LOCALE_Init(void)
mac_cptable->info.codepage, unix_cp ); 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; UNICODE_STRING keyName;
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
HKEY hkey; HANDLE hkey;
RtlInitUnicodeString( &keyName, szKeyName ); RtlInitUnicodeString( &keyName, szKeyName );
InitializeObjectAttributes(&attr, &keyName, 0, hRootKey, NULL); InitializeObjectAttributes(&attr, &keyName, 0, hRootKey, NULL);
@ -2600,9 +2600,9 @@ static HKEY NLS_RegOpenKey(HKEY hRootKey, LPCWSTR szKeyName)
return hkey; 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) if (hRootKey)
NtClose( hRootKey ); NtClose( hRootKey );
@ -2610,7 +2610,7 @@ static HKEY NLS_RegOpenSubKey(HKEY hRootKey, LPCWSTR szKeyName)
return hKey; return hKey;
} }
static BOOL NLS_RegEnumSubKey(HKEY hKey, UINT ulIndex, LPWSTR szKeyName, static BOOL NLS_RegEnumSubKey(HANDLE hKey, UINT ulIndex, LPWSTR szKeyName,
ULONG keyNameSize) ULONG keyNameSize)
{ {
BYTE buffer[80]; BYTE buffer[80];
@ -2633,7 +2633,7 @@ static BOOL NLS_RegEnumSubKey(HKEY hKey, UINT ulIndex, LPWSTR szKeyName,
return TRUE; return TRUE;
} }
static BOOL NLS_RegEnumValue(HKEY hKey, UINT ulIndex, static BOOL NLS_RegEnumValue(HANDLE hKey, UINT ulIndex,
LPWSTR szValueName, ULONG valueNameSize, LPWSTR szValueName, ULONG valueNameSize,
LPWSTR szValueData, ULONG valueDataSize) LPWSTR szValueData, ULONG valueDataSize)
{ {
@ -2660,7 +2660,7 @@ static BOOL NLS_RegEnumValue(HKEY hKey, UINT ulIndex,
return TRUE; 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]; BYTE buffer[128];
const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer;
@ -2749,7 +2749,7 @@ typedef struct
static BOOL NLS_EnumSystemLanguageGroups(ENUMLANGUAGEGROUP_CALLBACKS *lpProcs) static BOOL NLS_EnumSystemLanguageGroups(ENUMLANGUAGEGROUP_CALLBACKS *lpProcs)
{ {
WCHAR szNumber[10], szValue[4]; WCHAR szNumber[10], szValue[4];
HKEY hKey; HANDLE hKey;
BOOL bContinue = TRUE; BOOL bContinue = TRUE;
ULONG ulIndex = 0; ULONG ulIndex = 0;
@ -2898,7 +2898,7 @@ BOOL WINAPI IsValidLanguageGroup(LGRPID lgrpid, DWORD dwFlags)
static const WCHAR szFormat[] = { '%','x','\0' }; static const WCHAR szFormat[] = { '%','x','\0' };
WCHAR szValueName[16], szValue[2]; WCHAR szValueName[16], szValue[2];
BOOL bSupported = FALSE, bInstalled = FALSE; BOOL bSupported = FALSE, bInstalled = FALSE;
HKEY hKey; HANDLE hKey;
switch (dwFlags) 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' 'A','l','t','e','r','n','a','t','e',' ','S','o','r','t','s','\0'
}; };
WCHAR szNumber[10], szValue[4]; WCHAR szNumber[10], szValue[4];
HKEY hKey; HANDLE hKey;
BOOL bContinue = TRUE, bAlternate = FALSE; BOOL bContinue = TRUE, bAlternate = FALSE;
LGRPID lgrpid; LGRPID lgrpid;
ULONG ulIndex = 1; /* Ignore default entry of 1st key */ 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' 'C','o','u','n','t','r','y','C','o','d','e','\0'
}; };
WCHAR szNumber[10]; WCHAR szNumber[10];
HKEY hKey; HANDLE hKey;
ULONG ulIndex = 0; ULONG ulIndex = 0;
TRACE("(0x%08lX,0x%08lX,%p)\n", geoclass, reserved, pGeoEnumProc); 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; BOOL bContinue = TRUE;
DWORD dwGeoId; DWORD dwGeoId;
HKEY hSubKey = NLS_RegOpenKey( hKey, szNumber ); HANDLE hSubKey = NLS_RegOpenKey( hKey, szNumber );
if (hSubKey) if (hSubKey)
{ {

22
dlls/kernel/oldconfig.c
View File

@ -71,7 +71,7 @@ static int create_drives( int devices_only )
char dest[1024]; char dest[1024];
char *buffer; char *buffer;
WCHAR *p, name[3]; WCHAR *p, name[3];
HKEY hkey; HANDLE hkey;
DWORD dummy; DWORD dummy;
int i, count = 0; 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 */ if (!mkdir( buffer, 0777 )) /* we created it, so now create the devices */
{ {
HKEY hkey; HANDLE hkey;
DWORD dummy; DWORD dummy;
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW; UNICODE_STRING nameW;
@ -306,7 +306,7 @@ static void convert_drive_types(void)
UNICODE_STRING nameW; UNICODE_STRING nameW;
DWORD dummy; DWORD dummy;
ULONG disp; ULONG disp;
HKEY hkey_old, hkey_new; HANDLE hkey_old, hkey_new;
int i; int i;
attr.Length = sizeof(attr); 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 */ /* 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','\\', static const WCHAR wineW[] = {'M','a','c','h','i','n','e','\\',
'S','o','f','t','w','a','r','e','\\', 'S','o','f','t','w','a','r','e','\\',
@ -374,7 +374,7 @@ static void convert_environment( HKEY hkey_current_user )
UNICODE_STRING nameW; UNICODE_STRING nameW;
DWORD dummy; DWORD dummy;
ULONG disp; ULONG disp;
HKEY hkey_old, hkey_env; HANDLE hkey_old, hkey_env;
attr.Length = sizeof(attr); attr.Length = sizeof(attr);
attr.RootDirectory = 0; attr.RootDirectory = 0;
@ -485,7 +485,7 @@ static ULONG allocate_default_keys(void)
static const WCHAR ConfigManagerW[] = {'D','y','n','D','a','t','a','\\', static const WCHAR ConfigManagerW[] = {'D','y','n','D','a','t','a','\\',
'C','o','n','f','i','g',' ','M','a','n','a','g','e','r','\\', 'C','o','n','f','i','g',' ','M','a','n','a','g','e','r','\\',
'E','n','u','m',0}; 'E','n','u','m',0};
HKEY hkey; HANDLE hkey;
ULONG dispos; ULONG dispos;
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW; UNICODE_STRING nameW;
@ -527,10 +527,10 @@ static void init_cdrom_registry( HANDLE handle )
char buffer[40]; char buffer[40];
DWORD value; DWORD value;
const char *data; const char *data;
HKEY scsiKey; HANDLE scsiKey;
HKEY portKey; HANDLE portKey;
HKEY busKey; HANDLE busKey;
HKEY targetKey; HANDLE targetKey;
DWORD disp; DWORD disp;
IO_STATUS_BLOCK io; IO_STATUS_BLOCK io;
SCSI_ADDRESS scsi_addr; SCSI_ADDRESS scsi_addr;
@ -673,7 +673,7 @@ static void create_hardware_branch(void)
*/ */
void convert_old_config(void) void convert_old_config(void)
{ {
HKEY hkey_current_user; HANDLE hkey_current_user;
if (allocate_default_keys() == REG_OPENED_EXISTING_KEY) if (allocate_default_keys() == REG_OPENED_EXISTING_KEY)
return; /* someone else already loaded the registry */ return; /* someone else already loaded the registry */

2
dlls/kernel/path.c
View File

@ -133,7 +133,7 @@ static BOOL add_boot_rename_entry( LPCWSTR source, LPCWSTR dest, DWORD flags )
UNICODE_STRING nameW, source_name, dest_name; UNICODE_STRING nameW, source_name, dest_name;
KEY_VALUE_PARTIAL_INFORMATION *info; KEY_VALUE_PARTIAL_INFORMATION *info;
BOOL rc = FALSE; BOOL rc = FALSE;
HKEY Reboot = 0; HANDLE Reboot = 0;
DWORD len1, len2; DWORD len1, len2;
DWORD DataSize = 0; DWORD DataSize = 0;
BYTE *Buffer = NULL; BYTE *Buffer = NULL;

6
dlls/kernel/process.c
View File

@ -416,7 +416,7 @@ static BOOL build_initial_environment( char **environ )
* helper for set_registry_environment(). * helper for set_registry_environment().
* Note that Windows happily truncates the value if it's too big. * 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; UNICODE_STRING env_name, env_value;
NTSTATUS status; NTSTATUS status;
@ -481,7 +481,7 @@ static void set_registry_environment(void)
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW; UNICODE_STRING nameW;
HKEY hkey; HANDLE hkey;
attr.Length = sizeof(attr); attr.Length = sizeof(attr);
attr.RootDirectory = 0; attr.RootDirectory = 0;
@ -500,7 +500,7 @@ static void set_registry_environment(void)
} }
/* then the ones for the current user */ /* 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 ); RtlInitUnicodeString( &nameW, envW );
if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr ) == STATUS_SUCCESS) if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr ) == STATUS_SUCCESS)
{ {

2
dlls/kernel/relay16.c
View File

@ -109,7 +109,7 @@ void RELAY16_InitDebugLists(void)
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING name; UNICODE_STRING name;
char buffer[1024]; char buffer[1024];
HKEY root, hkey; HANDLE root, hkey;
DWORD count; DWORD count;
WCHAR *str; WCHAR *str;
static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\', static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\',

2
dlls/kernel/volume.c
View File

@ -172,7 +172,7 @@ static UINT get_registry_drive_type( const WCHAR *root )
'D','r','i','v','e','s',0 }; 'D','r','i','v','e','s',0 };
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW; UNICODE_STRING nameW;
HKEY hkey; HANDLE hkey;
DWORD dummy; DWORD dummy;
UINT ret = DRIVE_UNKNOWN; UINT ret = DRIVE_UNKNOWN;
char tmp[32 + sizeof(KEY_VALUE_PARTIAL_INFORMATION)]; char tmp[32 + sizeof(KEY_VALUE_PARTIAL_INFORMATION)];

1
dlls/ntdll/cdrom.c
View File

@ -80,7 +80,6 @@
#include "ntstatus.h" #include "ntstatus.h"
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "winioctl.h" #include "winioctl.h"
#include "ntddstor.h" #include "ntddstor.h"

1
dlls/ntdll/critsection.c
View File

@ -28,7 +28,6 @@
#include "winerror.h" #include "winerror.h"
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "ntdll_misc.h" #include "ntdll_misc.h"

1
dlls/ntdll/debugbuffer.c
View File

@ -28,7 +28,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winnt.h" #include "winnt.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "ntdll_misc.h" #include "ntdll_misc.h"
#include "wine/debug.h" #include "wine/debug.h"

1
dlls/ntdll/debugtools.c
View File

@ -37,7 +37,6 @@
#include "ntstatus.h" #include "ntstatus.h"
#include "winbase.h" #include "winbase.h"
#include "winnt.h" #include "winnt.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "excpt.h" #include "excpt.h"
#include "ntdll_misc.h" #include "ntdll_misc.h"

3
dlls/ntdll/directory.c
View File

@ -59,7 +59,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winnt.h" #include "winnt.h"
#include "winreg.h"
#include "ntstatus.h" #include "ntstatus.h"
#include "winternl.h" #include "winternl.h"
#include "ntdll_misc.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 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}; static const WCHAR ShowDirSymlinksW[] = {'S','h','o','w','D','i','r','S','y','m','l','i','n','k','s',0};
char tmp[80]; char tmp[80];
HKEY hkey; HANDLE hkey;
DWORD dummy; DWORD dummy;
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW; UNICODE_STRING nameW;

1
dlls/ntdll/env.c
View File

@ -25,7 +25,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"

1
dlls/ntdll/error.c
View File

@ -26,7 +26,6 @@
#include "ntstatus.h" #include "ntstatus.h"
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "winerror.h" #include "winerror.h"
#include "wine/debug.h" #include "wine/debug.h"

1
dlls/ntdll/exception.c
View File

@ -29,7 +29,6 @@
#include "ntstatus.h" #include "ntstatus.h"
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "wine/exception.h" #include "wine/exception.h"
#include "wine/server.h" #include "wine/server.h"

1
dlls/ntdll/handletable.c
View File

@ -22,7 +22,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "ntdll_misc.h" #include "ntdll_misc.h"

1
dlls/ntdll/heap.c
View File

@ -35,7 +35,6 @@
#include "ntstatus.h" #include "ntstatus.h"
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "winerror.h" #include "winerror.h"
#include "winnt.h" #include "winnt.h"

1
dlls/ntdll/large_int.c
View File

@ -24,7 +24,6 @@
#include "ntstatus.h" #include "ntstatus.h"
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
/* /*

1
dlls/ntdll/loader.c
View File

@ -31,7 +31,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winnt.h" #include "winnt.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "module.h" #include "module.h"

15
dlls/ntdll/loadorder.c
View File

@ -30,7 +30,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "ntdll_misc.h" #include "ntdll_misc.h"
#include "module.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. * 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; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW; UNICODE_STRING nameW;
HKEY root, hkey; HANDLE root, hkey;
WCHAR *str; WCHAR *str;
static const WCHAR AppDefaultsW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', 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}; '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. * 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; UNICODE_STRING valueW;
char buffer[80]; 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','\\', 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}; '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; WCHAR *module, *basename;
UNICODE_STRING path_str; UNICODE_STRING path_str;
int len; int len;
@ -531,11 +530,11 @@ void MODULE_GetLoadOrderW( enum loadorder_type loadorder[], const WCHAR *app_nam
} }
/* then explicit module name in standard section */ /* then explicit module name in standard section */
if (std_key == (HKEY)-1) if (std_key == (HANDLE)-1)
{ {
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW; UNICODE_STRING nameW;
HKEY root; HANDLE root;
RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); RtlOpenCurrentUser( KEY_ALL_ACCESS, &root );
attr.Length = sizeof(attr); attr.Length = sizeof(attr);

1
dlls/ntdll/nt.c
View File

@ -31,7 +31,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "ntdll_misc.h" #include "ntdll_misc.h"
#include "wine/server.h" #include "wine/server.h"

1
dlls/ntdll/om.c
View File

@ -33,7 +33,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "ntdll_misc.h" #include "ntdll_misc.h"
#include "wine/server.h" #include "wine/server.h"

1
dlls/ntdll/process.c
View File

@ -30,7 +30,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "ntdll_misc.h" #include "ntdll_misc.h"
#include "wine/server.h" #include "wine/server.h"

63
dlls/ntdll/reg.c
View File

@ -35,7 +35,6 @@
#include "winerror.h" #include "winerror.h"
#include "wine/library.h" #include "wine/library.h"
#include "winreg.h"
#include "ntdll_misc.h" #include "ntdll_misc.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h" #include "wine/unicode.h"
@ -49,7 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg);
* NtCreateKey [NTDLL.@] * NtCreateKey [NTDLL.@]
* ZwCreateKey [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, ULONG TitleIndex, const UNICODE_STRING *class, ULONG options,
PULONG dispos ) PULONG dispos )
{ {
@ -86,7 +85,7 @@ NTSTATUS WINAPI NtCreateKey( PHKEY retkey, ACCESS_MASK access, const OBJECT_ATTR
* *
* See NtCreateKey. * 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, ULONG TitleIndex, const UNICODE_STRING *class, ULONG options,
PULONG dispos ) PULONG dispos )
{ {
@ -100,11 +99,11 @@ NTSTATUS WINAPI RtlpNtCreateKey( PHKEY retkey, ACCESS_MASK access, OBJECT_ATTRIB
* NtOpenKey [NTDLL.@] * NtOpenKey [NTDLL.@]
* ZwOpenKey [NTDLL.@] * ZwOpenKey [NTDLL.@]
* *
* OUT PHKEY retkey (returns 0 when failure) * OUT HANDLE retkey (returns 0 when failure)
* IN ACCESS_MASK access * IN ACCESS_MASK access
* IN POBJECT_ATTRIBUTES attr * 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; NTSTATUS ret;
DWORD len = attr->ObjectName->Length; DWORD len = attr->ObjectName->Length;
@ -133,7 +132,7 @@ NTSTATUS WINAPI NtOpenKey( PHKEY retkey, ACCESS_MASK access, const OBJECT_ATTRIB
* *
* See NtOpenKey. * 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) if (attr)
attr->Attributes &= ~(OBJ_PERMANENT|OBJ_EXCLUSIVE); attr->Attributes &= ~(OBJ_PERMANENT|OBJ_EXCLUSIVE);
@ -144,7 +143,7 @@ NTSTATUS WINAPI RtlpNtOpenKey( PHKEY retkey, ACCESS_MASK access, OBJECT_ATTRIBUT
* NtDeleteKey [NTDLL.@] * NtDeleteKey [NTDLL.@]
* ZwDeleteKey [NTDLL.@] * ZwDeleteKey [NTDLL.@]
*/ */
NTSTATUS WINAPI NtDeleteKey( HKEY hkey ) NTSTATUS WINAPI NtDeleteKey( HANDLE hkey )
{ {
NTSTATUS ret; NTSTATUS ret;
@ -164,7 +163,7 @@ NTSTATUS WINAPI NtDeleteKey( HKEY hkey )
* *
* See NtDeleteKey. * See NtDeleteKey.
*/ */
NTSTATUS WINAPI RtlpNtMakeTemporaryKey( HKEY hkey ) NTSTATUS WINAPI RtlpNtMakeTemporaryKey( HANDLE hkey )
{ {
return NtDeleteKey(hkey); return NtDeleteKey(hkey);
} }
@ -173,7 +172,7 @@ NTSTATUS WINAPI RtlpNtMakeTemporaryKey( HKEY hkey )
* NtDeleteValueKey [NTDLL.@] * NtDeleteValueKey [NTDLL.@]
* ZwDeleteValueKey [NTDLL.@] * ZwDeleteValueKey [NTDLL.@]
*/ */
NTSTATUS WINAPI NtDeleteValueKey( HKEY hkey, const UNICODE_STRING *name ) NTSTATUS WINAPI NtDeleteValueKey( HANDLE hkey, const UNICODE_STRING *name )
{ {
NTSTATUS ret; NTSTATUS ret;
@ -196,7 +195,7 @@ NTSTATUS WINAPI NtDeleteValueKey( HKEY hkey, const UNICODE_STRING *name )
* *
* Implementation of NtQueryKey and NtEnumerateKey * 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 ) void *info, DWORD length, DWORD *result_len )
{ {
@ -286,7 +285,7 @@ static NTSTATUS enumerate_key( HKEY handle, int index, KEY_INFORMATION_CLASS inf
* NOTES * NOTES
* the name copied into the buffer is NOT 0-terminated * 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 ) void *info, DWORD length, DWORD *result_len )
{ {
/* -1 means query key, so avoid it here */ /* -1 means query key, so avoid it here */
@ -299,7 +298,7 @@ NTSTATUS WINAPI NtEnumerateKey( HKEY handle, ULONG index, KEY_INFORMATION_CLASS
* RtlpNtEnumerateSubKey [NTDLL.@] * 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; KEY_BASIC_INFORMATION *info;
DWORD dwLen, dwResultLen; DWORD dwLen, dwResultLen;
@ -346,7 +345,7 @@ NTSTATUS WINAPI RtlpNtEnumerateSubKey( HKEY handle, UNICODE_STRING *out, ULONG i
* NtQueryKey [NTDLL.@] * NtQueryKey [NTDLL.@]
* ZwQueryKey [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 ) void *info, DWORD length, DWORD *result_len )
{ {
return enumerate_key( handle, -1, info_class, info, length, 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.@] * NtEnumerateValueKey [NTDLL.@]
* ZwEnumerateValueKey [NTDLL.@] * ZwEnumerateValueKey [NTDLL.@]
*/ */
NTSTATUS WINAPI NtEnumerateValueKey( HKEY handle, ULONG index, NTSTATUS WINAPI NtEnumerateValueKey( HANDLE handle, ULONG index,
KEY_VALUE_INFORMATION_CLASS info_class, KEY_VALUE_INFORMATION_CLASS info_class,
void *info, DWORD length, DWORD *result_len ) void *info, DWORD length, DWORD *result_len )
{ {
@ -449,7 +448,7 @@ NTSTATUS WINAPI NtEnumerateValueKey( HKEY handle, ULONG index,
* NOTES * NOTES
* the name in the KeyValueInformation is never set * 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, KEY_VALUE_INFORMATION_CLASS info_class,
void *info, DWORD length, DWORD *result_len ) void *info, DWORD length, DWORD *result_len )
{ {
@ -502,7 +501,7 @@ NTSTATUS WINAPI NtQueryValueKey( HKEY handle, const UNICODE_STRING *name,
* RtlpNtQueryValueKey [NTDLL.@] * 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 ) DWORD *result_len )
{ {
KEY_VALUE_PARTIAL_INFORMATION *info; KEY_VALUE_PARTIAL_INFORMATION *info;
@ -538,7 +537,7 @@ NTSTATUS WINAPI RtlpNtQueryValueKey( HKEY handle, ULONG *result_type, PBYTE dest
* NtFlushKey [NTDLL.@] * NtFlushKey [NTDLL.@]
* ZwFlushKey [NTDLL.@] * ZwFlushKey [NTDLL.@]
*/ */
NTSTATUS WINAPI NtFlushKey(HKEY key) NTSTATUS WINAPI NtFlushKey(HANDLE key)
{ {
NTSTATUS ret; NTSTATUS ret;
@ -589,7 +588,7 @@ NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *fil
* ZwNotifyChangeKey [NTDLL.@] * ZwNotifyChangeKey [NTDLL.@]
*/ */
NTSTATUS WINAPI NtNotifyChangeKey( NTSTATUS WINAPI NtNotifyChangeKey(
IN HKEY KeyHandle, IN HANDLE KeyHandle,
IN HANDLE Event, IN HANDLE Event,
IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, IN PIO_APC_ROUTINE ApcRoutine OPTIONAL,
IN PVOID ApcContext OPTIONAL, IN PVOID ApcContext OPTIONAL,
@ -644,7 +643,7 @@ NTSTATUS WINAPI NtNotifyChangeKey(
*/ */
NTSTATUS WINAPI NtQueryMultipleValueKey( NTSTATUS WINAPI NtQueryMultipleValueKey(
HKEY KeyHandle, HANDLE KeyHandle,
PKEY_MULTIPLE_VALUE_INFORMATION ListOfValuesToQuery, PKEY_MULTIPLE_VALUE_INFORMATION ListOfValuesToQuery,
ULONG NumberOfItems, ULONG NumberOfItems,
PVOID MultipleValueInformation, PVOID MultipleValueInformation,
@ -663,7 +662,7 @@ NTSTATUS WINAPI NtQueryMultipleValueKey(
*/ */
NTSTATUS WINAPI NtReplaceKey( NTSTATUS WINAPI NtReplaceKey(
IN POBJECT_ATTRIBUTES ObjectAttributes, IN POBJECT_ATTRIBUTES ObjectAttributes,
IN HKEY Key, IN HANDLE Key,
IN POBJECT_ATTRIBUTES ReplacedObjectAttributes) IN POBJECT_ATTRIBUTES ReplacedObjectAttributes)
{ {
FIXME("(%p),stub!\n", Key); FIXME("(%p),stub!\n", Key);
@ -676,7 +675,7 @@ NTSTATUS WINAPI NtReplaceKey(
* ZwRestoreKey [NTDLL.@] * ZwRestoreKey [NTDLL.@]
*/ */
NTSTATUS WINAPI NtRestoreKey( NTSTATUS WINAPI NtRestoreKey(
HKEY KeyHandle, HANDLE KeyHandle,
HANDLE FileHandle, HANDLE FileHandle,
ULONG RestoreFlags) ULONG RestoreFlags)
{ {
@ -688,7 +687,7 @@ NTSTATUS WINAPI NtRestoreKey(
* NtSaveKey [NTDLL.@] * NtSaveKey [NTDLL.@]
* ZwSaveKey [NTDLL.@] * ZwSaveKey [NTDLL.@]
*/ */
NTSTATUS WINAPI NtSaveKey(IN HKEY KeyHandle, IN HANDLE FileHandle) NTSTATUS WINAPI NtSaveKey(IN HANDLE KeyHandle, IN HANDLE FileHandle)
{ {
NTSTATUS ret; NTSTATUS ret;
@ -709,7 +708,7 @@ NTSTATUS WINAPI NtSaveKey(IN HKEY KeyHandle, IN HANDLE FileHandle)
* ZwSetInformationKey [NTDLL.@] * ZwSetInformationKey [NTDLL.@]
*/ */
NTSTATUS WINAPI NtSetInformationKey( NTSTATUS WINAPI NtSetInformationKey(
IN HKEY KeyHandle, IN HANDLE KeyHandle,
IN const int KeyInformationClass, IN const int KeyInformationClass,
IN PVOID KeyInformation, IN PVOID KeyInformation,
IN ULONG KeyInformationLength) 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) * win95 does not care about count for REG_SZ and finds out the len by itself (js)
* NT does definitely care (aj) * 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 ) ULONG type, const void *data, ULONG count )
{ {
NTSTATUS ret; NTSTATUS ret;
@ -754,7 +753,7 @@ NTSTATUS WINAPI NtSetValueKey( HKEY hkey, const UNICODE_STRING *name, ULONG Titl
* RtlpNtSetValueKey [NTDLL.@] * RtlpNtSetValueKey [NTDLL.@]
* *
*/ */
NTSTATUS WINAPI RtlpNtSetValueKey( HKEY hkey, ULONG type, const void *data, NTSTATUS WINAPI RtlpNtSetValueKey( HANDLE hkey, ULONG type, const void *data,
ULONG count ) ULONG count )
{ {
UNICODE_STRING name; UNICODE_STRING name;
@ -767,7 +766,7 @@ NTSTATUS WINAPI RtlpNtSetValueKey( HKEY hkey, ULONG type, const void *data,
* NtUnloadKey [NTDLL.@] * NtUnloadKey [NTDLL.@]
* ZwUnloadKey [NTDLL.@] * ZwUnloadKey [NTDLL.@]
*/ */
NTSTATUS WINAPI NtUnloadKey(IN HKEY KeyHandle) NTSTATUS WINAPI NtUnloadKey(IN HANDLE KeyHandle)
{ {
NTSTATUS ret; NTSTATUS ret;
@ -812,7 +811,7 @@ NTSTATUS WINAPI RtlFormatCurrentUserKeyPath( IN OUT PUNICODE_STRING KeyPath)
*/ */
DWORD WINAPI RtlOpenCurrentUser( DWORD WINAPI RtlOpenCurrentUser(
IN ACCESS_MASK DesiredAccess, /* [in] */ 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; OBJECT_ATTRIBUTES ObjectAttributes;
UNICODE_STRING ObjectName; 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; UNICODE_STRING KeyString;
OBJECT_ATTRIBUTES regkey; OBJECT_ATTRIBUTES regkey;
@ -1078,7 +1077,7 @@ NTSTATUS WINAPI RtlQueryRegistryValues(IN ULONG RelativeTo, IN PCWSTR Path,
IN PVOID Environment OPTIONAL) IN PVOID Environment OPTIONAL)
{ {
UNICODE_STRING Value; UNICODE_STRING Value;
HKEY handle, topkey; HANDLE handle, topkey;
PKEY_VALUE_FULL_INFORMATION pInfo = NULL; PKEY_VALUE_FULL_INFORMATION pInfo = NULL;
ULONG len, buflen = 0; ULONG len, buflen = 0;
NTSTATUS status=STATUS_SUCCESS, ret = STATUS_SUCCESS; NTSTATUS status=STATUS_SUCCESS, ret = STATUS_SUCCESS;
@ -1251,7 +1250,7 @@ out:
*/ */
NTSTATUS WINAPI RtlCheckRegistryKey(IN ULONG RelativeTo, IN PWSTR Path) NTSTATUS WINAPI RtlCheckRegistryKey(IN ULONG RelativeTo, IN PWSTR Path)
{ {
HKEY handle; HANDLE handle;
NTSTATUS status; NTSTATUS status;
TRACE("(%ld, %s)\n", RelativeTo, debugstr_w(Path)); 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 WINAPI RtlDeleteRegistryValue(IN ULONG RelativeTo, IN PCWSTR Path, IN PCWSTR ValueName)
{ {
NTSTATUS status; NTSTATUS status;
HKEY handle; HANDLE handle;
UNICODE_STRING Value; UNICODE_STRING Value;
TRACE("(%ld, %s, %s)\n", RelativeTo, debugstr_w(Path), debugstr_w(ValueName)); 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); RtlInitUnicodeString(&Value, ValueName);
if(RelativeTo == RTL_REGISTRY_HANDLE) if(RelativeTo == RTL_REGISTRY_HANDLE)
{ {
return NtDeleteValueKey((HKEY)Path, &Value); return NtDeleteValueKey((HANDLE)Path, &Value);
} }
status = RTL_GetKeyHandle(RelativeTo, Path, &handle); status = RTL_GetKeyHandle(RelativeTo, Path, &handle);
if (status) return status; if (status) return status;

3
dlls/ntdll/relay.c
View File

@ -29,7 +29,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "excpt.h" #include "excpt.h"
#include "wine/exception.h" #include "wine/exception.h"
@ -113,7 +112,7 @@ void RELAY_InitDebugLists(void)
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING name; UNICODE_STRING name;
char buffer[1024]; char buffer[1024];
HKEY root, hkey; HANDLE root, hkey;
DWORD count; DWORD count;
WCHAR *str; WCHAR *str;
static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\', static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\',

1
dlls/ntdll/resource.c
View File

@ -39,7 +39,6 @@
#include "winbase.h" #include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "winnt.h" #include "winnt.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "winerror.h" #include "winerror.h"
#include "excpt.h" #include "excpt.h"

1
dlls/ntdll/rtl.c
View File

@ -33,7 +33,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "ntdll_misc.h" #include "ntdll_misc.h"

1
dlls/ntdll/rtlbitmap.c
View File

@ -33,7 +33,6 @@
#include <string.h> #include <string.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "wine/debug.h" #include "wine/debug.h"

1
dlls/ntdll/rtlstr.c
View File

@ -29,7 +29,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"

1
dlls/ntdll/sec.c
View File

@ -35,7 +35,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "wine/exception.h" #include "wine/exception.h"
#include "winreg.h"
#include "ntdll_misc.h" #include "ntdll_misc.h"
#include "excpt.h" #include "excpt.h"
#include "wine/library.h" #include "wine/library.h"

1
dlls/ntdll/signal_powerpc.c
View File

@ -52,7 +52,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "wine/library.h" #include "wine/library.h"
#include "wine/exception.h" #include "wine/exception.h"

1
dlls/ntdll/signal_sparc.c
View File

@ -33,7 +33,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "winnt.h" #include "winnt.h"

1
dlls/ntdll/string.c
View File

@ -28,7 +28,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"

3
dlls/ntdll/time.c
View File

@ -41,7 +41,6 @@
#define NONAMELESSSTRUCT #define NONAMELESSSTRUCT
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"
@ -848,7 +847,7 @@ static int TIME_GetTimeZoneInfoFromReg(LPTIME_ZONE_INFORMATION tzinfo)
BYTE buf[90]; BYTE buf[90];
KEY_VALUE_PARTIAL_INFORMATION * KpInfo = KEY_VALUE_PARTIAL_INFORMATION * KpInfo =
(KEY_VALUE_PARTIAL_INFORMATION *) buf; (KEY_VALUE_PARTIAL_INFORMATION *) buf;
HKEY hkey; HANDLE hkey;
DWORD size; DWORD size;
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW; UNICODE_STRING nameW;

5
dlls/ntdll/version.c
View File

@ -31,7 +31,6 @@
#include "ntstatus.h" #include "ntstatus.h"
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "ntdll_misc.h" #include "ntdll_misc.h"
@ -190,7 +189,7 @@ static WINDOWS_VERSION forcedWinVersion; /* init value irrelevant */
* *
* Parse the contents of the Version key. * 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}; 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; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW; UNICODE_STRING nameW;
HKEY hkey, config_key; HANDLE hkey, config_key;
static const WCHAR configW[] = {'M','a','c','h','i','n','e','\\', static const WCHAR configW[] = {'M','a','c','h','i','n','e','\\',
'S','o','f','t','w','a','r','e','\\', 'S','o','f','t','w','a','r','e','\\',
'W','i','n','e','\\', 'W','i','n','e','\\',

1
dlls/ntdll/virtual.c
View File

@ -44,7 +44,6 @@
#include "ntstatus.h" #include "ntstatus.h"
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "winioctl.h" #include "winioctl.h"
#include "wine/library.h" #include "wine/library.h"

1
dlls/ntdll/wcstring.c
View File

@ -31,7 +31,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"

2
dlls/winedos/ioports.c
View File

@ -254,7 +254,7 @@ static inline void outl( DWORD value, WORD port )
static void IO_port_init(void) static void IO_port_init(void)
{ {
char tmp[1024]; char tmp[1024];
HKEY hkey; HANDLE hkey;
DWORD dummy; DWORD dummy;
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW; UNICODE_STRING nameW;

2
dlls/winedos/ppdev.c
View File

@ -75,7 +75,7 @@ char IO_pp_init(void)
{ {
char name[80]; char name[80];
char buffer[256]; char buffer[256];
HKEY hkey; HANDLE hkey;
int i,idx=0,fd,res,userbase,nports=0; int i,idx=0,fd,res,userbase,nports=0;
char * timeout; char * timeout;
char ret=1; char ret=1;

36
include/winternl.h
View File

@ -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 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 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 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 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 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); 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 NtDelayExecution(BOOLEAN,const LARGE_INTEGER*);
NTSTATUS WINAPI NtDeleteAtom(RTL_ATOM); NTSTATUS WINAPI NtDeleteAtom(RTL_ATOM);
NTSTATUS WINAPI NtDeleteFile(POBJECT_ATTRIBUTES); NTSTATUS WINAPI NtDeleteFile(POBJECT_ATTRIBUTES);
NTSTATUS WINAPI NtDeleteKey(HKEY); NTSTATUS WINAPI NtDeleteKey(HANDLE);
NTSTATUS WINAPI NtDeleteValueKey(HKEY,const UNICODE_STRING *); 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 NtDeviceIoControlFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,PVOID,ULONG,PVOID,ULONG);
NTSTATUS WINAPI NtDisplayString(PUNICODE_STRING); NTSTATUS WINAPI NtDisplayString(PUNICODE_STRING);
NTSTATUS WINAPI NtDuplicateObject(HANDLE,HANDLE,HANDLE,PHANDLE,ACCESS_MASK,ULONG,ULONG); 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 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 NtEnumerateKey(HANDLE,ULONG,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *);
NTSTATUS WINAPI NtEnumerateValueKey(HKEY,ULONG,KEY_VALUE_INFORMATION_CLASS,PVOID,ULONG,PULONG); NTSTATUS WINAPI NtEnumerateValueKey(HANDLE,ULONG,KEY_VALUE_INFORMATION_CLASS,PVOID,ULONG,PULONG);
NTSTATUS WINAPI NtFindAtom(const WCHAR*,ULONG,RTL_ATOM*); NTSTATUS WINAPI NtFindAtom(const WCHAR*,ULONG,RTL_ATOM*);
NTSTATUS WINAPI NtFlushBuffersFile(HANDLE,IO_STATUS_BLOCK*); NTSTATUS WINAPI NtFlushBuffersFile(HANDLE,IO_STATUS_BLOCK*);
NTSTATUS WINAPI NtFlushInstructionCache(HANDLE,LPCVOID,ULONG); NTSTATUS WINAPI NtFlushInstructionCache(HANDLE,LPCVOID,ULONG);
NTSTATUS WINAPI NtFlushKey(HKEY); NTSTATUS WINAPI NtFlushKey(HANDLE);
NTSTATUS WINAPI NtFlushVirtualMemory(HANDLE,LPCVOID*,ULONG*,ULONG); NTSTATUS WINAPI NtFlushVirtualMemory(HANDLE,LPCVOID*,ULONG*,ULONG);
NTSTATUS WINAPI NtFreeVirtualMemory(HANDLE,PVOID*,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); NTSTATUS WINAPI NtFsControlFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,PVOID,ULONG,PVOID,ULONG);
@ -1647,12 +1647,12 @@ 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 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 NtLockVirtualMemory(HANDLE,PVOID*,ULONG*,ULONG);
NTSTATUS WINAPI NtMapViewOfSection(HANDLE,HANDLE,PVOID*,ULONG,ULONG,const LARGE_INTEGER*,ULONG*,SECTION_INHERIT,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 NtOpenDirectoryObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES);
NTSTATUS WINAPI NtOpenEvent(PHANDLE,ACCESS_MASK,const OBJECT_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 NtOpenFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG);
NTSTATUS WINAPI NtOpenIoCompletion(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); 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 NtOpenMutant(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*);
NTSTATUS WINAPI NtOpenProcessToken(HANDLE,DWORD,HANDLE *); NTSTATUS WINAPI NtOpenProcessToken(HANDLE,DWORD,HANDLE *);
NTSTATUS WINAPI NtOpenSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*); 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 NtQueryInformationThread(HANDLE,THREADINFOCLASS,PVOID,ULONG,PULONG);
NTSTATUS WINAPI NtQueryInformationToken(HANDLE,DWORD,LPVOID,DWORD,LPDWORD); NTSTATUS WINAPI NtQueryInformationToken(HANDLE,DWORD,LPVOID,DWORD,LPDWORD);
NTSTATUS WINAPI NtQueryInstallUILanguage(LANGID*); NTSTATUS WINAPI NtQueryInstallUILanguage(LANGID*);
NTSTATUS WINAPI NtQueryKey(HKEY,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *); NTSTATUS WINAPI NtQueryKey(HANDLE,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *);
NTSTATUS WINAPI NtQueryMultipleValueKey(HKEY,PKEY_MULTIPLE_VALUE_INFORMATION,ULONG,PVOID,ULONG,PULONG); NTSTATUS WINAPI NtQueryMultipleValueKey(HANDLE,PKEY_MULTIPLE_VALUE_INFORMATION,ULONG,PVOID,ULONG,PULONG);
NTSTATUS WINAPI NtQueryMutant(HANDLE,MUTANT_INFORMATION_CLASS,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 NtQueryObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG, PULONG);
NTSTATUS WINAPI NtQueryPerformanceCounter(PLARGE_INTEGER, PLARGE_INTEGER); 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 NtQuerySystemTime(PLARGE_INTEGER);
NTSTATUS WINAPI NtQueryTimer(HANDLE,TIMER_INFORMATION_CLASS,PVOID,ULONG,PULONG); NTSTATUS WINAPI NtQueryTimer(HANDLE,TIMER_INFORMATION_CLASS,PVOID,ULONG,PULONG);
NTSTATUS WINAPI NtQueryTimerResolution(PULONG,PULONG,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 NtQueryVirtualMemory(HANDLE,LPCVOID,MEMORY_INFORMATION_CLASS,PVOID,ULONG,ULONG*);
NTSTATUS WINAPI NtQueryVolumeInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS); NTSTATUS WINAPI NtQueryVolumeInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS);
void WINAPI NtRaiseException(PEXCEPTION_RECORD,PCONTEXT,BOOL); void WINAPI NtRaiseException(PEXCEPTION_RECORD,PCONTEXT,BOOL);
@ -1703,21 +1703,21 @@ NTSTATUS WINAPI NtRegisterThreadTerminatePort(HANDLE);
NTSTATUS WINAPI NtReleaseMutant(HANDLE,PLONG); NTSTATUS WINAPI NtReleaseMutant(HANDLE,PLONG);
NTSTATUS WINAPI NtReleaseSemaphore(HANDLE,ULONG,PULONG); NTSTATUS WINAPI NtReleaseSemaphore(HANDLE,ULONG,PULONG);
NTSTATUS WINAPI NtRemoveIoCompletion(HANDLE,PULONG,PULONG,PIO_STATUS_BLOCK,PLARGE_INTEGER); 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 NtReplyWaitReceivePort(HANDLE,PULONG,PLPC_MESSAGE,PLPC_MESSAGE);
NTSTATUS WINAPI NtReplyWaitReplyPort(HANDLE,PLPC_MESSAGE); NTSTATUS WINAPI NtReplyWaitReplyPort(HANDLE,PLPC_MESSAGE);
NTSTATUS WINAPI NtRequestWaitReplyPort(HANDLE,PLPC_MESSAGE,PLPC_MESSAGE); NTSTATUS WINAPI NtRequestWaitReplyPort(HANDLE,PLPC_MESSAGE,PLPC_MESSAGE);
NTSTATUS WINAPI NtResetEvent(HANDLE,PULONG); NTSTATUS WINAPI NtResetEvent(HANDLE,PULONG);
NTSTATUS WINAPI NtRestoreKey(HKEY,HANDLE,ULONG); NTSTATUS WINAPI NtRestoreKey(HANDLE,HANDLE,ULONG);
NTSTATUS WINAPI NtResumeThread(HANDLE,PULONG); NTSTATUS WINAPI NtResumeThread(HANDLE,PULONG);
NTSTATUS WINAPI NtSaveKey(HKEY,HANDLE); NTSTATUS WINAPI NtSaveKey(HANDLE,HANDLE);
NTSTATUS WINAPI NtSetContextThread(HANDLE,const CONTEXT*); NTSTATUS WINAPI NtSetContextThread(HANDLE,const CONTEXT*);
NTSTATUS WINAPI NtSetDefaultLocale(BOOLEAN,LCID); NTSTATUS WINAPI NtSetDefaultLocale(BOOLEAN,LCID);
NTSTATUS WINAPI NtSetDefaultUILanguage(LANGID); NTSTATUS WINAPI NtSetDefaultUILanguage(LANGID);
NTSTATUS WINAPI NtSetEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG); NTSTATUS WINAPI NtSetEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG);
NTSTATUS WINAPI NtSetEvent(HANDLE,PULONG); NTSTATUS WINAPI NtSetEvent(HANDLE,PULONG);
NTSTATUS WINAPI NtSetInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FILE_INFORMATION_CLASS); 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 NtSetInformationObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG);
NTSTATUS WINAPI NtSetInformationProcess(HANDLE,PROCESS_INFORMATION_CLASS,PVOID,ULONG); NTSTATUS WINAPI NtSetInformationProcess(HANDLE,PROCESS_INFORMATION_CLASS,PVOID,ULONG);
NTSTATUS WINAPI NtSetInformationThread(HANDLE,THREADINFOCLASS,LPCVOID,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 NtSetSystemTime(const LARGE_INTEGER*,LARGE_INTEGER*);
NTSTATUS WINAPI NtSetTimer(HANDLE, const LARGE_INTEGER*, PTIMER_APC_ROUTINE, PVOID, BOOLEAN, ULONG, BOOLEAN*); NTSTATUS WINAPI NtSetTimer(HANDLE, const LARGE_INTEGER*, PTIMER_APC_ROUTINE, PVOID, BOOLEAN, ULONG, BOOLEAN*);
NTSTATUS WINAPI NtSetTimerResolution(ULONG,BOOLEAN,PULONG); 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 NtSetVolumeInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS);
NTSTATUS WINAPI NtSignalAndWaitForSingleObject(HANDLE,HANDLE,BOOLEAN,const LARGE_INTEGER*); NTSTATUS WINAPI NtSignalAndWaitForSingleObject(HANDLE,HANDLE,BOOLEAN,const LARGE_INTEGER*);
NTSTATUS WINAPI NtShutdownSystem(SHUTDOWN_ACTION); NTSTATUS WINAPI NtShutdownSystem(SHUTDOWN_ACTION);
@ -1736,7 +1736,7 @@ NTSTATUS WINAPI NtSuspendThread(HANDLE,PULONG);
NTSTATUS WINAPI NtTerminateProcess(HANDLE,LONG); NTSTATUS WINAPI NtTerminateProcess(HANDLE,LONG);
NTSTATUS WINAPI NtTerminateThread(HANDLE,LONG); NTSTATUS WINAPI NtTerminateThread(HANDLE,LONG);
NTSTATUS WINAPI NtUnloadDriver(const UNICODE_STRING *); 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 NtUnlockFile(HANDLE,PIO_STATUS_BLOCK,PLARGE_INTEGER,PLARGE_INTEGER,PULONG);
NTSTATUS WINAPI NtUnlockVirtualMemory(HANDLE,PVOID*,ULONG*,ULONG); NTSTATUS WINAPI NtUnlockVirtualMemory(HANDLE,PVOID*,ULONG*,ULONG);
NTSTATUS WINAPI NtUnmapViewOfSection(HANDLE,PVOID); NTSTATUS WINAPI NtUnmapViewOfSection(HANDLE,PVOID);
@ -1941,7 +1941,7 @@ ULONG WINAPI RtlNumberOfClearBits(PCRTL_BITMAP);
UINT WINAPI RtlOemStringToUnicodeSize(const STRING*); UINT WINAPI RtlOemStringToUnicodeSize(const STRING*);
NTSTATUS WINAPI RtlOemStringToUnicodeString(UNICODE_STRING*,const STRING*,BOOLEAN); NTSTATUS WINAPI RtlOemStringToUnicodeString(UNICODE_STRING*,const STRING*,BOOLEAN);
NTSTATUS WINAPI RtlOemToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD); 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); NTSTATUS WINAPI RtlPinAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM);
BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN); BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN);