marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shlwapi: Refactor data return code in IQueryAssociations_fnGetString.

oldstable
Lei Zhang 2008-10-13 18:09:28 -07:00 committed by Alexandre Julliard
parent 4e0c0ec157
commit 58797fc54c
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dlls/shlwapi/assoc.c
View File

@ -670,6 +670,29 @@ static HRESULT ASSOC_GetExecutable(IQueryAssociationsImpl *This,
return S_OK;
}
static HRESULT ASSOC_ReturnData(LPWSTR out, DWORD *outlen, LPCWSTR data,
DWORD datalen)
{
assert(outlen);
if (out)
{
if (*outlen < datalen)
{
*outlen = datalen;
return E_POINTER;
}
*outlen = datalen;
lstrcpynW(out, data, datalen);
return S_OK;
}
else
{
*outlen = datalen;
return S_FALSE;
}
}
/**************************************************************************
* IQueryAssociations_GetString {SHLWAPI}
*
@ -718,22 +741,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString(
if (FAILED(hr))
return hr;
len++;
if (pszOut)
{
if (*pcchOut < len)
{
*pcchOut = len;
return E_POINTER;
}
*pcchOut = len;
lstrcpynW(pszOut, path, len);
return S_OK;
}
else
{
*pcchOut = len;
return S_FALSE;
}
return ASSOC_ReturnData(pszOut, pcchOut, path, len);
break;
}