diff options
| author | Lev Stipakov | 2016-02-07 22:21:32 +0200 |
|---|---|---|
| committer | Gert Doering | 2016-02-26 10:58:53 +0100 |
| commit | 6a8e946174509ca50c63842f155ce5c90cfe43e0 (patch) | |
| tree | 1461615ca7eaeb85d1a5bee13ff2cb6972811805 /src | |
| parent | 22f399f5509a56c7aaa57779b14a650d33d30e5e (diff) | |
| download | openvpn-6a8e946174509ca50c63842f155ce5c90cfe43e0.zip openvpn-6a8e946174509ca50c63842f155ce5c90cfe43e0.tar.gz | |
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>
(cherry picked from commit 15f78acfae2f99b74a72b5766559f28c2d1d3cac)
Diffstat (limited to 'src')
| -rw-r--r-- | src/openvpn/win32.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/openvpn/win32.c b/src/openvpn/win32.c index 1787dca..e17cca1 100644 --- a/src/openvpn/win32.c +++ b/src/openvpn/win32.c @@ -1342,6 +1342,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) { @@ -1368,6 +1382,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; } |