Jacek Caban : ntdll: Don't call NtOpenKeyEx directly from NtOpenKey.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 31fa3bbe96f746706ca065496b8777f1a89d735b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=31fa3bbe96f746706ca065496b...

Author: Jacek Caban 
Date:   Tue Feb  9 12:12:43 2016 +0100

ntdll: Don't call NtOpenKeyEx directly from NtOpenKey.

Needed by Office 2013.

Signed-off-by: Jacek Caban 
Signed-off-by: Alexandre Julliard 
(cherry picked from commit 7f005dc43cf76d09c9646969db1fa16639a1d960)
Signed-off-by: Michael Stefaniuc

---

dlls/ntdll/reg.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c
index 83749c4..788f1a7 100644
--- 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,