Improve Windows version detection with manifest
PATCH 1/1 Improve Windows version detection with manifest
From: Lev Stipakov <[email protected]...>
Add manifest file to detect Windows versions greater than Windows 8.
Below is an example output on Windows 10.
Before:
Windows version 6.2 (Windows 8 or greater) 64bit
After:
Windows version 10.0 (Windows 10 or greater) 64bit
--- src/compat/compat-versionhelpers.h | 6 +++++ src/openvpn/openvpn.manifest | 33 ++++++++++++++++++++++++++ src/openvpn/openvpn.vcxproj | 15 ++++++++++++ src/openvpn/openvpn.vcxproj.filters | 5 ++++ src/openvpn/openvpn_win32_resources.rc | 2 ++ src/openvpn/win32.c | 20 ++++++++++++++-- src/openvpn/win32.h | 8 ++++--- 7 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 src/openvpn/openvpn.manifest
src/compat/compat-versionhelpers.h +6 -0
@@ -95,6 +95,12 @@ IsWindows8Point1OrGreater(void)return IsWindowsVersionOrGreater (HIBYTE (_WIN32_WINNT_WINBLUE),LOBYTE (_WIN32_WINNT_WINBLUE),0 ); } +VERSIONHELPERAPI +IsWindows10OrGreater () +{ +return IsWindowsVersionOrGreater (HIBYTE (_WIN32_WINNT_WINTHRESHOLD),LOBYTE (_WIN32_WINNT_WINTHRESHOLD),0 ); +} +VERSIONHELPERAPI IsWindowsServer (void ) {
src/openvpn/openvpn.manifest new file +33 -0
@@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"> + <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> + <application> + <!-- Windows 10 --> + <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> + <!-- Windows 8.1 --> + <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> + <!-- Windows 8 --> + <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> + <!-- Windows 7 --> + <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> + <!-- Windows Vista --> + <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> + </application> + </compatibility> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <!-- + UAC settings: + - app should run at same integrity level as calling process + - app does not need to manipulate windows belonging to + higher-integrity-level processes + --> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> + </trustInfo> +</assembly>
src/openvpn/openvpn.vcxproj +15 -0
@@ -70,6 +70,18 @@ <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -311,6 +323,9 @@ <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> </ItemGroup> + <ItemGroup> + <Manifest Include="openvpn.manifest" /> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup>
src/openvpn/openvpn.vcxproj.filters +5 -0
@@ -515,4 +515,9 @@ <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> + <ItemGroup> + <Manifest Include="openvpn.manifest"> + <Filter>Resource Files</Filter> + </Manifest> + </ItemGroup> </Project>
src/openvpn/openvpn_win32_resources.rc +2 -0
@@ -7,6 +7,8 @@ #pragma code_page(65001) /* UTF8 */ +1 RT_MANIFEST "openvpn.manifest" + LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL VS_VERSION_INFO VERSIONINFO
src/openvpn/win32.c +18 -2
@@ -1417,10 +1417,18 @@ win32_version_info(void) {return WIN_7 ; } - else + +if (!IsWindows8Point1OrGreater ()) {return WIN_8 ; } + +if (!IsWindows10OrGreater ()) + { +return WIN_8_1 ; + } + +return WIN_10 ; }bool
@@ -1458,7 +1466,15 @@ win32_version_string(struct gc_arena *gc, bool add_name)break ;case WIN_8 : -buf_printf (&out,"6.2%s" , add_name ?" (Windows 8 or greater)" :"" ); +buf_printf (&out,"6.2%s" , add_name ?" (Windows 8)" :"" ); +break ; + +case WIN_8_1 : +buf_printf (&out,"6.3%s" , add_name ?" (Windows 8.1)" :"" ); +break ; + +case WIN_10 : +buf_printf (&out,"10.0%s" , add_name ?" (Windows 10 or greater)" :"" );break ;default :
src/openvpn/win32.h +5 -3
@@ -298,10 +298,12 @@ bool win_wfp_block_dns(const NET_IFINDEX index, const HANDLE msg_channel);bool win_wfp_uninit (const NET_IFINDEX index,const HANDLE msg_channel); -#define WIN_XP 0 +#define WIN_XP 0#define WIN_VISTA 1 -#define WIN_7 2 -#define WIN_8 3 +#define WIN_7 2 +#define WIN_8 3 +#define WIN_8_1 4 +#define WIN_10 5int win32_version_info (void );
Signature · 1 line
2.17.1
Gert Doering
NAKHi,
Quoted 3 lines · Lev Stipakov
From: Lev Stipakov <[email protected]...>
Add manifest file to detect Windows versions greater than Windows 8.
NAK, this breaks Ubuntu/MinGW builds. Actually, I think it breaks all windows builds, if you build from tarballs (which the "generic" build does - first, make dist, then, build from there).
You introduce an include to "openvpn.manifest", but this is not bundled, so
i686-w64-mingw32-windres -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -I../../src/compat -DWIN32_LEAN_AND_MEAN -DNTDDI_VERSION=NTDDI_VISTA -D_WIN32_WINNT=_WIN32_WINNT_VISTA -i "openvpn_win32_resources.rc" -o "openvpn_win32_resources.o"
i686-w64-mingw32-windres: can't open file `openvpn.manifest': No such file or directory
Makefile:933: recipe for target 'openvpn_win32_resources.o' failed
make[4]: *** [openvpn_win32_resources.o] Error 1
make[4]: *** Waiting for unfinished jobs....
And this is what breaks MinGW builds:
../../src/compat/compat-versionhelpers.h: In function 'IsWindows10OrGreater':../../src/compat/compat-versionhelpers.h:101:45: error: '_WIN32_WINNT_WINTHRESHOLD' undeclared (first use in this function); did you mean '_WIN32_WINNT_WINBLUE'?
return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINTHRESHOLD), LOBYTE(_WIN32_WINNT_WINTHRESHOLD), 0);
^../../src/compat/compat-versionhelpers.h:101:45: note: each undeclared identifier is reported only once for each function it appears in
possibly the _WIN32_WINNT_WINTHRESHOLD is missing on MinGW, at least the version bundled with Ubuntu 18.04 (I've skimmed the headers, and it's missing).
The rest of the code changes look good, and I have no idea what all the XML files do - but those are relevant for MSVC, and you are the expert on that ("if you say this is beneficial, I'll merge").
gert
Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany [email protected]...Hm.. I tested mingw build (windows-nsis) on Ubuntu 19.04 and everything worked fine.
That's because:
1) Ubuntu 19.04 probably has recent enough mingw with _WIN32_WINNT_WINTHRESHOLD
2) When I tested mingw build, I pointed source url to git repo, not to tarball - that's why it worked.
That XML is required (no matter msvc or mingw) to tell Windows that your app is Win10-aware and allows you
to use API which detects Windows >= 8.1
I'll send V2 with above issues fixed.
pe 24. heinäk. 2020 klo 21.40 Gert Doering ([email protected]...) kirjoitti:
Quoted 48 lines
Hi,
Quoted 3 lines · Lev Stipakov
From: Lev Stipakov <[email protected]...>
Add manifest file to detect Windows versions greater than Windows 8.
NAK, this breaks Ubuntu/MinGW builds. Actually, I think it breaks all windows builds, if you build from tarballs (which the "generic" build does - first, make dist, then, build from there).
You introduce an include to "openvpn.manifest", but this is not bundled, so
i686-w64-mingw32-windres -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -I../../src/compat -DWIN32_LEAN_AND_MEAN -DNTDDI_VERSION=NTDDI_VISTA -D_WIN32_WINNT=_WIN32_WINNT_VISTA -i "openvpn_win32_resources.rc" -o "openvpn_win32_resources.o"
i686-w64-mingw32-windres: can't open file `openvpn.manifest': No such file or directory
Makefile:933: recipe for target 'openvpn_win32_resources.o' failed
make[4]: *** [openvpn_win32_resources.o] Error 1
make[4]: *** Waiting for unfinished jobs....And this is what breaks MinGW builds:
../../src/compat/compat-versionhelpers.h: In function 'IsWindows10OrGreater':../../src/compat/compat-versionhelpers.h:101:45: error: '_WIN32_WINNT_WINTHRESHOLD' undeclared (first use in this function); did you mean '_WIN32_WINNT_WINBLUE'?return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINTHRESHOLD), LOBYTE(_WIN32_WINNT_WINTHRESHOLD), 0); ^
../../src/compat/compat-versionhelpers.h:101:45: note: each undeclared identifier is reported only once for each function it appears inpossibly the
_WIN32_WINNT_WINTHRESHOLDis missing on MinGW, at least the version bundled with Ubuntu 18.04 (I've skimmed the headers, and it's missing).The rest of the code changes look good, and I have no idea what all the XML files do - but those are relevant for MSVC, and you are the expert on that ("if you say this is beneficial, I'll merge").
gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh MistressGert Doering - Munich, Germany [email protected]...
Signature · 1 line
-Lev
Hi,
Quoted 2 lines · Lev Stipakov
2) When I tested mingw build, I pointed source url to git repo, not to tarball - that's why it worked.
How do you build? I use the "build-snapshot" script, and that does a "make dist" somewhere in between.
Quoted 3 lines
That XML is required (no matter msvc or mingw) to tell Windows that your app is Win10-aware and allows you
to use API which detects Windows >= 8.1
Thanks for explaining.
Quoted 1 line
I'll send V2 with above issues fixed.
Thanks :)
gert
Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany [email protected]...Quoted 2 lines
How do you build? I use the "build-snapshot" script, and that does a "make dist" somewhere in between.
[email protected]...:~/openvpn-build/windows-nsis$ OPENVPN_VERSION=fix-remove-impersonation OPENVPN_URL=https://github.com/lstipakov/openvpn/archive/fix/remove-impersonation.zip ./build-complete --use-depcache
Signature · 1 line
-Lev
Hi,
Quoted 7 lines · Lev Stipakov
Quoted 2 lines
How do you build? I use the "build-snapshot" script, and that does a "make dist" somewhere in between.
[email protected]...:~/openvpn-build/windows-nsis$ OPENVPN_VERSION=fix-remove-impersonation OPENVPN_URL=https://github.com/lstipakov/openvpn/archive/fix/remove-impersonation.zip ./build-complete --use-depcache
Ah, you point it at (effectively) a ready-made tarball.
I use "build-snapshot" which fetches a git repo + branch
Maybe build-complete does the same if "OPENVPN_URL" points to a git repo... dunno. I have
OPENVPN_URL="git://github.greenie.net/openvpn-236.git" OPENVPN_VERSION="${OPENVPN_VERSION:-2.5_git}"; export OPENVPN_VERSION OPENVPN_BRANCH="${OPENVPN_BRANCH:-master}"
gert
Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany [email protected]...PATCH v2 1/1 Improve Windows version detection with manifest
In reply to Gert DoeringFrom: Lev Stipakov <[email protected]...>
Add manifest file to detect Windows versions greater than Windows 8.
Below is example output on Windows 10.
Before:
Windows version 6.2 (Windows 8 or greater) 64bit
After:
Windows version 10.0 (Windows 10 or greater) 64bit
---
v2:
- fix build from tarball (added manifest file to EXTRA_DIST)
- fix build on old mingw like ubuntu 18.04 (added missig define)
src/compat/compat-versionhelpers.h | 10 ++++++++ src/openvpn/Makefile.am | 3 ++- src/openvpn/openvpn.manifest | 33 ++++++++++++++++++++++++++ src/openvpn/openvpn.vcxproj | 15 ++++++++++++ src/openvpn/openvpn.vcxproj.filters | 5 ++++ src/openvpn/openvpn_win32_resources.rc | 2 ++ src/openvpn/win32.c | 20 ++++++++++++++-- src/openvpn/win32.h | 8 ++++--- 8 files changed, 90 insertions(+), 6 deletions(-) create mode 100644 src/openvpn/openvpn.manifest
src/compat/compat-versionhelpers.h +10 -0
@@ -18,6 +18,10 @@#define _WIN32_WINNT_WINBLUE 0x0603 +#ifndef _WIN32_WINNT_WINTHRESHOLD +#define _WIN32_WINNT_WINTHRESHOLD 0x0A00 // Windows 10 +#endif +VERSIONHELPERAPI IsWindowsVersionOrGreater (WORD major,WORD minor,WORD servpack) {
@@ -95,6 +99,12 @@ IsWindows8Point1OrGreater(void)return IsWindowsVersionOrGreater (HIBYTE (_WIN32_WINNT_WINBLUE),LOBYTE (_WIN32_WINNT_WINBLUE),0 ); } +VERSIONHELPERAPI +IsWindows10OrGreater () +{ +return IsWindowsVersionOrGreater (HIBYTE (_WIN32_WINNT_WINTHRESHOLD),LOBYTE (_WIN32_WINNT_WINTHRESHOLD),0 ); +} +VERSIONHELPERAPI IsWindowsServer (void ) {
src/openvpn/Makefile.am +2 -1
@@ -16,7 +16,8 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = \ openvpn.vcxproj \ - openvpn.vcxproj.filters + openvpn.vcxproj.filters \ + openvpn.manifest AM_CPPFLAGS = \ -I$(top_srcdir)/include \
src/openvpn/openvpn.manifest new file +33 -0
@@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"> + <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> + <application> + <!-- Windows 10 --> + <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> + <!-- Windows 8.1 --> + <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> + <!-- Windows 8 --> + <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> + <!-- Windows 7 --> + <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> + <!-- Windows Vista --> + <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> + </application> + </compatibility> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <!-- + UAC settings: + - app should run at same integrity level as calling process + - app does not need to manipulate windows belonging to + higher-integrity-level processes + --> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> + </trustInfo> +</assembly>
src/openvpn/openvpn.vcxproj +15 -0
@@ -70,6 +70,18 @@ <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -311,6 +323,9 @@ <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> </ItemGroup> + <ItemGroup> + <Manifest Include="openvpn.manifest" /> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup>
src/openvpn/openvpn.vcxproj.filters +5 -0
@@ -515,4 +515,9 @@ <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> + <ItemGroup> + <Manifest Include="openvpn.manifest"> + <Filter>Resource Files</Filter> + </Manifest> + </ItemGroup> </Project>
src/openvpn/openvpn_win32_resources.rc +2 -0
@@ -7,6 +7,8 @@ #pragma code_page(65001) /* UTF8 */ +1 RT_MANIFEST "openvpn.manifest" + LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL VS_VERSION_INFO VERSIONINFO
src/openvpn/win32.c +18 -2
@@ -1417,10 +1417,18 @@ win32_version_info(void) {return WIN_7 ; } - else + +if (!IsWindows8Point1OrGreater ()) {return WIN_8 ; } + +if (!IsWindows10OrGreater ()) + { +return WIN_8_1 ; + } + +return WIN_10 ; }bool
@@ -1458,7 +1466,15 @@ win32_version_string(struct gc_arena *gc, bool add_name)break ;case WIN_8 : -buf_printf (&out,"6.2%s" , add_name ?" (Windows 8 or greater)" :"" ); +buf_printf (&out,"6.2%s" , add_name ?" (Windows 8)" :"" ); +break ; + +case WIN_8_1 : +buf_printf (&out,"6.3%s" , add_name ?" (Windows 8.1)" :"" ); +break ; + +case WIN_10 : +buf_printf (&out,"10.0%s" , add_name ?" (Windows 10 or greater)" :"" );break ;default :
src/openvpn/win32.h +5 -3
@@ -298,10 +298,12 @@ bool win_wfp_block_dns(const NET_IFINDEX index, const HANDLE msg_channel);bool win_wfp_uninit (const NET_IFINDEX index,const HANDLE msg_channel); -#define WIN_XP 0 +#define WIN_XP 0#define WIN_VISTA 1 -#define WIN_7 2 -#define WIN_8 3 +#define WIN_7 2 +#define WIN_8 3 +#define WIN_8_1 4 +#define WIN_10 5int win32_version_info (void );
Signature · 1 line
2.17.1
Thanks for the v2. Builds nicely with "./build-snapshot" on my ubuntu 18.04 builder now. I have not tested the resulting installer.
The code change for the C code look good to me.
Thanks for the explanation about the manifest ("I've heard that before, but I won't ever become a windows programmer, it seems"), and I assume that the .vcproj adaptions are related to that.
You are the expert on MSVC building, so if you say this is needed, and it does not look harmful, I'm fine :-)
Your patch has been applied to the master branch.
commit a7d6977e6e14c512c89e51886b235af153cd4841
Author: Lev Stipakov Date: Fri Jul 24 22:56:34 2020 +0300
Improve Windows version detection with manifest
Signed-off-by: Lev Stipakov <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg20580.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering