CreateEmbedLangTransform: replace the usage of unique_ptr<char[]> with strings

 * using higher-level constructs is easier to understand
 * switch to C++17 for the mutable string::data() overload

git-svn-id: https://poroz/svnad/wfl_mr/branches/dev/trunk/src/tools/CreateEmbedLangTransform@13663 0d26eecb-4107-0410-bdd6-a17e8e2aa929

Author: jmairboeck

CreateEmbedLangTransform/CreateEmbedLangTransform.vcxproj

@@ -52,7 +52,8 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -65,7 +66,8 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

CreateEmbedLangTransform/main.cpp

@@ -2,7 +2,7 @@
 #include <tchar.h>
 #include <MsiQuery.h>
 #include <iostream>
-#include <memory>
+#include <string>
 
 #pragma comment(lib, "msi.lib")
 
@@ -11,6 +11,7 @@
 #else
 #define tcerr cerr
 #endif // _UNICODE
+using tstring = std::basic_string<TCHAR>;
 
 void HandleWindowsError(LPCTSTR func) {
   DWORD error{GetLastError()};
@@ -27,9 +28,10 @@ void HandleMsiError(UINT result, LPCTSTR func) {
     DWORD length{0u};
     auto status{MsiFormatRecord(0u, error, TEXT(""), &length)}; // get the length of the error message
     if (status == ERROR_MORE_DATA) {
+      tstring errorMessage;
+      errorMessage.resize(length);
       length++; // for the '\0' terminator
-      auto errorMessage{std::make_unique<TCHAR[]>(length)};
-      status = MsiFormatRecord(0u, error, errorMessage.get(), &length);
+      status = MsiFormatRecord(0u, error, errorMessage.data(), &length);
       if (status == ERROR_SUCCESS) {
         std::tcerr << TEXT("MSI error at ") << func << TEXT(": ") << errorMessage << TEXT(" (") << result << TEXT(")") << std::endl;
       }
@@ -125,18 +127,19 @@ int _tmain(int argc, TCHAR **argv) {
     HandleMsiError(uResult, TEXT("MsiSummaryInfoGetProperty length"));
     return 1;
   }
-  length++; // for the '\0' terminator
   {
-    auto stringValue{std::make_unique<TCHAR[]>(length + _tcslen(argv[3]) + 1)}; // allocate a buffer long enough for the new value (including the separator)
-    uResult = MsiSummaryInfoGetProperty(summaryInfo, PIDSI_TEMPLATE, &dataType, nullptr, nullptr, stringValue.get(), &length);
+    tstring stringValue;
+    stringValue.resize(length); // allocate space for the value to be filled (note: reserve would lead to UB!)
+    length++; // for the '\0' terminator
+    uResult = MsiSummaryInfoGetProperty(summaryInfo, PIDSI_TEMPLATE, &dataType, nullptr, nullptr, stringValue.data(), &length);
     if (uResult != ERROR_SUCCESS) {
       HandleMsiError(uResult, TEXT("MsiSummaryInfoGetProperty value"));
       return 1;
     }
-    if (_tcsstr(stringValue.get(), argv[3]) == nullptr) { // check if the required value is already included, only add it if not
-      stringValue[length] = TEXT(',');
-      _tcscpy(stringValue.get() + length + 1, argv[3]);
-      uResult = MsiSummaryInfoSetProperty(summaryInfo, PIDSI_TEMPLATE, dataType, 0, nullptr, stringValue.get());
+    if (stringValue.find(argv[3]) == tstring::npos) { // check if the required value is already included, only add it if not
+      stringValue.append(TEXT(","));
+      stringValue.append(argv[3]);
+      uResult = MsiSummaryInfoSetProperty(summaryInfo, PIDSI_TEMPLATE, dataType, 0, nullptr, stringValue.data());
       if (uResult != ERROR_SUCCESS) {
         HandleMsiError(uResult, TEXT("MsiSummaryInfoSetProperty"));
         return 1;