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

Side by Side Diff: chrome/installer/test/resource_updater.cc

Issue 1548153002: Switch to standard integer types in chrome/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/installer/test/resource_updater.h" 5 #include "chrome/installer/test/resource_updater.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <stdint.h>
8 9
9 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
10 #include "base/files/memory_mapped_file.h" 11 #include "base/files/memory_mapped_file.h"
11 #include "base/logging.h" 12 #include "base/logging.h"
12 13
13 namespace upgrade_test { 14 namespace upgrade_test {
14 15
15 ResourceUpdater::ResourceUpdater() : handle_(NULL) { 16 ResourceUpdater::ResourceUpdater() : handle_(NULL) {
16 } 17 }
17 18
(...skipping 18 matching lines...) Expand all
36 37
37 bool ResourceUpdater::Update(const std::wstring& name, 38 bool ResourceUpdater::Update(const std::wstring& name,
38 const std::wstring& type, 39 const std::wstring& type,
39 WORD language_id, 40 WORD language_id,
40 const base::FilePath& input_file) { 41 const base::FilePath& input_file) {
41 DCHECK(handle_ != NULL); 42 DCHECK(handle_ != NULL);
42 base::MemoryMappedFile input; 43 base::MemoryMappedFile input;
43 44
44 if (input.Initialize(input_file)) { 45 if (input.Initialize(input_file)) {
45 if (UpdateResource(handle_, type.c_str(), name.c_str(), language_id, 46 if (UpdateResource(handle_, type.c_str(), name.c_str(), language_id,
46 const_cast<uint8*>(input.data()), 47 const_cast<uint8_t*>(input.data()),
47 static_cast<DWORD>(input.length())) 48 static_cast<DWORD>(input.length())) != FALSE) {
48 != FALSE) {
49 return true; 49 return true;
50 } 50 }
51 PLOG(DFATAL) << "UpdateResource failed for resource \"" << name << "\""; 51 PLOG(DFATAL) << "UpdateResource failed for resource \"" << name << "\"";
52 } else { 52 } else {
53 PLOG(DFATAL) << "Failed mapping \"" << input_file.value() << "\""; 53 PLOG(DFATAL) << "Failed mapping \"" << input_file.value() << "\"";
54 } 54 }
55 return false; 55 return false;
56 } 56 }
57 57
58 bool ResourceUpdater::Commit() { 58 bool ResourceUpdater::Commit() {
59 DCHECK(handle_ != NULL); 59 DCHECK(handle_ != NULL);
60 bool result = true; 60 bool result = true;
61 if (EndUpdateResource(handle_, FALSE) == FALSE) { 61 if (EndUpdateResource(handle_, FALSE) == FALSE) {
62 PLOG(DFATAL) << "EndUpdateResource failed"; 62 PLOG(DFATAL) << "EndUpdateResource failed";
63 result = false; 63 result = false;
64 } 64 }
65 handle_ = NULL; 65 handle_ = NULL;
66 return result; 66 return result;
67 } 67 }
68 68
69 } // namespace upgrade_test 69 } // namespace upgrade_test
OLDNEW
« no previous file with comments | « chrome/installer/test/resource_updater.h ('k') | chrome/installer/util/advanced_firewall_manager_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698