Skip to content

Commit 3d35c1c

Browse files
jimevansjimevans
committed
Correcting IE driver build process to create executables runnable on Windows XP
Fixes issue #936.
1 parent 26b6d70 commit 3d35c1c

File tree

13 files changed

+72
-34
lines changed

13 files changed

+72
-34
lines changed

‎cpp/iedriver/BrowserFactory.cpp

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <sddl.h>
2424
#include <shlguid.h>
2525
#include <shlobj.h>
26-
#include <VersionHelpers.h>
2726
#include <WinInet.h>
2827
#include "FileUtilities.h"
2928
#include "logging.h"
@@ -64,7 +63,7 @@ void BrowserFactory::Initialize(BrowserFactorySettings settings) {
6463
void BrowserFactory::ClearCache() {
6564
LOG(TRACE) << "Entering BrowserFactory::ClearCache";
6665
if (this->clear_cache_) {
67-
if (::IsWindowsVistaOrGreater()) {
66+
if (IsWindowsVistaOrGreater()) {
6867
LOG(DEBUG) << "Clearing cache with low mandatory integrity level as required on Windows Vista or later.";
6968
this->InvokeClearCacheUtility(true);
7069
}
@@ -635,7 +634,7 @@ IWebBrowser2* BrowserFactory::CreateBrowser() {
635634

636635
IWebBrowser2* browser = NULL;
637636
DWORD context = CLSCTX_LOCAL_SERVER;
638-
if (this->ie_major_version_ == 7 && ::IsWindowsVistaOrGreater()) {
637+
if (this->ie_major_version_ == 7 && IsWindowsVistaOrGreater()) {
639638
// ONLY for IE 7 on Windows Vista. XP and below do not have Protected Mode;
640639
// Windows 7 shipped with IE8.
641640
context = context | CLSCTX_ENABLE_CLOAKING;
@@ -995,14 +994,14 @@ bool BrowserFactory::ProtectedModeSettingsAreValid() {
995994
bool settings_are_valid = true;
996995
LOG(DEBUG) << "Detected IE version: " << this->ie_major_version_
997996
<< ", Windows version supports Protected Mode: "
998-
<< ::IsWindowsVistaOrGreater() ? "true" : "false";
997+
<< IsWindowsVistaOrGreater() ? "true" : "false";
999998
// Only need to check Protected Mode settings on IE 7 or higher
1000999
// and on Windows Vista or higher. Otherwise, Protected Mode
10011000
// doesn't come into play, and are valid.
10021001
// Documentation of registry settings can be found at the following
10031002
// Microsoft KnowledgeBase article:
10041003
// http://support.microsoft.com/kb/182569
1005-
if (this->ie_major_version_ >= 7 && ::IsWindowsVistaOrGreater()) {
1004+
if (this->ie_major_version_ >= 7 && IsWindowsVistaOrGreater()) {
10061005
HKEY key_handle;
10071006
if (ERROR_SUCCESS == ::RegOpenKeyEx(HKEY_CURRENT_USER,
10081007
IE_SECURITY_ZONES_REGISTRY_KEY,
@@ -1113,4 +1112,29 @@ int BrowserFactory::GetZoneProtectedModeSetting(const HKEY key_handle,
11131112
return protected_mode_value;
11141113
}
11151114

1115+
bool BrowserFactory::IsWindowsVersionOrGreater(unsigned short major_version,
1116+
unsigned short minor_version,
1117+
unsigned short service_pack) {
1118+
OSVERSIONINFOEXW osvi = { sizeof(osvi), 0, 0, 0, 0,{ 0 }, 0, 0 };
1119+
DWORDLONG const dwlConditionMask = VerSetConditionMask(
1120+
VerSetConditionMask(
1121+
VerSetConditionMask(
1122+
0, VER_MAJORVERSION, VER_GREATER_EQUAL),
1123+
VER_MINORVERSION, VER_GREATER_EQUAL),
1124+
VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL);
1125+
1126+
osvi.dwMajorVersion = major_version;
1127+
osvi.dwMinorVersion = minor_version;
1128+
osvi.wServicePackMajor = service_pack;
1129+
1130+
return VerifyVersionInfoW(&osvi,
1131+
VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR,
1132+
dwlConditionMask) != FALSE;
1133+
}
1134+
1135+
bool BrowserFactory::IsWindowsVistaOrGreater() {
1136+
return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_VISTA), LOBYTE(_WIN32_WINNT_VISTA), 0);
1137+
}
1138+
1139+
11161140
} // namespace webdriver

‎cpp/iedriver/BrowserFactory.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,13 @@ class BrowserFactory {
127127
static BOOL CALLBACK FindChildWindowForProcess(HWND hwnd, LPARAM arg);
128128
static BOOL CALLBACK FindDialogWindowForProcess(HWND hwnd, LPARAM arg);
129129

130+
static bool IsWindowsVistaOrGreater(void);
131+
130132
private:
131133
static BOOL CALLBACK FindBrowserWindow(HWND hwnd, LPARAM param);
134+
static bool IsWindowsVersionOrGreater(unsigned short major_version,
135+
unsigned short minor_version,
136+
unsigned short service_pack);
132137

133138
UINT html_getobject_msg_;
134139
HINSTANCE oleacc_instance_handle_;

‎cpp/iedriver/IEDriver.vcxproj

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,33 +22,34 @@
2222
<ProjectGuid>{BB72383B-427F-4191-B692-E4345A30E33C}</ProjectGuid>
2323
<RootNamespace>IEDriver</RootNamespace>
2424
<Keyword>Win32Proj</Keyword>
25+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
2526
</PropertyGroup>
2627
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2728
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2829
<ConfigurationType>DynamicLibrary</ConfigurationType>
2930
<UseOfAtl>Static</UseOfAtl>
3031
<CharacterSet>Unicode</CharacterSet>
3132
<WholeProgramOptimization>true</WholeProgramOptimization>
32-
<PlatformToolset>v140</PlatformToolset>
33+
<PlatformToolset>v140_xp</PlatformToolset>
3334
</PropertyGroup>
3435
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3536
<ConfigurationType>DynamicLibrary</ConfigurationType>
3637
<UseOfAtl>Static</UseOfAtl>
3738
<CharacterSet>Unicode</CharacterSet>
38-
<PlatformToolset>v140</PlatformToolset>
39+
<PlatformToolset>v140_xp</PlatformToolset>
3940
</PropertyGroup>
4041
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4142
<ConfigurationType>DynamicLibrary</ConfigurationType>
4243
<UseOfAtl>Static</UseOfAtl>
4344
<CharacterSet>Unicode</CharacterSet>
4445
<WholeProgramOptimization>true</WholeProgramOptimization>
45-
<PlatformToolset>v140</PlatformToolset>
46+
<PlatformToolset>v140_xp</PlatformToolset>
4647
</PropertyGroup>
4748
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4849
<ConfigurationType>DynamicLibrary</ConfigurationType>
4950
<UseOfAtl>Static</UseOfAtl>
5051
<CharacterSet>Unicode</CharacterSet>
51-
<PlatformToolset>v140</PlatformToolset>
52+
<PlatformToolset>v140_xp</PlatformToolset>
5253
</PropertyGroup>
5354
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5455
<ImportGroup Label="ExtensionSettings">
@@ -114,7 +115,7 @@
114115
<AdditionalDependencies>ws2_32.lib;Rpcrt4.lib;version.lib;iepmapi.lib;psapi.lib;oleacc.lib;comsuppw.lib;wininet.lib;urlmon.lib;%(AdditionalDependencies)</AdditionalDependencies>
115116
<GenerateDebugInformation>true</GenerateDebugInformation>
116117
<AssemblyDebug>true</AssemblyDebug>
117-
<SubSystem>NotSet</SubSystem>
118+
<SubSystem>Console</SubSystem>
118119
<RandomizedBaseAddress>false</RandomizedBaseAddress>
119120
<DataExecutionPrevention>
120121
</DataExecutionPrevention>
@@ -144,7 +145,7 @@
144145
<AdditionalDependencies>ws2_32.lib;Rpcrt4.lib;version.lib;iepmapi.lib;psapi.lib;oleacc.lib;comsuppw.lib;wininet.lib;urlmon.lib;%(AdditionalDependencies)</AdditionalDependencies>
145146
<GenerateDebugInformation>true</GenerateDebugInformation>
146147
<AssemblyDebug>true</AssemblyDebug>
147-
<SubSystem>NotSet</SubSystem>
148+
<SubSystem>Console</SubSystem>
148149
<RandomizedBaseAddress>false</RandomizedBaseAddress>
149150
<DataExecutionPrevention>
150151
</DataExecutionPrevention>
@@ -169,7 +170,7 @@
169170
<Link>
170171
<AdditionalDependencies>ws2_32.lib;Rpcrt4.lib;version.lib;iepmapi.lib;psapi.lib;oleacc.lib;comsuppw.lib;wininet.lib;urlmon.lib;%(AdditionalDependencies)</AdditionalDependencies>
171172
<GenerateDebugInformation>true</GenerateDebugInformation>
172-
<SubSystem>Windows</SubSystem>
173+
<SubSystem>Console</SubSystem>
173174
<OptimizeReferences>true</OptimizeReferences>
174175
<EnableCOMDATFolding>true</EnableCOMDATFolding>
175176
<TargetMachine>MachineX86</TargetMachine>
@@ -196,7 +197,7 @@
196197
<Link>
197198
<AdditionalDependencies>ws2_32.lib;Rpcrt4.lib;version.lib;iepmapi.lib;psapi.lib;oleacc.lib;comsuppw.lib;wininet.lib;urlmon.lib;%(AdditionalDependencies)</AdditionalDependencies>
198199
<GenerateDebugInformation>true</GenerateDebugInformation>
199-
<SubSystem>Windows</SubSystem>
200+
<SubSystem>Console</SubSystem>
200201
<OptimizeReferences>true</OptimizeReferences>
201202
<EnableCOMDATFolding>true</EnableCOMDATFolding>
202203
<TargetMachine>MachineX64</TargetMachine>

‎cpp/iedriver/IEServer.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#include "IEServer.h"
1818
#include "IESession.h"
19-
#include <VersionHelpers.h>
2019
#include "FileUtilities.h"
2120
#include "logging.h"
2221

‎cpp/iedriverserver/CHANGELOG

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ available via the project downloads page. Changes in "revision" field indicate
99
private releases checked into the prebuilts directory of the source tree, but
1010
not made generally available on the downloads page.
1111

12+
v2.47.0.2
13+
=========
14+
* Corrected build process to create executables runnable on Windows XP.
15+
1216
v2.47.0.1
1317
=========
1418
* Added logging messages for IE driver for bitness mismatches. This commit

‎cpp/iedriverserver/IEDriverServer.rc

0 Bytes
Binary file not shown.

‎cpp/iedriverserver/IEDriverServer.vcxproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,37 +22,38 @@
2222
<ProjectGuid>{08C3286F-F132-44EC-80F0-2DF30D87A5D3}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>InternetExplorerDriver</RootNamespace>
25+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
2526
</PropertyGroup>
2627
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2728
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2829
<ConfigurationType>Application</ConfigurationType>
2930
<UseDebugLibraries>true</UseDebugLibraries>
3031
<CharacterSet>Unicode</CharacterSet>
3132
<UseOfAtl>false</UseOfAtl>
32-
<PlatformToolset>v140</PlatformToolset>
33+
<PlatformToolset>v140_xp</PlatformToolset>
3334
</PropertyGroup>
3435
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3536
<ConfigurationType>Application</ConfigurationType>
3637
<UseDebugLibraries>true</UseDebugLibraries>
3738
<CharacterSet>Unicode</CharacterSet>
3839
<UseOfAtl>false</UseOfAtl>
39-
<PlatformToolset>v140</PlatformToolset>
40+
<PlatformToolset>v140_xp</PlatformToolset>
4041
</PropertyGroup>
4142
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4243
<ConfigurationType>Application</ConfigurationType>
4344
<UseDebugLibraries>false</UseDebugLibraries>
4445
<WholeProgramOptimization>true</WholeProgramOptimization>
4546
<CharacterSet>Unicode</CharacterSet>
4647
<UseOfAtl>false</UseOfAtl>
47-
<PlatformToolset>v140</PlatformToolset>
48+
<PlatformToolset>v140_xp</PlatformToolset>
4849
</PropertyGroup>
4950
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5051
<ConfigurationType>Application</ConfigurationType>
5152
<UseDebugLibraries>false</UseDebugLibraries>
5253
<WholeProgramOptimization>true</WholeProgramOptimization>
5354
<CharacterSet>Unicode</CharacterSet>
5455
<UseOfAtl>false</UseOfAtl>
55-
<PlatformToolset>v140</PlatformToolset>
56+
<PlatformToolset>v140_xp</PlatformToolset>
5657
</PropertyGroup>
5758
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5859
<ImportGroup Label="ExtensionSettings">

‎cpp/prebuilt/Win32/Release/IEDriverServer.exe

-8.5 KB
Binary file not shown.

‎cpp/prebuilt/x64/Release/IEDriverServer.exe

0 Bytes
Binary file not shown.

‎cpp/webdriver-interactions/webdriver-interactions.vcxproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<PropertyGroup Label="Globals">
2222
<ProjectGuid>{87FA39A1-958E-478A-8AB9-6D5E5AAA3886}</ProjectGuid>
2323
<RootNamespace>webdriverinteractions</RootNamespace>
24+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
2425
</PropertyGroup>
2526
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2627
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -29,29 +30,29 @@
2930
<UseOfAtl>Static</UseOfAtl>
3031
<CharacterSet>Unicode</CharacterSet>
3132
<WholeProgramOptimization>true</WholeProgramOptimization>
32-
<PlatformToolset>v140</PlatformToolset>
33+
<PlatformToolset>v140_xp</PlatformToolset>
3334
</PropertyGroup>
3435
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3536
<ConfigurationType>StaticLibrary</ConfigurationType>
3637
<UseOfMfc>Static</UseOfMfc>
3738
<UseOfAtl>Static</UseOfAtl>
3839
<CharacterSet>Unicode</CharacterSet>
39-
<PlatformToolset>v140</PlatformToolset>
40+
<PlatformToolset>v140_xp</PlatformToolset>
4041
</PropertyGroup>
4142
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4243
<ConfigurationType>StaticLibrary</ConfigurationType>
4344
<UseOfMfc>Static</UseOfMfc>
4445
<UseOfAtl>Static</UseOfAtl>
4546
<CharacterSet>Unicode</CharacterSet>
4647
<WholeProgramOptimization>true</WholeProgramOptimization>
47-
<PlatformToolset>v140</PlatformToolset>
48+
<PlatformToolset>v140_xp</PlatformToolset>
4849
</PropertyGroup>
4950
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5051
<ConfigurationType>StaticLibrary</ConfigurationType>
5152
<UseOfMfc>Static</UseOfMfc>
5253
<UseOfAtl>Static</UseOfAtl>
5354
<CharacterSet>Unicode</CharacterSet>
54-
<PlatformToolset>v140</PlatformToolset>
55+
<PlatformToolset>v140_xp</PlatformToolset>
5556
</PropertyGroup>
5657
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5758
<ImportGroup Label="ExtensionSettings">

0 commit comments

Comments
 (0)