First run page triggering

src/engine/main.cpp

 #include <AdblockPlus.h>
 #include <functional>
 #include <vector>
 #include <Windows.h>
 
 #include "../shared/AutoHandle.h"
 #include "../shared/Communication.h"
 #include "../shared/Dictionary.h"
 #include "../shared/Utils.h"
 #include "../shared/Version.h"
@@ skipping 23 matching lines @@
     {
       AdblockPlus::SubscriptionPtr subscription = subscriptions[i];
       response << subscription->GetProperty("url")->AsString()
                << subscription->GetProperty("title")->AsString()
                << subscription->GetProperty("specialization")->AsString()
                << subscription->IsListed();
     }
   }
   
   CriticalSection firstRunLock;
-  bool firstRunActionTaken = false;
+  bool firstRunActionExecuted = false;
 
   Communication::OutputBuffer HandleRequest(Communication::InputBuffer& request)
   {
     Communication::OutputBuffer response;
 
     Communication::ProcType procedure;
     request >> procedure;
     switch (procedure)
     {
       case Communication::PROC_MATCHES:
@@ skipping 87 matching lines @@
       }
       case Communication::PROC_REMOVE_FILTER:
       {
         std::string text;
         request >> text;
         filterEngine->GetFilter(text)->RemoveFromList();
         break;
       }
       case Communication::PROC_SET_PREF:
       {
-        std::string prefName = "";
-        std::string prefValue = "";
+        std::string prefName;
         request >> prefName;
-        request >> prefValue;
-        filterEngine->SetPref(prefName, filterEngine->GetJsEngine()->NewValue(prefValue));
+
+        Communication::ValueType valueType = request.GetType();
+        switch (valueType)
+        {
+        case Communication::TYPE_STRING:
+          {
+            std::string prefValue;
+            request >> prefValue;
+            filterEngine->SetPref(prefName, filterEngine->GetJsEngine()->NewValue(prefValue));
+            break;
+          }
+        case Communication::TYPE_INT64:
+          {
+            int64_t prefValue;
+            request >> prefValue;
+            filterEngine->SetPref(prefName, filterEngine->GetJsEngine()->NewValue(prefValue));
+            break;
+          }
+        case Communication::TYPE_INT32:
+          {
+            int prefValue;
+            request >> prefValue;
+            filterEngine->SetPref(prefName, filterEngine->GetJsEngine()->NewValue(prefValue));
+            break;
+          }
+        case Communication::TYPE_BOOL:
+          {
+            bool prefValue;
+            request >> prefValue;
+            filterEngine->SetPref(prefName, filterEngine->GetJsEngine()->NewValue(prefValue));
+            break;
+          }
+        default:
+          break;
+        }
         break;
       }
       case Communication::PROC_GET_PREF:
       {
         std::string name;
         request >> name;
 
         AdblockPlus::JsValuePtr valuePtr = filterEngine->GetPref(name);
-        if ((valuePtr->IsNull()) || (!valuePtr->IsString()))
-          response << 0;
+        if (valuePtr->IsNull() || valuePtr->IsUndefined())
+        {
+          // Report no success
+          response << false;
+          break;
+        }
+
+        // Report success
+        response << true;
+        
+        if (valuePtr->IsBool())
+        {
+          response << valuePtr->AsBool();
+        }
+        else if (valuePtr->IsNumber())
+        {
+          response << valuePtr->AsInt();
+        }
+        else if (valuePtr->IsString())
+        {
+          response << valuePtr->AsString();
+        }
+        break;
+      }
+      case Communication::PROC_IS_FIRST_RUN_ACTION_NEEDED:
+      {
+        CriticalSection::Lock lock(firstRunLock);
+        if (!firstRunActionExecuted && filterEngine->IsFirstRun())
+        {
+          response << true;
+          firstRunActionExecuted = true;
+        }
         else
         {
-          response << 1;
-          response << valuePtr->AsString();
-        }
-        break;
-      }
-      case Communication::PROC_IS_FIRST_RUN_ACTION_NEEDED:
-      {
-        CriticalSection::Lock lock(firstRunLock);
-        if (!firstRunActionTaken && filterEngine->IsFirstRun())
-        {
-          response << !firstRunActionTaken;

[Wladimir Palant, 2013/07/21 11:53:45]

How about just response << true? No point obscuring the logic here...

-          firstRunActionTaken = true;
+          response << false;
         }

[Wladimir Palant, 2013/07/21 11:53:45]

What about:

else
  response << false;

Shouldn't we always send a response?

         break;
       }
 
     }
     return response;
   }
 
   DWORD WINAPI ClientThread(LPVOID param)
   {
     std::auto_ptr<Communication::Pipe> pipe(static_cast<Communication::Pipe*>(param));
@@ skipping 94 matching lines @@
     }
     catch (std::runtime_error e)
     {
       DebugException(e);
       return 1;
     }
   }
 
   return 0;
 }