temp windows fixes

Change-Id: I86972657e333821a153bb0c1e154f22841f624e5

6 files changed, 8 insertions, 13 deletions

diff --git a/onlineupdate/Module_onlineupdate.mk b/onlineupdate/Module_onlineupdate.mk
index 19a4ae954b3c..2611faa595e7 100644
--- a/onlineupdate/Module_onlineupdate.mk
+++ b/onlineupdate/Module_onlineupdate.mk
@@ -15,8 +15,6 @@ $(eval $(call gb_Module_add_targets,onlineupdate,\
 	StaticLibrary_libmar \
 	Executable_mar \
 	Executable_updater \
-	$(if $(filter WNT,$(OS)), \
-		Executable_update_service ) \
 ))
 endif
 
diff --git a/onlineupdate/source/libmar/src/mar_read.c b/onlineupdate/source/libmar/src/mar_read.c
index 8ce3cfe0fc13..2815d12e7ccb 100644
--- a/onlineupdate/source/libmar/src/mar_read.c
+++ b/onlineupdate/source/libmar/src/mar_read.c
@@ -333,7 +333,7 @@ int get_mar_file_info_fp(FILE *fp,
     }
   }
 
-  if (ftell(fp) == offsetToContent) {
+  if (ftell(fp) == (long)offsetToContent) {
     *hasAdditionalBlocks = 0;
   } else {
     if (numAdditionalBlocks) {
diff --git a/onlineupdate/source/update/common/updatehelper.cxx b/onlineupdate/source/update/common/updatehelper.cxx
index 319e6b02c66a..c19b830e36e1 100644
--- a/onlineupdate/source/update/common/updatehelper.cxx
+++ b/onlineupdate/source/update/common/updatehelper.cxx
@@ -14,14 +14,12 @@
 #include "updatehelper.h"
 #include "uachelper.h"
 #include "pathhash.h"
-#include "mozilla/UniquePtr.h"
+
+#include <memory>
 
 // Needed for PathAppendW
 #include <shlwapi.h>
 
-using mozilla::MakeUnique;
-using mozilla::UniquePtr;
-
 BOOL PathAppendSafe(LPWSTR base, LPCWSTR extra);
 
 /**
@@ -225,7 +223,7 @@ StartServiceUpdate(LPCWSTR installDir)
 
   // Get the service config information, in particular we want the binary
   // path of the service.
-  UniquePtr<char[]> serviceConfigBuffer = MakeUnique<char[]>(bytesNeeded);
+  std::unique_ptr<char[]> serviceConfigBuffer = std::make_unique<char[]>(bytesNeeded);
   if (!QueryServiceConfigW(svc,
       reinterpret_cast<QUERY_SERVICE_CONFIGW*>(serviceConfigBuffer.get()),
       bytesNeeded, &bytesNeeded)) {
@@ -739,7 +737,8 @@ IsUnpromptedElevation(BOOL &isUnpromptedElevation)
     return FALSE;
   }
 
-  DWORD consent, secureDesktop;
+  DWORD consent;
+  DWORD secureDesktop = 0;
   BOOL success = GetDWORDValue(baseKey, L"ConsentPromptBehaviorAdmin",
                                consent);
   success = success &&
diff --git a/onlineupdate/source/update/updater/progressui_win.cxx b/onlineupdate/source/update/updater/progressui_win.cxx
index 3d4ac09a28d4..861835994dff 100644
--- a/onlineupdate/source/update/updater/progressui_win.cxx
+++ b/onlineupdate/source/update/updater/progressui_win.cxx
@@ -138,7 +138,8 @@ InitDialog(HWND hDlg)
 
   // Get the control's font for calculating the new size for the control
   HDC hDCInfo = GetDC(hWndInfo);
-  HFONT hInfoFont, hOldFont;
+  HFONT hInfoFont;
+  HFONT hOldFont = 0;
   hInfoFont = (HFONT)SendMessage(hWndInfo, WM_GETFONT, 0, 0);
 
   if (hInfoFont)
diff --git a/onlineupdate/source/update/updater/updater.cxx b/onlineupdate/source/update/updater/updater.cxx
index fd6bfc28cd2d..e58ab076394a 100644
--- a/onlineupdate/source/update/updater/updater.cxx
+++ b/onlineupdate/source/update/updater/updater.cxx
@@ -59,8 +59,6 @@
 #include <onlineupdate/mozilla/Types.h>
 
 #ifdef _WIN32
-#include "nsWindowsRestart.cxx"
-#include "nsWindowsHelpers.h"
 #include "uachelper.h"
 #include "pathhash.h"
 #endif
diff --git a/onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.h b/onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.h
index c199d214efc1..0d4d7bb54b87 100644
--- a/onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.h
+++ b/onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.h
@@ -13,7 +13,6 @@
 #if defined(_WIN32) && !defined(UPDATER_NO_STRING_GLUE_STL)
 #include <wchar.h>
 #include <stdint.h>
-#include "mozilla/Char16.h"
 
 #endif