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

Side by Side Diff: sandbox/win/wow_helper/wow_helper.cc

Issue 109843003: Replace wstring with string16 in sandbox (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | Annotate | Revision Log
« no previous file with comments | « sandbox/win/tests/validation_tests/commands.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 // Wow_helper.exe is a simple Win32 64-bit executable designed to help to 5 // Wow_helper.exe is a simple Win32 64-bit executable designed to help to
6 // sandbox a 32 bit application running on a 64 bit OS. The basic idea is to 6 // sandbox a 32 bit application running on a 64 bit OS. The basic idea is to
7 // perform a 64 bit interception of the target process and notify the 32-bit 7 // perform a 64 bit interception of the target process and notify the 32-bit
8 // broker process whenever a DLL is being loaded. This allows the broker to 8 // broker process whenever a DLL is being loaded. This allows the broker to
9 // setup the interceptions (32-bit) properly on the target. 9 // setup the interceptions (32-bit) properly on the target.
10 10
11 #include <windows.h> 11 #include <windows.h>
12 12
13 #include <string> 13 #include <string>
14 14
15 #include "sandbox/win/wow_helper/service64_resolver.h" 15 #include "sandbox/win/wow_helper/service64_resolver.h"
16 #include "sandbox/win/wow_helper/target_code.h" 16 #include "sandbox/win/wow_helper/target_code.h"
17 17
18 namespace { 18 namespace {
19 19
20 // Grabbed from base/strings/string_util.h 20 // Grabbed from base/strings/string_util.h
21 template <class string_type> 21 template <class string_type>
22 inline typename string_type::value_type* WriteInto(string_type* str, 22 inline typename string_type::value_type* WriteInto(string_type* str,
23 size_t length_with_null) { 23 size_t length_with_null) {
24 str->reserve(length_with_null); 24 str->reserve(length_with_null);
25 str->resize(length_with_null - 1); 25 str->resize(length_with_null - 1);
26 return &((*str)[0]); 26 return &((*str)[0]);
27 } 27 }
28 28
29 // Grabbed from base/string_util.cc 29 // Grabbed from base/string_util.cc
30 std::string WideToMultiByte(const std::wstring& wide, UINT code_page) { 30 std::string WideToMultiByte(const base::string16& wide, UINT code_page) {
31 if (wide.length() == 0) 31 if (wide.length() == 0)
32 return std::string(); 32 return std::string();
33 33
34 // compute the length of the buffer we'll need 34 // compute the length of the buffer we'll need
35 int charcount = WideCharToMultiByte(code_page, 0, wide.c_str(), -1, 35 int charcount = WideCharToMultiByte(code_page, 0, wide.c_str(), -1,
36 NULL, 0, NULL, NULL); 36 NULL, 0, NULL, NULL);
37 if (charcount == 0) 37 if (charcount == 0)
38 return std::string(); 38 return std::string();
39 39
40 // convert 40 // convert
41 std::string mb; 41 std::string mb;
42 WideCharToMultiByte(code_page, 0, wide.c_str(), -1, 42 WideCharToMultiByte(code_page, 0, wide.c_str(), -1,
43 WriteInto(&mb, charcount), charcount, NULL, NULL); 43 WriteInto(&mb, charcount), charcount, NULL, NULL);
44 44
45 return mb; 45 return mb;
46 } 46 }
47 47
48 // Grabbed from base/string_util.cc 48 // Grabbed from base/string_util.cc
49 std::string WideToUTF8(const std::wstring& wide) { 49 std::string WideToUTF8(const base::string16& wide) {
50 return WideToMultiByte(wide, CP_UTF8); 50 return WideToMultiByte(wide, CP_UTF8);
51 } 51 }
52 52
53 } // namespace 53 } // namespace
54 54
55 namespace sandbox { 55 namespace sandbox {
56 56
57 // Performs the interception of NtMapViewOfSection on the 64-bit version of 57 // Performs the interception of NtMapViewOfSection on the 64-bit version of
58 // ntdll.dll. 'thunk' is the buffer on the address space of process 'child', 58 // ntdll.dll. 'thunk' is the buffer on the address space of process 'child',
59 // that will be used to store the information about the patch. 59 // that will be used to store the information about the patch.
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 114
115 DWORD buffer = wcstoul(next, NULL, 0); 115 DWORD buffer = wcstoul(next, NULL, 0);
116 if (!buffer) 116 if (!buffer)
117 return 4; 117 return 4;
118 118
119 void* thunk = reinterpret_cast<void*>(static_cast<ULONG_PTR>(buffer)); 119 void* thunk = reinterpret_cast<void*>(static_cast<ULONG_PTR>(buffer));
120 120
121 const size_t kPageSize = 4096; 121 const size_t kPageSize = 4096;
122 return sandbox::PatchNtdll(child, thunk, kPageSize); 122 return sandbox::PatchNtdll(child, thunk, kPageSize);
123 } 123 }
OLDNEW
« no previous file with comments | « sandbox/win/tests/validation_tests/commands.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698