Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2293)

Unified Diff: ui/base/dragdrop/os_exchange_data_provider_win.cc

Issue 11889017: some fixes and warning disables in ui/ for building on win x64 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/base/range/range.h » ('j') | ui/base/range/range_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/dragdrop/os_exchange_data_provider_win.cc
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc
index 800f81a52fab023852b03099dd2f4ca4d57b16d7..e69b40f42de0ecf8519cb073c0d596d5e005139d 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.cc
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc
@@ -964,10 +964,9 @@ static STGMEDIUM* GetStorageForFileDescriptor(
FILEGROUPDESCRIPTOR* descriptor = locked_mem.get();
descriptor->cItems = 1;
descriptor->fgd[0].dwFlags = FD_LINKUI;
- wcsncpy_s(descriptor->fgd[0].cFileName,
- MAX_PATH,
- file_name.c_str(),
- std::min(file_name.size(), MAX_PATH - 1u));
+ wcsncpy_s(
+ descriptor->fgd[0].cFileName, MAX_PATH, file_name.c_str(),
+ std::min(static_cast<unsigned int>(file_name.size()), MAX_PATH - 1u));
jschuh 2013/01/14 21:31:39 This should be: std::min(file_name.size(), static
scottmg 2013/01/14 21:45:00 duh, done.
STGMEDIUM* storage = new STGMEDIUM;
storage->tymed = TYMED_HGLOBAL;
« no previous file with comments | « no previous file | ui/base/range/range.h » ('j') | ui/base/range/range_win.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698