Trace winpty version info, move agent trace output as early as possible

src/agent/Agent.cc

@@ -126,8 +126,7 @@ Agent::Agent(LPCWSTR controlPipeName,
     m_directMode(false),
     m_ptySize(initialCols, initialRows)
 {
-    trace("Agent starting...");
-    dumpWindowsVersion();
+    trace("Agent::Agent entered");
 
     m_bufferData.resize(BUFFER_LINE_COUNT);
 

src/agent/main.cc

@@ -26,6 +26,7 @@
 #include "Agent.h"
 #include "DebugShowInput.h"
 #include "../shared/StringUtil.h"
+#include "../shared/WindowsVersion.h"
 #include "../shared/WinptyAssert.h"
 #include "../shared/WinptyVersion.h"
 
@@ -46,6 +47,9 @@ const char USAGE[] =
 
 int main()
 {
+    dumpWindowsVersion();
+    dumpVersionToTrace();
+
     // Technically, we should free the CommandLineToArgvW return value using
     // a single call to LocalFree, but the call will never actually happen in
     // the normal case.

src/libwinpty/subdir.mk

@@ -32,7 +32,8 @@ LIBWINPTY_OBJECTS = \
 	build/libwinpty/shared/WindowsSecurity.o \
 	build/libwinpty/shared/WindowsVersion.o \
 	build/libwinpty/shared/WinptyAssert.o \
-	build/libwinpty/shared/WinptyException.o
+	build/libwinpty/shared/WinptyException.o \
+	build/libwinpty/shared/WinptyVersion.o
 
 build/winpty.dll : $(LIBWINPTY_OBJECTS)
 	$(info Linking $@)

src/libwinpty/winpty.cc

@@ -37,6 +37,7 @@
 #include "../shared/WindowsSecurity.h"
 #include "../shared/WindowsVersion.h"
 #include "../shared/WinptyException.h"
+#include "../shared/WinptyVersion.h"
 
 // TODO: Error handling, handle out-of-memory.
 
@@ -334,6 +335,7 @@ static bool verifyPipeClientPid(HANDLE serverPipe, DWORD agentPid)
 WINPTY_API winpty_t *winpty_open(int cols, int rows)
 {
     dumpWindowsVersion();
+    dumpVersionToTrace();
 
     winpty_t *pc = new winpty_t;
 

src/shared/WinptyVersion.cc

@@ -22,6 +22,8 @@
 
 #include <stdio.h>
 
+#include "DebugClient.h"
+
 #define XSTRINGIFY(x) #x
 #define STRINGIFY(x) XSTRINGIFY(x)
 
@@ -29,3 +31,10 @@ void dumpVersionToStdout() {
     printf("winpty version %s%s\n", STRINGIFY(WINPTY_VERSION), STRINGIFY(WINPTY_VERSION_SUFFIX));
     printf("commit %s\n", STRINGIFY(WINPTY_COMMIT_HASH));
 }
+
+void dumpVersionToTrace() {
+    trace("winpty version %s%s (commit %s)",
+        STRINGIFY(WINPTY_VERSION),
+        STRINGIFY(WINPTY_VERSION_SUFFIX),
+        STRINGIFY(WINPTY_COMMIT_HASH));
+}

src/shared/WinptyVersion.h

@@ -22,5 +22,6 @@
 #define WINPTY_VERSION_H
 
 void dumpVersionToStdout();
+void dumpVersionToTrace();
 
 #endif // WINPTY_VERSION_H

src/winpty.gyp

@@ -144,6 +144,8 @@
                 'shared/WinptyAssert.cc',
                 'shared/WinptyException.h',
                 'shared/WinptyException.cc',
+                'shared/WinptyVersion.h',
+                'shared/WinptyVersion.cc',
                 'shared/winpty_snprintf.h',
             ],
         },