Kaydet (Commit) 538f7d66 authored tarafından Mike Kaganski's avatar Mike Kaganski

IShellLinkA -> IShellLinkW

Change-Id: If07d7e0d2a3a33f0bcc96352ea40ff83a2f483ed
Reviewed-on: https://gerrit.libreoffice.org/70062
Tested-by: Jenkins
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst 07da6d9e
...@@ -301,9 +301,9 @@ static std::wstring getShellLinkTarget(const std::wstring& aLnkFile) ...@@ -301,9 +301,9 @@ static std::wstring getShellLinkTarget(const std::wstring& aLnkFile)
try try
{ {
sal::systools::COMReference<IShellLinkA> pIShellLink; sal::systools::COMReference<IShellLinkW> pIShellLink;
HRESULT hr = CoCreateInstance( HRESULT hr = CoCreateInstance(
CLSID_ShellLink, nullptr, CLSCTX_INPROC_SERVER, IID_IShellLink, reinterpret_cast<LPVOID*>(&pIShellLink)); CLSID_ShellLink, nullptr, CLSCTX_INPROC_SERVER, IID_IShellLinkW, reinterpret_cast<LPVOID*>(&pIShellLink));
if (FAILED(hr)) if (FAILED(hr))
return target; return target;
...@@ -318,14 +318,12 @@ static std::wstring getShellLinkTarget(const std::wstring& aLnkFile) ...@@ -318,14 +318,12 @@ static std::wstring getShellLinkTarget(const std::wstring& aLnkFile)
if (FAILED(hr)) if (FAILED(hr))
return target; return target;
char pathA[MAX_PATH]; wchar_t pathW[MAX_PATH];
WIN32_FIND_DATA wfd; WIN32_FIND_DATAW wfd;
hr = pIShellLink->GetPath(pathA, MAX_PATH, &wfd, SLGP_RAWPATH); hr = pIShellLink->GetPath(pathW, MAX_PATH, &wfd, SLGP_RAWPATH);
if (FAILED(hr)) if (FAILED(hr))
return target; return target;
wchar_t pathW[MAX_PATH];
MultiByteToWideChar(CP_ACP, 0, pathA, -1, pathW, MAX_PATH);
target = pathW; target = pathW;
} }
catch(sal::systools::ComError& ex) catch(sal::systools::ComError& ex)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment