Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Warnings with VC++ 2017

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2018-01-03 18:04:00 +01:00
parent cba3e90f32
commit 2502e10592
4 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/tools/3d/object_viewer/object_viewer.cpp
View file

@ -3897,7 +3897,7 @@ bool browseFolder(const CString &caption, CString &destFolder, HWND parent)
bi.lpfn = NULL; bi.lpfn = NULL;
bi.lParam = NULL; bi.lParam = NULL;
bi.iImage = 0; bi.iImage = 0;
LPITEMIDLIST result = SHBrowseForFolder(&bi); PIDLIST_ABSOLUTE result = SHBrowseForFolder(&bi);
if (result != NULL && SHGetPathFromIDList(result, chosenPath)) if (result != NULL && SHGetPathFromIDList(result, chosenPath))
{ {
destFolder = chosenPath; destFolder = chosenPath;

2
code/nel/tools/3d/plugin_max/nel_export/nel_export_filetools.cpp
View file

@ -91,7 +91,7 @@ ULONG CNelExport::SelectDir(HWND Parent, TCHAR* Title, std::string &Path)
bi.lParam=0; bi.lParam=0;
bi.iImage=0; bi.iImage=0;
ITEMIDLIST* pidl = SHBrowseForFolder(&bi); PIDLIST_ABSOLUTE pidl = SHBrowseForFolder(&bi);
if (!SHGetPathFromIDList(pidl,str) ) if (!SHGetPathFromIDList(pidl,str) )
{ {

4
code/nel/tools/3d/tile_edit/SelectionTerritoire.cpp
View file

@ -517,8 +517,8 @@ void SelectionTerritoire::OnPath()
info.ulFlags=BIF_RETURNONLYFSDIRS; info.ulFlags=BIF_RETURNONLYFSDIRS;
// Select the path // Select the path
LPITEMIDLIST list; PIDLIST_ABSOLUTE list = SHBrowseForFolder(&info);
if (list=SHBrowseForFolder (&info)) if (list)
{ {
// Convert item into path string // Convert item into path string
BOOL bRet=SHGetPathFromIDList(list, path); BOOL bRet=SHGetPathFromIDList(list, path);

7
code/nel/tools/misc/branch_patcher/branch_patcherDlg.cpp
View file

@ -208,7 +208,6 @@ int CDirDialog::DoBrowse()
} }
BROWSEINFO bInfo; BROWSEINFO bInfo;
LPITEMIDLIST pidl;
ZeroMemory((PVOID)&bInfo, sizeof(BROWSEINFO)); ZeroMemory((PVOID)&bInfo, sizeof(BROWSEINFO));
if (!m_strInitDir.IsEmpty()) if (!m_strInitDir.IsEmpty())
@ -258,10 +257,8 @@ int CDirDialog::DoBrowse()
bInfo.lpszTitle = (m_strTitle.IsEmpty()) ? "Open" : m_strTitle; bInfo.lpszTitle = (m_strTitle.IsEmpty()) ? "Open" : m_strTitle;
bInfo.ulFlags = BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS; bInfo.ulFlags = BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
if ((pidl = ::SHBrowseForFolder(&bInfo)) == NULL) PIDLIST_ABSOLUTE pidl = ::SHBrowseForFolder(&bInfo);
{ if (!pidl) return 0;
return 0;
}
m_strPath.ReleaseBuffer(); m_strPath.ReleaseBuffer();
m_iImageIndex = bInfo.iImage; m_iImageIndex = bInfo.iImage;