From fc99e176ada8bb07d55929bcfcf8733f6bd95831 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 8 Mar 2018 21:23:00 +0300 Subject: IMGL_WCHAR removed, all paths are in Unicode now --- plugins/TabSRMM/src/msgdlgutils.cpp | 8 ++++---- plugins/TabSRMM/src/themes.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/TabSRMM') diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index 574a228ece..a619dffa0d 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -183,11 +183,11 @@ static void SaveAvatarToFile(CTabBaseDlg *dat, HBITMAP hbm, int isOwnPic) IMGSRVC_INFO ii; ii.cbSize = sizeof(ii); - ii.szName.w = szFinalFilename; + ii.pwszName = szFinalFilename; ii.hbm = hbm; ii.dwMask = IMGI_HBITMAP; ii.fif = FIF_UNKNOWN; // get the format from the filename extension. png is default. - Image_Save(&ii, IMGL_WCHAR); + Image_Save(&ii); } } @@ -1813,10 +1813,10 @@ void CTabBaseDlg::SendHBitmapAsFile(HBITMAP hbmp) const IMGSRVC_INFO ii; ii.cbSize = sizeof(ii); ii.hbm = hbmp; - ii.szName.w = filename; + ii.pwszName = filename; ii.dwMask = IMGI_HBITMAP; ii.fif = FIF_JPEG; - Image_Save(&ii, IMGL_WCHAR); + Image_Save(&ii); int totalCount = 0; wchar_t **ppFiles = nullptr; diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp index ec2390160a..4791b19699 100644 --- a/plugins/TabSRMM/src/themes.cpp +++ b/plugins/TabSRMM/src/themes.cpp @@ -1722,7 +1722,7 @@ void CSkin::setupAeroSkins() m_dwmColorRGB = RGB((BYTE)fr, (BYTE)fg, (BYTE)fb); - FIBITMAP *fib = (FIBITMAP *)Image_Load(tszFilename, IMGL_WCHAR | IMGL_RETURNDIB); + FIBITMAP *fib = (FIBITMAP *)Image_Load(tszFilename, IMGL_RETURNDIB); HBITMAP hbm = FreeImage_CreateHBITMAPFromDIB(fib); @@ -1764,7 +1764,7 @@ void CSkin::setupAeroSkins() if (!PathFileExists(tszFilename)) mir_snwprintf(tszFilename, L"%stabskin_aero_glow.png", tszBasePath); - fib = (FIBITMAP *)Image_Load(tszFilename, IMGL_WCHAR | IMGL_RETURNDIB); + fib = (FIBITMAP *)Image_Load(tszFilename, IMGL_RETURNDIB); COLORREF glowColor = M.GetDword(FONTMODULE, "aeroGlow", RGB(40, 40, 255)); hbm = FreeImage_CreateHBITMAPFromDIB(fib); -- cgit v1.2.3