Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 13:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[0.4.2] * Merge the shell fixes by Joachim and Christoph in revisions 72033 and 72034. CORE-5272

Browse source 
svn path=/branches/ros-branch-0_4_2/; revision=72037
This commit is contained in:
Amine Khaldi 2016-07-28 19:34:06 +00:00
parent 30e30daf51
commit 09f6700528
1 changed files with 54 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
reactos/dll/win32/shell32/CShellLink.cpp
View file

@ -1332,12 +1332,18 @@ HRESULT WINAPI CShellLink::SetDescription(LPCWSTR pszName)
TRACE("(%p)->(desc=%s)\n", this, debugstr_w(pszName));
HeapFree(GetProcessHeap(), 0, sDescription);
sDescription = (LPWSTR)HeapAlloc(GetProcessHeap(), 0,
(wcslen(pszName) + 1) * sizeof(WCHAR));
if (!sDescription)
return E_OUTOFMEMORY;
if (pszName)
{
sDescription = (LPWSTR)HeapAlloc(GetProcessHeap(), 0,
(wcslen(pszName) + 1) * sizeof(WCHAR));
if (!sDescription)
return E_OUTOFMEMORY;
wcscpy(sDescription, pszName);
}
else
sDescription = NULL;
wcscpy(sDescription, pszName);
bDirty = TRUE;
return S_OK;
@ -1360,11 +1366,17 @@ HRESULT WINAPI CShellLink::SetWorkingDirectory(LPCWSTR pszDir)
TRACE("(%p)->(dir=%s)\n", this, debugstr_w(pszDir));
HeapFree(GetProcessHeap(), 0, sWorkDir);
sWorkDir = (LPWSTR)HeapAlloc(GetProcessHeap(), 0,
(wcslen(pszDir) + 1) * sizeof (WCHAR));
if (!sWorkDir)
return E_OUTOFMEMORY;
wcscpy(sWorkDir, pszDir);
if (pszDir)
{
sWorkDir = (LPWSTR)HeapAlloc(GetProcessHeap(), 0,
(wcslen(pszDir) + 1) * sizeof (WCHAR));
if (!sWorkDir)
return E_OUTOFMEMORY;
wcscpy(sWorkDir, pszDir);
}
else
sWorkDir = NULL;
bDirty = TRUE;
return S_OK;
@ -1387,12 +1399,18 @@ HRESULT WINAPI CShellLink::SetArguments(LPCWSTR pszArgs)
TRACE("(%p)->(args=%s)\n", this, debugstr_w(pszArgs));
HeapFree(GetProcessHeap(), 0, sArgs);
sArgs = (LPWSTR)HeapAlloc(GetProcessHeap(), 0,
(wcslen(pszArgs) + 1) * sizeof (WCHAR));
if (!sArgs)
return E_OUTOFMEMORY;
if (pszArgs)
{
sArgs = (LPWSTR)HeapAlloc(GetProcessHeap(), 0,
(wcslen(pszArgs) + 1) * sizeof (WCHAR));
if (!sArgs)
return E_OUTOFMEMORY;
wcscpy(sArgs, pszArgs);
}
else
sArgs = NULL;
wcscpy(sArgs, pszArgs);
bDirty = TRUE;
return S_OK;
@ -1473,11 +1491,16 @@ HRESULT WINAPI CShellLink::SetIconLocation(LPCWSTR pszIconPath, INT iIcon)
TRACE("(%p)->(path=%s iicon=%u)\n", this, debugstr_w(pszIconPath), iIcon);
HeapFree(GetProcessHeap(), 0, sIcoPath);
sIcoPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0,
(wcslen(pszIconPath) + 1) * sizeof (WCHAR));
if (!sIcoPath)
return E_OUTOFMEMORY;
wcscpy(sIcoPath, pszIconPath);
if (pszIconPath)
{
sIcoPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0,
(wcslen(pszIconPath) + 1) * sizeof (WCHAR));
if (!sIcoPath)
return E_OUTOFMEMORY;
wcscpy(sIcoPath, pszIconPath);
}
else
sIcoPath = NULL;
iIcoNdx = iIcon;
bDirty = TRUE;
@ -1490,11 +1513,17 @@ HRESULT WINAPI CShellLink::SetRelativePath(LPCWSTR pszPathRel, DWORD dwReserved)
TRACE("(%p)->(path=%s %x)\n", this, debugstr_w(pszPathRel), dwReserved);
HeapFree(GetProcessHeap(), 0, sPathRel);
sPathRel = (LPWSTR)HeapAlloc(GetProcessHeap(), 0,
(wcslen(pszPathRel) + 1) * sizeof (WCHAR));
if (!sPathRel)
return E_OUTOFMEMORY;
wcscpy(sPathRel, pszPathRel);
if (pszPathRel)
{
sPathRel = (LPWSTR)HeapAlloc(GetProcessHeap(), 0,
(wcslen(pszPathRel) + 1) * sizeof (WCHAR));
if (!sPathRel)
return E_OUTOFMEMORY;
wcscpy(sPathRel, pszPathRel);
}
else
sPathRel = NULL;
bDirty = TRUE;
return ShellLink_UpdatePath(sPathRel, sPath, sWorkDir, &sPath);