Fixed a few prototypes.
diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
index 9552d8b..c4d3109 100644
--- a/dlls/ntdll/misc.c
+++ b/dlls/ntdll/misc.c
@@ -17,7 +17,7 @@
#define POP_FPU(x) DO_FPU("fstpl",x)
#endif
-void dump_ObjectAttributes (POBJECT_ATTRIBUTES oa)
+void dump_ObjectAttributes (const OBJECT_ATTRIBUTES *oa)
{
if (oa)
TRACE("%p:(name=%s, attr=0x%08lx, hRoot=0x%08x, sd=%p) \n",
@@ -25,18 +25,7 @@
oa->Attributes, oa->RootDirectory, oa->SecurityDescriptor);
}
-void dump_AnsiString(PANSI_STRING as, BOOLEAN showstring)
-{
- if (as)
- {
- if (showstring)
- TRACE("%p %p(%s) (%u %u)\n", as, as->Buffer, debugstr_as(as), as->Length, as->MaximumLength);
- else
- TRACE("%p %p(<OUT>) (%u %u)\n", as, as->Buffer, as->Length, as->MaximumLength);
- }
-}
-
-void dump_UnicodeString(PUNICODE_STRING us, BOOLEAN showstring)
+void dump_UnicodeString(const UNICODE_STRING *us, BOOLEAN showstring)
{
if (us)
{
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 1e269f4..08e8b2e 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -7,8 +7,7 @@
/* debug helper */
extern LPCSTR debugstr_as( const STRING *str );
extern LPCSTR debugstr_us( const UNICODE_STRING *str );
-extern void dump_ObjectAttributes (POBJECT_ATTRIBUTES ObjectAttributes);
-extern void dump_AnsiString(PANSI_STRING as, BOOLEAN showstring);
-extern void dump_UnicodeString(PUNICODE_STRING us, BOOLEAN showstring);
+extern void dump_ObjectAttributes (const OBJECT_ATTRIBUTES *ObjectAttributes);
+extern void dump_UnicodeString(const UNICODE_STRING *us, BOOLEAN showstring);
#endif
diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c
index b8ff851..45148b4 100644
--- a/dlls/ntdll/reg.c
+++ b/dlls/ntdll/reg.c
@@ -405,13 +405,12 @@
* NtLoadKey [NTDLL]
* ZwLoadKey
*/
-NTSTATUS WINAPI NtLoadKey(
- PHANDLE KeyHandle,
- POBJECT_ATTRIBUTES ObjectAttributes)
+NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, const OBJECT_ATTRIBUTES *file )
{
- FIXME("(%p),stub!\n", KeyHandle);
- dump_ObjectAttributes(ObjectAttributes);
- return STATUS_SUCCESS;
+ FIXME("stub!\n");
+ dump_ObjectAttributes(attr);
+ dump_ObjectAttributes(file);
+ return STATUS_SUCCESS;
}
/******************************************************************************
diff --git a/include/ntddk.h b/include/ntddk.h
index 1177670..8bc5160 100644
--- a/include/ntddk.h
+++ b/include/ntddk.h
@@ -820,20 +820,14 @@
NTSTATUS WINAPI NtDeleteKey(HANDLE);
NTSTATUS WINAPI NtDeleteValueKey(HANDLE,const UNICODE_STRING*);
NTSTATUS WINAPI NtOpenKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*);
+NTSTATUS WINAPI NtQueryKey(HANDLE,KEY_INFORMATION_CLASS,void*,DWORD,DWORD*);
NTSTATUS WINAPI NtSetValueKey(HANDLE,const UNICODE_STRING*,ULONG,ULONG,const void*,ULONG);
NTSTATUS WINAPI NtEnumerateKey(HANDLE,ULONG,KEY_INFORMATION_CLASS,void*,DWORD,DWORD*);
NTSTATUS WINAPI NtQueryValueKey(HANDLE,const UNICODE_STRING*,KEY_VALUE_INFORMATION_CLASS,
void*,DWORD,DWORD*);
+NTSTATUS WINAPI NtLoadKey(const OBJECT_ATTRIBUTES*,const OBJECT_ATTRIBUTES*);
-
-NTSTATUS WINAPI NtQueryKey(
- HANDLE KeyHandle,
- KEY_INFORMATION_CLASS KeyInformationClass,
- PVOID KeyInformation,
- ULONG Length,
- PULONG ResultLength);
-
NTSTATUS WINAPI NtEnumerateValueKey(
HANDLE KeyHandle,
ULONG Index,
@@ -844,10 +838,6 @@
NTSTATUS WINAPI NtFlushKey(HANDLE KeyHandle);
-NTSTATUS WINAPI NtLoadKey(
- PHANDLE KeyHandle,
- POBJECT_ATTRIBUTES ObjectAttributes);
-
NTSTATUS WINAPI NtNotifyChangeKey(
IN HANDLE KeyHandle,
IN HANDLE Event,