[PATCH 0/2] MR3301: Improve trace output

[PATCH 1/2] advapi32: Improve trace output for ADVAPI_GetDomainName.

[Vitaly Lipatov]

From: Vitaly Lipatov

---
 dlls/advapi32/lsa.c | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
index b63519c0299..c5b0f72c961 100644
--- a/dlls/advapi32/lsa.c
+++ b/dlls/advapi32/lsa.c
@@ -62,6 +62,30 @@ static void dumpLsaAttributes(const LSA_OBJECT_ATTRIBUTES *oa)
     }
 }

+static LPCSTR string_InformationClass[] =
+{
+    "(null)",
+    "PolicyAuditLogInformation",
+    "PolicyAuditEventsInformation",
+    "PolicyPrimaryDomainInformation",
+    "PolicyPdAccountInformation",
+    "PolicyAccountDomainInformation",
+    "PolicyLsaServerRoleInformation",
+    "PolicyReplicaSourceInformation",
+    "PolicyDefaultQuotaInformation",
+    "PolicyModificationInformation",
+    "PolicyAuditFullSetInformation",
+    "PolicyAuditFullQueryInformation",
+    "PolicyDnsDomainInformation"
+};
+
+static LPCSTR debugstr_InformationClass(IN POLICY_INFORMATION_CLASS InformationClass)
+{
+    if (InformationClass >= sizeof(string_InformationClass)/sizeof(string_InformationClass[0]))
+        return "(unknown)";
+    return string_InformationClass[InformationClass];
+}
+
 static void* ADVAPI_GetDomainName(unsigned sz, unsigned ofs)
 {
     HKEY key;
@@ -779,7 +803,7 @@ NTSTATUS WINAPI LsaQueryInformationPolicy(
     IN POLICY_INFORMATION_CLASS InformationClass,
     OUT PVOID *Buffer)
 {
-    TRACE("(%p,0x%08x,%p)\n", PolicyHandle, InformationClass, Buffer);
+    TRACE("(%p,0x%08x %s,%p)\n", PolicyHandle, InformationClass, debugstr_InformationClass(InformationClass), Buffer);

if(!Buffer) return STATUS_INVALID_PARAMETER;
     switch (InformationClass)

[PATCH 2/2] secur32: Improve trace (print NameFormat name) for GetUserNameExW.

[Vitaly Lipatov]

From: Vitaly Lipatov

---
 dlls/secur32/secur32.c | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c
index d703757bae7..e0100b3a8a0 100644
--- a/dlls/secur32/secur32.c
+++ b/dlls/secur32/secur32.c
@@ -1099,10 +1099,33 @@ BOOLEAN WINAPI GetUserNameExA(
     return rc;
 }

+static LPCSTR string_NameFormat[] =
+{
+    "NameUnknown",
+    "NameFullyQualifiedDN",
+    "NameSamCompatible",
+    "NameDisplay",
+    "NameUniqueId",
+    "NameCanonical",
+    "NameUserPrincipal",
+    "NameCanonicalEx",
+    "NameServicePrincipal",
+    "NameDnsDomain",
+    "NameGivenName",
+    "NameSurname"
+};
+
+static LPCSTR debugstr_NameFormat(IN EXTENDED_NAME_FORMAT NameFormat)
+{
+    if (NameFormat >= sizeof(string_NameFormat)/sizeof(string_NameFormat[0]))
+        return "(unknown)";
+    return string_NameFormat[NameFormat];
+}
+
 BOOLEAN WINAPI GetUserNameExW(
   EXTENDED_NAME_FORMAT NameFormat, LPWSTR lpNameBuffer, PULONG nSize)
 {
-    TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize);
+    TRACE("(%d %s %p %p)\n", NameFormat, debugstr_NameFormat(NameFormat), lpNameBuffer, nSize);

switch (NameFormat)
     {