diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 08:20:51 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 08:20:51 +0000 |
| commit | 71de701b062f87231657bcdbc73c177d1e808f9f (patch) | |
| tree | 57e905a1269cfc230f8e93fe557d31283d1e0249 /win8 | |
| parent | 89700f661c02975ecbcadc1615ad17c4ff753076 (diff) | |
| download | chromium_src-71de701b062f87231657bcdbc73c177d1e808f9f.zip chromium_src-71de701b062f87231657bcdbc73c177d1e808f9f.tar.gz chromium_src-71de701b062f87231657bcdbc73c177d1e808f9f.tar.bz2 | |
fix SetWindowLong->SetWindowLongPtr for win x64
ref: http://msdn.microsoft.com/en-us/library/windows/desktop/ms644898(v=vs.85).aspx
R=cpu@chromium.org
BUG=166496
Review URL: https://chromiumcodereview.appspot.com/11882029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176847 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8')
| -rw-r--r-- | win8/metro_driver/chrome_app_view.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/win8/metro_driver/chrome_app_view.cc b/win8/metro_driver/chrome_app_view.cc index ffdd3b0..4c177a7 100644 --- a/win8/metro_driver/chrome_app_view.cc +++ b/win8/metro_driver/chrome_app_view.cc @@ -220,9 +220,9 @@ void AdjustFrameWindowStyleForMetro(HWND hwnd) { // Subclass the wndproc of the frame window, if it's not already there. if (::GetProp(hwnd, kChromeSubclassWindowProp) == NULL) { - WNDPROC old_chrome_proc = reinterpret_cast<WNDPROC>( - ::SetWindowLong(hwnd, GWL_WNDPROC, - reinterpret_cast<long>(ChromeWindowProc))); + WNDPROC old_chrome_proc = + reinterpret_cast<WNDPROC>(::SetWindowLongPtr( + hwnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(ChromeWindowProc))); ::SetProp(hwnd, kChromeSubclassWindowProp, old_chrome_proc); } AdjustToFitWindow(hwnd, SWP_FRAMECHANGED | SWP_NOACTIVATE); @@ -637,9 +637,10 @@ DWORD WINAPI HostMainThreadProc(void*) { globals.metro_command_line_switches = winrt_utils::ReadArgumentsFromPinnedTaskbarShortcut(); - globals.g_core_proc = reinterpret_cast<WNDPROC>( - ::SetWindowLong(globals.core_window, GWL_WNDPROC, - reinterpret_cast<long>(ChromeAppView::CoreWindowProc))); + globals.g_core_proc = + reinterpret_cast<WNDPROC>(::SetWindowLongPtr( + globals.core_window, GWLP_WNDPROC, + reinterpret_cast<LONG_PTR>(ChromeAppView::CoreWindowProc))); DWORD exit_code = globals.host_main(globals.host_context); DVLOG(1) << "host thread done, exit_code=" << exit_code; |