Adding upstream version 1:7.0.4.upstream/1%7.0.4upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

14 files changed, 1991 insertions, 0 deletions

diff --git a/onlineupdate/source/update/common/errors.h b/onlineupdate/source/update/common/errors.h
new file mode 100644
index 000000000..95bdcdfa7
--- /dev/null
+++ b/onlineupdate/source/update/common/errors.h
@@ -0,0 +1,96 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef Errors_h__
+#define Errors_h__
+
+#define OK 0
+
+// Error codes that are no longer used should not be used again unless they
+// aren't used in client code (e.g. nsUpdateService.js, updates.js,
+// UpdatePrompt.js, etc.).
+
+#define MAR_ERROR_EMPTY_ACTION_LIST 1
+#define LOADSOURCE_ERROR_WRONG_SIZE 2
+
+// Error codes 3-16 are for general update problems.
+#define USAGE_ERROR 3
+#define CRC_ERROR 4
+#define PARSE_ERROR 5
+#define READ_ERROR 6
+#define WRITE_ERROR 7
+// #define UNEXPECTED_ERROR 8 // Replaced with errors 38-42
+#define ELEVATION_CANCELED 9
+#define READ_STRINGS_MEM_ERROR 10
+#define ARCHIVE_READER_MEM_ERROR 11
+#define BSPATCH_MEM_ERROR 12
+#define UPDATER_MEM_ERROR 13
+#define UPDATER_QUOTED_PATH_MEM_ERROR 14
+#define BAD_ACTION_ERROR 15
+#define STRING_CONVERSION_ERROR 16
+
+// Error codes 17-23 are related to security tasks for MAR
+// signing and MAR protection.
+#define CERT_LOAD_ERROR 17
+#define CERT_HANDLING_ERROR 18
+#define CERT_VERIFY_ERROR 19
+#define ARCHIVE_NOT_OPEN 20
+#define COULD_NOT_READ_PRODUCT_INFO_BLOCK_ERROR 21
+#define MAR_CHANNEL_MISMATCH_ERROR 22
+#define VERSION_DOWNGRADE_ERROR 23
+
+// Error codes 24-33 and 49-51 are for the Windows maintenance service.
+#define SERVICE_UPDATER_COULD_NOT_BE_STARTED 24
+#define SERVICE_NOT_ENOUGH_COMMAND_LINE_ARGS 25
+#define SERVICE_UPDATER_SIGN_ERROR 26
+#define SERVICE_UPDATER_COMPARE_ERROR 27
+#define SERVICE_UPDATER_IDENTITY_ERROR 28
+#define SERVICE_STILL_APPLYING_ON_SUCCESS 29
+#define SERVICE_STILL_APPLYING_ON_FAILURE 30
+#define SERVICE_UPDATER_NOT_FIXED_DRIVE 31
+#define SERVICE_COULD_NOT_LOCK_UPDATER 32
+#define SERVICE_INSTALLDIR_ERROR 33
+
+#define NO_INSTALLDIR_ERROR 34
+#define WRITE_ERROR_ACCESS_DENIED 35
+// #define WRITE_ERROR_SHARING_VIOLATION 36 // Replaced with errors 46-48
+#define WRITE_ERROR_CALLBACK_APP 37
+#define UNEXPECTED_BZIP_ERROR 39
+#define UNEXPECTED_MAR_ERROR 40
+#define UNEXPECTED_BSPATCH_ERROR 41
+#define UNEXPECTED_FILE_OPERATION_ERROR 42
+#define FILESYSTEM_MOUNT_READWRITE_ERROR 43
+#define DELETE_ERROR_EXPECTED_DIR 46
+#define DELETE_ERROR_EXPECTED_FILE 47
+#define RENAME_ERROR_EXPECTED_FILE 48
+
+// Error codes 24-33 and 49-51 are for the Windows maintenance service.
+#define SERVICE_COULD_NOT_COPY_UPDATER 49
+#define SERVICE_STILL_APPLYING_TERMINATED 50
+#define SERVICE_STILL_APPLYING_NO_EXIT_CODE 51
+
+#define WRITE_ERROR_FILE_COPY 61
+#define WRITE_ERROR_DELETE_FILE 62
+#define WRITE_ERROR_OPEN_PATCH_FILE 63
+#define WRITE_ERROR_PATCH_FILE 64
+#define WRITE_ERROR_APPLY_DIR_PATH 65
+#define WRITE_ERROR_CALLBACK_PATH 66
+#define WRITE_ERROR_FILE_ACCESS_DENIED 67
+#define WRITE_ERROR_DIR_ACCESS_DENIED 68
+#define WRITE_ERROR_DELETE_BACKUP 69
+#define WRITE_ERROR_EXTRACT 70
+
+// Error codes 80 through 99 are reserved for nsUpdateService.js
+
+// The following error codes are only used by updater.exe
+// when a fallback key exists for tests.
+#define FALLBACKKEY_UNKNOWN_ERROR 100
+#define FALLBACKKEY_REGPATH_ERROR 101
+#define FALLBACKKEY_NOKEY_ERROR 102
+#define FALLBACKKEY_SERVICE_NO_STOP_ERROR 103
+#define FALLBACKKEY_LAUNCH_ERROR 104
+
+#endif  // Errors_h__
diff --git a/onlineupdate/source/update/common/pathhash.cxx b/onlineupdate/source/update/common/pathhash.cxx
new file mode 100644
index 000000000..67e53fa35
--- /dev/null
+++ b/onlineupdate/source/update/common/pathhash.cxx
@@ -0,0 +1,153 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifdef _WIN32
+#include <windows.h>
+#include <wincrypt.h>
+#include "pathhash.h"
+
+
+/**
+ * Converts a binary sequence into a hex string
+ *
+ * @param hash      The binary data sequence
+ * @param hashSize  The size of the binary data sequence
+ * @param hexString A buffer to store the hex string, must be of
+ *                  size 2 * @hashSize
+*/
+static void
+BinaryDataToHexString(const BYTE *hash, DWORD &hashSize,
+                      LPWSTR hexString)
+{
+    WCHAR *p = hexString;
+    for (DWORD i = 0; i < hashSize; ++i)
+    {
+        wsprintfW(p, L"%.2x", hash[i]);
+        p += 2;
+    }
+}
+
+/**
+ * Calculates an MD5 hash for the given input binary data
+ *
+ * @param  data     Any sequence of bytes
+ * @param  dataSize The number of bytes inside @data
+ * @param  hash     Output buffer to store hash, must be freed by the caller
+ * @param  hashSize The number of bytes in the output buffer
+ * @return TRUE on success
+*/
+static BOOL
+CalculateMD5(const char *data, DWORD dataSize,
+             BYTE **hash, DWORD &hashSize)
+{
+    HCRYPTPROV hProv = 0;
+    HCRYPTHASH hHash = 0;
+
+    if (!CryptAcquireContext(&hProv, nullptr, nullptr, PROV_RSA_FULL,
+                             CRYPT_VERIFYCONTEXT))
+    {
+        if (NTE_BAD_KEYSET != GetLastError())
+        {
+            return FALSE;
+        }
+
+        // Maybe it doesn't exist, try to create it.
+        if (!CryptAcquireContext(&hProv, nullptr, nullptr, PROV_RSA_FULL,
+                                 CRYPT_VERIFYCONTEXT | CRYPT_NEWKEYSET))
+        {
+            return FALSE;
+        }
+    }
+
+    if (!CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash))
+    {
+        return FALSE;
+    }
+
+    if (!CryptHashData(hHash, reinterpret_cast<const BYTE*>(data),
+                       dataSize, 0))
+    {
+        return FALSE;
+    }
+
+    DWORD dwCount = sizeof(DWORD);
+    if (!CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE *)&hashSize,
+                           &dwCount, 0))
+    {
+        return FALSE;
+    }
+
+    *hash = new BYTE[hashSize];
+    ZeroMemory(*hash, hashSize);
+    if (!CryptGetHashParam(hHash, HP_HASHVAL, *hash, &hashSize, 0))
+    {
+        return FALSE;
+    }
+
+    if (hHash)
+    {
+        CryptDestroyHash(hHash);
+    }
+
+    if (hProv)
+    {
+        CryptReleaseContext(hProv,0);
+    }
+
+    return TRUE;
+}
+
+/**
+ * Converts a file path into a unique registry location for cert storage
+ *
+ * @param  filePath     The input file path to get a registry path from
+ * @param  registryPath A buffer to write the registry path to, must
+ *                      be of size in WCHARs MAX_PATH + 1
+ * @return TRUE if successful
+*/
+BOOL
+CalculateRegistryPathFromFilePath(const LPCWSTR filePath,
+                                  LPWSTR registryPath)
+{
+    size_t filePathLen = wcslen(filePath);
+    if (!filePathLen)
+    {
+        return FALSE;
+    }
+
+    // If the file path ends in a slash, ignore that character
+    if (filePath[filePathLen -1] == L'\\' ||
+            filePath[filePathLen - 1] == L'/')
+    {
+        filePathLen--;
+    }
+
+    // Copy in the full path into our own buffer.
+    // Copying in the extra slash is OK because we calculate the hash
+    // based on the filePathLen which excludes the slash.
+    // +2 to account for the possibly trailing slash and the null terminator.
+    WCHAR *lowercasePath = new WCHAR[filePathLen + 2];
+    memset(lowercasePath, 0, (filePathLen + 2) * sizeof(WCHAR));
+    wcsncpy(lowercasePath, filePath, filePathLen + 1);
+    _wcslwr(lowercasePath);
+
+    BYTE *hash;
+    DWORD hashSize = 0;
+    if (!CalculateMD5(reinterpret_cast<const char*>(lowercasePath),
+                      filePathLen * 2,
+                      &hash, hashSize))
+    {
+        delete[] lowercasePath;
+        return FALSE;
+    }
+    delete[] lowercasePath;
+
+    LPCWSTR baseRegPath = L"SOFTWARE\\LibreOffice\\MaintenanceService\\";
+    wcsncpy(registryPath, baseRegPath, MAX_PATH);
+    BinaryDataToHexString(hash, hashSize,
+                          registryPath + wcslen(baseRegPath));
+    delete[] hash;
+    return TRUE;
+}
+#endif
diff --git a/onlineupdate/source/update/common/pathhash.h b/onlineupdate/source/update/common/pathhash.h
new file mode 100644
index 000000000..9856b4cf4
--- /dev/null
+++ b/onlineupdate/source/update/common/pathhash.h
@@ -0,0 +1,19 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef _PATHHASH_H_
+#define _PATHHASH_H_
+
+/**
+ * Converts a file path into a unique registry location for cert storage
+ *
+ * @param  filePath     The input file path to get a registry path from
+ * @param  registryPath A buffer to write the registry path to, must
+ *                      be of size in WCHARs MAX_PATH + 1
+ * @return TRUE if successful
+*/
+BOOL CalculateRegistryPathFromFilePath(const LPCWSTR filePath,
+                                       LPWSTR registryPath);
+
+#endif
diff --git a/onlineupdate/source/update/common/readstrings.cxx b/onlineupdate/source/update/common/readstrings.cxx
new file mode 100644
index 000000000..e1366cddd
--- /dev/null
+++ b/onlineupdate/source/update/common/readstrings.cxx
@@ -0,0 +1,267 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <limits.h>
+#include <string.h>
+#include <stdio.h>
+#include "readstrings.h"
+#include "errors.h"
+
+#ifdef _WIN32
+# define NS_tfopen _wfopen
+# define OPEN_MODE L"rb"
+#else
+# define NS_tfopen fopen
+# define OPEN_MODE "r"
+#endif
+
+// stack based FILE wrapper to ensure that fclose is called.
+class AutoFILE
+{
+public:
+    explicit AutoFILE(FILE *fp) : fp_(fp) {}
+    ~AutoFILE()
+    {
+        if (fp_) fclose(fp_);
+    }
+    operator FILE *()
+    {
+        return fp_;
+    }
+private:
+    FILE *fp_;
+};
+
+class AutoCharArray
+{
+public:
+    explicit AutoCharArray(size_t len)
+    {
+        ptr_ = new char[len];
+    }
+    ~AutoCharArray()
+    {
+        delete[] ptr_;
+    }
+    operator char *()
+    {
+        return ptr_;
+    }
+private:
+    char *ptr_;
+};
+
+static const char kNL[] = "\r\n";
+static const char kEquals[] = "=";
+static const char kWhitespace[] = " \t";
+static const char kRBracket[] = "]";
+
+static const char*
+NS_strspnp(const char *delims, const char *str)
+{
+    const char *d;
+    do
+    {
+        for (d = delims; *d != '\0'; ++d)
+        {
+            if (*str == *d)
+            {
+                ++str;
+                break;
+            }
+        }
+    }
+    while (*d);
+
+    return str;
+}
+
+static char*
+NS_strtok(const char *delims, char **str)
+{
+    if (!*str)
+        return nullptr;
+
+    char *ret = (char*) NS_strspnp(delims, *str);
+
+    if (!*ret)
+    {
+        *str = ret;
+        return nullptr;
+    }
+
+    char *i = ret;
+    do
+    {
+        for (const char *d = delims; *d != '\0'; ++d)
+        {
+            if (*i == *d)
+            {
+                *i = '\0';
+                *str = ++i;
+                return ret;
+            }
+        }
+        ++i;
+    }
+    while (*i);
+
+    *str = nullptr;
+    return ret;
+}
+
+/**
+ * Find a key in a keyList containing zero-delimited keys ending with "\0\0".
+ * Returns a zero-based index of the key in the list, or -1 if the key is not found.
+ */
+static int
+find_key(const char *keyList, char* key)
+{
+    if (!keyList)
+        return -1;
+
+    int index = 0;
+    const char *p = keyList;
+    while (*p)
+    {
+        if (strcmp(key, p) == 0)
+            return index;
+
+        p += strlen(p) + 1;
+        index++;
+    }
+
+    // The key was not found if we came here
+    return -1;
+}
+
+/**
+ * A very basic parser for updater.ini taken mostly from nsINIParser.cpp
+ * that can be used by standalone apps.
+ *
+ * @param path       Path to the .ini file to read
+ * @param keyList    List of zero-delimited keys ending with two zero characters
+ * @param numStrings Number of strings to read into results buffer - must be equal to the number of keys
+ * @param results    Two-dimensional array of strings to be filled in the same order as the keys provided
+ * @param section    Optional name of the section to read; defaults to "Strings"
+ */
+int
+ReadStrings(const NS_tchar *path,
+            const char *keyList,
+            unsigned int numStrings,
+            char results[][MAX_TEXT_LEN],
+            const char *section)
+{
+    AutoFILE fp(NS_tfopen(path, OPEN_MODE));
+
+    if (!fp)
+        return READ_ERROR;
+
+    /* get file size */
+    if (fseek(fp, 0, SEEK_END) != 0)
+        return READ_ERROR;
+
+    long len = ftell(fp);
+    if (len <= 0)
+        return READ_ERROR;
+
+    size_t flen = size_t(len);
+    AutoCharArray fileContents(flen + 1);
+    if (!fileContents)
+        return READ_STRINGS_MEM_ERROR;
+
+    /* read the file in one swoop */
+    if (fseek(fp, 0, SEEK_SET) != 0)
+        return READ_ERROR;
+
+    size_t rd = fread(fileContents, sizeof(char), flen, fp);
+    if (rd != flen)
+        return READ_ERROR;
+
+    fileContents[flen] = '\0';
+
+    char *buffer = fileContents;
+    bool inStringsSection = false;
+
+    unsigned int read = 0;
+
+    while (char *token = NS_strtok(kNL, &buffer))
+    {
+        if (token[0] == '#' || token[0] == ';') // it's a comment
+            continue;
+
+        token = (char*) NS_strspnp(kWhitespace, token);
+        if (!*token) // empty line
+            continue;
+
+        if (token[0] == '[')   // section header!
+        {
+            ++token;
+            char const * currSection = token;
+
+            char *rb = NS_strtok(kRBracket, &token);
+            if (!rb || NS_strtok(kWhitespace, &token))
+            {
+                // there's either an unclosed [Section or a [Section]Moretext!
+                // we could frankly decide that this INI file is malformed right
+                // here and stop, but we won't... keep going, looking for
+                // a well-formed [section] to continue working with
+                inStringsSection = false;
+            }
+            else
+            {
+                if (section)
+                    inStringsSection = strcmp(currSection, section) == 0;
+                else
+                    inStringsSection = strcmp(currSection, "Strings") == 0;
+            }
+
+            continue;
+        }
+
+        if (!inStringsSection)
+        {
+            // If we haven't found a section header (or we found a malformed
+            // section header), or this isn't the [Strings] section don't bother
+            // parsing this line.
+            continue;
+        }
+
+        char *key = token;
+        char *e = NS_strtok(kEquals, &token);
+        if (!e)
+            continue;
+
+        int keyIndex = find_key(keyList, key);
+        if (keyIndex >= 0 && (unsigned int)keyIndex < numStrings)
+        {
+            strncpy(results[keyIndex], token, MAX_TEXT_LEN - 1);
+            results[keyIndex][MAX_TEXT_LEN - 1] = '\0';
+            read++;
+        }
+    }
+
+    return (read == numStrings) ? OK : PARSE_ERROR;
+}
+
+// A wrapper function to read strings for the updater.
+// Added for compatibility with the original code.
+int
+ReadStrings(const NS_tchar *path, StringTable *results)
+{
+    const unsigned int kNumStrings = 2;
+    const char *kUpdaterKeys = "Title\0Info\0";
+    char updater_strings[kNumStrings][MAX_TEXT_LEN];
+
+    int result = ReadStrings(path, kUpdaterKeys, kNumStrings, updater_strings);
+
+    strncpy(results->title, updater_strings[0], MAX_TEXT_LEN - 1);
+    results->title[MAX_TEXT_LEN - 1] = '\0';
+    strncpy(results->info, updater_strings[1], MAX_TEXT_LEN - 1);
+    results->info[MAX_TEXT_LEN - 1] = '\0';
+
+    return result;
+}
diff --git a/onlineupdate/source/update/common/readstrings.h b/onlineupdate/source/update/common/readstrings.h
new file mode 100644
index 000000000..747081394
--- /dev/null
+++ b/onlineupdate/source/update/common/readstrings.h
@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef READSTRINGS_H__
+#define READSTRINGS_H__
+
+#define MAX_TEXT_LEN 600
+
+#ifdef _WIN32
+# include <windows.h>
+#endif
+
+#include "types.hxx"
+
+struct StringTable
+{
+    char title[MAX_TEXT_LEN];
+    char info[MAX_TEXT_LEN];
+};
+
+/**
+ * This function reads in localized strings from updater.ini
+ */
+int ReadStrings(const NS_tchar *path, StringTable *results);
+
+/**
+ * This function reads in localized strings corresponding to the keys from a given .ini
+ */
+int ReadStrings(const NS_tchar *path,
+                const char *keyList,
+                unsigned int numStrings,
+                char results[][MAX_TEXT_LEN],
+                const char *section = nullptr);
+
+#endif  // READSTRINGS_H__
diff --git a/onlineupdate/source/update/common/sources.mozbuild b/onlineupdate/source/update/common/sources.mozbuild
new file mode 100644
index 000000000..3de907b32
--- /dev/null
+++ b/onlineupdate/source/update/common/sources.mozbuild
@@ -0,0 +1,19 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+sources = []
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    sources += [
+        'pathhash.cpp',
+        'uachelper.cpp',
+        'updatehelper.cpp',
+    ]
+
+sources += [
+    'readstrings.cpp',
+    'updatelogging.cpp',
+]
+
+SOURCES += sorted(['%s/%s' % (srcdir, s) for s in sources])
diff --git a/onlineupdate/source/update/common/uachelper.cxx b/onlineupdate/source/update/common/uachelper.cxx
new file mode 100644
index 000000000..831b12680
--- /dev/null
+++ b/onlineupdate/source/update/common/uachelper.cxx
@@ -0,0 +1,237 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifdef _WIN32
+#include <windows.h>
+#include <wtsapi32.h>
+#include "uachelper.h"
+#include "updatelogging.h"
+
+// See the MSDN documentation with title: Privilege Constants
+// At the time of this writing, this documentation is located at:
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb530716%28v=vs.85%29.aspx
+LPCTSTR UACHelper::PrivsToDisable[] =
+{
+    SE_ASSIGNPRIMARYTOKEN_NAME,
+    SE_AUDIT_NAME,
+    SE_BACKUP_NAME,
+    // CreateProcess will succeed but the app will fail to launch on some WinXP
+    // machines if SE_CHANGE_NOTIFY_NAME is disabled.  In particular this happens
+    // for limited user accounts on those machines.  The define is kept here as a
+    // reminder that it should never be re-added.
+    // This permission is for directory watching but also from MSDN: "This
+    // privilege also causes the system to skip all traversal access checks."
+    // SE_CHANGE_NOTIFY_NAME,
+    SE_CREATE_GLOBAL_NAME,
+    SE_CREATE_PAGEFILE_NAME,
+    SE_CREATE_PERMANENT_NAME,
+    SE_CREATE_SYMBOLIC_LINK_NAME,
+    SE_CREATE_TOKEN_NAME,
+    SE_DEBUG_NAME,
+    SE_ENABLE_DELEGATION_NAME,
+    SE_IMPERSONATE_NAME,
+    SE_INC_BASE_PRIORITY_NAME,
+    SE_INCREASE_QUOTA_NAME,
+    SE_INC_WORKING_SET_NAME,
+    SE_LOAD_DRIVER_NAME,
+    SE_LOCK_MEMORY_NAME,
+    SE_MACHINE_ACCOUNT_NAME,
+    SE_MANAGE_VOLUME_NAME,
+    SE_PROF_SINGLE_PROCESS_NAME,
+    SE_RELABEL_NAME,
+    SE_REMOTE_SHUTDOWN_NAME,
+    SE_RESTORE_NAME,
+    SE_SECURITY_NAME,
+    SE_SHUTDOWN_NAME,
+    SE_SYNC_AGENT_NAME,
+    SE_SYSTEM_ENVIRONMENT_NAME,
+    SE_SYSTEM_PROFILE_NAME,
+    SE_SYSTEMTIME_NAME,
+    SE_TAKE_OWNERSHIP_NAME,
+    SE_TCB_NAME,
+    SE_TIME_ZONE_NAME,
+    SE_TRUSTED_CREDMAN_ACCESS_NAME,
+    SE_UNDOCK_NAME,
+    SE_UNSOLICITED_INPUT_NAME
+};
+
+/**
+ * Opens a user token for the given session ID
+ *
+ * @param  sessionID  The session ID for the token to obtain
+ * @return A handle to the token to obtain which will be primary if enough
+ *         permissions exist.  Caller should close the handle.
+ */
+HANDLE
+UACHelper::OpenUserToken(DWORD sessionID)
+{
+    HMODULE module = LoadLibraryW(L"wtsapi32.dll");
+    HANDLE token = nullptr;
+    decltype(WTSQueryUserToken)* wtsQueryUserToken =
+        (decltype(WTSQueryUserToken)*) GetProcAddress(module, "WTSQueryUserToken");
+    if (wtsQueryUserToken)
+    {
+        wtsQueryUserToken(sessionID, &token);
+    }
+    FreeLibrary(module);
+    return token;
+}
+
+/**
+ * Opens a linked token for the specified token.
+ *
+ * @param  token The token to get the linked token from
+ * @return A linked token or nullptr if one does not exist.
+ *         Caller should close the handle.
+ */
+HANDLE
+UACHelper::OpenLinkedToken(HANDLE token)
+{
+    // Magic below...
+    // UAC creates 2 tokens.  One is the restricted token which we have.
+    // the other is the UAC elevated one. Since we are running as a service
+    // as the system account we have access to both.
+    TOKEN_LINKED_TOKEN tlt;
+    HANDLE hNewLinkedToken = nullptr;
+    DWORD len;
+    if (GetTokenInformation(token, (TOKEN_INFORMATION_CLASS)TokenLinkedToken,
+                            &tlt, sizeof(TOKEN_LINKED_TOKEN), &len))
+    {
+        token = tlt.LinkedToken;
+        hNewLinkedToken = token;
+    }
+    return hNewLinkedToken;
+}
+
+
+/**
+ * Enables or disables a privilege for the specified token.
+ *
+ * @param  token  The token to adjust the privilege on.
+ * @param  priv   The privilege to adjust.
+ * @param  enable Whether to enable or disable it
+ * @return TRUE if the token was adjusted to the specified value.
+ */
+BOOL
+UACHelper::SetPrivilege(HANDLE token, LPCTSTR priv, BOOL enable)
+{
+    LUID luidOfPriv;
+    if (!LookupPrivilegeValue(nullptr, priv, &luidOfPriv))
+    {
+        return FALSE;
+    }
+
+    TOKEN_PRIVILEGES tokenPriv;
+    tokenPriv.PrivilegeCount = 1;
+    tokenPriv.Privileges[0].Luid = luidOfPriv;
+    tokenPriv.Privileges[0].Attributes = enable ? SE_PRIVILEGE_ENABLED : 0;
+
+    SetLastError(ERROR_SUCCESS);
+    if (!AdjustTokenPrivileges(token, false, &tokenPriv,
+                               sizeof(tokenPriv), nullptr, nullptr))
+    {
+        return FALSE;
+    }
+
+    return GetLastError() == ERROR_SUCCESS;
+}
+
+/**
+ * For each privilege that is specified, an attempt will be made to
+ * drop the privilege.
+ *
+ * @param  token         The token to adjust the privilege on.
+ *         Pass nullptr for current token.
+ * @param  unneededPrivs An array of unneeded privileges.
+ * @param  count         The size of the array
+ * @return TRUE if there were no errors
+ */
+BOOL
+UACHelper::DisableUnneededPrivileges(HANDLE token,
+                                     LPCTSTR *unneededPrivs,
+                                     size_t count)
+{
+    HANDLE obtainedToken = nullptr;
+    if (!token)
+    {
+        // Note: This handle is a pseudo-handle and need not be closed
+        HANDLE process = GetCurrentProcess();
+        if (!OpenProcessToken(process, TOKEN_ALL_ACCESS_P, &obtainedToken))
+        {
+            LOG_WARN(("Could not obtain token for current process, no "
+                      "privileges changed. (%d)", GetLastError()));
+            return FALSE;
+        }
+        token = obtainedToken;
+    }
+
+    BOOL result = TRUE;
+    for (size_t i = 0; i < count; i++)
+    {
+        if (SetPrivilege(token, unneededPrivs[i], FALSE))
+        {
+            LOG(("Disabled unneeded token privilege: %s.",
+                 unneededPrivs[i]));
+        }
+        else
+        {
+            LOG(("Could not disable token privilege value: %s. (%d)",
+                 unneededPrivs[i], GetLastError()));
+            result = FALSE;
+        }
+    }
+
+    if (obtainedToken)
+    {
+        CloseHandle(obtainedToken);
+    }
+    return result;
+}
+
+/**
+ * Disables privileges for the specified token.
+ * The privileges to disable are in PrivsToDisable.
+ * In the future there could be new privs and we are not sure if we should
+ * explicitly disable these or not.
+ *
+ * @param  token The token to drop the privilege on.
+ *         Pass nullptr for current token.
+ * @return TRUE if there were no errors
+ */
+BOOL
+UACHelper::DisablePrivileges(HANDLE token)
+{
+    static const size_t PrivsToDisableSize =
+        sizeof(UACHelper::PrivsToDisable) / sizeof(UACHelper::PrivsToDisable[0]);
+
+    return DisableUnneededPrivileges(token, UACHelper::PrivsToDisable,
+                                     PrivsToDisableSize);
+}
+
+/**
+ * Check if the current user can elevate.
+ *
+ * @return true if the user can elevate.
+ *         false otherwise.
+ */
+bool
+UACHelper::CanUserElevate()
+{
+    HANDLE token;
+    if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token))
+    {
+        return false;
+    }
+
+    TOKEN_ELEVATION_TYPE elevationType;
+    DWORD len;
+    bool canElevate = GetTokenInformation(token, TokenElevationType,
+                                          &elevationType,
+                                          sizeof(elevationType), &len) &&
+                      (elevationType == TokenElevationTypeLimited);
+    CloseHandle(token);
+
+    return canElevate;
+}
+#endif
diff --git a/onlineupdate/source/update/common/uachelper.h b/onlineupdate/source/update/common/uachelper.h
new file mode 100644
index 000000000..4e8d1c842
--- /dev/null
+++ b/onlineupdate/source/update/common/uachelper.h
@@ -0,0 +1,23 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef _UACHELPER_H_
+#define _UACHELPER_H_
+
+class UACHelper
+{
+public:
+    static HANDLE OpenUserToken(DWORD sessionID);
+    static HANDLE OpenLinkedToken(HANDLE token);
+    static BOOL DisablePrivileges(HANDLE token);
+    static bool CanUserElevate();
+
+private:
+    static BOOL SetPrivilege(HANDLE token, LPCTSTR privs, BOOL enable);
+    static BOOL DisableUnneededPrivileges(HANDLE token,
+                                          LPCTSTR *unneededPrivs, size_t count);
+    static LPCTSTR PrivsToDisable[];
+};
+
+#endif
diff --git a/onlineupdate/source/update/common/updatedefines.h b/onlineupdate/source/update/common/updatedefines.h
new file mode 100644
index 000000000..748f9e098
--- /dev/null
+++ b/onlineupdate/source/update/common/updatedefines.h
@@ -0,0 +1,135 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef UPDATEDEFINES_H
+#define UPDATEDEFINES_H
+
+#include "readstrings.h"
+
+#ifndef MAXPATHLEN
+# ifdef PATH_MAX
+#  define MAXPATHLEN PATH_MAX
+# elif defined(MAX_PATH)
+#  define MAXPATHLEN MAX_PATH
+# elif defined(_MAX_PATH)
+#  define MAXPATHLEN _MAX_PATH
+# elif defined(CCHMAXPATH)
+#  define MAXPATHLEN CCHMAXPATH
+# else
+#  define MAXPATHLEN 1024
+# endif
+#endif
+
+#if defined(_WIN32)
+# include <windows.h>
+# include <shlwapi.h>
+# include <direct.h>
+# include <io.h>
+# include <stdio.h>
+# include <stdarg.h>
+
+# define F_OK 00
+# define W_OK 02
+# define R_OK 04
+# define S_ISDIR(s) (((s) & _S_IFMT) == _S_IFDIR)
+# define S_ISREG(s) (((s) & _S_IFMT) == _S_IFREG)
+
+# define access _access
+
+# define putenv _putenv
+# define DELETE_DIR L"tobedeleted"
+# define CALLBACK_BACKUP_EXT L".moz-callback"
+
+# define LOG_S "%S"
+# define NS_T(str) L ## str
+# define NS_SLASH NS_T('\\')
+
+static inline int mywcsprintf(WCHAR* dest, size_t count, const WCHAR* fmt, ...)
+{
+    size_t _count = count - 1;
+    va_list varargs;
+    va_start(varargs, fmt);
+    int result = _vsnwprintf(dest, count - 1, fmt, varargs);
+    va_end(varargs);
+    dest[_count] = L'\0';
+    return result;
+}
+#define NS_tsnprintf mywcsprintf
+# define NS_taccess _waccess
+# define NS_tchdir _wchdir
+# define NS_tchmod _wchmod
+# define NS_tfopen _wfopen
+# define NS_tmkdir(path, perms) _wmkdir(path)
+# define NS_tremove _wremove
+// _wrename is used to avoid the link tracking service.
+# define NS_trename _wrename
+# define NS_trmdir _wrmdir
+# define NS_tstat _wstat
+# define NS_tlstat _wstat // No symlinks on Windows
+# define NS_tstat_t _stat
+# define NS_tstrcat wcscat
+# define NS_tstrcmp wcscmp
+# define NS_tstrncmp wcsncmp
+# define NS_tstricmp wcsicmp
+# define NS_tstrcpy wcscpy
+# define NS_tstrncpy wcsncpy
+# define NS_tstrlen wcslen
+# define NS_tstrchr wcschr
+# define NS_tstrrchr wcsrchr
+# define NS_tstrstr wcsstr
+# include "win_dirent.h"
+# define NS_tDIR DIR
+# define NS_tdirent dirent
+# define NS_topendir opendir
+# define NS_tclosedir closedir
+# define NS_treaddir readdir
+#else
+# include <sys/wait.h>
+# include <unistd.h>
+
+#ifdef __sun
+# include <sys/stat.h>
+#else
+# include <fts.h>
+#endif
+# include <dirent.h>
+
+#ifdef MACOSX
+# include <sys/time.h>
+#endif
+
+# define LOG_S "%s"
+# define NS_T(str) str
+# define NS_SLASH NS_T('/')
+# define NS_tsnprintf snprintf
+# define NS_taccess access
+# define NS_tchdir chdir
+# define NS_tchmod chmod
+# define NS_tfopen fopen
+# define NS_tmkdir mkdir
+# define NS_tremove remove
+# define NS_trename rename
+# define NS_trmdir rmdir
+# define NS_tstat stat
+# define NS_tstat_t stat
+# define NS_tlstat lstat
+# define NS_tstrcat strcat
+# define NS_tstrcmp strcmp
+# define NS_tstrncmp strncmp
+# define NS_tstricmp strcasecmp
+# define NS_tstrcpy strcpy
+# define NS_tstrncpy strncpy
+# define NS_tstrlen strlen
+# define NS_tstrrchr strrchr
+# define NS_tstrstr strstr
+# define NS_tDIR DIR
+# define NS_tdirent dirent
+# define NS_topendir opendir
+# define NS_tclosedir closedir
+# define NS_treaddir readdir
+#endif
+
+#define BACKUP_EXT NS_T(".moz-backup")
+
+#endif
diff --git a/onlineupdate/source/update/common/updatehelper.cxx b/onlineupdate/source/update/common/updatehelper.cxx
new file mode 100644
index 000000000..09f857b1a
--- /dev/null
+++ b/onlineupdate/source/update/common/updatehelper.cxx
@@ -0,0 +1,807 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifdef _WIN32
+#include <windows.h>
+
+// Needed for CreateToolhelp32Snapshot
+#include <tlhelp32.h>
+#ifndef ONLY_SERVICE_LAUNCHING
+
+#include <stdio.h>
+#include "shlobj.h"
+#include "updatehelper.h"
+#include "uachelper.h"
+#include "pathhash.h"
+
+#include <memory>
+
+// Needed for PathAppendW
+#include <shlwapi.h>
+
+BOOL PathAppendSafe(LPWSTR base, LPCWSTR extra);
+
+/**
+ * Obtains the path of a file in the same directory as the specified file.
+ *
+ * @param  destinationBuffer A buffer of size MAX_PATH + 1 to store the result.
+ * @param  siblingFIlePath   The path of another file in the same directory
+ * @param  newFileName       The filename of another file in the same directory
+ * @return TRUE if successful
+ */
+BOOL
+PathGetSiblingFilePath(LPWSTR destinationBuffer,
+                       LPCWSTR siblingFilePath,
+                       LPCWSTR newFileName)
+{
+    if (wcslen(siblingFilePath) >= MAX_PATH)
+    {
+        return FALSE;
+    }
+
+    wcsncpy(destinationBuffer, siblingFilePath, MAX_PATH);
+    if (!PathRemoveFileSpecW(destinationBuffer))
+    {
+        return FALSE;
+    }
+
+    if (wcslen(destinationBuffer) + wcslen(newFileName) >= MAX_PATH)
+    {
+        return FALSE;
+    }
+
+    return PathAppendSafe(destinationBuffer, newFileName);
+}
+
+/**
+ * Launch the post update application as the specified user (helper.exe).
+ * It takes in the path of the callback application to calculate the path
+ * of helper.exe.  For service updates this is called from both the system
+ * account and the current user account.
+ *
+ * @param  installationDir The path to the callback application binary.
+ * @param  updateInfoDir   The directory where update info is stored.
+ * @param  forceSync       If true even if the ini file specifies async, the
+ *                         process will wait for termination of PostUpdate.
+ * @param  userToken       The user token to run as, if nullptr the current
+ *                         user will be used.
+ * @return TRUE if there was no error starting the process.
+ */
+BOOL
+LaunchWinPostProcess(const WCHAR *installationDir,
+                     const WCHAR *updateInfoDir,
+                     bool forceSync,
+                     HANDLE userToken)
+{
+    WCHAR workingDirectory[MAX_PATH + 1] = { L'\0' };
+    wcsncpy(workingDirectory, installationDir, MAX_PATH);
+
+    // Launch helper.exe to perform post processing (e.g. registry and log file
+    // modifications) for the update.
+    WCHAR inifile[MAX_PATH + 1] = { L'\0' };
+    wcsncpy(inifile, installationDir, MAX_PATH);
+    if (!PathAppendSafe(inifile, L"updater.ini"))
+    {
+        return FALSE;
+    }
+
+    WCHAR exefile[MAX_PATH + 1];
+    WCHAR exearg[MAX_PATH + 1];
+    WCHAR exeasync[10];
+    bool async = true;
+    if (!GetPrivateProfileStringW(L"PostUpdateWin", L"ExeRelPath", nullptr,
+                                  exefile, MAX_PATH + 1, inifile))
+    {
+        return FALSE;
+    }
+
+    if (!GetPrivateProfileStringW(L"PostUpdateWin", L"ExeArg", nullptr, exearg,
+                                  MAX_PATH + 1, inifile))
+    {
+        return FALSE;
+    }
+
+    if (!GetPrivateProfileStringW(L"PostUpdateWin", L"ExeAsync", L"TRUE",
+                                  exeasync,
+                                  sizeof(exeasync)/sizeof(exeasync[0]),
+                                  inifile))
+    {
+        return FALSE;
+    }
+
+    WCHAR exefullpath[MAX_PATH + 1] = { L'\0' };
+    wcsncpy(exefullpath, installationDir, MAX_PATH);
+    if (!PathAppendSafe(exefullpath, exefile))
+    {
+        return false;
+    }
+
+    WCHAR dlogFile[MAX_PATH + 1];
+    if (!PathGetSiblingFilePath(dlogFile, exefullpath, L"uninstall.update"))
+    {
+        return FALSE;
+    }
+
+    WCHAR slogFile[MAX_PATH + 1] = { L'\0' };
+    wcsncpy(slogFile, updateInfoDir, MAX_PATH);
+    if (!PathAppendSafe(slogFile, L"update.log"))
+    {
+        return FALSE;
+    }
+
+    WCHAR dummyArg[14] = { L'\0' };
+    wcsncpy(dummyArg, L"argv0ignored ", sizeof(dummyArg) / sizeof(dummyArg[0]) - 1);
+
+    size_t len = wcslen(exearg) + wcslen(dummyArg);
+    WCHAR *cmdline = (WCHAR *) malloc((len + 1) * sizeof(WCHAR));
+    if (!cmdline)
+    {
+        return FALSE;
+    }
+
+    wcsncpy(cmdline, dummyArg, len);
+    wcscat(cmdline, exearg);
+
+    if (forceSync ||
+            !_wcsnicmp(exeasync, L"false", 6) ||
+            !_wcsnicmp(exeasync, L"0", 2))
+    {
+        async = false;
+    }
+
+    // We want to launch the post update helper app to update the Windows
+    // registry even if there is a failure with removing the uninstall.update
+    // file or copying the update.log file.
+    CopyFileW(slogFile, dlogFile, false);
+
+    STARTUPINFOW si = {sizeof(si), 0};
+    si.lpDesktop = L"";
+    PROCESS_INFORMATION pi = {0};
+
+    bool ok;
+    if (userToken)
+    {
+        ok = CreateProcessAsUserW(userToken,
+                                  exefullpath,
+                                  cmdline,
+                                  nullptr,  // no special security attributes
+                                  nullptr,  // no special thread attributes
+                                  false,    // don't inherit filehandles
+                                  0,        // No special process creation flags
+                                  nullptr,  // inherit my environment
+                                  workingDirectory,
+                                  &si,
+                                  &pi);
+    }
+    else
+    {
+        ok = CreateProcessW(exefullpath,
+                            cmdline,
+                            nullptr,  // no special security attributes
+                            nullptr,  // no special thread attributes
+                            false,    // don't inherit filehandles
+                            0,        // No special process creation flags
+                            nullptr,  // inherit my environment
+                            workingDirectory,
+                            &si,
+                            &pi);
+    }
+    free(cmdline);
+    if (ok)
+    {
+        if (!async)
+            WaitForSingleObject(pi.hProcess, INFINITE);
+        CloseHandle(pi.hProcess);
+        CloseHandle(pi.hThread);
+    }
+    return ok;
+}
+
+/**
+ * Starts the upgrade process for update of the service if it is
+ * already installed.
+ *
+ * @param  installDir the installation directory where
+ *         maintenanceservice_installer.exe is located.
+ * @return TRUE if successful
+ */
+BOOL
+StartServiceUpdate(LPCWSTR installDir)
+{
+    // Get a handle to the local computer SCM database
+    SC_HANDLE manager = OpenSCManager(nullptr, nullptr,
+                                      SC_MANAGER_ALL_ACCESS);
+    if (!manager)
+    {
+        return FALSE;
+    }
+
+    // Open the service
+    SC_HANDLE svc = OpenServiceW(manager, SVC_NAME,
+                                 SERVICE_ALL_ACCESS);
+    if (!svc)
+    {
+        CloseServiceHandle(manager);
+        return FALSE;
+    }
+
+    // If we reach here, then the service is installed, so
+    // proceed with upgrading it.
+
+    CloseServiceHandle(manager);
+
+    // The service exists and we opened it, get the config bytes needed
+    DWORD bytesNeeded;
+    if (!QueryServiceConfigW(svc, nullptr, 0, &bytesNeeded) &&
+            GetLastError() != ERROR_INSUFFICIENT_BUFFER)
+    {
+        CloseServiceHandle(svc);
+        return FALSE;
+    }
+
+    // Get the service config information, in particular we want the binary
+    // path of the service.
+    std::unique_ptr<char[]> serviceConfigBuffer = std::make_unique<char[]>(bytesNeeded);
+    if (!QueryServiceConfigW(svc,
+                             reinterpret_cast<QUERY_SERVICE_CONFIGW*>(serviceConfigBuffer.get()),
+                             bytesNeeded, &bytesNeeded))
+    {
+        CloseServiceHandle(svc);
+        return FALSE;
+    }
+
+    CloseServiceHandle(svc);
+
+    QUERY_SERVICE_CONFIGW &serviceConfig =
+        *reinterpret_cast<QUERY_SERVICE_CONFIGW*>(serviceConfigBuffer.get());
+
+    PathUnquoteSpacesW(serviceConfig.lpBinaryPathName);
+
+    // Obtain the temp path of the maintenance service binary
+    WCHAR tmpService[MAX_PATH + 1] = { L'\0' };
+    if (!PathGetSiblingFilePath(tmpService, serviceConfig.lpBinaryPathName,
+                                L"maintenanceservice_tmp.exe"))
+    {
+        return FALSE;
+    }
+
+    // Get the new maintenance service path from the install dir
+    WCHAR newMaintServicePath[MAX_PATH + 1] = { L'\0' };
+    wcsncpy(newMaintServicePath, installDir, MAX_PATH);
+    PathAppendSafe(newMaintServicePath,
+                   L"maintenanceservice.exe");
+
+    // Copy the temp file in alongside the maintenance service.
+    // This is a requirement for maintenance service upgrades.
+    if (!CopyFileW(newMaintServicePath, tmpService, FALSE))
+    {
+        return FALSE;
+    }
+
+    // Start the upgrade comparison process
+    STARTUPINFOW si = {0};
+    si.cb = sizeof(STARTUPINFOW);
+    // No particular desktop because no UI
+    si.lpDesktop = L"";
+    PROCESS_INFORMATION pi = {0};
+    WCHAR cmdLine[64] = { '\0' };
+    wcsncpy(cmdLine, L"dummyparam.exe upgrade",
+            sizeof(cmdLine) / sizeof(cmdLine[0]) - 1);
+    BOOL svcUpdateProcessStarted = CreateProcessW(tmpService,
+                                   cmdLine,
+                                   nullptr, nullptr, FALSE,
+                                   0,
+                                   nullptr, installDir, &si, &pi);
+    if (svcUpdateProcessStarted)
+    {
+        CloseHandle(pi.hProcess);
+        CloseHandle(pi.hThread);
+    }
+    return svcUpdateProcessStarted;
+}
+
+#endif
+
+/**
+ * Executes a maintenance service command
+ *
+ * @param  argc    The total number of arguments in argv
+ * @param  argv    An array of null terminated strings to pass to the service,
+ * @return ERROR_SUCCESS if the service command was started.
+ *         Less than 16000, a windows system error code from StartServiceW
+ *         More than 20000, 20000 + the last state of the service constant if
+ *         the last state is something other than stopped.
+ *         17001 if the SCM could not be opened
+ *         17002 if the service could not be opened
+*/
+DWORD
+StartServiceCommand(int argc, LPCWSTR* argv)
+{
+    DWORD lastState = WaitForServiceStop(SVC_NAME, 5);
+    if (lastState != SERVICE_STOPPED)
+    {
+        return 20000 + lastState;
+    }
+
+    // Get a handle to the SCM database.
+    SC_HANDLE serviceManager = OpenSCManager(nullptr, nullptr,
+                               SC_MANAGER_CONNECT |
+                               SC_MANAGER_ENUMERATE_SERVICE);
+    if (!serviceManager)
+    {
+        return 17001;
+    }
+
+    // Get a handle to the service.
+    SC_HANDLE service = OpenServiceW(serviceManager,
+                                     SVC_NAME,
+                                     SERVICE_START);
+    if (!service)
+    {
+        CloseServiceHandle(serviceManager);
+        return 17002;
+    }
+
+    // Wait at most 5 seconds trying to start the service in case of errors
+    // like ERROR_SERVICE_DATABASE_LOCKED or ERROR_SERVICE_REQUEST_TIMEOUT.
+    const DWORD maxWaitMS = 5000;
+    DWORD currentWaitMS = 0;
+    DWORD lastError = ERROR_SUCCESS;
+    while (currentWaitMS < maxWaitMS)
+    {
+        BOOL result = StartServiceW(service, argc, argv);
+        if (result)
+        {
+            lastError = ERROR_SUCCESS;
+            break;
+        }
+        else
+        {
+            lastError = GetLastError();
+        }
+        Sleep(100);
+        currentWaitMS += 100;
+    }
+    CloseServiceHandle(service);
+    CloseServiceHandle(serviceManager);
+    return lastError;
+}
+
+#ifndef ONLY_SERVICE_LAUNCHING
+
+/**
+ * Launch a service initiated action for a software update with the
+ * specified arguments.
+ *
+ * @param  exePath The path of the executable to run
+ * @param  argc    The total number of arguments in argv
+ * @param  argv    An array of null terminated strings to pass to the exePath,
+ *                 argv[0] must be the path to the updater.exe
+ * @return ERROR_SUCCESS if successful
+ */
+DWORD
+LaunchServiceSoftwareUpdateCommand(int argc, LPCWSTR* argv)
+{
+    // The service command is the same as the updater.exe command line except
+    // it has 2 extra args: 1) The Path to updater.exe, and 2) the command
+    // being executed which is "software-update"
+    LPCWSTR *updaterServiceArgv = new LPCWSTR[argc + 2];
+    updaterServiceArgv[0] = L"MozillaMaintenance";
+    updaterServiceArgv[1] = L"software-update";
+
+    for (int i = 0; i < argc; ++i)
+    {
+        updaterServiceArgv[i + 2] = argv[i];
+    }
+
+    // Execute the service command by starting the service with
+    // the passed in arguments.
+    DWORD ret = StartServiceCommand(argc + 2, updaterServiceArgv);
+    delete[] updaterServiceArgv;
+    return ret;
+}
+
+/**
+ * Joins a base directory path with a filename.
+ *
+ * @param  base  The base directory path of size MAX_PATH + 1
+ * @param  extra The filename to append
+ * @return TRUE if the file name was successful appended to base
+ */
+BOOL
+PathAppendSafe(LPWSTR base, LPCWSTR extra)
+{
+    if (wcslen(base) + wcslen(extra) >= MAX_PATH)
+    {
+        return FALSE;
+    }
+
+    return PathAppendW(base, extra);
+}
+
+/**
+ * Sets update.status to pending so that the next startup will not use
+ * the service and instead will attempt an update the with a UAC prompt.
+ *
+ * @param  updateDirPath The path of the update directory
+ * @return TRUE if successful
+ */
+BOOL
+WriteStatusPending(LPCWSTR updateDirPath)
+{
+    WCHAR updateStatusFilePath[MAX_PATH + 1] = { L'\0' };
+    wcsncpy(updateStatusFilePath, updateDirPath, MAX_PATH);
+    if (!PathAppendSafe(updateStatusFilePath, L"update.status"))
+    {
+        return FALSE;
+    }
+
+    const char pending[] = "pending";
+    HANDLE statusFile = CreateFileW(updateStatusFilePath, GENERIC_WRITE, 0,
+                                    nullptr, CREATE_ALWAYS, 0, nullptr);
+    if (statusFile == INVALID_HANDLE_VALUE)
+    {
+        return FALSE;
+    }
+
+    DWORD wrote;
+    BOOL ok = WriteFile(statusFile, pending,
+                        sizeof(pending) - 1, &wrote, nullptr);
+    CloseHandle(statusFile);
+    return ok && (wrote == sizeof(pending) - 1);
+}
+
+/**
+ * Sets update.status to a specific failure code
+ *
+ * @param  updateDirPath The path of the update directory
+ * @return TRUE if successful
+ */
+BOOL
+WriteStatusFailure(LPCWSTR updateDirPath, int errorCode)
+{
+    WCHAR updateStatusFilePath[MAX_PATH + 1] = { L'\0' };
+    wcsncpy(updateStatusFilePath, updateDirPath, MAX_PATH);
+    if (!PathAppendSafe(updateStatusFilePath, L"update.status"))
+    {
+        return FALSE;
+    }
+
+    HANDLE statusFile = CreateFileW(updateStatusFilePath, GENERIC_WRITE, 0,
+                                    nullptr, CREATE_ALWAYS, 0, nullptr);
+    if (statusFile == INVALID_HANDLE_VALUE)
+    {
+        return FALSE;
+    }
+    char failure[32];
+    sprintf(failure, "failed: %d", errorCode);
+
+    DWORD toWrite = strlen(failure);
+    DWORD wrote;
+    BOOL ok = WriteFile(statusFile, failure,
+                        toWrite, &wrote, nullptr);
+    CloseHandle(statusFile);
+    return ok && wrote == toWrite;
+}
+
+#endif
+
+/**
+ * Waits for a service to enter a stopped state.
+ * This function does not stop the service, it just blocks until the service
+ * is stopped.
+ *
+ * @param  serviceName     The service to wait for.
+ * @param  maxWaitSeconds  The maximum number of seconds to wait
+ * @return state of the service after a timeout or when stopped.
+ *         A value of 255 is returned for an error. Typical values are:
+ *         SERVICE_STOPPED 0x00000001
+ *         SERVICE_START_PENDING 0x00000002
+ *         SERVICE_STOP_PENDING 0x00000003
+ *         SERVICE_RUNNING 0x00000004
+ *         SERVICE_CONTINUE_PENDING 0x00000005
+ *         SERVICE_PAUSE_PENDING 0x00000006
+ *         SERVICE_PAUSED 0x00000007
+ *         last status not set 0x000000CF
+ *         Could no query status 0x000000DF
+ *         Could not open service, access denied 0x000000EB
+ *         Could not open service, invalid handle 0x000000EC
+ *         Could not open service, invalid name 0x000000ED
+ *         Could not open service, does not exist 0x000000EE
+ *         Could not open service, other error 0x000000EF
+ *         Could not open SCM, access denied 0x000000FD
+ *         Could not open SCM, database does not exist 0x000000FE;
+ *         Could not open SCM, other error 0x000000FF;
+ * Note: The strange choice of error codes above SERVICE_PAUSED are chosen
+ * in case Windows comes out with other service stats higher than 7, they
+ * would likely call it 8 and above.  JS code that uses this in TestAUSHelper
+ * only handles values up to 255 so that's why we don't use GetLastError
+ * directly.
+ */
+DWORD
+WaitForServiceStop(LPCWSTR serviceName, DWORD maxWaitSeconds)
+{
+    // 0x000000CF is defined above to be not set
+    DWORD lastServiceState = 0x000000CF;
+
+    // Get a handle to the SCM database.
+    SC_HANDLE serviceManager = OpenSCManager(nullptr, nullptr,
+                               SC_MANAGER_CONNECT |
+                               SC_MANAGER_ENUMERATE_SERVICE);
+    if (!serviceManager)
+    {
+        DWORD lastError = GetLastError();
+        switch (lastError)
+        {
+            case ERROR_ACCESS_DENIED:
+                return 0x000000FD;
+            case ERROR_DATABASE_DOES_NOT_EXIST:
+                return 0x000000FE;
+            default:
+                return 0x000000FF;
+        }
+    }
+
+    // Get a handle to the service.
+    SC_HANDLE service = OpenServiceW(serviceManager,
+                                     serviceName,
+                                     SERVICE_QUERY_STATUS);
+    if (!service)
+    {
+        DWORD lastError = GetLastError();
+        CloseServiceHandle(serviceManager);
+        switch (lastError)
+        {
+            case ERROR_ACCESS_DENIED:
+                return 0x000000EB;
+            case ERROR_INVALID_HANDLE:
+                return 0x000000EC;
+            case ERROR_INVALID_NAME:
+                return 0x000000ED;
+            case ERROR_SERVICE_DOES_NOT_EXIST:
+                return 0x000000EE;
+            default:
+                return 0x000000EF;
+        }
+    }
+
+    DWORD currentWaitMS = 0;
+    SERVICE_STATUS_PROCESS ssp;
+    ssp.dwCurrentState = lastServiceState;
+    while (currentWaitMS < maxWaitSeconds * 1000)
+    {
+        DWORD bytesNeeded;
+        if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, (LPBYTE)&ssp,
+                                  sizeof(SERVICE_STATUS_PROCESS), &bytesNeeded))
+        {
+            DWORD lastError = GetLastError();
+            switch (lastError)
+            {
+                case ERROR_INVALID_HANDLE:
+                    ssp.dwCurrentState = 0x000000D9;
+                    break;
+                case ERROR_ACCESS_DENIED:
+                    ssp.dwCurrentState = 0x000000DA;
+                    break;
+                case ERROR_INSUFFICIENT_BUFFER:
+                    ssp.dwCurrentState = 0x000000DB;
+                    break;
+                case ERROR_INVALID_PARAMETER:
+                    ssp.dwCurrentState = 0x000000DC;
+                    break;
+                case ERROR_INVALID_LEVEL:
+                    ssp.dwCurrentState = 0x000000DD;
+                    break;
+                case ERROR_SHUTDOWN_IN_PROGRESS:
+                    ssp.dwCurrentState = 0x000000DE;
+                    break;
+                // These 3 errors can occur when the service is not yet stopped but
+                // it is stopping.
+                case ERROR_INVALID_SERVICE_CONTROL:
+                case ERROR_SERVICE_CANNOT_ACCEPT_CTRL:
+                case ERROR_SERVICE_NOT_ACTIVE:
+                    currentWaitMS += 50;
+                    Sleep(50);
+                    continue;
+                default:
+                    ssp.dwCurrentState = 0x000000DF;
+            }
+
+            // We couldn't query the status so just break out
+            break;
+        }
+
+        // The service is already in use.
+        if (ssp.dwCurrentState == SERVICE_STOPPED)
+        {
+            break;
+        }
+        currentWaitMS += 50;
+        Sleep(50);
+    }
+
+    lastServiceState = ssp.dwCurrentState;
+    CloseServiceHandle(service);
+    CloseServiceHandle(serviceManager);
+    return lastServiceState;
+}
+
+#ifndef ONLY_SERVICE_LAUNCHING
+
+/**
+ * Determines if there is at least one process running for the specified
+ * application. A match will be found across any session for any user.
+ *
+ * @param process The process to check for existence
+ * @return ERROR_NOT_FOUND if the process was not found
+ *         ERROR_SUCCESS if the process was found and there were no errors
+ *         Other Win32 system error code for other errors
+**/
+DWORD
+IsProcessRunning(LPCWSTR filename)
+{
+    // Take a snapshot of all processes in the system.
+    HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+    if (INVALID_HANDLE_VALUE == snapshot)
+    {
+        return GetLastError();
+    }
+
+    PROCESSENTRY32W processEntry;
+    processEntry.dwSize = sizeof(PROCESSENTRY32W);
+    if (!Process32FirstW(snapshot, &processEntry))
+    {
+        DWORD lastError = GetLastError();
+        CloseHandle(snapshot);
+        return lastError;
+    }
+
+    do
+    {
+        if (wcsicmp(filename, processEntry.szExeFile) == 0)
+        {
+            CloseHandle(snapshot);
+            return ERROR_SUCCESS;
+        }
+    }
+    while (Process32NextW(snapshot, &processEntry));
+    CloseHandle(snapshot);
+    return ERROR_NOT_FOUND;
+}
+
+/**
+ * Waits for the specified application to exit.
+ *
+ * @param filename   The application to wait for.
+ * @param maxSeconds The maximum amount of seconds to wait for all
+ *                   instances of the application to exit.
+ * @return  ERROR_SUCCESS if no instances of the application exist
+ *          WAIT_TIMEOUT if the process is still running after maxSeconds.
+ *          Any other Win32 system error code.
+*/
+DWORD
+WaitForProcessExit(LPCWSTR filename, DWORD maxSeconds)
+{
+    DWORD applicationRunningError = WAIT_TIMEOUT;
+    for (DWORD i = 0; i < maxSeconds; i++)
+    {
+        applicationRunningError = IsProcessRunning(filename);
+        if (ERROR_NOT_FOUND == applicationRunningError)
+        {
+            return ERROR_SUCCESS;
+        }
+        Sleep(1000);
+    }
+
+    if (ERROR_SUCCESS == applicationRunningError)
+    {
+        return WAIT_TIMEOUT;
+    }
+
+    return applicationRunningError;
+}
+
+/**
+ *  Determines if the fallback key exists or not
+ *
+ *  @return TRUE if the fallback key exists and there was no error checking
+*/
+BOOL
+DoesFallbackKeyExist()
+{
+    HKEY testOnlyFallbackKey;
+    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+                      TEST_ONLY_FALLBACK_KEY_PATH, 0,
+                      KEY_READ | KEY_WOW64_64KEY,
+                      &testOnlyFallbackKey) != ERROR_SUCCESS)
+    {
+        return FALSE;
+    }
+
+    RegCloseKey(testOnlyFallbackKey);
+    return TRUE;
+}
+
+#endif
+
+/**
+ * Determines if the file system for the specified file handle is local
+ * @param file path to check the filesystem type for, must be at most MAX_PATH
+ * @param isLocal out parameter which will hold TRUE if the drive is local
+ * @return TRUE if the call succeeded
+*/
+BOOL
+IsLocalFile(LPCWSTR file, BOOL &isLocal)
+{
+    WCHAR rootPath[MAX_PATH + 1] = { L'\0' };
+    if (wcslen(file) > MAX_PATH)
+    {
+        return FALSE;
+    }
+
+    wcsncpy(rootPath, file, MAX_PATH);
+    PathStripToRootW(rootPath);
+    isLocal = GetDriveTypeW(rootPath) == DRIVE_FIXED;
+    return TRUE;
+}
+
+
+/**
+ * Determines the DWORD value of a registry key value
+ *
+ * @param key       The base key to where the value name exists
+ * @param valueName The name of the value
+ * @param retValue  Out parameter which will hold the value
+ * @return TRUE on success
+*/
+static BOOL
+GetDWORDValue(HKEY key, LPCWSTR valueName, DWORD &retValue)
+{
+    DWORD regDWORDValueSize = sizeof(DWORD);
+    LONG retCode = RegQueryValueExW(key, valueName, 0, nullptr,
+                                    reinterpret_cast<LPBYTE>(&retValue),
+                                    &regDWORDValueSize);
+    return ERROR_SUCCESS == retCode;
+}
+
+/**
+ * Determines if the system's elevation type allows
+ * unprompted elevation.
+ *
+ * @param isUnpromptedElevation Out parameter which specifies if unprompted
+ *                              elevation is allowed.
+ * @return TRUE if the user can actually elevate and the value was obtained
+ *         successfully.
+*/
+BOOL
+IsUnpromptedElevation(BOOL &isUnpromptedElevation)
+{
+    if (!UACHelper::CanUserElevate())
+    {
+        return FALSE;
+    }
+
+    LPCWSTR UACBaseRegKey =
+        L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\System";
+    HKEY baseKey;
+    LONG retCode = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+                                 UACBaseRegKey, 0,
+                                 KEY_READ, &baseKey);
+    if (retCode != ERROR_SUCCESS)
+    {
+        return FALSE;
+    }
+
+    DWORD consent;
+    DWORD secureDesktop = 0;
+    BOOL success = GetDWORDValue(baseKey, L"ConsentPromptBehaviorAdmin",
+                                 consent);
+    success = success &&
+              GetDWORDValue(baseKey, L"PromptOnSecureDesktop", secureDesktop);
+    isUnpromptedElevation = !consent && !secureDesktop;
+
+    RegCloseKey(baseKey);
+    return success;
+}
+#endif
diff --git a/onlineupdate/source/update/common/updatehelper.h b/onlineupdate/source/update/common/updatehelper.h
new file mode 100644
index 000000000..b8c557bd6
--- /dev/null
+++ b/onlineupdate/source/update/common/updatehelper.h
@@ -0,0 +1,34 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+BOOL LaunchWinPostProcess(const WCHAR *installationDir,
+                          const WCHAR *updateInfoDir,
+                          bool forceSync,
+                          HANDLE userToken);
+BOOL StartServiceUpdate(LPCWSTR installDir);
+BOOL GetUpdateDirectoryPath(LPWSTR path);
+DWORD LaunchServiceSoftwareUpdateCommand(int argc, LPCWSTR *argv);
+BOOL WriteStatusFailure(LPCWSTR updateDirPath, int errorCode);
+BOOL WriteStatusPending(LPCWSTR updateDirPath);
+DWORD WaitForServiceStop(LPCWSTR serviceName, DWORD maxWaitSeconds);
+DWORD WaitForProcessExit(LPCWSTR filename, DWORD maxSeconds);
+BOOL DoesFallbackKeyExist();
+BOOL IsLocalFile(LPCWSTR file, BOOL &isLocal);
+DWORD StartServiceCommand(int argc, LPCWSTR* argv);
+BOOL IsUnpromptedElevation(BOOL &isUnpromptedElevation);
+
+#define SVC_NAME L"LibreOfficeMaintenance"
+
+#define BASE_SERVICE_REG_KEY \
+  L"SOFTWARE\\LibreOffice\\MaintenanceService"
+
+// The test only fallback key, as its name implies, is only present on machines
+// that will use automated tests.  Since automated tests always run from a
+// different directory for each test, the presence of this key bypasses the
+// "This is a valid installation directory" check.  This key also stores
+// the allowed name and issuer for cert checks so that the cert check
+// code can still be run unchanged.
+#define TEST_ONLY_FALLBACK_KEY_PATH \
+  BASE_SERVICE_REG_KEY L"\\3932ecacee736d366d6436db0f55bce4"
+
diff --git a/onlineupdate/source/update/common/updatelogging.cxx b/onlineupdate/source/update/common/updatelogging.cxx
new file mode 100644
index 000000000..ed055cd47
--- /dev/null
+++ b/onlineupdate/source/update/common/updatelogging.cxx
@@ -0,0 +1,85 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#if defined(_WIN32)
+#include <windows.h>
+#endif
+
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+
+#include "updatelogging.h"
+
+UpdateLog::UpdateLog()
+    : logFP(nullptr)
+    , sourcePath(nullptr)
+{
+}
+
+void UpdateLog::Init(NS_tchar* sourcePathParam,
+                     const NS_tchar* fileName,
+                     const NS_tchar* alternateFileName,
+                     bool append)
+{
+    if (logFP)
+        return;
+
+    sourcePath = sourcePathParam;
+    NS_tchar logFile[MAXPATHLEN];
+    NS_tsnprintf(logFile, sizeof(logFile)/sizeof(logFile[0]),
+                 NS_T("%s/%s"), sourcePathParam, fileName);
+
+    if (alternateFileName && NS_taccess(logFile, F_OK))
+    {
+        NS_tsnprintf(logFile, sizeof(logFile)/sizeof(logFile[0]),
+                     NS_T("%s/%s"), sourcePathParam, alternateFileName);
+    }
+
+    logFP = NS_tfopen(logFile, append ? NS_T("a") : NS_T("w"));
+}
+
+void UpdateLog::Finish()
+{
+    if (!logFP)
+        return;
+
+    fclose(logFP);
+    logFP = nullptr;
+}
+
+void UpdateLog::Flush()
+{
+    if (!logFP)
+        return;
+
+    fflush(logFP);
+}
+
+void UpdateLog::Printf(const char *fmt, ... )
+{
+    if (!logFP)
+        return;
+
+    va_list ap;
+    va_start(ap, fmt);
+    vfprintf(logFP, fmt, ap);
+    fprintf(logFP, "\n");
+    va_end(ap);
+}
+
+void UpdateLog::WarnPrintf(const char *fmt, ... )
+{
+    if (!logFP)
+        return;
+
+    va_list ap;
+    va_start(ap, fmt);
+    fprintf(logFP, "*** Warning: ");
+    vfprintf(logFP, fmt, ap);
+    fprintf(logFP, "***\n");
+    va_end(ap);
+}
diff --git a/onlineupdate/source/update/common/updatelogging.h b/onlineupdate/source/update/common/updatelogging.h
new file mode 100644
index 000000000..591cb3f4f
--- /dev/null
+++ b/onlineupdate/source/update/common/updatelogging.h
@@ -0,0 +1,47 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef UPDATELOGGING_H
+#define UPDATELOGGING_H
+
+#include "updatedefines.h"
+#include <stdio.h>
+
+class UpdateLog
+{
+public:
+    static UpdateLog & GetPrimaryLog()
+    {
+        static UpdateLog primaryLog;
+        return primaryLog;
+    }
+
+    void Init(NS_tchar* sourcePath, const NS_tchar* fileName,
+              const NS_tchar* alternateFileName, bool append);
+    void Finish();
+    void Flush();
+    void Printf(const char *fmt, ... );
+    void WarnPrintf(const char *fmt, ... );
+
+    ~UpdateLog()
+    {
+        Finish();
+    }
+
+protected:
+    UpdateLog();
+    FILE *logFP;
+    NS_tchar* sourcePath;
+};
+
+#define LOG_WARN(args) UpdateLog::GetPrimaryLog().WarnPrintf args
+#define LOG(args) UpdateLog::GetPrimaryLog().Printf args
+#define LogInit(PATHNAME_, FILENAME_) \
+  UpdateLog::GetPrimaryLog().Init(PATHNAME_, FILENAME_, 0, false)
+#define LogInitAppend(PATHNAME_, FILENAME_, ALTERNATE_) \
+  UpdateLog::GetPrimaryLog().Init(PATHNAME_, FILENAME_, ALTERNATE_, true)
+#define LogFinish() UpdateLog::GetPrimaryLog().Finish()
+#define LogFlush() UpdateLog::GetPrimaryLog().Flush()
+
+#endif
diff --git a/onlineupdate/source/update/common/win_dirent.h b/onlineupdate/source/update/common/win_dirent.h
new file mode 100644
index 000000000..ee2ab6c67
--- /dev/null
+++ b/onlineupdate/source/update/common/win_dirent.h
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WINDIRENT_H__
+#define WINDIRENT_H__
+#ifdef _WIN32
+#include <windows.h>
+
+struct DIR
+{
+    explicit DIR(const WCHAR* path);
+    ~DIR();
+    HANDLE findHandle;
+    WCHAR name[MAX_PATH];
+};
+
+struct dirent
+{
+    dirent();
+    WCHAR d_name[MAX_PATH];
+};
+
+DIR* opendir(const WCHAR* path);
+int closedir(DIR* dir);
+dirent* readdir(DIR* dir);
+
+#endif  // WNT
+#endif  // WINDIRENT_H__