[ros-diffs] [reactos] 04/04: [NETAPI32] Improve some error traces.

[Hermès Bélusca-Maïto]

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

commit da7cd27018a6c55e784949d114eb4cdf090f6738
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Sun Dec 29 16:08:38 2019 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Sun Dec 29 16:14:34 2019 +0100

    [NETAPI32] Improve some error traces.
---
 dll/win32/netapi32/group_new.c   | 20 ++++++++++----------
 dll/win32/netapi32/local_group.c | 26 +++++++++++++-------------
 dll/win32/netapi32/user.c        | 20 ++++++++++----------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/dll/win32/netapi32/group_new.c b/dll/win32/netapi32/group_new.c
index 027f1f72735..f8dbce66789 100644
--- a/dll/win32/netapi32/group_new.c
+++ b/dll/win32/netapi32/group_new.c
@@ -241,7 +241,7 @@ OpenGroupByName(
                                     &Use);
     if (!NT_SUCCESS(Status))
     {
-        WARN("SamLookupNamesInDomain failed (Status %08lx)\n", Status);
+        WARN("SamLookupNamesInDomain(%wZ) failed (Status %08lx)\n", GroupName,
Status);
         return NetpNtStatusToApiStatus(Status);
     }
 
@@ -521,7 +521,7 @@ NetGroupAddUser(
                                 NULL);
     if (ApiStatus != NERR_Success)
     {
-        ERR("OpenGroupByName failed (ApiStatus %lu)\n", ApiStatus);
+        ERR("OpenGroupByName(%wZ) failed (ApiStatus %lu)\n", &GroupName,
ApiStatus);
         if (ApiStatus == ERROR_NONE_MAPPED)
             ApiStatus = NERR_GroupNotFound;
         goto done;
@@ -534,7 +534,7 @@ NetGroupAddUser(
                                     &Use);
     if (!NT_SUCCESS(Status))
     {
-        ERR("SamLookupNamesInDomain failed (Status %08lx)\n", Status);
+        ERR("SamLookupNamesInDomain(%wZ) failed (Status %08lx)\n",
&UserName, Status);
         ApiStatus = NetpNtStatusToApiStatus(Status);
         goto done;
     }
@@ -631,7 +631,7 @@ NetGroupDel(
                                 NULL);
     if (ApiStatus != NERR_Success)
     {
-        ERR("OpenGroupByName failed (ApiStatus %lu)\n", ApiStatus);
+        ERR("OpenGroupByName(%wZ) failed (ApiStatus %lu)\n", &GroupName,
ApiStatus);
         if (ApiStatus == ERROR_NONE_MAPPED)
             ApiStatus = NERR_GroupNotFound;
         goto done;
@@ -720,7 +720,7 @@ NetGroupDelUser(
                                 NULL);
     if (ApiStatus != NERR_Success)
     {
-        ERR("OpenGroupByName failed (ApiStatus %lu)\n", ApiStatus);
+        ERR("OpenGroupByName(%wZ) failed (ApiStatus %lu)\n", &GroupName,
ApiStatus);
         if (ApiStatus == ERROR_NONE_MAPPED)
             ApiStatus = NERR_GroupNotFound;
         goto done;
@@ -733,7 +733,7 @@ NetGroupDelUser(
                                     &Use);
     if (!NT_SUCCESS(Status))
     {
-        ERR("SamLookupNamesInDomain failed (Status %08lx)\n", Status);
+        ERR("SamLookupNamesInDomain(%wZ) failed (Status %08lx)\n",
&UserName, Status);
         ApiStatus = NetpNtStatusToApiStatus(Status);
         goto done;
     }
@@ -1083,7 +1083,7 @@ NetGroupGetInfo(
                                 &RelativeId);
     if (ApiStatus != NERR_Success)
     {
-        ERR("OpenGroupByName failed (ApiStatus %lu)\n", ApiStatus);
+        ERR("OpenGroupByName(%wZ) failed (ApiStatus %lu)\n", &GroupName,
ApiStatus);
         if (ApiStatus == ERROR_NONE_MAPPED)
             ApiStatus = NERR_GroupNotFound;
         goto done;
@@ -1210,7 +1210,7 @@ NetGroupGetUsers(
                                     NULL);
         if (ApiStatus != NERR_Success)
         {
-            ERR("OpenGroupByName failed (ApiStatus %lu)\n", ApiStatus);
+            ERR("OpenGroupByName(%wZ) failed (ApiStatus %lu)\n",
&GroupName, ApiStatus);
             if (ApiStatus == ERROR_NONE_MAPPED)
                 ApiStatus = NERR_GroupNotFound;
             goto done;
@@ -1440,7 +1440,7 @@ NetGroupSetInfo(
                                 NULL);
     if (ApiStatus != NERR_Success)
     {
-        WARN("OpenGroupByName failed (ApiStatus %lu)\n", ApiStatus);
+        WARN("OpenGroupByName(%wZ) failed (ApiStatus %lu)\n", &GroupName,
ApiStatus);
         if (ApiStatus == ERROR_NONE_MAPPED)
             ApiStatus = NERR_GroupNotFound;
         goto done;
@@ -1697,7 +1697,7 @@ NetGroupSetUsers(
                                 NULL);
     if (ApiStatus != NERR_Success)
     {
-        ERR("OpenGroupByName failed (ApiStatus %lu)\n", ApiStatus);
+        ERR("OpenGroupByName(%wZ) failed (ApiStatus %lu)\n", &GroupName,
ApiStatus);
         if (ApiStatus == ERROR_NONE_MAPPED)
             ApiStatus = NERR_GroupNotFound;
         goto done;
diff --git a/dll/win32/netapi32/local_group.c b/dll/win32/netapi32/local_group.c
index 1ef5aa64f98..ab9a4cde1e4 100644
--- a/dll/win32/netapi32/local_group.c
+++ b/dll/win32/netapi32/local_group.c
@@ -182,7 +182,7 @@ OpenAliasByName(SAM_HANDLE DomainHandle,
                                     &Use);
     if (!NT_SUCCESS(Status))
     {
-        ERR("SamLookupNamesInDomain failed (Status %08lx)\n", Status);
+        ERR("SamLookupNamesInDomain(%wZ) failed (Status %08lx)\n", AliasName,
Status);
         return NetpNtStatusToApiStatus(Status);
     }
 
@@ -596,7 +596,7 @@ NetLocalGroupAddMembers(
                                 &AliasHandle);
     if (ApiStatus != NERR_Success && ApiStatus != ERROR_NONE_MAPPED)
     {
-        ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus);
+        ERR("OpenAliasByName(%wZ) failed (ApiStatus %lu)\n", &AliasName,
ApiStatus);
         goto done;
     }
 
@@ -624,7 +624,7 @@ NetLocalGroupAddMembers(
                                     &AliasHandle);
         if (ApiStatus != NERR_Success)
         {
-            ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus);
+            ERR("OpenAliasByName(%wZ) failed (ApiStatus %lu)\n",
&AliasName, ApiStatus);
             if (ApiStatus == ERROR_NONE_MAPPED)
                 ApiStatus = NERR_GroupNotFound;
             goto done;
@@ -723,7 +723,7 @@ NetLocalGroupDel(
                                 &AliasHandle);
     if (ApiStatus != NERR_Success && ApiStatus != ERROR_NONE_MAPPED)
     {
-        TRACE("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus);
+        TRACE("OpenAliasByName(%wZ) failed (ApiStatus %lu)\n", &GroupName,
ApiStatus);
         goto done;
     }
 
@@ -754,7 +754,7 @@ NetLocalGroupDel(
                                     &AliasHandle);
         if (ApiStatus != NERR_Success)
         {
-            ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus);
+            ERR("OpenAliasByName(%wZ) failed (ApiStatus %lu)\n",
&GroupName, ApiStatus);
             if (ApiStatus == ERROR_NONE_MAPPED)
                 ApiStatus = NERR_GroupNotFound;
             goto done;
@@ -893,7 +893,7 @@ NetLocalGroupDelMembers(
                                 &AliasHandle);
     if (ApiStatus != NERR_Success && ApiStatus != ERROR_NONE_MAPPED)
     {
-        ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus);
+        ERR("OpenAliasByName(%wZ) failed (ApiStatus %lu)\n", &AliasName,
ApiStatus);
         goto done;
     }
 
@@ -921,7 +921,7 @@ NetLocalGroupDelMembers(
                                     &AliasHandle);
         if (ApiStatus != NERR_Success)
         {
-            ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus);
+            ERR("OpenAliasByName(%wZ) failed (ApiStatus %lu)\n",
&AliasName, ApiStatus);
             if (ApiStatus == ERROR_NONE_MAPPED)
                 ApiStatus = NERR_GroupNotFound;
             goto done;
@@ -1276,7 +1276,7 @@ NetLocalGroupGetInfo(
                                 &AliasHandle);
     if (ApiStatus != NERR_Success && ApiStatus != ERROR_NONE_MAPPED)
     {
-        ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus);
+        ERR("OpenAliasByName(%wZ) failed (ApiStatus %lu)\n", &GroupName,
ApiStatus);
         goto done;
     }
 
@@ -1304,7 +1304,7 @@ NetLocalGroupGetInfo(
                                     &AliasHandle);
         if (ApiStatus != NERR_Success)
         {
-            ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus);
+            ERR("OpenAliasByName(%wZ) failed (ApiStatus %lu)\n",
&GroupName, ApiStatus);
             if (ApiStatus == ERROR_NONE_MAPPED)
                 ApiStatus = NERR_GroupNotFound;
             goto done;
@@ -1431,7 +1431,7 @@ NetLocalGroupGetMembers(
                                     &EnumContext->AliasHandle);
         if (ApiStatus != NERR_Success && ApiStatus != ERROR_NONE_MAPPED)
         {
-            ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus);
+            ERR("OpenAliasByName(%wZ) failed (ApiStatus %lu)\n",
&AliasName, ApiStatus);
             goto done;
         }
 
@@ -1459,7 +1459,7 @@ NetLocalGroupGetMembers(
                                         &EnumContext->AliasHandle);
             if (ApiStatus != NERR_Success)
             {
-                ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus);
+                ERR("OpenAliasByName(%wZ) failed (ApiStatus %lu)\n",
&AliasName, ApiStatus);
                 if (ApiStatus == ERROR_NONE_MAPPED)
                     ApiStatus = NERR_GroupNotFound;
                 goto done;
@@ -1787,7 +1787,7 @@ NetLocalGroupSetInfo(
                                 &AliasHandle);
     if (ApiStatus != NERR_Success && ApiStatus != ERROR_NONE_MAPPED)
     {
-        ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus);
+        ERR("OpenAliasByName(%wZ) failed (ApiStatus %lu)\n", &AliasName,
ApiStatus);
         goto done;
     }
 
@@ -1815,7 +1815,7 @@ NetLocalGroupSetInfo(
                                     &AliasHandle);
         if (ApiStatus != NERR_Success)
         {
-            ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus);
+            ERR("OpenAliasByName(%wZ) failed (ApiStatus %lu)\n",
&AliasName, ApiStatus);
             if (ApiStatus == ERROR_NONE_MAPPED)
                 ApiStatus = NERR_GroupNotFound;
             goto done;
diff --git a/dll/win32/netapi32/user.c b/dll/win32/netapi32/user.c
index 4e0c8b65335..74f351e055e 100644
--- a/dll/win32/netapi32/user.c
+++ b/dll/win32/netapi32/user.c
@@ -2230,7 +2230,7 @@ OpenUserByName(SAM_HANDLE DomainHandle,
                                     &Use);
     if (!NT_SUCCESS(Status))
     {
-        ERR("SamLookupNamesInDomain failed (Status %08lx)\n", Status);
+        ERR("SamLookupNamesInDomain(%wZ) failed (Status %08lx)\n", UserName,
Status);
         return NetpNtStatusToApiStatus(Status);
     }
 
@@ -2588,7 +2588,7 @@ NetUserDel(LPCWSTR servername,
                                &UserHandle);
     if (ApiStatus != NERR_Success && ApiStatus != ERROR_NONE_MAPPED)
     {
-        TRACE("OpenUserByName failed (ApiStatus %lu)\n", ApiStatus);
+        TRACE("OpenUserByName(%wZ) failed (ApiStatus %lu)\n", &UserName,
ApiStatus);
         goto done;
     }
 
@@ -2619,7 +2619,7 @@ NetUserDel(LPCWSTR servername,
                                    &UserHandle);
         if (ApiStatus != NERR_Success)
         {
-            ERR("OpenUserByName failed (ApiStatus %lu)\n", ApiStatus);
+            ERR("OpenUserByName(%wZ) failed (ApiStatus %lu)\n", &UserName,
ApiStatus);
             if (ApiStatus == ERROR_NONE_MAPPED)
                 ApiStatus = NERR_UserNotFound;
             goto done;
@@ -3039,7 +3039,7 @@ NetUserGetGroups(LPCWSTR servername,
                            &AccountDomainHandle);
     if (!NT_SUCCESS(Status))
     {
-        ERR("OpenAccountDomain failed (Status %08lx)\n", Status);
+        ERR("SamOpenDomain failed (Status %08lx)\n", Status);
         ApiStatus = NetpNtStatusToApiStatus(Status);
         goto done;
     }
@@ -3052,7 +3052,7 @@ NetUserGetGroups(LPCWSTR servername,
                                     &Use);
     if (!NT_SUCCESS(Status))
     {
-        ERR("SamLookupNamesInDomain failed (Status %08lx)\n", Status);
+        ERR("SamLookupNamesInDomain(%wZ) failed (Status %08lx)\n",
&UserName, Status);
         if (Status == STATUS_NONE_MAPPED)
             ApiStatus = NERR_UserNotFound;
         else
@@ -3226,7 +3226,7 @@ NetUserGetInfo(LPCWSTR servername,
                            &AccountDomainHandle);
     if (!NT_SUCCESS(Status))
     {
-        ERR("OpenAccountDomain failed (Status %08lx)\n", Status);
+        ERR("SamOpenDomain failed (Status %08lx)\n", Status);
         ApiStatus = NetpNtStatusToApiStatus(Status);
         goto done;
     }
@@ -3239,7 +3239,7 @@ NetUserGetInfo(LPCWSTR servername,
                                     &Use);
     if (!NT_SUCCESS(Status))
     {
-        ERR("SamOpenDomain failed (Status %08lx)\n", Status);
+        ERR("SamLookupNamesInDomain(%wZ) failed (Status %08lx)\n",
&UserName, Status);
         if (Status == STATUS_NONE_MAPPED)
             ApiStatus = NERR_UserNotFound;
         else
@@ -3414,7 +3414,7 @@ NetUserGetLocalGroups(LPCWSTR servername,
                            &AccountDomainHandle);
     if (!NT_SUCCESS(Status))
     {
-        ERR("OpenAccountDomain failed (Status %08lx)\n", Status);
+        ERR("SamOpenDomain failed (Status %08lx)\n", Status);
         ApiStatus = NetpNtStatusToApiStatus(Status);
         goto done;
     }
@@ -3427,7 +3427,7 @@ NetUserGetLocalGroups(LPCWSTR servername,
                                     &Use);
     if (!NT_SUCCESS(Status))
     {
-        ERR("SamLookupNamesInDomain failed (Status %08lx)\n", Status);
+        ERR("SamLookupNamesInDomain(%wZ) failed (Status %08lx)\n",
&UserName, Status);
         if (Status == STATUS_NONE_MAPPED)
             ApiStatus = NERR_UserNotFound;
         else
@@ -4063,7 +4063,7 @@ NetUserSetInfo(LPCWSTR servername,
                                &UserHandle);
     if (ApiStatus != NERR_Success)
     {
-        ERR("OpenUserByName failed (ApiStatus %lu)\n", ApiStatus);
+        ERR("OpenUserByName(%wZ) failed (ApiStatus %lu)\n", &UserName,
ApiStatus);
         goto done;
     }