ntdll: Don't call NtOpenKeyEx directly from NtOpenKey.

Needed by Office 2013. Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Don't call NtOpenKeyEx directly from NtOpenKey.
7f005dc4 · Jacek Caban · Alexandre Julliard · 443c2a47 · 7f005dc4
Commit 7f005dc4 authored Feb 09, 2016 by Jacek Caban Committed by Alexandre Julliard Feb 09, 2016
Show whitespace changes
Inline Side-by-side

Showing with 11 additions and 6 deletions

reg.c dlls/ntdll/reg.c +11 -6

No files found.
--- a/dlls/ntdll/reg.c
+++ b/dlls/ntdll/reg.c
@@ -120,11 +120,7 @@ NTSTATUS WINAPI RtlpNtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJEC
    return NtCreateKey(retkey, access, attr, 0, NULL, 0, dispos);
 }

-/******************************************************************************
- * NtOpenKeyEx [NTDLL.@]
- * ZwOpenKeyEx [NTDLL.@]
- */
-NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG options )
+static NTSTATUS open_key( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG options )
 {
    NTSTATUS ret;

@@ -151,6 +147,15 @@ NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT
 }

 /******************************************************************************
+ * NtOpenKeyEx [NTDLL.@]
+ * ZwOpenKeyEx [NTDLL.@]
+ */
+NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG options )
+{
+    return open_key( retkey, access, attr, options );
+}
+
+/******************************************************************************
 * NtOpenKey [NTDLL.@]
 * ZwOpenKey [NTDLL.@]
 *
@@ -160,7 +165,7 @@ NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT
 */
 NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr )
 {
-    return NtOpenKeyEx( retkey, access, attr, 0 );
+    return open_key( retkey, access, attr, 0 );
 }

 NTSTATUS WINAPI NtOpenKeyTransactedEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr,