Take 2 at fixing image corruption on drag and drop....

chrome/common/os_exchange_data.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <shlobj.h>
 
 #include "chrome/common/os_exchange_data.h"
 
 #include "base/clipboard_util.h"
 #include "base/file_util.h"
@@ skipping 312 matching lines @@
 }
 
 void OSExchangeData::SetFileContents(const std::wstring& filename,
                                      const std::string& file_contents) {
   // Add CFSTR_FILEDESCRIPTOR
   STGMEDIUM* storage = GetStorageForFileDescriptor(filename);
   contents_.push_back(new StoredDataInfo(
       ClipboardUtil::GetFileDescriptorFormat()->cfFormat, storage));
 
   // Add CFSTR_FILECONTENTS
-  storage = GetStorageForString(file_contents);
+  storage = GetStorageForBytes(file_contents.data(), file_contents.length());
   contents_.push_back(new StoredDataInfo(
       ClipboardUtil::GetFileContentFormatZero()->cfFormat, storage));
 }
 
 void OSExchangeData::SetCFHtml(const std::wstring& cf_html) {
   std::string utf8 = WideToUTF8(cf_html);
   STGMEDIUM* storage = GetStorageForBytes(utf8.c_str(), utf8.size());
   contents_.push_back(new StoredDataInfo(
       ClipboardUtil::GetHtmlFormat()->cfFormat, storage));
 }
@@ skipping 342 matching lines @@
 
   GlobalUnlock(handle);
 
   STGMEDIUM* storage = new STGMEDIUM;
   storage->hGlobal = handle;
   storage->tymed = TYMED_HGLOBAL;
   storage->pUnkForRelease = NULL;
   return storage;
 }