ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correctly handle flags parameter in SHAddToRecentDocs.

This commit is contained in:
Dmitry Timoshkov 2005-10-27 10:22:38 +00:00 committed by Alexandre Julliard
parent 049b5943e6
commit 520bec000f
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dlls/shell32/shellord.c
View File

@ -623,11 +623,13 @@ static INT SHADD_create_add_mru_data(HANDLE mruhandle, LPSTR doc_name, LPSTR new
* SHAddToRecentDocs [SHELL32.@] * SHAddToRecentDocs [SHELL32.@]
* *
* PARAMETERS * PARAMETERS
* uFlags [IN] SHARD_PATH or SHARD_PIDL * uFlags [IN] SHARD_PATHA, SHARD_PATHW or SHARD_PIDL
* pv [IN] string or pidl, NULL clears the list * pv [IN] string or pidl, NULL clears the list
* *
* NOTES * NOTES
* exported by name * exported by name
*
* FIXME: convert to unicode
*/ */
void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
{ {
@ -652,6 +654,8 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
INT ret; INT ret;
DWORD data[64], datalen, type; DWORD data[64], datalen, type;
TRACE("%04x %p\n", uFlags, pv);
/*FIXME: Document: /*FIXME: Document:
* RecentDocs MRU data structure seems to be: * RecentDocs MRU data structure seems to be:
* +0h document file name w/ terminating 0h * +0h document file name w/ terminating 0h
@ -757,15 +761,28 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
/* Get the pure document name from the input /* Get the pure document name from the input
*/ */
if (uFlags & SHARD_PIDL) { switch (uFlags)
{
case SHARD_PIDL:
SHGetPathFromIDListA((LPCITEMIDLIST) pv, doc_name); SHGetPathFromIDListA((LPCITEMIDLIST) pv, doc_name);
break;
case SHARD_PATHA:
lstrcpynA(doc_name, (LPCSTR)pv, MAX_PATH);
break;
case SHARD_PATHW:
WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)pv, -1, doc_name, MAX_PATH, NULL, NULL);
break;
default:
FIXME("Unsupported flags: %u\n", uFlags);
return;
} }
else {
lstrcpyA(doc_name, (LPCSTR) pv); TRACE("full document name %s\n", debugstr_a(doc_name));
}
TRACE("full document name %s\n", doc_name);
PathStripPathA(doc_name); PathStripPathA(doc_name);
TRACE("stripped document name %s\n", doc_name); TRACE("stripped document name %s\n", debugstr_a(doc_name));
/* *** JOB 1: Update registry for ...\Explorer\RecentDocs list *** */ /* *** JOB 1: Update registry for ...\Explorer\RecentDocs list *** */
@ -902,7 +919,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
} }
/* Set the document path or pidl */ /* Set the document path or pidl */
if (uFlags & SHARD_PIDL) { if (uFlags == SHARD_PIDL) {
hres = IShellLinkA_SetIDList(psl, (LPCITEMIDLIST) pv); hres = IShellLinkA_SetIDList(psl, (LPCITEMIDLIST) pv);
} else { } else {
hres = IShellLinkA_SetPath(psl, (LPCSTR) pv); hres = IShellLinkA_SetPath(psl, (LPCSTR) pv);