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

remoting/host/host_service_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.
 //
 // This file implements the Windows service controlling Me2Me host processes
 // running within user sessions.
 
 #include "remoting/host/host_service_win.h"
 
 #include <windows.h>
 #include <wtsapi32.h>
 #include <stdio.h>
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
-#include "base/process_util.h"
 #include "base/stringize_macros.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread.h"
 #include "base/win/wrapped_window_proc.h"
 
 #include "remoting/base/scoped_sc_handle_win.h"
 #include "remoting/host/branding.h"
 #include "remoting/host/host_service_resource.h"
 #include "remoting/host/wts_console_observer_win.h"
 #include "remoting/host/wts_session_process_launcher_win.h"
@@ skipping 215 matching lines @@
   int result = kErrorExitCode;
 
   // Subscribe to Ctrl-C and other console events.
   if (!SetConsoleCtrlHandler(&HostService::ConsoleControlHandler, TRUE)) {
     LOG_GETLASTERROR(ERROR)
         << "Failed to set console control handler";
     return result;
   }
 
   // Create a window for receiving session change notifications.
-  LPCWSTR atom = NULL;
   HWND window = NULL;
-  WNDPROC window_proc =
-      base::win::WrappedWindowProc<SessionChangeNotificationProc>;
-  HINSTANCE instance = base::GetModuleFromAddress(window_proc);
-
-  WNDCLASSEX wc = {0};
-  wc.cbSize = sizeof(wc);
-  wc.lpfnWndProc = window_proc;
-  wc.hInstance = instance;
-  wc.lpszClassName = kSessionNotificationWindowClass;
-  atom = reinterpret_cast<LPCWSTR>(RegisterClassExW(&wc));
-  if (atom == NULL) {
+  WNDCLASSEX window_class;
+  base::win::InitializeWindowClass(
+      kSessionNotificationWindowClass,
+      &base::win::WrappedWindowProc<SessionChangeNotificationProc>,
+      0, 0, 0, NULL, NULL, NULL, NULL, NULL,
+      &window_class);
+  HINSTANCE instance = window_class.hInstance;
+  ATOM atom = RegisterClassExW(&window_class);
+  if (atom == 0) {
     LOG_GETLASTERROR(ERROR)
         << "Failed to register the window class '"
         << kSessionNotificationWindowClass << "'";
     goto cleanup;
   }
 
-  window = CreateWindowW(atom, 0, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, instance, 0);
+  window = CreateWindowW(MAKEINTATOM(atom), 0, 0, 0, 0, 0, 0, HWND_MESSAGE, 0,
+                         instance, 0);
   if (window == NULL) {
     LOG_GETLASTERROR(ERROR)
         << "Failed to creat the session notificationwindow";
     goto cleanup;
   }
 
   // Post a dummy session change notification to peek up the current console
   // session.
   message_loop.PostTask(FROM_HERE, base::Bind(
       &HostService::OnSessionChange, base::Unretained(this)));
 
   // Subscribe to session change notifications.
   if (WTSRegisterSessionNotification(window,
                                      NOTIFY_FOR_ALL_SESSIONS) != FALSE) {
     // Run the service.
     RunMessageLoop();
 
     WTSUnRegisterSessionNotification(window);
     result = kSuccessExitCode;
   }
 
 cleanup:
   if (window != NULL) {
     DestroyWindow(window);
   }
 
   if (atom != 0) {
-    UnregisterClass(atom, instance);
+    UnregisterClass(MAKEINTATOM(atom), instance);
   }
 
   // Unsubscribe from console events. Ignore the exit code. There is nothing
   // we can do about it now and the program is about to exit anyway. Even if
   // it crashes nothing is going to be broken because of it.
   SetConsoleCtrlHandler(&HostService::ConsoleControlHandler, FALSE);
 
   message_loop_ = NULL;
   return result;
 }
@@ skipping 121 matching lines @@
   }
 
   remoting::HostService* service = remoting::HostService::GetInstance();
   if (!service->InitWithCommandLine(command_line)) {
     usage(argv[0]);
     return kUsageExitCode;
   }
 
   return service->Run();
 }