diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-16 19:15:56 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-16 19:15:56 +0000 |
| commit | 8db7d4d83f706b02e72fcdad2d1fd6328c738be5 (patch) | |
| tree | 0db72120ccd2f2887a4279917fd7143dfff52b78 | |
| parent | 1937f681527f276e861a3502aadaa21ffda4d353 (diff) | |
| download | chromium_src-8db7d4d83f706b02e72fcdad2d1fd6328c738be5.zip chromium_src-8db7d4d83f706b02e72fcdad2d1fd6328c738be5.tar.gz chromium_src-8db7d4d83f706b02e72fcdad2d1fd6328c738be5.tar.bz2 | |
Use qualified ITEMIDLISTs in CreateOrderBlob
Win64 builds fail on alignment error if you use the wrong struct type.
BUG=166496
R=isherman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12287025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182998 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/importer/ie_importer_unittest_win.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/importer/ie_importer_unittest_win.cc b/chrome/browser/importer/ie_importer_unittest_win.cc index 7dd282f..da99050 100644 --- a/chrome/browser/importer/ie_importer_unittest_win.cc +++ b/chrome/browser/importer/ie_importer_unittest_win.cc @@ -131,9 +131,9 @@ bool CreateOrderBlob(const base::FilePath& favorites_folder, blob[16] = static_cast<uint8>(entries.size()); for (size_t i = 0; i < entries.size(); ++i) { - ITEMIDLIST* id_list_full = ILCreateFromPath( + PIDLIST_ABSOLUTE id_list_full = ILCreateFromPath( favorites_folder.Append(path).Append(entries[i]).value().c_str()); - ITEMIDLIST* id_list = ILFindLastID(id_list_full); + PUITEMID_CHILD id_list = ILFindLastID(id_list_full); // Include the trailing zero-length item id. Don't include the single // element array. size_t id_list_size = id_list->mkid.cb + sizeof(id_list->mkid.cb); |