diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-15 19:31:41 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-15 19:31:41 +0000 |
| commit | 3bed530a103bf950a9a22be913622565afe10d36 (patch) | |
| tree | e164754a28939f7ef1021e6a5ce0e6ebfe66415b /content/shell/shell_javascript_dialog_win.cc | |
| parent | 91f5d5f21f2add1805b036fa2b447e8cf3f52d00 (diff) | |
| download | chromium_src-3bed530a103bf950a9a22be913622565afe10d36.zip chromium_src-3bed530a103bf950a9a22be913622565afe10d36.tar.gz chromium_src-3bed530a103bf950a9a22be913622565afe10d36.tar.bz2 | |
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
Diffstat (limited to 'content/shell/shell_javascript_dialog_win.cc')
| -rw-r--r-- | content/shell/shell_javascript_dialog_win.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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<LONG_PTR>(lparam)); + SetWindowLongPtr(dialog, DWLP_USER, static_cast<LONG_PTR>(lparam)); ShellJavaScriptDialog* owner = reinterpret_cast<ShellJavaScriptDialog*>(lparam); owner->dialog_win_ = dialog; @@ -31,7 +31,7 @@ INT_PTR CALLBACK ShellJavaScriptDialog::DialogProc(HWND dialog, } case WM_DESTROY: { ShellJavaScriptDialog* owner = reinterpret_cast<ShellJavaScriptDialog*>( - 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<ShellJavaScriptDialog*>( - 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); |