NTDLL: use HANDLE instead of HKEY in the NT API
Mike McCormack
mike at codeweavers.com
Fri Jun 17 02:58:40 CDT 2005
This gives us more correct NtReg* prototypes, and removes ntdll's
dependency on winreg.h.
Mike
ChangeLog:
* use HANDLE instead of HKEY in the NT API
-------------- next part --------------
? dlls/kernel/tests/sync.c.1
Index: include/winternl.h
===================================================================
RCS file: /home/wine/wine/include/winternl.h,v
retrieving revision 1.139
diff -u -p -r1.139 winternl.h
--- include/winternl.h 16 Jun 2005 10:46:11 -0000 1.139
+++ include/winternl.h 17 Jun 2005 07:56:31 -0000
@@ -1601,7 +1601,7 @@ NTSTATUS WINAPI NtConnectPort(PHANDLE,P
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);
@@ -1614,18 +1614,18 @@ NTSTATUS WINAPI NtCreateTimer(HANDLE*,
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);
@@ -1640,11 +1640,11 @@ NTSTATUS WINAPI NtLoadKey(const OBJECT_
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 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*);
@@ -1671,8 +1671,8 @@ NTSTATUS WINAPI NtQueryInformationProce
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);
@@ -1684,7 +1684,7 @@ NTSTATUS WINAPI NtQuerySystemInformatio
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);
@@ -1694,21 +1694,21 @@ NTSTATUS WINAPI NtRegisterThreadTermina
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);
@@ -1719,7 +1719,7 @@ NTSTATUS WINAPI NtSetSecurityObject(HAN
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);
@@ -1727,7 +1727,7 @@ NTSTATUS WINAPI NtSuspendThread(HANDLE,
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);
@@ -1932,7 +1932,7 @@ ULONG WINAPI RtlNumberOfClearBits(PC
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);
@@ -2016,6 +2016,7 @@ NTSTATUS WINAPI RtlVerifyVersionInfo(co
NTSTATUS WINAPI RtlWalkHeap(HANDLE,PVOID);
+//NTSTATUS WINAPI RtlpNtCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,PULONG);
NTSTATUS WINAPI RtlpWaitForCriticalSection(RTL_CRITICAL_SECTION *);
NTSTATUS WINAPI RtlpUnWaitCriticalSection(RTL_CRITICAL_SECTION *);
Index: dlls/ntdll/cdrom.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/cdrom.c,v
retrieving revision 1.53
diff -u -p -r1.53 cdrom.c
--- dlls/ntdll/cdrom.c 14 Jun 2005 12:25:41 -0000 1.53
+++ dlls/ntdll/cdrom.c 17 Jun 2005 07:56:31 -0000
@@ -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"
Index: dlls/ntdll/critsection.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/critsection.c,v
retrieving revision 1.28
diff -u -p -r1.28 critsection.c
--- dlls/ntdll/critsection.c 24 Feb 2005 13:15:36 -0000 1.28
+++ dlls/ntdll/critsection.c 17 Jun 2005 07:56:31 -0000
@@ -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"
Index: dlls/ntdll/debugbuffer.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/debugbuffer.c,v
retrieving revision 1.1
diff -u -p -r1.1 debugbuffer.c
--- dlls/ntdll/debugbuffer.c 18 Mar 2004 02:08:43 -0000 1.1
+++ dlls/ntdll/debugbuffer.c 17 Jun 2005 07:56:31 -0000
@@ -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"
Index: dlls/ntdll/debugtools.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/debugtools.c,v
retrieving revision 1.39
diff -u -p -r1.39 debugtools.c
--- dlls/ntdll/debugtools.c 6 Jun 2005 20:04:33 -0000 1.39
+++ dlls/ntdll/debugtools.c 17 Jun 2005 07:56:31 -0000
@@ -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"
Index: dlls/ntdll/directory.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/directory.c,v
retrieving revision 1.31
diff -u -p -r1.31 directory.c
--- dlls/ntdll/directory.c 13 Jun 2005 18:56:01 -0000 1.31
+++ dlls/ntdll/directory.c 17 Jun 2005 07:56:31 -0000
@@ -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;
Index: dlls/ntdll/env.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/env.c,v
retrieving revision 1.16
diff -u -p -r1.16 env.c
--- dlls/ntdll/env.c 29 Nov 2004 18:24:08 -0000 1.16
+++ dlls/ntdll/env.c 17 Jun 2005 07:56:31 -0000
@@ -25,7 +25,6 @@
#include "windef.h"
#include "winbase.h"
-#include "winreg.h"
#include "winternl.h"
#include "wine/unicode.h"
#include "wine/debug.h"
Index: dlls/ntdll/error.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/error.c,v
retrieving revision 1.14
diff -u -p -r1.14 error.c
--- dlls/ntdll/error.c 6 Jun 2005 20:13:08 -0000 1.14
+++ dlls/ntdll/error.c 17 Jun 2005 07:56:32 -0000
@@ -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"
Index: dlls/ntdll/exception.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/exception.c,v
retrieving revision 1.77
diff -u -p -r1.77 exception.c
--- dlls/ntdll/exception.c 6 Jun 2005 20:13:08 -0000 1.77
+++ dlls/ntdll/exception.c 17 Jun 2005 07:56:32 -0000
@@ -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"
Index: dlls/ntdll/handletable.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/handletable.c,v
retrieving revision 1.2
diff -u -p -r1.2 handletable.c
--- dlls/ntdll/handletable.c 22 Feb 2005 19:33:50 -0000 1.2
+++ dlls/ntdll/handletable.c 17 Jun 2005 07:56:32 -0000
@@ -22,7 +22,6 @@
#include "windef.h"
#include "winbase.h"
-#include "winreg.h"
#include "winternl.h"
#include "wine/debug.h"
#include "ntdll_misc.h"
Index: dlls/ntdll/heap.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/heap.c,v
retrieving revision 1.37
diff -u -p -r1.37 heap.c
--- dlls/ntdll/heap.c 16 Jun 2005 10:45:25 -0000 1.37
+++ dlls/ntdll/heap.c 17 Jun 2005 07:56:32 -0000
@@ -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"
Index: dlls/ntdll/large_int.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/large_int.c,v
retrieving revision 1.12
diff -u -p -r1.12 large_int.c
--- dlls/ntdll/large_int.c 25 Feb 2005 14:07:57 -0000 1.12
+++ dlls/ntdll/large_int.c 17 Jun 2005 07:56:32 -0000
@@ -24,7 +24,6 @@
#include "ntstatus.h"
#include "windef.h"
#include "winbase.h"
-#include "winreg.h"
#include "winternl.h"
/*
Index: dlls/ntdll/loader.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/loader.c,v
retrieving revision 1.91
diff -u -p -r1.91 loader.c
--- dlls/ntdll/loader.c 5 Jun 2005 18:22:02 -0000 1.91
+++ dlls/ntdll/loader.c 17 Jun 2005 07:56:32 -0000
@@ -31,7 +31,6 @@
#include "windef.h"
#include "winbase.h"
#include "winnt.h"
-#include "winreg.h"
#include "winternl.h"
#include "module.h"
Index: dlls/ntdll/loadorder.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/loadorder.c,v
retrieving revision 1.14
diff -u -p -r1.14 loadorder.c
--- dlls/ntdll/loadorder.c 16 Jun 2005 16:13:11 -0000 1.14
+++ dlls/ntdll/loadorder.c 17 Jun 2005 07:56:32 -0000
@@ -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_orde
*
* 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 *a
*
* 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 loadorde
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 loadorde
}
/* 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);
Index: dlls/ntdll/nt.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/nt.c,v
retrieving revision 1.94
diff -u -p -r1.94 nt.c
--- dlls/ntdll/nt.c 16 Jun 2005 10:46:11 -0000 1.94
+++ dlls/ntdll/nt.c 17 Jun 2005 07:56:32 -0000
@@ -31,7 +31,6 @@
#include "windef.h"
#include "winbase.h"
-#include "winreg.h"
#include "winternl.h"
#include "ntdll_misc.h"
#include "wine/server.h"
Index: dlls/ntdll/om.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/om.c,v
retrieving revision 1.30
diff -u -p -r1.30 om.c
--- dlls/ntdll/om.c 16 Jun 2005 10:46:11 -0000 1.30
+++ dlls/ntdll/om.c 17 Jun 2005 07:56:32 -0000
@@ -33,7 +33,6 @@
#include "windef.h"
#include "winbase.h"
-#include "winreg.h"
#include "winternl.h"
#include "ntdll_misc.h"
#include "wine/server.h"
Index: dlls/ntdll/process.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/process.c,v
retrieving revision 1.4
diff -u -p -r1.4 process.c
--- dlls/ntdll/process.c 14 Jun 2005 12:25:02 -0000 1.4
+++ dlls/ntdll/process.c 17 Jun 2005 07:56:32 -0000
@@ -30,7 +30,6 @@
#include "windef.h"
#include "winbase.h"
-#include "winreg.h"
#include "winternl.h"
#include "ntdll_misc.h"
#include "wine/server.h"
Index: dlls/ntdll/reg.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/reg.c,v
retrieving revision 1.60
diff -u -p -r1.60 reg.c
--- dlls/ntdll/reg.c 10 Jun 2005 19:33:47 -0000 1.60
+++ dlls/ntdll/reg.c 17 Jun 2005 07:56:33 -0000
@@ -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 retke
*
* 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 r
* 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,
*
* 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 ret
* 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(
* 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 h
*
* 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 hand
* 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 han
* 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( H
* 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_VAL
* 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( HKE
* 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 ha
* 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( HKE
* 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_
* 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 KeyHan
* 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
* 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
* NtUnloadKey [NTDLL.@]
* ZwUnloadKey [NTDLL.@]
*/
-NTSTATUS WINAPI NtUnloadKey(IN HKEY KeyHandle)
+NTSTATUS WINAPI NtUnloadKey(IN HANDLE KeyHandle)
{
NTSTATUS ret;
@@ -812,7 +811,7 @@ NTSTATUS WINAPI RtlFormatCurrentUserKeyP
*/
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(
}
-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(I
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 U
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(I
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;
Index: dlls/ntdll/relay.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/relay.c,v
retrieving revision 1.23
diff -u -p -r1.23 relay.c
--- dlls/ntdll/relay.c 16 Jun 2005 20:51:50 -0000 1.23
+++ dlls/ntdll/relay.c 17 Jun 2005 07:56:33 -0000
@@ -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','\\',
Index: dlls/ntdll/resource.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/resource.c,v
retrieving revision 1.13
diff -u -p -r1.13 resource.c
--- dlls/ntdll/resource.c 6 Jun 2005 20:13:08 -0000 1.13
+++ dlls/ntdll/resource.c 17 Jun 2005 07:56:33 -0000
@@ -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"
Index: dlls/ntdll/rtl.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/rtl.c,v
retrieving revision 1.73
diff -u -p -r1.73 rtl.c
--- dlls/ntdll/rtl.c 7 May 2005 18:10:30 -0000 1.73
+++ dlls/ntdll/rtl.c 17 Jun 2005 07:56:33 -0000
@@ -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"
Index: dlls/ntdll/rtlbitmap.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/rtlbitmap.c,v
retrieving revision 1.13
diff -u -p -r1.13 rtlbitmap.c
--- dlls/ntdll/rtlbitmap.c 25 Feb 2005 14:07:57 -0000 1.13
+++ dlls/ntdll/rtlbitmap.c 17 Jun 2005 07:56:33 -0000
@@ -33,7 +33,6 @@
#include <string.h>
#include "windef.h"
#include "winbase.h"
-#include "winreg.h"
#include "winternl.h"
#include "wine/debug.h"
Index: dlls/ntdll/rtlstr.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/rtlstr.c,v
retrieving revision 1.51
diff -u -p -r1.51 rtlstr.c
--- dlls/ntdll/rtlstr.c 10 Jun 2005 19:30:23 -0000 1.51
+++ dlls/ntdll/rtlstr.c 17 Jun 2005 07:56:33 -0000
@@ -29,7 +29,6 @@
#include "windef.h"
#include "winbase.h"
-#include "winreg.h"
#include "winternl.h"
#include "wine/unicode.h"
#include "wine/debug.h"
Index: dlls/ntdll/sec.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/sec.c,v
retrieving revision 1.56
diff -u -p -r1.56 sec.c
--- dlls/ntdll/sec.c 13 Jun 2005 11:34:02 -0000 1.56
+++ dlls/ntdll/sec.c 17 Jun 2005 07:56:33 -0000
@@ -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"
Index: dlls/ntdll/signal_powerpc.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/signal_powerpc.c,v
retrieving revision 1.27
diff -u -p -r1.27 signal_powerpc.c
--- dlls/ntdll/signal_powerpc.c 7 May 2005 18:10:30 -0000 1.27
+++ dlls/ntdll/signal_powerpc.c 17 Jun 2005 07:56:33 -0000
@@ -52,7 +52,6 @@
#include "windef.h"
#include "winbase.h"
-#include "winreg.h"
#include "winternl.h"
#include "wine/library.h"
#include "wine/exception.h"
Index: dlls/ntdll/signal_sparc.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/signal_sparc.c,v
retrieving revision 1.35
diff -u -p -r1.35 signal_sparc.c
--- dlls/ntdll/signal_sparc.c 7 May 2005 18:10:30 -0000 1.35
+++ dlls/ntdll/signal_sparc.c 17 Jun 2005 07:56:33 -0000
@@ -33,7 +33,6 @@
#include "windef.h"
#include "winbase.h"
-#include "winreg.h"
#include "winternl.h"
#include "winnt.h"
Index: dlls/ntdll/string.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/string.c,v
retrieving revision 1.15
diff -u -p -r1.15 string.c
--- dlls/ntdll/string.c 17 Dec 2004 19:41:55 -0000 1.15
+++ dlls/ntdll/string.c 17 Jun 2005 07:56:33 -0000
@@ -28,7 +28,6 @@
#include "windef.h"
#include "winbase.h"
-#include "winreg.h"
#include "winternl.h"
Index: dlls/ntdll/time.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/time.c,v
retrieving revision 1.71
diff -u -p -r1.71 time.c
--- dlls/ntdll/time.c 12 May 2005 09:54:39 -0000 1.71
+++ dlls/ntdll/time.c 17 Jun 2005 07:56:34 -0000
@@ -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(L
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;
Index: dlls/ntdll/version.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/version.c,v
retrieving revision 1.17
diff -u -p -r1.17 version.c
--- dlls/ntdll/version.c 13 Jun 2005 18:56:01 -0000 1.17
+++ dlls/ntdll/version.c 17 Jun 2005 07:56:34 -0000
@@ -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;
*
* 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','\\',
Index: dlls/ntdll/virtual.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/virtual.c,v
retrieving revision 1.51
diff -u -p -r1.51 virtual.c
--- dlls/ntdll/virtual.c 6 Jun 2005 20:13:08 -0000 1.51
+++ dlls/ntdll/virtual.c 17 Jun 2005 07:56:34 -0000
@@ -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"
@@ -648,7 +647,9 @@ static void *unaligned_mmap( void *addr,
unsigned int flags, int fd, off_t offset )
{
#if defined(linux) && defined(__i386__) && defined(__GNUC__)
- if (!(offset >> 32) && (offset & page_mask))
+ long long l_ofs = offset;
+
+ if ( !(l_ofs >> 32) && (l_ofs & page_mask))
{
int ret;
Index: dlls/ntdll/wcstring.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/wcstring.c,v
retrieving revision 1.24
diff -u -p -r1.24 wcstring.c
--- dlls/ntdll/wcstring.c 21 Apr 2005 17:18:50 -0000 1.24
+++ dlls/ntdll/wcstring.c 17 Jun 2005 07:56:34 -0000
@@ -31,7 +31,6 @@
#include "windef.h"
#include "winbase.h"
-#include "winreg.h"
#include "winternl.h"
#include "wine/unicode.h"
#include "wine/debug.h"
Index: dlls/kernel/computername.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/computername.c,v
retrieving revision 1.15
diff -u -p -r1.15 computername.c
--- dlls/kernel/computername.c 14 Jun 2005 17:22:41 -0000 1.15
+++ dlls/kernel/computername.c 17 Jun 2005 07:56:34 -0000
@@ -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
{
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 lp
{
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;
Index: dlls/kernel/cpu.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/cpu.c,v
retrieving revision 1.13
diff -u -p -r1.13 cpu.c
--- dlls/kernel/cpu.c 18 May 2005 18:20:23 -0000 1.13
+++ dlls/kernel/cpu.c 17 Jun 2005 07:56:34 -0000
@@ -119,7 +119,7 @@ static void create_registry_keys( const
/* 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;
Index: dlls/kernel/except.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/except.c,v
retrieving revision 1.10
diff -u -p -r1.10 except.c
--- dlls/kernel/except.c 6 Jun 2005 20:13:08 -0000 1.10
+++ dlls/kernel/except.c 17 Jun 2005 07:56:34 -0000
@@ -223,7 +223,7 @@ static BOOL start_debugger(PEXCEPTION_PO
OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW;
char *cmdline, *env, *p;
- HKEY hDbgConf;
+ HANDLE hDbgConf;
DWORD bAuto = FALSE;
PROCESS_INFORMATION info;
STARTUPINFOA startup;
Index: dlls/kernel/locale.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/locale.c,v
retrieving revision 1.62
diff -u -p -r1.62 locale.c
--- dlls/kernel/locale.c 6 Jun 2005 20:00:14 -0000 1.62
+++ dlls/kernel/locale.c 17 Jun 2005 07:56:34 -0000
@@ -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
*
* 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( LPC
{
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, L
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
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 hRoot
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,
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,
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
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
'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 geo
'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 geo
{
BOOL bContinue = TRUE;
DWORD dwGeoId;
- HKEY hSubKey = NLS_RegOpenKey( hKey, szNumber );
+ HANDLE hSubKey = NLS_RegOpenKey( hKey, szNumber );
if (hSubKey)
{
Index: dlls/kernel/oldconfig.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/oldconfig.c,v
retrieving revision 1.3
diff -u -p -r1.3 oldconfig.c
--- dlls/kernel/oldconfig.c 13 Jun 2005 18:56:01 -0000 1.3
+++ dlls/kernel/oldconfig.c 17 Jun 2005 07:56:35 -0000
@@ -71,7 +71,7 @@ static int create_drives( int devices_on
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 hk
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
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 */
Index: dlls/kernel/path.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/path.c,v
retrieving revision 1.20
diff -u -p -r1.20 path.c
--- dlls/kernel/path.c 12 Jun 2005 10:41:22 -0000 1.20
+++ dlls/kernel/path.c 17 Jun 2005 07:56:35 -0000
@@ -133,7 +133,7 @@ static BOOL add_boot_rename_entry( LPCWS
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;
Index: dlls/kernel/process.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/process.c,v
retrieving revision 1.89
diff -u -p -r1.89 process.c
--- dlls/kernel/process.c 14 Jun 2005 11:42:34 -0000 1.89
+++ dlls/kernel/process.c 17 Jun 2005 07:56:35 -0000
@@ -416,7 +416,7 @@ static BOOL build_initial_environment( c
* 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(voi
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(voi
}
/* then the ones for the current user */
- if (RtlOpenCurrentUser( KEY_ALL_ACCESS, (HKEY *)&attr.RootDirectory ) != STATUS_SUCCESS) return;
+ if (RtlOpenCurrentUser( KEY_ALL_ACCESS, (HANDLE *)&attr.RootDirectory ) != STATUS_SUCCESS) return;
RtlInitUnicodeString( &nameW, envW );
if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr ) == STATUS_SUCCESS)
{
Index: dlls/kernel/relay16.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/relay16.c,v
retrieving revision 1.15
diff -u -p -r1.15 relay16.c
--- dlls/kernel/relay16.c 14 Jun 2005 19:23:01 -0000 1.15
+++ dlls/kernel/relay16.c 17 Jun 2005 07:56:35 -0000
@@ -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','\\',
Index: dlls/kernel/volume.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/volume.c,v
retrieving revision 1.28
diff -u -p -r1.28 volume.c
--- dlls/kernel/volume.c 13 Jun 2005 18:56:01 -0000 1.28
+++ dlls/kernel/volume.c 17 Jun 2005 07:56:35 -0000
@@ -172,7 +172,7 @@ static UINT get_registry_drive_type( con
'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)];
Index: dlls/advapi32/registry.c
===================================================================
RCS file: /home/wine/wine/dlls/advapi32/registry.c,v
retrieving revision 1.77
diff -u -p -r1.77 registry.c
--- dlls/advapi32/registry.c 16 May 2005 14:08:11 -0000 1.77
+++ dlls/advapi32/registry.c 17 Jun 2005 07:56:36 -0000
@@ -97,9 +97,9 @@ 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 HANDLE create_special_root_hkey( HANDLE hkey, DWORD access )
{
- HKEY ret = 0;
+ HANDLE ret = 0;
int idx = (UINT)hkey - (UINT)HKEY_SPECIAL_ROOT_FIRST;
if (hkey == HKEY_CURRENT_USER)
@@ -129,9 +129,9 @@ static HKEY create_special_root_hkey( HK
}
/* map the hkey from special root to normal key if necessary */
-inline static HKEY get_special_root_hkey( HKEY hkey )
+inline static HANDLE get_special_root_hkey( HKEY hkey )
{
- HKEY ret = hkey;
+ HANDLE ret = hkey;
if ((hkey >= HKEY_SPECIAL_ROOT_FIRST) && (hkey <= HKEY_SPECIAL_ROOT_LAST))
{
@@ -153,6 +153,7 @@ DWORD WINAPI RegCreateKeyExW( HKEY hkey,
{
OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW, classW;
+ PHANDLE phandle = (PHANDLE) retkey;
if (reserved) return ERROR_INVALID_PARAMETER;
if (!(access & KEY_ACCESS_MASK) || (access & ~KEY_ACCESS_MASK)) return ERROR_ACCESS_DENIED;
@@ -167,7 +168,7 @@ DWORD WINAPI RegCreateKeyExW( HKEY hkey,
RtlInitUnicodeString( &nameW, name );
RtlInitUnicodeString( &classW, class );
- return RtlNtStatusToDosError( NtCreateKey( retkey, access, &attr, 0,
+ return RtlNtStatusToDosError( NtCreateKey( phandle, access, &attr, 0,
&classW, options, dispos ) );
}
@@ -203,6 +204,7 @@ DWORD WINAPI RegCreateKeyExA( HKEY hkey,
UNICODE_STRING classW;
ANSI_STRING nameA, classA;
NTSTATUS status;
+ PHANDLE phandle = (PHANDLE) retkey;
if (reserved) return ERROR_INVALID_PARAMETER;
if (!is_version_nt()) access = KEY_ALL_ACCESS; /* Win95 ignores the access mask */
@@ -223,7 +225,7 @@ DWORD WINAPI RegCreateKeyExA( HKEY hkey,
{
if (!(status = RtlAnsiStringToUnicodeString( &classW, &classA, TRUE )))
{
- status = NtCreateKey( retkey, access, &attr, 0, &classW, options, dispos );
+ status = NtCreateKey( phandle, access, &attr, 0, &classW, options, dispos );
RtlFreeUnicodeString( &classW );
}
}
@@ -276,6 +278,7 @@ DWORD WINAPI RegOpenKeyExW( HKEY hkey, L
{
OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW;
+ PHANDLE phandle = (PHANDLE) retkey;
if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE;
@@ -286,7 +289,7 @@ DWORD WINAPI RegOpenKeyExW( HKEY hkey, L
attr.SecurityDescriptor = NULL;
attr.SecurityQualityOfService = NULL;
RtlInitUnicodeString( &nameW, name );
- return RtlNtStatusToDosError( NtOpenKey( retkey, access, &attr ) );
+ return RtlNtStatusToDosError( NtOpenKey( phandle, access, &attr ) );
}
@@ -315,6 +318,7 @@ DWORD WINAPI RegOpenKeyExA( HKEY hkey, L
OBJECT_ATTRIBUTES attr;
STRING nameA;
NTSTATUS status;
+ PHANDLE phandle = (PHANDLE) retkey;
if (!is_version_nt()) access = KEY_ALL_ACCESS; /* Win95 ignores the access mask */
@@ -331,7 +335,7 @@ DWORD WINAPI RegOpenKeyExA( HKEY hkey, L
if (!(status = RtlAnsiStringToUnicodeString( &NtCurrentTeb()->StaticUnicodeString,
&nameA, FALSE )))
{
- status = NtOpenKey( retkey, access, &attr );
+ status = NtOpenKey( phandle, access, &attr );
}
return RtlNtStatusToDosError( status );
}
Index: dlls/winedos/ioports.c
===================================================================
RCS file: /home/wine/wine/dlls/winedos/ioports.c,v
retrieving revision 1.10
diff -u -p -r1.10 ioports.c
--- dlls/winedos/ioports.c 13 Jun 2005 18:56:01 -0000 1.10
+++ dlls/winedos/ioports.c 17 Jun 2005 07:56:36 -0000
@@ -254,7 +254,7 @@ static inline void outl( DWORD value, WO
static void IO_port_init(void)
{
char tmp[1024];
- HKEY hkey;
+ HANDLE hkey;
DWORD dummy;
OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW;
Index: dlls/winedos/ppdev.c
===================================================================
RCS file: /home/wine/wine/dlls/winedos/ppdev.c,v
retrieving revision 1.8
diff -u -p -r1.8 ppdev.c
--- dlls/winedos/ppdev.c 13 Jun 2005 18:56:01 -0000 1.8
+++ dlls/winedos/ppdev.c 17 Jun 2005 07:56:36 -0000
@@ -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;
More information about the wine-patches
mailing list