Fix the open file dialog on Windows

ui/base/win/open_file_name_win.cc

 // Copyright (c) 2014 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 "ui/base/win/open_file_name_win.h"
 
 #include "base/files/file_path.h"
 #include "base/strings/string_util.h"
 #include "base/win/windows_version.h"
 
@@ skipping 133 matching lines @@
   GetResult(&directory, &filenames);
   if (filenames.size() != 1)
     return base::FilePath();
   return directory.Append(filenames[0]);
 }
 
 void OpenFileName::GetResult(base::FilePath* directory,
                              std::vector<base::FilePath>* filenames) {
   DCHECK(filenames->empty());
   const wchar_t* selection = openfilename_.lpstrFile;
-  while (*selection) {  // Empty string indicates end of list.
+  // The return value of |openfilename_.lpstrFile| is dependent on the
+  // value of the Multi-Select flag within |openfilename_|. If the flag is
+  // not set the return value will be a single null-terminated wide string.
+  // If it is set it will be more than one null-terminated wide string, itself
+  // terminated by an empty null-terminated wide string.
+  if (openfilename_.Flags & OFN_ALLOWMULTISELECT) {
+    while (*selection) {  // Empty string indicates end of list.
+      filenames->push_back(base::FilePath(selection));
+      // Skip over filename and null-terminator.
+      selection += filenames->back().value().length() + 1;
+    }
+  } else {
     filenames->push_back(base::FilePath(selection));
-    // Skip over filename and null-terminator.
-    selection += filenames->back().value().length() + 1;
   }
   if (filenames->size() == 1) {
     // When there is one file, it contains the path and filename.
     *directory = (*filenames)[0].DirName();
     (*filenames)[0] = (*filenames)[0].BaseName();
   } else if (filenames->size() > 1) {
     // Otherwise, the first string is the path, and the remainder are
     // filenames.
     *directory = (*filenames)[0];
     filenames->erase(filenames->begin());
@@ skipping 48 matching lines @@
         MakeTuple(base::string16(display_string, display_string_end),
                   base::string16(pattern, pattern_end)));
     display_string = pattern_end + 1;
   }
 
   return filters;
 }
 
 }  // namespace win
 }  // namespace ui