Fixing retrieval of CSS properties that return non-string values in IE

This commit now properly coerces the return value of the to a string
when a non-string value is returned. The actual proper fix would be to
do the coersion in the JavaScript atom itself, but this will be just
as effective. Fixes issue SeleniumHQ#6527.

Author: jimevans

cpp/iedriver/Element.cpp

@@ -640,11 +640,26 @@ int Element::GetCssPropertyValue(const std::string& property_name,
   status_code = script_wrapper.Execute();
 
   if (status_code == WD_SUCCESS) {
-    std::wstring raw_value(script_wrapper.result().bstrVal);
+    std::wstring raw_value = L"";
+    if (script_wrapper.ResultIsString()) {
+      raw_value.assign(script_wrapper.result().bstrVal);
+    } else if (script_wrapper.ResultIsInteger()) {
+      long int_value = script_wrapper.result().lVal;
+      raw_value = std::to_wstring(int_value);
+    } else if (script_wrapper.ResultIsDouble()) {
+      double dbl_value = script_wrapper.result().dblVal;
+      raw_value = std::to_wstring(dbl_value);
+    } else if (script_wrapper.ResultIsBoolean()) {
+      if (script_wrapper.result().boolVal == VARIANT_TRUE) {
+        raw_value = L"true";
+      } else {
+        raw_value = L"false";
+      }
+    }
     std::string value = StringUtilities::ToString(raw_value);
-    std::transform(raw_value.begin(),
-                   raw_value.end(),
-                   raw_value.begin(),
+    std::transform(value.begin(),
+                   value.end(),
+                   value.begin(),
                    tolower);
     *property_value = value;
   } else {

cpp/iedriver/IEDriver.rc

@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,14,0,13
- PRODUCTVERSION 3,14,0,13
+ FILEVERSION 3,14,0,14
+ PRODUCTVERSION 3,14,0,14
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Software Freedom Conservancy"
             VALUE "FileDescription", "Driver library for the IE driver"
-            VALUE "FileVersion", "3.14.0.13"
+            VALUE "FileVersion", "3.14.0.14"
             VALUE "InternalName", "IEDriver.dll"
             VALUE "LegalCopyright", "Copyright (C) 2018"
             VALUE "OriginalFilename", "IEDriver.dll"
             VALUE "ProductName", "Selenium WebDriver"
-            VALUE "ProductVersion", "3.14.0.13"
+            VALUE "ProductVersion", "3.14.0.14"
         END
     END
     BLOCK "VarFileInfo"

cpp/iedriverserver/CHANGELOG

@@ -9,6 +9,11 @@ available via the project downloads page. Changes in "revision" field indicate
 private releases checked into the prebuilts directory of the source tree, but
 not made generally available on the downloads page.
 
+v3.14.0.14
+==========
+ * Fixed retrieval of CSS properties that return non-string values. Fixes
+   issue #6527.
+
 v3.14.0.13
 ==========
  * Fixed multiple file upload element detection.

cpp/iedriverserver/IEDriverServer.rc

@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,14,0,13
- PRODUCTVERSION 3,14,0,13
+ FILEVERSION 3,14,0,14
+ PRODUCTVERSION 3,14,0,14
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Software Freedom Conservancy"
             VALUE "FileDescription", "Command line server for the IE driver"
-            VALUE "FileVersion", "3.14.0.13"
+            VALUE "FileVersion", "3.14.0.14"
             VALUE "InternalName", "IEDriverServer.exe"
             VALUE "LegalCopyright", "Copyright (C) 2018"
             VALUE "OriginalFilename", "IEDriverServer.exe"
             VALUE "ProductName", "Selenium WebDriver"
-            VALUE "ProductVersion", "3.14.0.13"
+            VALUE "ProductVersion", "3.14.0.14"
         END
     END
     BLOCK "VarFileInfo"