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> (cherry picked from commit 7f005dc4) Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

ntdll: Don't call NtOpenKeyEx directly from NtOpenKey.
31fa3bbe · Jacek Caban · Michael Stefaniuc · cec6924b · 31fa3bbe
Commit 31fa3bbe authored Feb 09, 2016 by Jacek Caban Committed by Michael Stefaniuc Mar 20, 2016
Hide 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;
    DWORD len;
@@ -154,6 +150,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.@]
 *
@@ -163,7 +168,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,