Fixes for Windows (#1603)

* Fix warnings on Windows

* Use dynamic C runtime for nanopb

Author: wilhuff

CMakeLists.txt

@@ -169,6 +169,7 @@ endif()
 # nanopb
 set(nanopb_BUILD_GENERATOR ON CACHE BOOL "Enable the nanopb generator")
 set(nanopb_PROTOC_PATH ${NANOPB_PROTOC_BIN} CACHE STRING "Protoc location")
+set(nanopb_MSVC_STATIC_RUNTIME OFF CACHE BOOL "Link static runtime libraries")
 add_external_subdirectory(nanopb)
 
 target_compile_definitions(

Firestore/core/src/firebase/firestore/local/local_serializer.cc

@@ -271,7 +271,7 @@ util::StatusOr<QueryData> LocalSerializer::DecodeQueryData(
 QueryData LocalSerializer::DecodeQueryData(Reader* reader) const {
   if (!reader->status().ok()) return QueryData::Invalid();
 
-  int64_t target_id = 0;
+  model::TargetId target_id = 0;
   SnapshotVersion version = SnapshotVersion::None();
   std::vector<uint8_t> resume_token;
   Query query = Query::Invalid();
@@ -284,7 +284,8 @@ QueryData LocalSerializer::DecodeQueryData(Reader* reader) const {
       case firestore_client_Target_target_id_tag:
         if (!reader->RequireWireType(PB_WT_VARINT, tag))
           return QueryData::Invalid();
-        target_id = reader->ReadInteger();
+        // TODO(rsgowman): How to handle truncation of integer types?
+        target_id = static_cast<model::TargetId>(reader->ReadInteger());
         break;
 
       case firestore_client_Target_snapshot_version_tag:

Firestore/core/src/firebase/firestore/local/local_serializer.h

@@ -24,6 +24,7 @@
 #include "Firestore/core/src/firebase/firestore/model/document.h"
 #include "Firestore/core/src/firebase/firestore/model/maybe_document.h"
 #include "Firestore/core/src/firebase/firestore/model/no_document.h"
+#include "Firestore/core/src/firebase/firestore/model/types.h"
 #include "Firestore/core/src/firebase/firestore/nanopb/reader.h"
 #include "Firestore/core/src/firebase/firestore/nanopb/writer.h"
 #include "Firestore/core/src/firebase/firestore/remote/serializer.h"

Firestore/core/src/firebase/firestore/local/query_data.cc

@@ -26,7 +26,7 @@ using core::Query;
 using model::SnapshotVersion;
 
 QueryData::QueryData(Query&& query,
-                     int target_id,
+                     model::TargetId target_id,
                      QueryPurpose purpose,
                      SnapshotVersion&& snapshot_version,
                      std::vector<uint8_t>&& resume_token)

Firestore/core/src/firebase/firestore/local/query_data.h

@@ -22,6 +22,7 @@
 
 #include "Firestore/core/src/firebase/firestore/core/query.h"
 #include "Firestore/core/src/firebase/firestore/model/snapshot_version.h"
+#include "Firestore/core/src/firebase/firestore/model/types.h"
 
 namespace firebase {
 namespace firestore {
@@ -61,7 +62,7 @@ class QueryData {
    *     point in time from which the server should resume sending results.
    */
   QueryData(core::Query&& query,
-            int target_id,
+            model::TargetId target_id,
             QueryPurpose purpose,
             model::SnapshotVersion&& snapshot_version,
             std::vector<uint8_t>&& resume_token);
@@ -83,7 +84,7 @@ class QueryData {
     return query_;
   }
 
-  int target_id() const {
+  model::TargetId target_id() const {
     return target_id_;
   }
 
@@ -104,7 +105,7 @@ class QueryData {
 
  private:
   const core::Query query_;
-  int target_id_;
+  model::TargetId target_id_;
   QueryPurpose purpose_;
   const model::SnapshotVersion snapshot_version_;
   const std::vector<uint8_t> resume_token_;

Firestore/core/src/firebase/firestore/remote/serializer.cc

@@ -703,7 +703,7 @@ Query Serializer::DecodeQueryTarget(nanopb::Reader* reader) {
     }
   }
 
-  int from_count = query.from.size();
+  size_t from_count = query.from.size();
   if (from_count > 0) {
     HARD_ASSERT(
         from_count == 1,

Firestore/core/src/firebase/firestore/util/string_win.cc

@@ -104,7 +104,7 @@ std::string LastErrorMessage(DWORD last_error) {
   DWORD output_len = ::FormatMessageW(
       FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, nullptr,
       last_error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), error_text.get(),
-      size, nullptr);
+      static_cast<DWORD>(size), nullptr);
   if (output_len == 0) {
     DWORD format_error = ::GetLastError();
     return util::StringFormat(