diff options
Diffstat (limited to 'shell/source/win32/shlxthandler/infotips/infotips.cxx')
-rwxr-xr-x[-rw-r--r--] | shell/source/win32/shlxthandler/infotips/infotips.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx index 58f8a877b2..6ef6b57d8f 100644..100755 --- a/shell/source/win32/shlxthandler/infotips/infotips.cxx +++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx @@ -352,14 +352,16 @@ HRESULT STDMETHODCALLTYPE CInfoTip::Load(LPCOLESTR pszFileName, DWORD /*dwMode*/ std::wstring::iterator end = fname.end(); m_FileNameOnly = std::wstring(begin, end); - + + fname = getShortPathName( fname ); + std::string fnameA = WStringToString(fname); // #115531# // ZeroMemory because strncpy doesn't '\0'-terminates the destination // string; reserve the last place in the buffer for the final '\0' // that's why '(sizeof(m_szFileName) - 1)' - ZeroMemory(m_szFileName, sizeof(m_szFileName)); + ZeroMemory(m_szFileName, sizeof(m_szFileName)); strncpy(m_szFileName, fnameA.c_str(), (sizeof(m_szFileName) - 1)); return S_OK; |