[chrome_elf] NTRegistry - added wow64 redirection support.

chrome_elf/blacklist/test/blacklist_test_main_dll.cc

Index: chrome_elf/blacklist/test/blacklist_test_main_dll.cc
diff --git a/chrome_elf/blacklist/test/blacklist_test_main_dll.cc b/chrome_elf/blacklist/test/blacklist_test_main_dll.cc
index 3b2c4d7deac0cdb6d6f362c63cead8bb2632a355..176b12a896a534daf01b3a1bd7d535c17e50e41a 100644
--- a/chrome_elf/blacklist/test/blacklist_test_main_dll.cc
+++ b/chrome_elf/blacklist/test/blacklist_test_main_dll.cc
@@ -14,22 +14,22 @@ namespace {
 void GetIpcOverrides() {
   DWORD buffer_size = ::GetEnvironmentVariableW(L"hkcu_override", nullptr, 0);
   if (buffer_size > 0) {
-    wchar_t* content = new wchar_t[buffer_size];
+    std::wstring content;

[grt (UTC plus 2), 2016/09/30 09:32:16]

nit: construct the string with the desired size:
    std::wstring content(buffer_size, '\0');
and remove the resize

[penny, 2016/10/01 01:44:25]

Nice one.  It's unfortunate there's no constructor with just the size.  I don't
need the contents to be zeroed. Oh well, I suppose I'm not really using the
object as intended here.

[grt (UTC plus 2), 2016/10/02 20:10:54]

resize(buffer_size) zero-fills it as well, so the form i suggested is only
marginally better (construct with the right size rather than construct and then
alloc). reserve(buffer_size) would allocate the memory, but you still couldn't
touch it. meh.

+    content.resize(buffer_size);
     buffer_size =
-        ::GetEnvironmentVariableW(L"hkcu_override", content, buffer_size);
+        ::GetEnvironmentVariableW(L"hkcu_override", &content[0], buffer_size);
     if (buffer_size)
-      ::wcsncpy(nt::HKCU_override, content, nt::g_kRegMaxPathLen - 1);
-    delete[] content;
+      nt::SetTestingOverride(nt::HKCU, content);
   }
 
   buffer_size = ::GetEnvironmentVariableW(L"hklm_override", nullptr, 0);
   if (buffer_size > 0) {
-    wchar_t* content = new wchar_t[buffer_size];
+    std::wstring content;
+    content.resize(buffer_size);
     buffer_size =
-        ::GetEnvironmentVariableW(L"hklm_override", content, buffer_size);
+        ::GetEnvironmentVariableW(L"hklm_override", &content[0], buffer_size);
     if (buffer_size)
-      ::wcsncpy(nt::HKLM_override, content, nt::g_kRegMaxPathLen - 1);
-    delete[] content;
+      nt::SetTestingOverride(nt::HKLM, content);
   }
 
   return;