diff options
-rw-r--r-- | plugins/Clist_modern/src/modern_aniavatars.cpp | 1 | ||||
-rw-r--r-- | plugins/MyDetails/src/frame.cpp | 12 | ||||
-rw-r--r-- | plugins/Popup/src/avatars_gif.cpp | 2 | ||||
-rw-r--r-- | plugins/TabSRMM/src/msgdlgutils.cpp | 2 | ||||
-rw-r--r-- | protocols/SkypeWeb/src/skype_profile.cpp | 28 | ||||
-rw-r--r-- | src/mir_app/src/FontOptions.cpp | 4 |
6 files changed, 13 insertions, 36 deletions
diff --git a/plugins/Clist_modern/src/modern_aniavatars.cpp b/plugins/Clist_modern/src/modern_aniavatars.cpp index c45c91ee0e..b98eae48c7 100644 --- a/plugins/Clist_modern/src/modern_aniavatars.cpp +++ b/plugins/Clist_modern/src/modern_aniavatars.cpp @@ -841,7 +841,6 @@ int AniAva_RedrawAllAvatars(BOOL updateZOrder) {
aacheck 0;
mir_cslock lck(s_CS);
- updateZOrder = 1;
for (auto &it : s_Objects) {
if (updateZOrder)
SendMessage(it->hWindow, AAM_REDRAW, (WPARAM)updateZOrder, 0);
diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp index f7a4b44242..0674df3f1b 100644 --- a/plugins/MyDetails/src/frame.cpp +++ b/plugins/MyDetails/src/frame.cpp @@ -592,15 +592,21 @@ void DeleteTooltipWindows(MyDetailsFrameData *data) void CalcRectangles(HWND hwnd)
{
HDC hdc = GetDC(hwnd);
+ if (hdc == nullptr)
+ return;
+
HFONT hOldFont = (HFONT)GetCurrentObject(hdc, OBJ_FONT);
MyDetailsFrameData *data = (MyDetailsFrameData *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
-
- if (hdc == nullptr || data == nullptr)
+ if (data == nullptr) {
+ ReleaseDC(hwnd, hdc);
return;
+ }
Protocol *proto = protocols->Get(data->protocol_number);
- if (proto == nullptr)
+ if (proto == nullptr) {
+ ReleaseDC(hwnd, hdc);
return;
+ }
data->recalc_rectangles = false;
proto->data_changed = false;
diff --git a/plugins/Popup/src/avatars_gif.cpp b/plugins/Popup/src/avatars_gif.cpp index bfb5d63368..29c4926606 100644 --- a/plugins/Popup/src/avatars_gif.cpp +++ b/plugins/Popup/src/avatars_gif.cpp @@ -67,8 +67,8 @@ void GifAvatar::draw(MyBitmap *bmp, int x, int y, int w, int h, POPUPOPTIONS *op mir_free(frameDelays);
frameDelays = nullptr;
}
- if (hBitmap) DeleteObject(hBitmap);
GDIPlus_ExtractAnimatedGIF(av->szFilename, w, h, hBitmap, frameDelays, frameCount, frameSize);
+ if (hBitmap) DeleteObject(hBitmap);
}
if (!frameCount) return;
diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index 81a4be9065..cf5fded890 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -1208,7 +1208,7 @@ void CTabBaseDlg::LoadSplitter() }
else m_iSplitterY = (int)M.GetDword(m_hContact, "splitsplity", M.GetDword("splitsplity", 60));
- if (m_iSplitterY < MINSPLITTERY || m_iSplitterY < 0)
+ if (m_iSplitterY < MINSPLITTERY)
m_iSplitterY = 150;
}
diff --git a/protocols/SkypeWeb/src/skype_profile.cpp b/protocols/SkypeWeb/src/skype_profile.cpp index 832cfea8b5..52be5e902f 100644 --- a/protocols/SkypeWeb/src/skype_profile.cpp +++ b/protocols/SkypeWeb/src/skype_profile.cpp @@ -48,7 +48,6 @@ void CSkypeProto::InitLanguages() result[L"br"] = L"Breton";
result[L"bg"] = L"Bulgarian";
result[L"my"] = L"Burmese";
- result[L"es"] = L"Castilian";
result[L"ca"] = L"Catalan";
result[L"km"] = L"Central Khmer";
result[L"ch"] = L"Chamorro";
@@ -57,7 +56,6 @@ void CSkypeProto::InitLanguages() result[L"zh"] = L"Chinese";
result[L"za"] = L"Chuang";
result[L"cu"] = L"Church Slavic";
- result[L"cu"] = L"Church Slavonic";
result[L"cv"] = L"Chuvash";
result[L"kw"] = L"Cornish";
result[L"co"] = L"Corsican";
@@ -75,7 +73,6 @@ void CSkypeProto::InitLanguages() result[L"fo"] = L"Faroese";
result[L"fj"] = L"Fijian";
result[L"fi"] = L"Finnish";
- result[L"nl"] = L"Flemish";
result[L"fr"] = L"French";
result[L"ff"] = L"Fulah";
result[L"gd"] = L"Gaelic";
@@ -107,12 +104,10 @@ void CSkypeProto::InitLanguages() result[L"it"] = L"Italian";
result[L"ja"] = L"Japanese";
result[L"jv"] = L"Javanese";
- result[L"kl"] = L"Kalaallisut";
result[L"kn"] = L"Kannada";
result[L"kr"] = L"Kanuri";
result[L"ks"] = L"Kashmiri";
result[L"kk"] = L"Kazakh";
- result[L"ki"] = L"Kikuyu";
result[L"rw"] = L"Kinyarwanda";
result[L"ky"] = L"Kirghiz";
result[L"kv"] = L"Komi";
@@ -120,30 +115,23 @@ void CSkypeProto::InitLanguages() result[L"ko"] = L"Korean";
result[L"kj"] = L"Kuanyama";
result[L"ku"] = L"Kurdish";
- result[L"kj"] = L"Kwanyama";
- result[L"ky"] = L"Kyrgyz";
result[L"lo"] = L"Lao";
result[L"la"] = L"Latin";
result[L"lv"] = L"Latvian";
result[L"lb"] = L"Letzeburgesch";
result[L"li"] = L"Limburgan";
- result[L"li"] = L"Limburger";
- result[L"li"] = L"Limburgish";
result[L"ln"] = L"Lingala";
result[L"lt"] = L"Lithuanian";
result[L"lu"] = L"Luba-Katanga";
- result[L"lb"] = L"Luxembourgish";
result[L"mk"] = L"Macedonian";
result[L"mg"] = L"Malagasy";
result[L"ms"] = L"Malay";
result[L"ml"] = L"Malayalam";
- result[L"dv"] = L"Maldivian";
result[L"mt"] = L"Maltese";
result[L"gv"] = L"Manx";
result[L"mi"] = L"Maori";
result[L"mr"] = L"Marathi";
result[L"mh"] = L"Marshallese";
- result[L"ro"] = L"Moldovan";
result[L"mn"] = L"Mongolian";
result[L"na"] = L"Nauru";
result[L"nv"] = L"Navajo";
@@ -151,20 +139,12 @@ void CSkypeProto::InitLanguages() result[L"nr"] = L"Ndebele, South";
result[L"ng"] = L"Ndonga";
result[L"ne"] = L"Nepali";
- result[L"nd"] = L"North Ndebele";
result[L"se"] = L"Northern Sami";
result[L"no"] = L"Norwegian";
- result[L"nb"] = L"Norwegian Bokmal";
result[L"nn"] = L"Norwegian Nynorsk";
result[L"ii"] = L"Nuosu";
- result[L"ny"] = L"Nyanja";
- result[L"nn"] = L"Nynorsk, Norwegian";
- result[L"ie"] = L"Occidental";
result[L"oc"] = L"Occitan (post 1500)";
result[L"oj"] = L"Ojibwa";
- result[L"cu"] = L"Old Bulgarian";
- result[L"cu"] = L"Old Church Slavonic";
- result[L"cu"] = L"Old Slavonic";
result[L"or"] = L"Oriya";
result[L"om"] = L"Oromo";
result[L"os"] = L"Ossetic";
@@ -174,8 +154,6 @@ void CSkypeProto::InitLanguages() result[L"fa"] = L"Persian";
result[L"pl"] = L"Polish";
result[L"pt"] = L"Portuguese";
- result[L"pa"] = L"Punjabi";
- result[L"ps"] = L"Pushto";
result[L"qu"] = L"Quechua";
result[L"ro"] = L"Romanian";
result[L"rm"] = L"Romansh";
@@ -185,17 +163,14 @@ void CSkypeProto::InitLanguages() result[L"sg"] = L"Sango";
result[L"sa"] = L"Sanskrit";
result[L"sc"] = L"Sardinian";
- result[L"gd"] = L"Scottish Gaelic";
result[L"sr"] = L"Serbian";
result[L"sn"] = L"Shona";
- result[L"ii"] = L"Sichuan Yi";
result[L"sd"] = L"Sindhi";
result[L"si"] = L"Sinhalese";
result[L"sk"] = L"Slovak";
result[L"sl"] = L"Slovenian";
result[L"so"] = L"Somali";
result[L"st"] = L"Sotho, Southern";
- result[L"nr"] = L"South Ndebele";
result[L"es"] = L"Spanish";
result[L"su"] = L"Sundanese";
result[L"sw"] = L"Swahili";
@@ -219,9 +194,7 @@ void CSkypeProto::InitLanguages() result[L"ug"] = L"Uighur";
result[L"uk"] = L"Ukrainian";
result[L"ur"] = L"Urdu";
- result[L"ug"] = L"Uyghur";
result[L"uz"] = L"Uzbek";
- result[L"ca"] = L"Valencian";
result[L"ve"] = L"Venda";
result[L"vi"] = L"Vietnamese";
result[L"vo"] = L"Volapuk";
@@ -232,7 +205,6 @@ void CSkypeProto::InitLanguages() result[L"xh"] = L"Xhosa";
result[L"yi"] = L"Yiddish";
result[L"yo"] = L"Yoruba";
- result[L"za"] = L"Zhuang";
result[L"zu"] = L"Zulu";
}
diff --git a/src/mir_app/src/FontOptions.cpp b/src/mir_app/src/FontOptions.cpp index e87ea4cd11..7847d3d92a 100644 --- a/src/mir_app/src/FontOptions.cpp +++ b/src/mir_app/src/FontOptions.cpp @@ -236,8 +236,8 @@ static BOOL ExportSettings(HWND hwndDlg, const wchar_t *filename, OBJLIST<FontIn SIZE size;
GetTextExtentPoint32(hdc, L"_W", 2, &size);
- ReleaseDC(hwndDlg, hdc);
SelectObject(hdc, hOldFont);
+ ReleaseDC(hwndDlg, hdc);
DeleteObject(hFont);
iFontSize = size.cy;
@@ -577,8 +577,8 @@ static void sttSaveFontData(HWND hwndDlg, FontInternal &F) HDC hdc = GetDC(hwndDlg);
HFONT hOldFont = (HFONT)SelectObject(hdc, hFont);
GetTextExtentPoint32(hdc, L"_W", 2, &size);
- ReleaseDC(hwndDlg, hdc);
SelectObject(hdc, hOldFont);
+ ReleaseDC(hwndDlg, hdc);
DeleteObject(hFont);
db_set_b(0, F.dbSettingsGroup, str, (char)size.cy);
|