[Chromoting] Handle CR-LF correctly when transferring text items to and from the clipboard on a Win…

remoting/host/clipboard_win.cc

 // Copyright (c) 2012 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 "remoting/host/clipboard.h"
 
 #include <windows.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/process_util.h"
 #include "base/string16.h"
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_hglobal.h"
 #include "base/win/windows_version.h"
 #include "base/win/wrapped_window_proc.h"
 #include "remoting/base/constants.h"
+#include "remoting/base/util.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/protocol/clipboard_stub.h"
 
 namespace {
 
 const WCHAR kWindowClassName[] = L"clipboardWindowClass";
 const WCHAR kWindowName[] = L"clipboardWindow";
 
 // A scoper class that opens and closes the clipboard.
 // This class was adapted from the ScopedClipboard class in
@@ skipping 165 matching lines @@
 
 void ClipboardWin::InjectClipboardEvent(
     const protocol::ClipboardEvent& event) {
   if (!hwnd_) {
     return;
   }
   // Currently we only handle UTF-8 text.
   if (event.mime_type().compare(kMimeTypeTextUtf8)) {
     return;
   }
-  string16 text = UTF8ToUTF16(event.data());
+  string16 text = UTF8ToUTF16(ReplaceLfByCrLf(event.data()));
 
   ScopedClipboard clipboard;
   if (!clipboard.Init(hwnd_)) {
     LOG(WARNING) << "Couldn't open the clipboard.";
     return;
   }
 
   clipboard.Empty();
 
   HGLOBAL text_global =
@@ skipping 36 matching lines @@
       base::win::ScopedHGlobal<WCHAR> text_lock(text_global);
       if (!text_lock.get()) {
         LOG(WARNING) << "Couldn't lock clipboard data: " << GetLastError();
         return;
       }
       text.assign(text_lock.get());
     }
 
     protocol::ClipboardEvent event;
     event.set_mime_type(kMimeTypeTextUtf8);
-    event.set_data(UTF16ToUTF8(text));
+    event.set_data(ReplaceCrLfByLf(UTF16ToUTF8(text)));
 
     if (client_clipboard_.get()) {
       client_clipboard_->InjectClipboardEvent(event);
     }
   }
 }
 
 bool ClipboardWin::HaveClipboardListenerApi() {
   return add_clipboard_format_listener_ && remove_clipboard_format_listener_;
 }
@@ skipping 37 matching lines @@
       return 0;
   }
   return ::DefWindowProc(hwnd, msg, wparam, lparam);
 }
 
 scoped_ptr<Clipboard> Clipboard::Create() {
   return scoped_ptr<Clipboard>(new ClipboardWin());
 }
 
 }  // namespace remoting