mirror of
https://github.com/chylex/Nextcloud-Desktop.git
synced 2024-11-15 01:42:45 +01:00
0ba5df597f
This also ensures a clear separation in the system registry. SelfReg is not recommended by Microsoft and will be handled by the MSI package to allow proper Repair and Uninstall. However, we keep it for backward compatibility with the NSIS installer. For details see: https://stackoverflow.com/questions/364187/how-do-you-register-a-win32-com-dll-file-in-wix-3#364210 https://docs.microsoft.com/en-us/windows/win32/msi/selfreg-table#remarks Another fix by this commit: The "Version" registry value in the NCOverlays self reg should be a key and not a value. Details: https://wixtoolset.org/documentation/manual/v3/xsd/wix/class.html Example: [HKCR\CLSID\{01234567-89AB-CDEF-0123-456789ABCDEF}\Version] @="1.0.0.0" Signed-off-by: Michael Schuster <michael@schuster.ms>
37 lines
1.1 KiB
C++
37 lines
1.1 KiB
C++
/**
|
|
* Copyright (c) 2014 ownCloud GmbH. All rights reserved.
|
|
*
|
|
* This library is free software; you can redistribute it and/or modify it under
|
|
* the terms of the GNU Lesser General Public License as published by the Free
|
|
* Software Foundation; version 2.1 of the License
|
|
*
|
|
* This library is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
|
|
* details.
|
|
*/
|
|
|
|
#include <locale>
|
|
#include <string>
|
|
#include <codecvt>
|
|
|
|
#include "StringUtil.h"
|
|
|
|
std::string StringUtil::toUtf8(const wchar_t *utf16, int len)
|
|
{
|
|
if (len < 0) {
|
|
len = (int) wcslen(utf16);
|
|
}
|
|
std::wstring_convert<std::codecvt_utf8_utf16<wchar_t> > converter;
|
|
return converter.to_bytes(utf16, utf16+len);
|
|
}
|
|
|
|
std::wstring StringUtil::toUtf16(const char *utf8, int len)
|
|
{
|
|
if (len < 0) {
|
|
len = (int) strlen(utf8);
|
|
}
|
|
std::wstring_convert<std::codecvt_utf8_utf16<wchar_t> > converter;
|
|
return converter.from_bytes(utf8, utf8+len);
|
|
}
|