Added base::win::InitializeWindowClass() wrapper to make sure that window classes are properly asso…

ui/base/clipboard/clipboard_win.cc

 // Copyright (c) 2012 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.
 
 // Many of these functions are based on those found in
 // webkit/port/platform/PasteboardWin.cpp
 
 #include "ui/base/clipboard/clipboard.h"
 
 #include <shlobj.h>
@@ skipping 170 matching lines @@
   if (!base::StringToInt(serialization, &clipboard_format)) {
     NOTREACHED();
     return FormatType();
   }
   return FormatType(clipboard_format);
 }
 
 Clipboard::Clipboard() : create_window_(false) {
   if (MessageLoop::current()->type() == MessageLoop::TYPE_UI) {
     // Make a dummy HWND to be the clipboard's owner.
-    WNDCLASSEX wcex = {0};
-    wcex.cbSize = sizeof(WNDCLASSEX);
-    wcex.lpfnWndProc = base::win::WrappedWindowProc<ClipboardOwnerWndProc>;
-    wcex.hInstance = GetModuleHandle(NULL);
-    wcex.lpszClassName = L"ClipboardOwnerWindowClass";
-    ::RegisterClassEx(&wcex);
+    WNDCLASSEXW window_class;

[dcheng, 2012/05/04 19:40:31]

Why change this from WNDCLASSEX to WNDCLASSEXW?

[alexeypa (please no reviews), 2012/05/04 19:54:24]

Unintentional. Reverted.

+    base::win::InitializeWindowClass(
+        L"ClipboardOwnerWindowClass",
+        &base::win::WrappedWindowProc<ClipboardOwnerWndProc>,
+        0, 0, 0, NULL, NULL, NULL, NULL, NULL,
+        &window_class);
+    ::RegisterClassEx(&window_class);
     create_window_ = true;
   }
 
   clipboard_owner_ = NULL;
 }
 
 Clipboard::~Clipboard() {
   if (clipboard_owner_)
     ::DestroyWindow(clipboard_owner_);
   clipboard_owner_ = NULL;
@@ skipping 629 matching lines @@
     clipboard_owner_ = ::CreateWindow(L"ClipboardOwnerWindowClass",
                                       L"ClipboardOwnerWindow",
                                       0, 0, 0, 0, 0,
                                       HWND_MESSAGE,
                                       0, 0, 0);
   }
   return clipboard_owner_;
 }
 
 }  // namespace ui