[PATCH v10 2/2] secur32: Print also text name for EXTENDED_NAME_FORMAT argument.

[Vitaly Lipatov]

From: Vitaly Lipatov

---
 dlls/secur32/secur32.c | 44 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c
index 46a80c9a76c..5d067bf8ff8 100644
--- a/dlls/secur32/secur32.c
+++ b/dlls/secur32/secur32.c
@@ -816,6 +816,34 @@ SECURITY_STATUS WINAPI EnumerateSecurityPackagesA(PULONG pcPackages,
     return ret;
 }

+
+static LPCSTR string_NameFormat[] =
+{
+    "NameUnknown",
+    "NameFullyQualifiedDN",
+    "NameSamCompatible",
+    "NameDisplay",
+    "(unknown)",
+    "(unknown)",
+    "NameUniqueId",
+    "NameCanonical",
+    "NameUserPrincipal",
+    "NameCanonicalEx",
+    "NameServicePrincipal",
+    "(unknown)",
+    "NameDnsDomain",
+    "NameGivenName",
+    "NameSurname"
+};
+
+static LPCSTR debugstr_NameFormat(IN EXTENDED_NAME_FORMAT NameFormat)
+{
+    if (NameFormat >= ARRAY_SIZE(string_NameFormat))
+        return "(unknown)";
+    return string_NameFormat[NameFormat];
+}
+
+
 /***********************************************************************
  *		GetComputerObjectNameA (SECUR32.@)
  *
@@ -847,7 +875,7 @@ BOOLEAN WINAPI GetComputerObjectNameA(
     LPWSTR bufferW = NULL;
     ULONG sizeW = *nSize;

-    TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize);
+    TRACE("(%s(%d) %p %p)\n", debugstr_NameFormat(NameFormat), NameFormat, lpNameBuffer, nSize);

if (lpNameBuffer) {
         if (!(bufferW = malloc(sizeW * sizeof(WCHAR)))) {
@@ -879,7 +907,7 @@ BOOLEAN WINAPI GetComputerObjectNameW(
     NTSTATUS ntStatus;
     BOOLEAN status;

-    TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize);
+    TRACE("(%s(%d) %p %p)\n", debugstr_NameFormat(NameFormat), NameFormat, lpNameBuffer, nSize);

if (NameFormat == NameUnknown)
     {
@@ -1066,7 +1094,7 @@ BOOLEAN WINAPI GetUserNameExA(
     BOOLEAN rc;
     LPWSTR bufferW = NULL;
     ULONG sizeW = *nSize;
-    TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize);
+    TRACE("(%s(%d) %p %p)\n", debugstr_NameFormat(NameFormat), NameFormat, lpNameBuffer, nSize);
     if (lpNameBuffer) {
         bufferW = malloc(sizeW * sizeof(WCHAR));
         if (bufferW == NULL) {
@@ -1098,7 +1126,7 @@ BOOLEAN WINAPI GetUserNameExA(
 BOOLEAN WINAPI GetUserNameExW(
   EXTENDED_NAME_FORMAT NameFormat, LPWSTR lpNameBuffer, PULONG nSize)
 {
-    TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize);
+    TRACE("(%s(%d) %p %p)\n", debugstr_NameFormat(NameFormat), NameFormat, lpNameBuffer, nSize);

switch (NameFormat)
     {
@@ -1154,8 +1182,8 @@ BOOLEAN WINAPI TranslateNameA(
   EXTENDED_NAME_FORMAT DesiredNameFormat, LPSTR lpTranslatedName,
   PULONG nSize)
 {
-    FIXME("%p %d %d %p %p\n", lpAccountName, AccountNameFormat,
-          DesiredNameFormat, lpTranslatedName, nSize);
+    FIXME("%p %s(%d) %s(%d) %p %p\n", lpAccountName, debugstr_NameFormat(AccountNameFormat), AccountNameFormat,
+          debugstr_NameFormat(DesiredNameFormat), DesiredNameFormat, lpTranslatedName, nSize);
     return FALSE;
 }

@@ -1164,8 +1192,8 @@ BOOLEAN WINAPI TranslateNameW(
   EXTENDED_NAME_FORMAT DesiredNameFormat, LPWSTR lpTranslatedName,
   PULONG nSize)
 {
-    FIXME("%p %d %d %p %p\n", lpAccountName, AccountNameFormat,
-          DesiredNameFormat, lpTranslatedName, nSize);
+    FIXME("%p %s(%d) %s(%d) %p %p\n", lpAccountName, debugstr_NameFormat(AccountNameFormat), AccountNameFormat,
+          debugstr_NameFormat(DesiredNameFormat), DesiredNameFormat, lpTranslatedName, nSize);
     return FALSE;
 }