[ros-diffs] [reactos] 01/01: [SAMSRV] Older functions should call newer functions

[Eric Kohl]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf05fcbd294a9355e807e…

commit bf05fcbd294a9355e807e90a7baf2310b9d36f63
Author:     Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Sat Jul 3 14:46:32 2021 +0200
Commit:     Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Sat Jul 3 14:46:32 2021 +0200

    [SAMSRV] Older functions should call newer functions
---
 dll/win32/samsrv/samrpc.c | 59 ++++++++++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 24 deletions(-)

diff --git a/dll/win32/samsrv/samrpc.c b/dll/win32/samsrv/samrpc.c
index 9e443d00842..518ac75e0b5 100644
--- a/dll/win32/samsrv/samrpc.c
+++ b/dll/win32/samsrv/samrpc.c
@@ -8724,10 +8724,22 @@ SamrQueryDisplayInformation(IN SAMPR_HANDLE DomainHandle,
                             OUT unsigned long *TotalReturned,
                             OUT PSAMPR_DISPLAY_INFO_BUFFER Buffer)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    TRACE("SamrQueryDisplayInformation(%p %lu %lu %lu %lu %p %p %p)\n",
+          DomainHandle, DisplayInformationClass, Index,
+          EntryCount, PreferredMaximumLength, TotalAvailable,
+          TotalReturned, Buffer);
+
+    return SamrQueryDisplayInformation3(DomainHandle,
+                                        DisplayInformationClass,
+                                        Index,
+                                        EntryCount,
+                                        PreferredMaximumLength,
+                                        TotalAvailable,
+                                        TotalReturned,
+                                        Buffer);
 }
 
+
 /* Function 41 */
 NTSTATUS
 NTAPI
@@ -8736,10 +8748,16 @@ SamrGetDisplayEnumerationIndex(IN SAMPR_HANDLE DomainHandle,
                                IN PRPC_UNICODE_STRING Prefix,
                                OUT unsigned long *Index)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    TRACE("SamrGetDisplayEnumerationIndex(%p %lu %p %p)\n",
+          DomainHandle, DisplayInformationClass, Prefix, Index);
+
+    return SamrGetDisplayEnumerationIndex2(DomainHandle,
+                                           DisplayInformationClass,
+                                           Prefix,
+                                           Index);
 }
 
+
 /* Function 42 */
 NTSTATUS
 NTAPI
@@ -8749,6 +8767,7 @@ SamrTestPrivateFunctionsDomain(IN SAMPR_HANDLE DomainHandle)
     return STATUS_NOT_IMPLEMENTED;
 }
 
+
 /* Function 43 */
 NTSTATUS
 NTAPI
@@ -8955,14 +8974,14 @@ SamrQueryDisplayInformation2(IN SAMPR_HANDLE DomainHandle,
           EntryCount, PreferredMaximumLength, TotalAvailable,
           TotalReturned, Buffer);
 
-    return SamrQueryDisplayInformation(DomainHandle,
-                                       DisplayInformationClass,
-                                       Index,
-                                       EntryCount,
-                                       PreferredMaximumLength,
-                                       TotalAvailable,
-                                       TotalReturned,
-                                       Buffer);
+    return SamrQueryDisplayInformation3(DomainHandle,
+                                        DisplayInformationClass,
+                                        Index,
+                                        EntryCount,
+                                        PreferredMaximumLength,
+                                        TotalAvailable,
+                                        TotalReturned,
+                                        Buffer);
 }
 
 
@@ -8977,10 +8996,8 @@ SamrGetDisplayEnumerationIndex2(IN SAMPR_HANDLE DomainHandle,
     TRACE("SamrGetDisplayEnumerationIndex2(%p %lu %p %p)\n",
           DomainHandle, DisplayInformationClass, Prefix, Index);
 
-    return SamrGetDisplayEnumerationIndex(DomainHandle,
-                                          DisplayInformationClass,
-                                          Prefix,
-                                          Index);
+    UNIMPLEMENTED;
+    return STATUS_NOT_IMPLEMENTED;
 }
 
 
@@ -9416,14 +9433,8 @@ SamrQueryDisplayInformation3(IN SAMPR_HANDLE DomainHandle,
           EntryCount, PreferredMaximumLength, TotalAvailable,
           TotalReturned, Buffer);
 
-    return SamrQueryDisplayInformation(DomainHandle,
-                                       DisplayInformationClass,
-                                       Index,
-                                       EntryCount,
-                                       PreferredMaximumLength,
-                                       TotalAvailable,
-                                       TotalReturned,
-                                       Buffer);
+    UNIMPLEMENTED;
+    return STATUS_NOT_IMPLEMENTED;
 }