Module: wine Branch: master Commit: 44b2f66ac7f639c54afab3d1a2dde4d8991248e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44b2f66ac7f639c54afab3d1a2...
Author: Michael Stefaniuc mstefani@redhat.de Date: Wed Sep 21 11:59:19 2011 +0200
shell32: Remove casts to the type of the casted expression.
---
dlls/shell32/shellitem.c | 2 +- dlls/shell32/shfldr_netplaces.c | 2 +- dlls/shell32/shlview.c | 2 +- dlls/shell32/tests/ebrowser.c | 4 ++-- dlls/shell32/tests/shlfolder.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index e5bf6ed..b2093a1 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -1080,7 +1080,7 @@ HRESULT WINAPI SHCreateShellItemArrayFromDataObject(IDataObject *pdo, REFIID rii for(i = 0; i < pida->cidl; i++) children[i] = (LPCITEMIDLIST) ((LPBYTE)pida+pida->aoffset[i+1]);
- ret = SHCreateShellItemArray(parent_pidl, NULL, pida->cidl, children, (IShellItemArray**)&psia); + ret = SHCreateShellItemArray(parent_pidl, NULL, pida->cidl, children, &psia);
HeapFree(GetProcessHeap(), 0, children);
diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 3e4a8e5..0ab0470 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -367,7 +367,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnGetAttributesOf (IShellFolder2 * iface IShellFolder *psfParent = NULL; LPCITEMIDLIST rpidl = NULL;
- hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, (LPCITEMIDLIST*)&rpidl); + hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (void**)&psfParent, &rpidl); if(SUCCEEDED(hr)) { SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut); diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index ff5f05c..787a1b7 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -731,7 +731,7 @@ static LRESULT ShellView_OnCreate(IShellViewImpl *This) LPITEMIDLIST raw_pidl; SHChangeNotifyEntry ntreg;
- hr = IPersistFolder2_GetCurFolder(ppf2, (LPITEMIDLIST*)&raw_pidl); + hr = IPersistFolder2_GetCurFolder(ppf2, &raw_pidl); if(SUCCEEDED(hr)) { LPITEMIDLIST computer_pidl; diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 4ad6682..8149f8f 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -466,7 +466,7 @@ static HRESULT WINAPI IServiceProvider_fnQueryInterface(IServiceProvider *iface, if(IsEqualIID(riid, &IID_IServiceProvider)) { *ppvObj = iface; - IServiceProvider_AddRef((IServiceProvider*)iface); + IServiceProvider_AddRef(iface); return S_OK; }
@@ -532,7 +532,7 @@ static HRESULT WINAPI IServiceProvider_fnQueryService(IServiceProvider *iface, if(punk) { *ppv = punk; - IUnknown_AddRef((IUnknown*)punk); + IUnknown_AddRef(punk); return S_OK; }
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index e9e4267..fb634b4 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3894,8 +3894,8 @@ static void test_GetUIObject(void) ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { - hr = IShellFolder_GetUIObjectOf(psf, NULL, 1, (LPCITEMIDLIST*)&pidl_child, - &IID_IContextMenu, NULL, (void**)&pcm); + hr = IShellFolder_GetUIObjectOf(psf, NULL, 1, &pidl_child, &IID_IContextMenu, NULL, + (void**)&pcm); ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) {