From: Lev Stipakov <lstipakov@gmail.com>
Date: Sun, 7 Feb 2016 20:21:32 +0000 (+0200)
Subject: Report Windows bitness
X-Git-Tag: v2.4_alpha1~141
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15f78acfae2f99b74a72b5766559f28c2d1d3cac;p=thirdparty%2Fopenvpn.git

Report Windows bitness

Trac #599

Signed-off-by: Lev Stipakov <lstipakov@gmail.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1454876492-6588-1-git-send-email-lstipakov@gmail.com>
URL: http://article.gmane.org/gmane.network.openvpn.devel/11086
Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/src/openvpn/win32.c b/src/openvpn/win32.c
index a01121b98..6b7a6ae45 100644
--- a/src/openvpn/win32.c
+++ b/src/openvpn/win32.c
@@ -1322,6 +1322,20 @@ win32_version_info()
     }
 }
 
+bool
+win32_is_64bit()
+{
+#if defined(_WIN64)
+    return true;  // 64-bit programs run only on Win64
+#elif defined(_WIN32)
+    // 32-bit programs run on both 32-bit and 64-bit Windows
+    BOOL f64 = FALSE;
+    return IsWow64Process(GetCurrentProcess(), &f64) && f64;
+#else
+    return false; // Win64 does not support Win16
+#endif
+}
+
 const char *
 win32_version_string(struct gc_arena *gc, bool add_name)
 {
@@ -1348,6 +1362,8 @@ win32_version_string(struct gc_arena *gc, bool add_name)
             break;
     }
 
+    buf_printf (&out, win32_is_64bit() ? " 64bit" : " 32bit");
+
     return (const char *)out.data;
 }