<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
<META NAME="GENERATOR" CONTENT="GtkHTML/3.10.1">
</HEAD>
<BODY>
<PRE>
Hi,
</PRE>
<TT>New tests pass on NT4/W2K/XP/W2K3 and Wine.</TT><BR>
<BR>
<TT>Some original tests still fail for NT4, haven't looked into that (yet).</TT><BR>
<BR>
<TT>Changelog</TT><BR>
Fix returncode for NtDeleteKey (with test)
<PRE>
Cheers,
Paul.
<!--+GtkHTML:<DATA class="ClueFlow" key="orig" value="0">-->---
<!--+GtkHTML:<DATA class="ClueFlow" clear="orig">--> dlls/ntdll/reg.c | 2 ++
dlls/ntdll/tests/reg.c | 4 ++++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c
index fb67207..16d16ff 100644
--- a/dlls/ntdll/reg.c
+++ b/dlls/ntdll/reg.c
@@ -163,6 +163,8 @@ NTSTATUS WINAPI NtDeleteKey( HANDLE hkey
TRACE( "(%p)\n", hkey );
+ if (!hkey) return STATUS_INVALID_HANDLE;
+
SERVER_START_REQ( delete_key )
{
req->hkey = hkey;
diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c
index 6f04b23..275d4dd 100644
--- a/dlls/ntdll/tests/reg.c
+++ b/dlls/ntdll/tests/reg.c
@@ -410,6 +410,10 @@ static void test_NtDeleteKey(void)
OBJECT_ATTRIBUTES attr;
ACCESS_MASK am = KEY_ALL_ACCESS;
+ /* NULL check */
+ status = pNtDeleteKey(NULL);
+ ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got: 0x%08lx\n", status);
+
InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0);
status = pNtOpenKey(&hkey, am, &attr);
--
1.4.1
</PRE>
</BODY>
</HTML>