Issue 2005 - Refactor working with strings in InputBuffer and OutputBuffer

src/shared/Communication.h

 #ifndef COMMUNICATION_H
 #define COMMUNICATION_H
 
 #include <memory>
 #include <sstream>
 #include <stdexcept>
 #include <stdint.h>
 #include <string>
 #include <vector>
 #include <Windows.h>
+#include "Utils.h"
 
 namespace Communication
 {
   extern const std::wstring pipeName;
   extern std::wstring browserSID;
 
   enum ProcType : uint32_t {
     PROC_MATCHES,
     PROC_GET_ELEMHIDE_SELECTORS,
     PROC_AVAILABLE_SUBSCRIPTIONS,
@@ skipping 10 matching lines @@
     PROC_SET_PREF,
     PROC_GET_PREF,
     PROC_IS_FIRST_RUN_ACTION_NEEDED,
     PROC_CHECK_FOR_UPDATES,
     PROC_GET_DOCUMENTATION_LINK,
     PROC_TOGGLE_PLUGIN_ENABLED,
     PROC_GET_HOST,
     PROC_COMPARE_VERSIONS
   };
   enum ValueType : uint32_t {
-    TYPE_PROC, TYPE_STRING, TYPE_WSTRING, TYPE_INT64, TYPE_INT32, TYPE_BOOL, TYPE_STRINGS
+    TYPE_PROC, TYPE_STRING, TYPE_INT64, TYPE_INT32, TYPE_BOOL, TYPE_STRINGS
   };
   typedef uint32_t SizeType;
 
   class InputBuffer
   {
   public:
     InputBuffer() : buffer(), hasType(false) {}
     InputBuffer(const std::string& data) : buffer(data), hasType(false) {}
     InputBuffer(const InputBuffer& copy) 
     { 
       hasType = copy.hasType; 
       buffer = std::istringstream(copy.buffer.str()); 
       currentType = copy.currentType; 
     }
     InputBuffer& operator>>(ProcType& value) { return Read(value, TYPE_PROC); }
-    InputBuffer& operator>>(std::string& value) { return ReadString(value, TYPE_STRING); }
-    InputBuffer& operator>>(std::wstring& value) { return ReadString(value, TYPE_WSTRING); }
+    InputBuffer& operator>>(std::string& value) { return ReadString(value); }
+    InputBuffer& operator>>(std::wstring& value)
+    {
+      std::string tmpString;
+      operator>>(tmpString);
+      value = ToUtf16String(tmpString);
+      return *this;
+    }
     InputBuffer& operator>>(int64_t& value) { return Read(value, TYPE_INT64); }
     InputBuffer& operator>>(int32_t& value) { return Read(value, TYPE_INT32); }
     InputBuffer& operator>>(bool& value) { return Read(value, TYPE_BOOL); }
     InputBuffer& operator>>(std::vector<std::string>& value) { return ReadStrings(value); }
+    InputBuffer& operator>>(std::vector<std::wstring>& value)
+    {
+      std::vector<std::string> tmpStrings;
+      operator>>(tmpStrings);
+      value = ToUtf16Strings(tmpStrings);
+      return *this;
+    }
     InputBuffer& operator=(const InputBuffer& copy) 
     { 
       hasType = copy.hasType; 
       buffer = std::istringstream(copy.buffer.str()); 
       currentType = copy.currentType; 
       return *this; 
     }
     ValueType GetType();
   private:
     std::istringstream buffer;
     ValueType currentType;
     bool hasType;
 
     void CheckType(ValueType expectedType);
 
-    template<class T>
-    InputBuffer& ReadString(T& value, ValueType expectedType)
+    InputBuffer& ReadString(std::string& value)
     {
-      CheckType(expectedType);
+      CheckType(TYPE_STRING);
 
       SizeType length;
       ReadBinary(length);
-
-      std::auto_ptr<T::value_type> data(new T::value_type[length]);
-      buffer.read(reinterpret_cast<char*>(data.get()), sizeof(T::value_type) * length);
+      value.resize(length);
+      if (length > 0)
+      {
+        buffer.read(&value[0], length);
+      }
       if (buffer.fail())
         throw new std::runtime_error("Unexpected end of input buffer");

[Eric, 2015/02/18 18:12:47]

This test for failure should be guarded by the conditional. No sense in testing
the buffer if we didn't do an operation on it.

[sergei, 2015/02/19 17:26:57]

moved

-
-      value.assign(data.get(), length);
       return *this;
     }
 
     InputBuffer& ReadStrings(std::vector<std::string>& value)
     {
       value.clear();
       CheckType(ValueType::TYPE_STRINGS);
 
       SizeType length;
       ReadBinary(length);
@@ skipping 29 matching lines @@
     OutputBuffer() {}
 
     // Explicit copy constructor to allow returning OutputBuffer by value
     OutputBuffer(const OutputBuffer& copy) : buffer(copy.buffer.str()) {}
 
     std::string Get()
     {
       return buffer.str();
     }
     OutputBuffer& operator<<(ProcType value) { return Write(value, TYPE_PROC); }
-    OutputBuffer& operator<<(const std::string& value) { return WriteString(value, TYPE_STRING); }
-    OutputBuffer& operator<<(const std::wstring& value) { return WriteString(value, TYPE_WSTRING); }
+    OutputBuffer& operator<<(const std::string& value) { return WriteString(value); }
+    OutputBuffer& operator<<(const std::wstring& value)
+    {
+      return operator<<(ToUtf8String(value));
+    }
     OutputBuffer& operator<<(int64_t value) { return Write(value, TYPE_INT64); }
     OutputBuffer& operator<<(int32_t value) { return Write(value, TYPE_INT32); }
     OutputBuffer& operator<<(bool value) { return Write(value, TYPE_BOOL); }
     OutputBuffer& operator<<(const std::vector<std::string>& value) { return WriteStrings(value); }
   private:
     std::ostringstream buffer;
 
     // Disallow copying
     const OutputBuffer& operator=(const OutputBuffer&);
 
-    template<class T>
-    OutputBuffer& WriteString(const T& value, ValueType type)
+    OutputBuffer& WriteString(const std::string& value)
     {
-      WriteBinary(type);
+      WriteBinary(TYPE_STRING);
 
       SizeType length = static_cast<SizeType>(value.size());
       WriteBinary(length);
-
-      buffer.write(reinterpret_cast<const char*>(value.c_str()), sizeof(T::value_type) * length);
+      buffer.write(value.c_str(), length);
       if (buffer.fail())
         throw new std::runtime_error("Unexpected error writing to output buffer");
 
       return *this;
     }
 
     OutputBuffer& WriteStrings(const std::vector<std::string>& value)
     {
       WriteBinary(ValueType::TYPE_STRINGS);
       WriteBinary(static_cast<SizeType>(value.size()));
@@ skipping 49 matching lines @@
 
     InputBuffer ReadMessage();
     void WriteMessage(OutputBuffer& message);
 
   protected:
     HANDLE pipe;
   };
 }
 
 #endif