Fix the POC and some of unit tests to be build and

run correctly in 64 bit.

BUG=27218

Review URL: http://codereview.chromium.org/1168002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42392 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 6 deletions

diff --git a/sandbox/sandbox_poc/main_ui_window.cc b/sandbox/sandbox_poc/main_ui_window.cc
index 9669c4b..ef4d550 100644
--- a/sandbox/sandbox_poc/main_ui_window.cc
+++ b/sandbox/sandbox_poc/main_ui_window.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2010 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.
 
@@ -96,9 +96,9 @@ unsigned int MainUIWindow::CreateMainWindowAndLoop(
   if (NULL == window)
     return ::GetLastError();
 
-  ::SetWindowLong(window,
-                  GWL_USERDATA,
-                  static_cast<LONG>(reinterpret_cast<LONG_PTR>(this)));
+  ::SetWindowLongPtr(window,
+                     GWLP_USERDATA,
+                     reinterpret_cast<LONG_PTR>(this));
 
   ::SetWindowText(window, L"Sandbox Proof of Concept");
 
@@ -233,9 +233,9 @@ MainUIWindow* MainUIWindow::FromWindow(HWND main_window) {
   // so that we can retrieve it with this function later. This prevents us
   // from having to define all the message handling functions (that we refer to
   // in the window proc) as static
-  ::GetWindowLong(main_window, GWL_USERDATA);
+  ::GetWindowLongPtr(main_window, GWLP_USERDATA);
   return reinterpret_cast<MainUIWindow*>(
-      static_cast<LONG_PTR>(::GetWindowLong(main_window, GWL_USERDATA)));
+      ::GetWindowLongPtr(main_window, GWLP_USERDATA));
 }
 
 BOOL MainUIWindow::OnCreate(HWND parent_window, LPCREATESTRUCT) {