From bf713ccf7474dd40cfc68454e3781f3236e2c60f Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Mon, 1 May 2017 05:33:14 +0200 Subject: fix updater code on windows Change-Id: Ic1e39bc8f4ef6afe8781ce62997201acba56680a Reviewed-on: https://gerrit.libreoffice.org/40604 Tested-by: Jenkins Reviewed-by: Markus Mohrhard --- onlineupdate/inc/Char16.h | 194 +++++++++++++++++++++ onlineupdate/source/mbsdiff/bsdiff.cxx | 8 +- .../updater/xpcom/glue/nsVersionComparator.cxx | 2 +- 3 files changed, 199 insertions(+), 5 deletions(-) create mode 100755 onlineupdate/inc/Char16.h (limited to 'onlineupdate') diff --git a/onlineupdate/inc/Char16.h b/onlineupdate/inc/Char16.h new file mode 100755 index 000000000000..bc99179811c1 --- /dev/null +++ b/onlineupdate/inc/Char16.h @@ -0,0 +1,194 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ +/* 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/. */ + +/* Implements a UTF-16 character type. */ + +#ifndef mozilla_Char16_h +#define mozilla_Char16_h + +#ifdef __cplusplus + +/* + * C++11 introduces a char16_t type and support for UTF-16 string and character + * literals. C++11's char16_t is a distinct builtin type. Technically, char16_t + * is a 16-bit code unit of a Unicode code point, not a "character". + */ + +#ifdef _WIN32 +# define MOZ_USE_CHAR16_WRAPPER +# include + /** + * Win32 API extensively uses wchar_t, which is represented by a separated + * builtin type than char16_t per spec. It's not the case for MSVC prior to + * MSVC 2015, but other compilers follow the spec. We want to mix wchar_t and + * char16_t on Windows builds. This class is supposed to make it easier. It + * stores char16_t const pointer, but provides implicit casts for wchar_t as + * well. On other platforms, we simply use + * |typedef const char16_t* char16ptr_t|. Here, we want to make the class as + * similar to this typedef, including providing some casts that are allowed + * by the typedef. + */ +class char16ptr_t +{ +private: + const char16_t* mPtr; + static_assert(sizeof(char16_t) == sizeof(wchar_t), + "char16_t and wchar_t sizes differ"); + +public: + char16ptr_t(const char16_t* aPtr) : mPtr(aPtr) {} + char16ptr_t(const wchar_t* aPtr) : + mPtr(reinterpret_cast(aPtr)) + {} + + /* Without this, nullptr assignment would be ambiguous. */ + constexpr char16ptr_t(decltype(nullptr)) : mPtr(nullptr) {} + + operator const char16_t*() const + { + return mPtr; + } + operator const wchar_t*() const + { + return reinterpret_cast(mPtr); + } + operator const void*() const + { + return mPtr; + } + operator bool() const + { + return mPtr != nullptr; + } + + /* Explicit cast operators to allow things like (char16_t*)str. */ + explicit operator char16_t*() const + { + return const_cast(mPtr); + } + explicit operator wchar_t*() const + { + return const_cast(static_cast(*this)); + } + explicit operator int() const + { + return reinterpret_cast(mPtr); + } + explicit operator unsigned int() const + { + return reinterpret_cast(mPtr); + } + explicit operator long() const + { + return reinterpret_cast(mPtr); + } + explicit operator unsigned long() const + { + return reinterpret_cast(mPtr); + } + explicit operator long long() const + { + return reinterpret_cast(mPtr); + } + explicit operator unsigned long long() const + { + return reinterpret_cast(mPtr); + } + + /** + * Some Windows API calls accept BYTE* but require that data actually be + * WCHAR*. Supporting this requires explicit operators to support the + * requisite explicit casts. + */ + explicit operator const char*() const + { + return reinterpret_cast(mPtr); + } + explicit operator const unsigned char*() const + { + return reinterpret_cast(mPtr); + } + explicit operator unsigned char*() const + { + return + const_cast(reinterpret_cast(mPtr)); + } + explicit operator void*() const + { + return const_cast(mPtr); + } + + /* Some operators used on pointers. */ + char16_t operator[](size_t aIndex) const + { + return mPtr[aIndex]; + } + bool operator==(const char16ptr_t& aOther) const + { + return mPtr == aOther.mPtr; + } + bool operator==(decltype(nullptr)) const + { + return mPtr == nullptr; + } + bool operator!=(const char16ptr_t& aOther) const + { + return mPtr != aOther.mPtr; + } + bool operator!=(decltype(nullptr)) const + { + return mPtr != nullptr; + } + char16ptr_t operator+(int aValue) const + { + return char16ptr_t(mPtr + aValue); + } + char16ptr_t operator+(unsigned int aValue) const + { + return char16ptr_t(mPtr + aValue); + } + char16ptr_t operator+(long aValue) const + { + return char16ptr_t(mPtr + aValue); + } + char16ptr_t operator+(unsigned long aValue) const + { + return char16ptr_t(mPtr + aValue); + } + char16ptr_t operator+(long long aValue) const + { + return char16ptr_t(mPtr + aValue); + } + char16ptr_t operator+(unsigned long long aValue) const + { + return char16ptr_t(mPtr + aValue); + } + ptrdiff_t operator-(const char16ptr_t& aOther) const + { + return mPtr - aOther.mPtr; + } +}; + +inline decltype((char*)0-(char*)0) +operator-(const char16_t* aX, const char16ptr_t aY) +{ + return aX - static_cast(aY); +} + +#else + +typedef const char16_t* char16ptr_t; + +#endif + +static_assert(sizeof(char16_t) == 2, "Is char16_t type 16 bits?"); +static_assert(char16_t(-1) > char16_t(0), "Is char16_t type unsigned?"); +static_assert(sizeof(u'A') == 2, "Is unicode char literal 16 bits?"); +static_assert(sizeof(u""[0]) == 2, "Is unicode string char 16 bits?"); + +#endif + +#endif /* mozilla_Char16_h */ diff --git a/onlineupdate/source/mbsdiff/bsdiff.cxx b/onlineupdate/source/mbsdiff/bsdiff.cxx index d455bf98046d..72bbcde1899f 100644 --- a/onlineupdate/source/mbsdiff/bsdiff.cxx +++ b/onlineupdate/source/mbsdiff/bsdiff.cxx @@ -23,7 +23,7 @@ #include #include #include -#ifdef XP_WIN +#ifdef _WIN32 #include #include #else @@ -213,10 +213,10 @@ int main(int argc,char *argv[]) { int fd; unsigned char *old = nullptr,*newbuf = nullptr; - int32_t oldsize = 0,newsize = 0; + int32_t oldsize = 0, newsize = 0; int32_t *I = nullptr,*V = nullptr; - int32_t scan,pos,len; + int32_t scan,pos = 0,len; int32_t lastscan,lastpos,lastoffset; int32_t oldscore,scsc; @@ -225,7 +225,7 @@ int main(int argc,char *argv[]) int32_t i; int32_t dblen,eblen; - unsigned char *db,*eb; + unsigned char *db,*eb = nullptr; unsigned int scrc; diff --git a/onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.cxx b/onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.cxx index 33c058982caf..def164d3808e 100644 --- a/onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.cxx +++ b/onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.cxx @@ -11,7 +11,7 @@ #include #if defined(_WIN32) && !defined(UPDATER_NO_STRING_GLUE_STL) #include -#include "mozilla/Char16.h" +#include "Char16.h" #endif #ifdef _WIN32 -- cgit v1.2.3