Replace usage of MFC wrapper classes with their win32 base types to reduce de...

app/win_util.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "app/win_util.h"
 
-#include <atlbase.h>
-#include <atlapp.h>
 #include <commdlg.h>
 #include <dwmapi.h>
 #include <propvarutil.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
+#include <algorithm>
+
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/gfx/gdi_util.h"
 #include "base/gfx/png_encoder.h"
 #include "base/logging.h"
 #include "base/native_library.h"
 #include "base/registry.h"
 #include "base/scoped_comptr_win.h"
 #include "base/scoped_handle.h"
+#include "base/scoped_handle_win.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
 #include "grit/app_strings.h"
 #include "net/base/mime_util.h"
 
 // Ensure that we pick up this link library.
 #pragma comment(lib, "dwmapi.lib")
 
 namespace win_util {
 
@@ skipping 646 matching lines @@
   return !extended_key &&
             ((key_code >= VK_PRIOR && key_code <= VK_DOWN) ||  // All keys but 5
                                                                // and 0.
             (key_code == VK_CLEAR) ||  // Key 5.
             (key_code == VK_INSERT));  // Key 0.
 }
 
 void GrabWindowSnapshot(HWND window_handle,
                         std::vector<unsigned char>* png_representation) {
   // Create a memory DC that's compatible with the window.
-  CWindowDC window_hdc(window_handle);
-  CDC mem_hdc(::CreateCompatibleDC(window_hdc));
+  HDC window_hdc = GetWindowDC(window_handle);
+  ScopedHDC mem_hdc(CreateCompatibleDC(window_hdc));
 
   // Create a DIB that's the same size as the window.
   RECT content_rect = {0, 0, 0, 0};
   ::GetWindowRect(window_handle, &content_rect);
   content_rect.right++;  // Match what PrintWindow wants.
   int width = content_rect.right - content_rect.left;
   int height = content_rect.bottom - content_rect.top;
   BITMAPINFOHEADER hdr;
   gfx::CreateBitmapHeader(width, height, &hdr);
   unsigned char *bit_ptr = NULL;
-  CBitmap bitmap(::CreateDIBSection(mem_hdc,
-                                    reinterpret_cast<BITMAPINFO*>(&hdr),
-                                    DIB_RGB_COLORS,
-                                    reinterpret_cast<void **>(&bit_ptr),
-                                    NULL, 0));
+  ScopedBitmap bitmap(CreateDIBSection(mem_hdc,
+                                       reinterpret_cast<BITMAPINFO*>(&hdr),
+                                       DIB_RGB_COLORS,
+                                       reinterpret_cast<void **>(&bit_ptr),
+                                       NULL, 0));
 
-  mem_hdc.SelectBitmap(bitmap);
+  SelectObject(mem_hdc, bitmap);
   // Clear the bitmap to white (so that rounded corners on windows
   // show up on a white background, and strangely-shaped windows
   // look reasonable). Not capturing an alpha mask saves a
   // bit of space.
-  mem_hdc.PatBlt(0, 0, width, height, WHITENESS);
+  PatBlt(mem_hdc, 0, 0, width, height, WHITENESS);
   // Grab a copy of the window
   // First, see if PrintWindow is defined (it's not in Windows 2000).
   typedef BOOL (WINAPI *PrintWindowPointer)(HWND, HDC, UINT);
   PrintWindowPointer print_window =
       reinterpret_cast<PrintWindowPointer>(
           GetProcAddress(GetModuleHandle(L"User32.dll"), "PrintWindow"));
 
   // If PrintWindow is defined, use it.  It will work on partially
   // obscured windows, and works better for out of process sub-windows.
   // Otherwise grab the bits we can get with BitBlt; it's better
   // than nothing and will work fine in the average case (window is
   // completely on screen).
   if (print_window)
     (*print_window)(window_handle, mem_hdc, 0);
   else
-    mem_hdc.BitBlt(0, 0, width, height, window_hdc, 0, 0, SRCCOPY);
+    BitBlt(mem_hdc, 0, 0, width, height, window_hdc, 0, 0, SRCCOPY);
 
   // We now have a copy of the window contents in a DIB, so
   // encode it into a useful format for posting to the bug report
   // server.
   PNGEncoder::Encode(bit_ptr, PNGEncoder::FORMAT_BGRA,
                      width, height, width * 4, true,
                      png_representation);
+
+  ReleaseDC(window_handle, window_hdc);

[Peter Kasting, 2009/09/03 04:24:48]

BTW, we don't have any problems due to destruction order, right?  Windows won't
care that window_hdc gets released before mem_hdc or something?  I don't think
so, just being paranoid.

 }
 
 bool IsWindowActive(HWND hwnd) {
   WINDOWINFO info;
   return ::GetWindowInfo(hwnd, &info) &&
          ((info.dwWindowStatus & WS_ACTIVECAPTION) != 0);
 }
 
 bool IsReservedName(const std::wstring& filename) {
   // This list is taken from the MSDN article "Naming a file"
@@ skipping 127 matching lines @@
     if (S_OK == pps->SetValue(PKEY_AppUserModel_ID, pv))
       pps->Commit();
   }
 
   // Cleanup.
   PropVariantClear(&pv);
   base::UnloadNativeLibrary(shell32_library);
 }
 
 }  // namespace win_util