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/AVS/src/image_utils.cpp | 6 +++--- plugins/FloatingContacts/src/bitmap_funcs.cpp | 2 +- plugins/HistoryStats/src/canvas.cpp | 4 ++-- plugins/Popup/src/bitmap_funcs.cpp | 2 +- plugins/TabSRMM/src/msgdlgutils.cpp | 8 ++++---- plugins/TabSRMM/src/themes.cpp | 4 ++-- plugins/TipperYM/src/bitmap_func.cpp | 5 +++-- plugins/Toaster/src/utils.h | 4 ++-- 8 files changed, 18 insertions(+), 17 deletions(-) (limited to 'plugins') diff --git a/plugins/AVS/src/image_utils.cpp b/plugins/AVS/src/image_utils.cpp index 6ac47475b2..d89448e359 100644 --- a/plugins/AVS/src/image_utils.cpp +++ b/plugins/AVS/src/image_utils.cpp @@ -161,7 +161,7 @@ void SetHIMETRICtoDP(HDC hdc, SIZE* sz) HBITMAP BmpFilterLoadBitmap(BOOL *bIsTransparent, const wchar_t *ptszFilename) { - FIBITMAP *dib = (FIBITMAP*)Image_Load(ptszFilename, IMGL_RETURNDIB | IMGL_WCHAR); + FIBITMAP *dib = (FIBITMAP*)Image_Load(ptszFilename, IMGL_RETURNDIB); if (dib == nullptr) return nullptr; @@ -211,11 +211,11 @@ int BmpFilterSaveBitmap(HBITMAP hBmp, const wchar_t *ptszFile, int flags) IMGSRVC_INFO i = { 0 }; i.cbSize = sizeof(IMGSRVC_INFO); - i.szName.w = tszFilename; + i.pwszName = tszFilename; i.hbm = hBmp; i.dwMask = IMGI_HBITMAP; i.fif = FIF_UNKNOWN; - return !Image_Save(&i, MAKELONG(IMGL_WCHAR, flags)); + return !Image_Save(&i, flags); } // Other utilities //////////////////////////////////////////////////////////////////////////////// diff --git a/plugins/FloatingContacts/src/bitmap_funcs.cpp b/plugins/FloatingContacts/src/bitmap_funcs.cpp index d81c2102ff..2c0ff762e8 100644 --- a/plugins/FloatingContacts/src/bitmap_funcs.cpp +++ b/plugins/FloatingContacts/src/bitmap_funcs.cpp @@ -935,7 +935,7 @@ bool MyBitmap::loadFromFile_gradient(const char *fn) bool MyBitmap::loadFromFile_default(const char *fn, const char *fnAlpha) { SIZE sz; - HBITMAP hBmpLoaded = Image_Load((const wchar_t*)fn, 0); + HBITMAP hBmpLoaded = Image_Load(_A2T(fn)); if (!hBmpLoaded) return false; diff --git a/plugins/HistoryStats/src/canvas.cpp b/plugins/HistoryStats/src/canvas.cpp index 1639521957..b85cca45fc 100644 --- a/plugins/HistoryStats/src/canvas.cpp +++ b/plugins/HistoryStats/src/canvas.cpp @@ -138,6 +138,6 @@ bool Canvas::writePNG(const wchar_t* szFileName) img.dwMask = IMGI_HBITMAP; img.hbm = m_hBmp; img.fif = FIF_PNG; - img.szName.w = (wchar_t*)szFileName; - return Image_Save(&img, IMGL_WCHAR) == 0; + img.pwszName = (wchar_t*)szFileName; + return Image_Save(&img) == 0; } diff --git a/plugins/Popup/src/bitmap_funcs.cpp b/plugins/Popup/src/bitmap_funcs.cpp index 0107441a57..9f20a65aa6 100644 --- a/plugins/Popup/src/bitmap_funcs.cpp +++ b/plugins/Popup/src/bitmap_funcs.cpp @@ -730,7 +730,7 @@ bool MyBitmap::loadFromFile(const wchar_t *fn) if (!wcsncmp(fn, L"gradient:", mir_wstrlen(L"gradient:"))) return loadFromFile_gradient(fn); - HBITMAP hBmpLoaded = Image_Load(fn, IMGL_WCHAR); + HBITMAP hBmpLoaded = Image_Load(fn); if (!hBmpLoaded) return false; 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); diff --git a/plugins/TipperYM/src/bitmap_func.cpp b/plugins/TipperYM/src/bitmap_func.cpp index d2f7f561b5..1bc5552107 100644 --- a/plugins/TipperYM/src/bitmap_func.cpp +++ b/plugins/TipperYM/src/bitmap_func.cpp @@ -154,8 +154,9 @@ void CreateFromBitmaps(bool bServiceTip) if (tszFileName && *tszFileName != 0) { FIBITMAP *fib = nullptr; if (!skin.bCached) { - FIBITMAP *fibLoad = (FIBITMAP *)Image_Load(tszFileName, IMGL_WCHAR | IMGL_RETURNDIB); - if (!fibLoad) continue; + FIBITMAP *fibLoad = (FIBITMAP *)Image_Load(tszFileName, IMGL_RETURNDIB); + if (!fibLoad) + continue; if (FreeImage_GetBPP(fibLoad) != 32) fib = FreeImage_ConvertTo32Bits(fibLoad); diff --git a/plugins/Toaster/src/utils.h b/plugins/Toaster/src/utils.h index 524a96730e..97e8b8ed92 100644 --- a/plugins/Toaster/src/utils.h +++ b/plugins/Toaster/src/utils.h @@ -44,11 +44,11 @@ public: if (!(GetFileAttributes(wszSavePath) < 0xFFFFFFF)) { IMGSRVC_INFO isi = { sizeof(isi) }; - isi.szName.w = wszSavePath; + isi.pwszName = wszSavePath; isi.hbm = _hBitmap; isi.dwMask = IMGI_HBITMAP; isi.fif = FREE_IMAGE_FORMAT::FIF_PNG; - Image_Save(&isi, IMGL_WCHAR); + Image_Save(&isi); } return mir_wstrdup(wszSavePath); } -- cgit v1.2.3