diff options
author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-15 19:04:37 +0000 |
---|---|---|
committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-15 19:04:37 +0000 |
commit | e93dc535728da259ec16d1c3cc393f80b25f64ae (patch) | |
tree | 42c1cda46e3b1da834889e6754d0f38883ea4a84 /printing | |
parent | 4ad0ec9fd3292e1ca9dbf54dee9587dcb49caa70 (diff) | |
download | chromium_src-e93dc535728da259ec16d1c3cc393f80b25f64ae.zip chromium_src-e93dc535728da259ec16d1c3cc393f80b25f64ae.tar.gz chromium_src-e93dc535728da259ec16d1c3cc393f80b25f64ae.tar.bz2 |
Add a unit test that filenames aren't unintentionally converted to URLs.
Also fixes two issues in OSExchangeDataProviderWin:
- It used a disjoint set of clipboard formats when handling
GetUrl(..., true /* filename conversion */) vs GetFilenames(...), so the
actual returned results would vary depending on which one was called.
- It incorrectly used ::DragFinish() instead of ::ReleaseStgMedium().
::DragFinish() is only meant to be used in conjunction with WM_DROPFILES.
BUG=346135
Review URL: https://codereview.chromium.org/380553002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
-rw-r--r-- | printing/backend/print_backend_win.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/printing/backend/print_backend_win.cc b/printing/backend/print_backend_win.cc index a8139f3..d56ee60 100644 --- a/printing/backend/print_backend_win.cc +++ b/printing/backend/print_backend_win.cc @@ -30,7 +30,7 @@ HRESULT StreamOnHGlobalToString(IStream* stream, std::string* out) { HRESULT hr = GetHGlobalFromStream(stream, &hdata); if (SUCCEEDED(hr)) { DCHECK(hdata); - base::win::ScopedHGlobal<char> locked_data(hdata); + base::win::ScopedHGlobal<char*> locked_data(hdata); out->assign(locked_data.release(), locked_data.Size()); } return hr; |