size_t -> uint32 for building on win x64

win8/metro_driver/file_picker.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 "stdafx.h"
 #include "win8/metro_driver/file_picker.h"
 
 #include <windows.storage.pickers.h>
 
 #include "base/bind.h"
@@ skipping 27 matching lines @@
   }
 
   // IVector<HSTRING> implementation.
   STDMETHOD(GetAt)(unsigned index, HSTRING* item) {
     if (index >= strings_.size())
       return E_INVALIDARG;
 
     return ::WindowsDuplicateString(strings_[index], item);
   }
   STDMETHOD(get_Size)(unsigned *size) {
-    *size = strings_.size();
+    if (strings_.size() > UINT_MAX)
+      return E_INVALIDARG;

[cpu_(ooo_6.6-7.5), 2013/01/14 22:21:20]

return E_UNEXPECTED;

[scottmg, 2013/01/14 22:27:56]

Done.

+    *size = static_cast<unsigned>(strings_.size());
     return S_OK;
   }
   STDMETHOD(GetView)(winfoundtn::Collections::IVectorView<HSTRING> **view) {
     return E_NOTIMPL;
   }
   STDMETHOD(IndexOf)(HSTRING value, unsigned *index, boolean *found) {
     return E_NOTIMPL;
   }
 
   // write methods
@@ skipping 143 matching lines @@
     if (file) {
       mswr::ComPtr<winstorage::IStorageItem> storage_item;
       if (SUCCEEDED(hr))
         hr = file.As(&storage_item);
 
       mswrw::HString file_path;
       if (SUCCEEDED(hr))
         hr = storage_item->get_Path(file_path.GetAddressOf());
 
       if (SUCCEEDED(hr)) {
-        size_t path_len = 0;
+        UINT32 path_len = 0;
         const wchar_t* path_str =
             ::WindowsGetStringRawBuffer(file_path.Get(), &path_len);
 
         // If the selected file name is longer than the supplied buffer,
         // we return false as per GetOpenFileName documentation.
         if (path_len < open_file_name_->nMaxFile) {
           base::wcslcpy(open_file_name_->lpstrFile,
                         path_str,
                         open_file_name_->nMaxFile);
           success_ = true;
@@ skipping 147 matching lines @@
 }
 
 HRESULT OpenFilePickerSession::ComposeMultiFileResult(
     StorageFileVectorCollection* files, string16* result) {
   DCHECK(files != NULL);
   DCHECK(result != NULL);
 
   // Empty the output string.
   result->clear();
 
-  size_t num_files = 0;
+  unsigned int num_files = 0;
   HRESULT hr = files->get_Size(&num_files);
   if (FAILED(hr))
     return hr;
 
   // Make sure we return an error on an empty collection.
   if (num_files == 0) {
     DLOG(ERROR) << "Empty collection on input.";
     return E_UNEXPECTED;
   }
 
   // This stores the base path that should be the parent of all the files.
   FilePath base_path;
 
   // Iterate through the collection and append the file paths to the result.
-  for (size_t i = 0; i < num_files; ++i) {
+  for (unsigned int i = 0; i < num_files; ++i) {
     mswr::ComPtr<winstorage::IStorageFile> file;
     hr = files->GetAt(i, file.GetAddressOf());
     if (FAILED(hr))
       return hr;
 
     mswr::ComPtr<winstorage::IStorageItem> storage_item;
     hr = file.As(&storage_item);
     if (FAILED(hr))
       return hr;
 
@@ skipping 203 matching lines @@
   OpenFilePickerSession session(open_file_name);
 
   return session.Run();
 }
 
 BOOL MetroGetSaveFileName(OPENFILENAME* open_file_name) {
   SaveFilePickerSession session(open_file_name);
 
   return session.Run();
 }