From 3bed530a103bf950a9a22be913622565afe10d36 Mon Sep 17 00:00:00 2001 From: "jschuh@chromium.org" Date: Fri, 15 Feb 2013 19:31:41 +0000 Subject: Make content_shell build on Win64 A c4267 build suppression and some simple compile fixes for the wrong argument types. BUG=166496 BUG=167187 TBR=jam@chromium.org R=jam@chromium.org Review URL: https://codereview.chromium.org/12254051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182785 0039d316-1c4b-4281-b951-d872f2087c98 --- content/shell/shell_javascript_dialog_win.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'content/shell/shell_javascript_dialog_win.cc') diff --git a/content/shell/shell_javascript_dialog_win.cc b/content/shell/shell_javascript_dialog_win.cc index 08ca91c..e746a57 100644 --- a/content/shell/shell_javascript_dialog_win.cc +++ b/content/shell/shell_javascript_dialog_win.cc @@ -19,7 +19,7 @@ INT_PTR CALLBACK ShellJavaScriptDialog::DialogProc(HWND dialog, LPARAM lparam) { switch (message) { case WM_INITDIALOG: { - SetWindowLongPtr(dialog, DWL_USER, static_cast(lparam)); + SetWindowLongPtr(dialog, DWLP_USER, static_cast(lparam)); ShellJavaScriptDialog* owner = reinterpret_cast(lparam); owner->dialog_win_ = dialog; @@ -31,7 +31,7 @@ INT_PTR CALLBACK ShellJavaScriptDialog::DialogProc(HWND dialog, } case WM_DESTROY: { ShellJavaScriptDialog* owner = reinterpret_cast( - GetWindowLongPtr(dialog, DWL_USER)); + GetWindowLongPtr(dialog, DWLP_USER)); if (owner->dialog_win_) { owner->dialog_win_ = 0; owner->callback_.Run(false, string16()); @@ -41,7 +41,7 @@ INT_PTR CALLBACK ShellJavaScriptDialog::DialogProc(HWND dialog, } case WM_COMMAND: { ShellJavaScriptDialog* owner = reinterpret_cast( - GetWindowLongPtr(dialog, DWL_USER)); + GetWindowLongPtr(dialog, DWLP_USER)); string16 user_input; bool finish = false; bool result; @@ -50,7 +50,7 @@ INT_PTR CALLBACK ShellJavaScriptDialog::DialogProc(HWND dialog, finish = true; result = true; if (owner->message_type_ == JAVASCRIPT_MESSAGE_TYPE_PROMPT) { - size_t length = + int length = GetWindowTextLength(GetDlgItem(dialog, IDC_PROMPTEDIT)) + 1; GetDlgItemText(dialog, IDC_PROMPTEDIT, WriteInto(&user_input, length), length); -- cgit v1.1