Fix the software renderer "soft" fullscreen mode using the wrong monitor bug.

plugin/win/main_win.cc

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 702 matching lines @@
   style |= WS_CHILD;
   ::SetWindowLongPtr(content_hwnd, GWL_STYLE, style);
   ::SetParent(content_hwnd, containing_hwnd);
   BOOL res = ::SetWindowPos(content_hwnd, containing_hwnd,
                             0, 0, width, height,
                             SWP_NOZORDER | SWP_ASYNCWINDOWPOS);
   DCHECK(res);
   ::ShowWindow(content_hwnd, SW_SHOW);
 }
 
+// Get the screen rect of the monitor the window is on, in virtual screen
+// coordinates.
+// Return true on success, false on failure.
+bool GetScreenRect(HWND hwnd,
+                   RECT* rect) {
+  HMONITOR monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONULL);
+  if (monitor == NULL)
+    return false;
+
+  MONITORINFO monitor_info;
+  monitor_info.cbSize = sizeof(monitor_info);
+  if (GetMonitorInfo(monitor, &monitor_info)) {
+    *rect = monitor_info.rcMonitor;
+    return true;
+  } else {
+    return false;
+  }
+}
+
 }  // namespace anonymous
 
 #if defined(O3D_INTERNAL_PLUGIN)
 namespace o3d {
 #else
 extern "C" {
 #endif
 
 NPError OSCALL NP_Initialize(NPNetscapeFuncs *browserFuncs) {
   HANDLE_CRASHES;
@@ skipping 218 matching lines @@
     ::ShowWindow(GetContentHWnd(), SW_HIDE);
     ::SetParent(GetContentHWnd(), NULL);
     // Remove WS_CHILD from the window style
     LONG_PTR style = ::GetWindowLongPtr(GetContentHWnd(), GWL_STYLE);
     style &= ~WS_CHILD;
     ::SetWindowLongPtr(GetContentHWnd(), GWL_STYLE, style);
     ::ShowWindow(GetContentHWnd(), SW_SHOW);
     // We need to resize the full-screen window to the desired size of
     // the display mode early, before calling
     // Renderer::GoFullscreen().
-    o3d::DisplayMode mode;
-    if (GetDisplayMode(fullscreen_region_mode_id_, &mode)) {
-      ::SetWindowPos(GetContentHWnd(), HWND_TOP, 0, 0,
-                     mode.width(), mode.height(),
+    RECT screen_rect;
+    if (GetScreenRect(GetPluginHWnd(), &screen_rect)) {
+      ::SetWindowPos(GetContentHWnd(), HWND_TOP,
+                     screen_rect.left, screen_rect.top,
+                     screen_rect.right - screen_rect.left + 1,
+                     screen_rect.bottom - screen_rect.top + 1,
                      SWP_NOZORDER | SWP_NOREPOSITION | SWP_ASYNCWINDOWPOS);
       DisplayWindowWindows display;
       display.set_hwnd(GetContentHWnd());
       if (renderer_->GoFullscreen(display,
                                   fullscreen_region_mode_id_)) {
         fullscreen_ = true;
         client()->SendResizeEvent(renderer_->width(), renderer_->height(),
                                   true);
         success = true;
       }
@@ skipping 19 matching lines @@
     if (!renderer_->CancelFullscreen(display, prev_width_, prev_height_)) {
       LOG(FATAL) << "Failed to get the renderer out of fullscreen mode!";
     }
     ReplaceContentWindow(GetContentHWnd(), GetPluginHWnd(),
                          prev_width_, prev_height_);
     client()->SendResizeEvent(prev_width_, prev_height_, false);
   }
 }
 }  // namespace _o3d
 }  // namespace glue