[DRWTSN32][SHIMDBG] Add missing va_end.

[reactos.git] / base / applications / drwtsn32 / main.cpp

diff --git a/base/applications/drwtsn32/main.cpp b/base/applications/drwtsn32/main.cpp
index 2ac1e05..65c7dc1 100644 (file)
--- a/base/applications/drwtsn32/main.cpp
+++ b/base/applications/drwtsn32/main.cpp
@@ -32,6 +32,7 @@ void xfprintf(FILE* stream, const char *fmt, ...)
     va_start(ap, fmt);
     vfprintf(stream, fmt, ap);
     vDbgPrintEx(-1, DPFLTR_ERROR_LEVEL, fmt, ap);
+    va_end(ap);
 }
 
 
@@ -91,15 +92,41 @@ void PrintBugreport(FILE* output, DumpData& data)
 
         xfprintf(output, NEWLINE "State Dump for Thread Id 0x%x" NEWLINE NEWLINE, it->first);
         const CONTEXT& ctx = it->second.Context;
-        if (ctx.ContextFlags & CONTEXT_INTEGER)
+        if ((ctx.ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER)
+        {
+#if defined(_M_IX86)
             xfprintf(output, "eax:%p ebx:%p ecx:%p edx:%p esi:%p edi:%p" NEWLINE,
                      ctx.Eax, ctx.Ebx, ctx.Ecx, ctx.Edx, ctx.Esi, ctx.Edi);
-        if (ctx.ContextFlags & CONTEXT_CONTROL)
+#elif defined(_M_AMD64)
+            xfprintf(output, "rax:%p rbx:%p rcx:%p rdx:%p rsi:%p rdi:%p" NEWLINE,
+                     ctx.Rax, ctx.Rbx, ctx.Rcx, ctx.Rdx, ctx.Rsi, ctx.Rdi);
+            xfprintf(output, "r8:%p r9:%p r10:%p r11:%p r12:%p r13:%p r14:%p r15:%p" NEWLINE,
+                     ctx.R8, ctx.R9, ctx.R10, ctx.R11, ctx.R12, ctx.R13, ctx.R14, ctx.R15);
+#else
+#error Unknown architecture
+#endif
+        }
+        if ((ctx.ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL)
+        {
+#if defined(_M_IX86)
             xfprintf(output, "eip:%p esp:%p ebp:%p" NEWLINE,
                      ctx.Eip, ctx.Esp, ctx.Ebp);
-        if (ctx.ContextFlags & CONTEXT_DEBUG_REGISTERS)
+#elif defined(_M_AMD64)
+            xfprintf(output, "rip:%p rsp:%p rbp:%p" NEWLINE,
+                     ctx.Rip, ctx.Rsp, ctx.Rbp);
+#else
+#error Unknown architecture
+#endif
+        }
+        if ((ctx.ContextFlags & CONTEXT_DEBUG_REGISTERS) == CONTEXT_DEBUG_REGISTERS)
+        {
+#if defined(_M_IX86) || defined(_M_AMD64)
             xfprintf(output, "dr0:%p dr1:%p dr2:%p dr3:%p dr6:%p dr7:%p" NEWLINE,
                      ctx.Dr0, ctx.Dr1, ctx.Dr2, ctx.Dr3, ctx.Dr6, ctx.Dr7);
+#else
+#error Unknown architecture
+#endif
+        }
 
         PrintStackBacktrace(output, data, it->second);
     }