procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix compilation errors in conformance mode

This commit is contained in:
Stanislav Ershov 2018-10-19 01:51:55 +03:00
parent 5d336eb54f
commit e2e9b8aefc
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/platform/win/main_window_win.cpp
View File

@ -538,7 +538,7 @@ private:
BYTE r = 0, g = 0, b = 0; BYTE r = 0, g = 0, b = 0;
COLORREF noKeyColor; COLORREF noKeyColor;
static LRESULT CALLBACK _PsShadowWindows::wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); static LRESULT CALLBACK wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
}; };
_PsShadowWindows _psShadowWindows; _PsShadowWindows _psShadowWindows;

6
Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
View File

@ -213,7 +213,7 @@ class ToastEventHandler : public Implements<DesktopToastActivatedEventHandler, D
DesktopToastFailedEventHandler> { DesktopToastFailedEventHandler> {
public: public:
// We keep a weak pointer to a member field of native notifications manager. // We keep a weak pointer to a member field of native notifications manager.
ToastEventHandler::ToastEventHandler(const std::shared_ptr<Manager *> &guarded, const PeerId &peer, MsgId msg) ToastEventHandler(const std::shared_ptr<Manager *> &guarded, const PeerId &peer, MsgId msg)
: _peerId(peer) : _peerId(peer)
, _msgId(msg) , _msgId(msg)
, _weak(guarded) {} , _weak(guarded) {}
@ -608,8 +608,8 @@ void queryQuietHours() {
return; return;
} }
LPTSTR lpKeyName = L"Software\\Microsoft\\Windows\\CurrentVersion\\Notifications\\Settings"; LPCWSTR lpKeyName = L"Software\\Microsoft\\Windows\\CurrentVersion\\Notifications\\Settings";
LPTSTR lpValueName = L"NOC_GLOBAL_SETTING_TOASTS_ENABLED"; LPCWSTR lpValueName = L"NOC_GLOBAL_SETTING_TOASTS_ENABLED";
HKEY key; HKEY key;
auto result = RegOpenKeyEx(HKEY_CURRENT_USER, lpKeyName, 0, KEY_READ, &key); auto result = RegOpenKeyEx(HKEY_CURRENT_USER, lpKeyName, 0, KEY_READ, &key);
if (result != ERROR_SUCCESS) { if (result != ERROR_SUCCESS) {

15
Telegram/SourceFiles/platform/win/specific_win.cpp
View File

@ -510,15 +510,14 @@ QString SystemLanguage() {
namespace { namespace {
void _psLogError(const char *str, LSTATUS code) { void _psLogError(const char *str, LSTATUS code) {
LPTSTR errorText = NULL, errorTextDefault = L"(Unknown error)"; LPWSTR errorText = NULL;
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&errorText, 0, 0); if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
if (!errorText) { code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&errorText, 0, 0) > 0) {
errorText = errorTextDefault; LOG((str).arg(code).arg(QString::fromStdWString(errorText)));
}
LOG((str).arg(code).arg(QString::fromStdWString(errorText)));
if (errorText != errorTextDefault) {
LocalFree(errorText); LocalFree(errorText);
} else {
LOG((str).arg(code).arg("(Unknown error)"));
} }
} }

2
Telegram/SourceFiles/ui/text/text.cpp
View File

@ -663,7 +663,7 @@ private:
}; };
void computeLinkText(const QString &linkData, QString *outLinkText, LinkDisplayStatus *outDisplayStatus) { void computeLinkText(const QString &linkData, QString *outLinkText, LinkDisplayStatus *outDisplayStatus) {
QUrl url(linkData), good(url.isValid() ? url.toEncoded() : ""); QUrl url(linkData), good(url.isValid() ? url.toEncoded() : QString());
QString readable = good.isValid() ? good.toDisplayString() : linkData; QString readable = good.isValid() ? good.toDisplayString() : linkData;
*outLinkText = _t->_st->font->elided(readable, st::linkCropLimit); *outLinkText = _t->_st->font->elided(readable, st::linkCropLimit);
*outDisplayStatus = (*outLinkText == readable) ? LinkDisplayedFull : LinkDisplayedElided; *outDisplayStatus = (*outLinkText == readable) ? LinkDisplayedFull : LinkDisplayedElided;