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

shell32: Remove unneeded casts.

This commit is contained in:
Andrew Talbot 2008-01-19 16:54:28 +00:00 committed by Alexandre Julliard
parent 52db721a69
commit 2f25755674
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/shell32/recyclebin.c
View File

@ -207,7 +207,7 @@ static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SH
int pidls_count; int pidls_count;
int i=0; int i=0;
TRACE("(%p, %p, %x, %p)\n", This, hwnd, (unsigned int)grfFlags, ppenumIDList); TRACE("(%p, %p, %x, %p)\n", This, hwnd, grfFlags, ppenumIDList);
if (grfFlags & SHCONTF_NONFOLDERS) if (grfFlags & SHCONTF_NONFOLDERS)
{ {
@ -293,7 +293,7 @@ static HRESULT WINAPI RecycleBin_CreateViewObject(IShellFolder2 *iface, HWND hwn
static HRESULT WINAPI RecycleBin_GetAttributesOf(IShellFolder2 *This, UINT cidl, LPCITEMIDLIST *apidl, static HRESULT WINAPI RecycleBin_GetAttributesOf(IShellFolder2 *This, UINT cidl, LPCITEMIDLIST *apidl,
SFGAOF *rgfInOut) SFGAOF *rgfInOut)
{ {
TRACE("(%p, %d, {%p, ...}, {%x})\n", This, cidl, apidl[0], (unsigned int)*rgfInOut); TRACE("(%p, %d, {%p, ...}, {%x})\n", This, cidl, apidl[0], *rgfInOut);
*rgfInOut &= SFGAO_CANMOVE|SFGAO_CANDELETE|SFGAO_HASPROPSHEET|SFGAO_FILESYSTEM; *rgfInOut &= SFGAO_CANMOVE|SFGAO_CANDELETE|SFGAO_HASPROPSHEET|SFGAO_FILESYSTEM;
return S_OK; return S_OK;
} }
@ -310,7 +310,7 @@ static HRESULT WINAPI RecycleBin_GetDisplayNameOf(IShellFolder2 *This, LPCITEMID
{ {
WIN32_FIND_DATAW data; WIN32_FIND_DATAW data;
TRACE("(%p, %p, %x, %p)\n", This, pidl, (unsigned int)uFlags, pName); TRACE("(%p, %p, %x, %p)\n", This, pidl, uFlags, pName);
TRASH_UnpackItemID(&pidl->mkid, NULL, &data); TRASH_UnpackItemID(&pidl->mkid, NULL, &data);
pName->uType = STRRET_WSTR; pName->uType = STRRET_WSTR;
pName->u.pOleStr = StrDupW(PathFindFileNameW(data.cFileName)); pName->u.pOleStr = StrDupW(PathFindFileNameW(data.cFileName));
@ -371,7 +371,7 @@ static HRESULT WINAPI RecycleBin_EnumSearches(IShellFolder2 *iface, IEnumExtraSe
static HRESULT WINAPI RecycleBin_GetDefaultColumn(IShellFolder2 *iface, DWORD dwReserved, ULONG *pSort, ULONG *pDisplay) static HRESULT WINAPI RecycleBin_GetDefaultColumn(IShellFolder2 *iface, DWORD dwReserved, ULONG *pSort, ULONG *pDisplay)
{ {
RecycleBin *This = (RecycleBin *)iface; RecycleBin *This = (RecycleBin *)iface;
TRACE("(%p, %x, %p, %p)\n", This, (unsigned int)dwReserved, pSort, pDisplay); TRACE("(%p, %x, %p, %p)\n", This, dwReserved, pSort, pDisplay);
*pSort = 0; *pSort = 0;
*pDisplay = 0; *pDisplay = 0;
return S_OK; return S_OK;

2
dlls/shell32/shell.c
View File

@ -133,7 +133,7 @@ end:
void WINAPI DragFinish16(HDROP16 h) void WINAPI DragFinish16(HDROP16 h)
{ {
TRACE("\n"); TRACE("\n");
GlobalFree16((HGLOBAL16)h); GlobalFree16(h);
} }

6
dlls/shell32/shell32_main.c
View File

@ -526,7 +526,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
static const WCHAR p1W[] = {'%','1',0}; static const WCHAR p1W[] = {'%','1',0};
WCHAR sTemp [MAX_PATH]; WCHAR sTemp [MAX_PATH];
szExt = (LPWSTR) PathFindExtensionW(szFullPath); szExt = PathFindExtensionW(szFullPath);
TRACE("szExt=%s\n", debugstr_w(szExt)); TRACE("szExt=%s\n", debugstr_w(szExt));
if ( szExt && if ( szExt &&
HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) && HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) &&
@ -584,7 +584,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))
@ -1090,7 +1090,7 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff,
if(!(hRes = FindResourceW(shell32_hInstance, wszSHELL_ABOUT_MSGBOX, (LPWSTR)RT_DIALOG))) if(!(hRes = FindResourceW(shell32_hInstance, wszSHELL_ABOUT_MSGBOX, (LPWSTR)RT_DIALOG)))
return FALSE; return FALSE;
if(!(template = (LPVOID)LoadResource(shell32_hInstance, hRes))) if(!(template = LoadResource(shell32_hInstance, hRes)))
return FALSE; return FALSE;
info.szApp = szApp; info.szApp = szApp;
info.szOtherStuff = szOtherStuff; info.szOtherStuff = szOtherStuff;

4
dlls/shell32/shelllink.c
View File

@ -1539,7 +1539,7 @@ static HRESULT SHELL_PidlGeticonLocationA(IShellFolder* psf, LPCITEMIDLIST pidl,
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
IExtractIconA* pei; IExtractIconA* pei;
hr = IShellFolder_GetUIObjectOf(psf, 0, 1, (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconA, NULL, (LPVOID*)&pei); hr = IShellFolder_GetUIObjectOf(psf, 0, 1, &pidlLast, &IID_IExtractIconA, NULL, (LPVOID*)&pei);
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
hr = IExtractIconA_GetIconLocation(pei, 0, pszIconPath, MAX_PATH, piIcon, NULL); hr = IExtractIconA_GetIconLocation(pei, 0, pszIconPath, MAX_PATH, piIcon, NULL);
@ -1918,7 +1918,7 @@ static HRESULT SHELL_PidlGeticonLocationW(IShellFolder* psf, LPCITEMIDLIST pidl,
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
IExtractIconW* pei; IExtractIconW* pei;
hr = IShellFolder_GetUIObjectOf(psf, 0, 1, (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconW, NULL, (LPVOID*)&pei); hr = IShellFolder_GetUIObjectOf(psf, 0, 1, &pidlLast, &IID_IExtractIconW, NULL, (LPVOID*)&pei);
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
hr = IExtractIconW_GetIconLocation(pei, 0, pszIconPath, MAX_PATH, piIcon, NULL); hr = IExtractIconW_GetIconLocation(pei, 0, pszIconPath, MAX_PATH, piIcon, NULL);

2
dlls/shell32/shfldr_fs.c
View File

@ -588,7 +588,7 @@ IShellFolder_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl,
IShellFolder *psfParent = NULL; IShellFolder *psfParent = NULL;
LPCITEMIDLIST rpidl = NULL; LPCITEMIDLIST rpidl = NULL;
hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, (LPCITEMIDLIST*)&rpidl); hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, &rpidl);
if(SUCCEEDED(hr)) { if(SUCCEEDED(hr)) {
SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut); SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut);
IShellFolder_Release(psfParent); IShellFolder_Release(psfParent);

2
dlls/shell32/shfldr_mycomp.c
View File

@ -447,7 +447,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetAttributesOf (IShellFolder2 * iface,
IShellFolder *psfParent = NULL; IShellFolder *psfParent = NULL;
LPCITEMIDLIST rpidl = NULL; LPCITEMIDLIST rpidl = NULL;
hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, (LPCITEMIDLIST*)&rpidl); hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, &rpidl);
if(SUCCEEDED(hr)) { if(SUCCEEDED(hr)) {
SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut); SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut);
IShellFolder_Release(psfParent); IShellFolder_Release(psfParent);

2
dlls/shell32/shfldr_unixfs.c
View File

@ -950,7 +950,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_BindToObject(IShellFolder2* iface
hr = CreateUnixFolder(NULL, &IID_IPersistFolder3, (void**)&persistFolder, clsidChild); hr = CreateUnixFolder(NULL, &IID_IPersistFolder3, (void**)&persistFolder, clsidChild);
if (!SUCCEEDED(hr)) return hr; if (!SUCCEEDED(hr)) return hr;
hr = IPersistFolder_QueryInterface(persistFolder, riid, (void**)ppvOut); hr = IPersistFolder_QueryInterface(persistFolder, riid, ppvOut);
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
UnixFolder *subfolder = ADJUST_THIS(UnixFolder, IPersistFolder3, persistFolder); UnixFolder *subfolder = ADJUST_THIS(UnixFolder, IPersistFolder3, persistFolder);