Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-28 01:11:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

sync SHGetFileInfo and CommandLineToArgvW to wine 1.1.32

Browse source 
svn path=/trunk/; revision=44082
This commit is contained in:
Christoph von Wittich 2009-11-10 21:31:37 +00:00
parent e8c61b4a52
commit 2afeb94e20
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
reactos/dll/win32/shell32/shell32_main.c
View file

@ -84,7 +84,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs)
} }
argv[0]=(LPWSTR)(argv+1); argv[0]=(LPWSTR)(argv+1);
if (numargs) if (numargs)
*numargs=2; *numargs=1;
return argv; return argv;
} }
@ -323,8 +323,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
(flags & SHGFI_PIDL)? "pidl" : debugstr_w(path), dwFileAttributes, (flags & SHGFI_PIDL)? "pidl" : debugstr_w(path), dwFileAttributes,
psfi, psfi->dwAttributes, sizeofpsfi, flags); psfi, psfi->dwAttributes, sizeofpsfi, flags);
if ( (flags & SHGFI_USEFILEATTRIBUTES) && if (!path)
(flags & (SHGFI_ATTRIBUTES|SHGFI_EXETYPE|SHGFI_PIDL)))
return FALSE; return FALSE;
/* windows initializes these values regardless of the flags */ /* windows initializes these values regardless of the flags */
@ -403,6 +402,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
{ {
psfi->dwAttributes = 0xffffffff; psfi->dwAttributes = 0xffffffff;
} }
if (psfParent)
IShellFolder_GetAttributesOf( psfParent, 1, (LPCITEMIDLIST*)&pidlLast, IShellFolder_GetAttributesOf( psfParent, 1, (LPCITEMIDLIST*)&pidlLast,
&(psfi->dwAttributes) ); &(psfi->dwAttributes) );
} }
@ -520,7 +520,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
&uDummy, (LPVOID*)&pei); &uDummy, (LPVOID*)&pei);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
hr = pei->lpVtbl->GetIconLocation(pei, uGilFlags, hr = IExtractIconW_GetIconLocation(pei, uGilFlags,
szLocation, MAX_PATH, &iIndex, &uFlags); szLocation, MAX_PATH, &iIndex, &uFlags);
if (uFlags & GIL_NOTFILENAME) if (uFlags & GIL_NOTFILENAME)
@ -530,7 +530,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
wcscpy (psfi->szDisplayName, szLocation); wcscpy (psfi->szDisplayName, szLocation);
psfi->iIcon = iIndex; psfi->iIcon = iIndex;
} }
pei->lpVtbl->Release(pei); IExtractIconW_Release(pei);
} }
} }
} }
@ -553,7 +553,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
static const WCHAR p1W[] = {'%','1',0}; static const WCHAR p1W[] = {'%','1',0};
psfi->iIcon = 0; psfi->iIcon = 0;
szExt = (LPWSTR) PathFindExtensionW(sTemp); szExt = PathFindExtensionW(sTemp);
if ( szExt && if ( szExt &&
HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) && HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) &&
HCR_GetDefaultIconW(sTemp, sTemp, MAX_PATH, &icon_idx)) HCR_GetDefaultIconW(sTemp, sTemp, MAX_PATH, &icon_idx))
@ -569,22 +569,26 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
} }
else else
{ {
IconNotYetLoaded=FALSE; UINT ret;
if (flags & SHGFI_SMALLICON) if (flags & SHGFI_SMALLICON)
PrivateExtractIconsW( sTemp,icon_idx, ret = PrivateExtractIconsW( sTemp,icon_idx,
GetSystemMetrics( SM_CXSMICON ), GetSystemMetrics( SM_CXSMICON ),
GetSystemMetrics( SM_CYSMICON ), GetSystemMetrics( SM_CYSMICON ),
&psfi->hIcon, 0, 1, 0); &psfi->hIcon, 0, 1, 0);
else else
PrivateExtractIconsW( sTemp, icon_idx, ret = PrivateExtractIconsW( sTemp, icon_idx,
GetSystemMetrics( SM_CXICON), GetSystemMetrics( SM_CXICON),
GetSystemMetrics( SM_CYICON), GetSystemMetrics( SM_CYICON),
&psfi->hIcon, 0, 1, 0); &psfi->hIcon, 0, 1, 0);
if (ret != 0 && ret != 0xFFFFFFFF)
{
IconNotYetLoaded=FALSE;
psfi->iIcon = icon_idx; psfi->iIcon = icon_idx;
} }
} }
} }
} }
}
else else
{ {
if (!(PidlToSicIndex(psfParent, pidlLast, !(flags & SHGFI_SMALLICON), if (!(PidlToSicIndex(psfParent, pidlLast, !(flags & SHGFI_SMALLICON),
@ -593,7 +597,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
ret = FALSE; ret = FALSE;
} }
} }
if (ret) if (ret && (flags & SHGFI_SYSICONINDEX))
{ {
if (flags & SHGFI_SMALLICON) if (flags & SHGFI_SMALLICON)
ret = (DWORD_PTR) ShellSmallIconList; ret = (DWORD_PTR) ShellSmallIconList;
@ -633,6 +637,11 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
/************************************************************************* /*************************************************************************
* SHGetFileInfoA [SHELL32.@] * SHGetFileInfoA [SHELL32.@]
*
* Note:
* MSVBVM60.__vbaNew2 expects this function to return a value in range
* 1 .. 0x7fff when the function succeeds and flags does not contain
* SHGFI_EXETYPE or SHGFI_SYSICONINDEX (see bug 7701)
*/ */
DWORD_PTR WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes, DWORD_PTR WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes,
SHFILEINFOA *psfi, UINT sizeofpsfi, SHFILEINFOA *psfi, UINT sizeofpsfi,