lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-06 05:09:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SDK][ATL] Use CStringW in CImage

Browse Source
This commit is contained in:
Katayama Hirofumi MZ
2019-12-23 20:19:48 +09:00
parent ad319ef944
commit 03854056a2
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sdk/lib/atl/atlimage.h
View File

@@ -377,14 +377,7 @@ public:
HRESULT Load(LPCTSTR pszFileName) throw()
{
// convert the file name string into Unicode
// TODO: use a string class
#ifdef UNICODE
LPCWSTR pszNameW = pszFileName;
#else
WCHAR szPath[MAX_PATH];
::MultiByteToWideChar(CP_ACP, 0, pszFileName, -1, szPath, MAX_PATH);
LPCWSTR pszNameW = szPath;
#endif
CStringW pszNameW(pszFileName);
// create a GpBitmap object from file
using namespace Gdiplus;
@@ -555,14 +548,7 @@ public:
// TODO & FIXME: set parameters (m_rgbTransColor etc.)
// convert the file name string into Unicode
// TODO: use a string class
#ifdef UNICODE
LPCWSTR pszNameW = pszFileName;
#else
WCHAR szPath[MAX_PATH];
::MultiByteToWideChar(CP_ACP, 0, pszFileName, -1, szPath, MAX_PATH);
LPCWSTR pszNameW = szPath;
#endif
CStringW pszNameW(pszFileName);
// if the file type is null, get the file type from extension
const GUID *FileType = &guidFileType;