Fixing bug in IE screenshot handling due to Windows hook refactor.

SeleniumHQ · Jul 8, 2015 · 2051f9a · 2051f9a
1 parent 5e73475
commit 2051f9a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 0 deletions.
diff --git a/cpp/iedriver/CommandHandlers/ScreenshotCommandHandler.h b/cpp/iedriver/CommandHandlers/ScreenshotCommandHandler.h
@@ -180,8 +180,13 @@ class ScreenshotCommandHandler : public IECommandHandler {
 
     HookProcessor hook;
     hook.Initialize(hook_settings);
+
     hook.PushData(sizeof(max_image_dimensions), &max_image_dimensions);
     browser->SetWidth(max_image_dimensions.right);
+
+    // Must re-push data because the resize causes a message to the
+    // IE window, and reading the data clears the buffer.
+    hook.PushData(sizeof(max_image_dimensions), &max_image_dimensions);
     browser->SetHeight(max_image_dimensions.bottom);
 
     // Capture the window's canvas to a DIB.

diff --git a/cpp/iedriverserver/CHANGELOG b/cpp/iedriverserver/CHANGELOG
@@ -9,6 +9,10 @@ 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.
 
+v2.46.0.8
+=========
+ * Fixed bug in screenshot handling due to Windows hook refactor.
+
 v2.46.0.7
 =========
  * Fixed cookie delete bug for related domains.

diff --git a/cpp/iedriverserver/IEDriverServer.rc b/cpp/iedriverserver/IEDriverServer.rc
diff --git a/cpp/prebuilt/Win32/Release/IEDriverServer.exe b/cpp/prebuilt/Win32/Release/IEDriverServer.exe
diff --git a/cpp/prebuilt/x64/Release/IEDriverServer.exe b/cpp/prebuilt/x64/Release/IEDriverServer.exe