Nikolay Sivov : shell32: Cast to class data pointer IShellView2 vtable as it's a first member.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c9751d36881a7cea26588ae52a3d03aaeceedad2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c9751d36881a7cea26588ae52a...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Thu Mar  4 20:36:48 2010 +0300

shell32: Cast to class data pointer IShellView2 vtable as it's a first member.

---

 dlls/shell32/shlview.c |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index 8c30d72..6d09771 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -2180,7 +2180,7 @@ static HRESULT WINAPI ISVOleCmdTarget_QueryInterface(
 {
 	IShellViewImpl *This = impl_from_IOleCommandTarget(iface);
 
-	return IShellFolder_QueryInterface((IShellFolder*)This, iid, ppvObj);
+	return IShellView2_QueryInterface((IShellView2*)This, iid, ppvObj);
 }
 
 /**********************************************************
@@ -2191,7 +2191,7 @@ static ULONG WINAPI ISVOleCmdTarget_AddRef(
 {
 	IShellViewImpl *This = impl_from_IOleCommandTarget(iface);
 
-	return IShellFolder_AddRef((IShellFolder*)This);
+	return IShellView2_AddRef((IShellView2*)This);
 }
 
 /**********************************************************
@@ -2202,7 +2202,7 @@ static ULONG WINAPI ISVOleCmdTarget_Release(
 {
 	IShellViewImpl *This = impl_from_IOleCommandTarget(iface);
 
-	return IShellFolder_Release((IShellFolder*)This);
+	return IShellView2_Release((IShellView2*)This);
 }
 
 /**********************************************************
@@ -2283,7 +2283,7 @@ static HRESULT WINAPI ISVDropTarget_QueryInterface(
 
 	TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj);
 
-	return IShellFolder_QueryInterface((IShellFolder*)This, riid, ppvObj);
+	return IShellView2_QueryInterface((IShellView2*)This, riid, ppvObj);
 }
 
 static ULONG WINAPI ISVDropTarget_AddRef( IDropTarget *iface)
@@ -2292,7 +2292,7 @@ static ULONG WINAPI ISVDropTarget_AddRef( IDropTarget *iface)
 
 	TRACE("(%p)->(count=%u)\n",This,This->ref);
 
-	return IShellFolder_AddRef((IShellFolder*)This);
+	return IShellView2_AddRef((IShellView2*)This);
 }
 
 static ULONG WINAPI ISVDropTarget_Release( IDropTarget *iface)
@@ -2301,7 +2301,7 @@ static ULONG WINAPI ISVDropTarget_Release( IDropTarget *iface)
 
 	TRACE("(%p)->(count=%u)\n",This,This->ref);
 
-	return IShellFolder_Release((IShellFolder*)This);
+	return IShellView2_Release((IShellView2*)This);
 }
 
 /******************************************************************************
@@ -2463,7 +2463,7 @@ static HRESULT WINAPI ISVDropSource_QueryInterface(
 
 	TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj);
 
-	return IShellFolder_QueryInterface((IShellFolder*)This, riid, ppvObj);
+	return IShellView2_QueryInterface((IShellView2*)This, riid, ppvObj);
 }
 
 static ULONG WINAPI ISVDropSource_AddRef( IDropSource *iface)
@@ -2472,7 +2472,7 @@ static ULONG WINAPI ISVDropSource_AddRef( IDropSource *iface)
 
 	TRACE("(%p)->(count=%u)\n",This,This->ref);
 
-	return IShellFolder_AddRef((IShellFolder*)This);
+	return IShellView2_AddRef((IShellView2*)This);
 }
 
 static ULONG WINAPI ISVDropSource_Release( IDropSource *iface)
@@ -2481,8 +2481,9 @@ static ULONG WINAPI ISVDropSource_Release( IDropSource *iface)
 
 	TRACE("(%p)->(count=%u)\n",This,This->ref);
 
-	return IShellFolder_Release((IShellFolder*)This);
+	return IShellView2_Release((IShellView2*)This);
 }
+
 static HRESULT WINAPI ISVDropSource_QueryContinueDrag(
 	IDropSource *iface,
 	BOOL fEscapePressed,
@@ -2530,7 +2531,7 @@ static HRESULT WINAPI ISVViewObject_QueryInterface(
 
 	TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj);
 
-	return IShellFolder_QueryInterface((IShellFolder*)This, riid, ppvObj);
+	return IShellView2_QueryInterface((IShellView2*)This, riid, ppvObj);
 }
 
 static ULONG WINAPI ISVViewObject_AddRef( IViewObject *iface)
@@ -2539,7 +2540,7 @@ static ULONG WINAPI ISVViewObject_AddRef( IViewObject *iface)
 
 	TRACE("(%p)->(count=%u)\n",This,This->ref);
 
-	return IShellFolder_AddRef((IShellFolder*)This);
+	return IShellView2_AddRef((IShellView2*)This);
 }
 
 static ULONG WINAPI ISVViewObject_Release( IViewObject *iface)
@@ -2548,7 +2549,7 @@ static ULONG WINAPI ISVViewObject_Release( IViewObject *iface)
 
 	TRACE("(%p)->(count=%u)\n",This,This->ref);
 
-	return IShellFolder_Release((IShellFolder*)This);
+	return IShellView2_Release((IShellView2*)This);
 }
 
 static HRESULT WINAPI ISVViewObject_Draw(