From 01e0c4f1cdfdf4e7823cc0bb8b2deca37bda49c9 Mon Sep 17 00:00:00 2001
From: wj32 <wj32@21ef857c-d57f-4fe0-8362-d861dc6d29cd>
Date: Mon, 19 Jul 2010 00:58:14 +0000
Subject: [PATCH] * show version in About * write OS version info to text file
 headers * include math.h in basesup.c

git-svn-id: svn://svn.code.sf.net/p/processhacker/code@3393 21ef857c-d57f-4fe0-8362-d861dc6d29cd
---
 2.x/trunk/ProcessHacker/ProcessHacker.rc |  4 ++--
 2.x/trunk/ProcessHacker/about.c          | 15 +++++++++++++++
 2.x/trunk/ProcessHacker/support.c        | 11 +++++++++++
 2.x/trunk/phlib/basesup.c                |  1 +
 2.x/trunk/phlib/global.c                 |  2 ++
 2.x/trunk/phlib/include/phbase.h         |  1 +
 6 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/2.x/trunk/ProcessHacker/ProcessHacker.rc b/2.x/trunk/ProcessHacker/ProcessHacker.rc
index 3e86aab27..e07fae630 100644
--- a/2.x/trunk/ProcessHacker/ProcessHacker.rc
+++ b/2.x/trunk/ProcessHacker/ProcessHacker.rc
@@ -590,8 +590,8 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,197,142,50,14
     ICON            IDI_PROCESSHACKER,IDC_STATIC,16,15,20,20
-    LTEXT           "Process Hacker",IDC_ABOUT_NAME,45,14,50,8
-    LTEXT           "Licensed under the GNU GPL, v3.",IDC_STATIC,45,27,107,8
+    LTEXT           "Process Hacker",IDC_ABOUT_NAME,45,14,192,8
+    LTEXT           "Licensed under the GNU GPL, v3.",IDC_STATIC,45,27,193,8
     GROUPBOX        "Credits",IDC_STATIC,7,42,240,95
     LTEXT           "wj32 - Project Manager",IDC_STATIC,15,53,76,8
     PUSHBUTTON      "Diagnostics",IDC_DIAGNOSTICS,7,142,50,14
diff --git a/2.x/trunk/ProcessHacker/about.c b/2.x/trunk/ProcessHacker/about.c
index 8ddf64cae..fa2e54bcf 100644
--- a/2.x/trunk/ProcessHacker/about.c
+++ b/2.x/trunk/ProcessHacker/about.c
@@ -31,6 +31,21 @@ static INT_PTR CALLBACK PhpAboutDlgProc(
 {
     switch (uMsg)
     {
+    case WM_INITDIALOG:
+        {
+            PPH_STRING versionString;
+
+            if (versionString = PhGetPhVersion())
+            {
+                PPH_STRING appName;
+
+                appName = PhConcatStrings2(L"Process Hacker ", versionString->Buffer);
+                SetDlgItemText(hwndDlg, IDC_ABOUT_NAME, appName->Buffer);
+                PhDereferenceObject(appName);
+                PhDereferenceObject(versionString);
+            }
+        }
+        break;
     case WM_COMMAND:
         {
             switch (LOWORD(wParam))
diff --git a/2.x/trunk/ProcessHacker/support.c b/2.x/trunk/ProcessHacker/support.c
index f5576585a..251e7733f 100644
--- a/2.x/trunk/ProcessHacker/support.c
+++ b/2.x/trunk/ProcessHacker/support.c
@@ -748,6 +748,17 @@ VOID PhWritePhTextHeader(
         PhDereferenceObject(version);
     }
 
+    PhFileStreamWriteStringFormat(FileStream, L"\r\nWindows NT %u.%u", PhOsVersion.dwMajorVersion, PhOsVersion.dwMinorVersion);
+
+    if (PhOsVersion.szCSDVersion[0] != 0)
+        PhFileStreamWriteStringFormat(FileStream, L" %s", PhOsVersion.szCSDVersion);
+
+#ifdef _M_IX86
+    PhFileStreamWriteStringAsAnsi2(FileStream, L" (32-bit)");
+#else
+    PhFileStreamWriteStringAsAnsi2(FileStream, L" (64-bit)");
+#endif
+
     PhQuerySystemTime(&time);
     PhLargeIntegerToLocalSystemTime(&systemTime, &time);
 
diff --git a/2.x/trunk/phlib/basesup.c b/2.x/trunk/phlib/basesup.c
index 8371dd47b..6fd6ea53a 100644
--- a/2.x/trunk/phlib/basesup.c
+++ b/2.x/trunk/phlib/basesup.c
@@ -22,6 +22,7 @@
 
 #define BASESUP_PRIVATE
 #include <phbase.h>
+#include <math.h>
 
 typedef struct _PHP_BASE_THREAD_CONTEXT
 {
diff --git a/2.x/trunk/phlib/global.c b/2.x/trunk/phlib/global.c
index 933bec496..3b5a62277 100644
--- a/2.x/trunk/phlib/global.c
+++ b/2.x/trunk/phlib/global.c
@@ -41,6 +41,7 @@ HFONT PhIconTitleFont;
 HINSTANCE PhInstanceHandle;
 HANDLE PhKphHandle = NULL;
 ULONG PhKphFeatures;
+RTL_OSVERSIONINFOEXW PhOsVersion;
 SYSTEM_BASIC_INFORMATION PhSystemBasicInformation;
 ULONG WindowsVersion;
 
@@ -174,6 +175,7 @@ static VOID PhInitializeWindowsVersion()
         return;
     }
 
+    memcpy(&PhOsVersion, &versionInfo, sizeof(RTL_OSVERSIONINFOEXW));
     majorVersion = versionInfo.dwMajorVersion;
     minorVersion = versionInfo.dwMinorVersion;
 
diff --git a/2.x/trunk/phlib/include/phbase.h b/2.x/trunk/phlib/include/phbase.h
index 71419eeae..54b7eab64 100644
--- a/2.x/trunk/phlib/include/phbase.h
+++ b/2.x/trunk/phlib/include/phbase.h
@@ -52,6 +52,7 @@ extern __userSet HFONT PhIconTitleFont;
 extern HINSTANCE PhInstanceHandle;
 extern __userSet HANDLE PhKphHandle;
 extern __userSet ULONG PhKphFeatures;
+extern RTL_OSVERSIONINFOEXW PhOsVersion;
 extern SYSTEM_BASIC_INFORMATION PhSystemBasicInformation;
 extern ULONG WindowsVersion;