diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-10 16:11:57 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-10 16:11:57 +0000 |
| commit | 2704d1e17acc1c0451adbd78657aa9b3537f08c0 (patch) | |
| tree | 85c4610a41c55c51ada359dc08d1b3de7eae83f0 | |
| parent | 1dca727eeecf8cae8ecb952d1da74cfaebdc41fa (diff) | |
| download | chromium_src-2704d1e17acc1c0451adbd78657aa9b3537f08c0.zip chromium_src-2704d1e17acc1c0451adbd78657aa9b3537f08c0.tar.gz chromium_src-2704d1e17acc1c0451adbd78657aa9b3537f08c0.tar.bz2 | |
Make remoting_unittests build on Win64
Two simple compilation fixes and some c4267 build suppressions.
BUG=166496
BUG=167187
R=wez@chromium.org
Review URL: https://codereview.chromium.org/12225111
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181650 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | remoting/host/disconnect_window_win.cc | 10 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/remoting/host/disconnect_window_win.cc b/remoting/host/disconnect_window_win.cc index 8fc7ac4..effe964 100644 --- a/remoting/host/disconnect_window_win.cc +++ b/remoting/host/disconnect_window_win.cc @@ -47,8 +47,8 @@ class DisconnectWindowWin : public DisconnectWindow { virtual void Hide() OVERRIDE; private: - static BOOL CALLBACK DialogProc(HWND hwnd, UINT message, WPARAM wparam, - LPARAM lparam); + static INT_PTR CALLBACK DialogProc(HWND hwnd, UINT message, WPARAM wparam, + LPARAM lparam); BOOL OnDialogMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); @@ -122,8 +122,8 @@ void DisconnectWindowWin::Hide() { EndDialog(); } -BOOL CALLBACK DisconnectWindowWin::DialogProc(HWND hwnd, UINT message, - WPARAM wparam, LPARAM lparam) { +INT_PTR CALLBACK DisconnectWindowWin::DialogProc(HWND hwnd, UINT message, + WPARAM wparam, LPARAM lparam) { LONG_PTR self = NULL; if (message == WM_INITDIALOG) { self = lparam; @@ -189,7 +189,7 @@ BOOL DisconnectWindowWin::OnDialogMessage(HWND hwnd, UINT message, // Let the window be draggable by its client area by responding // that the entire window is the title bar. case WM_NCHITTEST: - SetWindowLong(hwnd, DWL_MSGRESULT, HTCAPTION); + SetWindowLongPtr(hwnd, DWLP_MSGRESULT, HTCAPTION); return TRUE; case WM_PAINT: { diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index bd40a01..f19e12e 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -560,6 +560,8 @@ '../google_update/google_update.gyp:google_update', 'remoting_controller_idl', ], + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + 'msvs_disabled_warnings': [4267, ], }], ], }, # end of target 'remoting_host_setup_base' |