Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 02:25:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Alexandre Julliard <julliard@winehq.org>

Browse source 
- Get rid of the non-standard ICOM_DEFINE macro.
- Get rid of the non-standard ICOM_VFIELD macro.
- Get rid of the non-standard ICOM_VTABLE macro.
- Get rid of the no longer used ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
  macro.
- Removed some more uses of the non-standard ICOM_THIS macro.

svn path=/trunk/; revision=10929
This commit is contained in:
Gé van Geldorp 2004-09-20 09:18:52 +00:00
parent f7f21544a4
commit 0785062c81
16 changed files with 311 additions and 347 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
reactos/lib/shell32/autocomplete.c
View file

@ -59,8 +59,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
typedef struct typedef struct
{ {
ICOM_VFIELD(IAutoComplete); IAutoCompleteVtbl *lpVtbl;
ICOM_VTABLE (IAutoComplete2) * lpvtblAutoComplete2; IAutoComplete2Vtbl *lpvtblAutoComplete2;
DWORD ref; DWORD ref;
BOOL enabled; BOOL enabled;
HWND hwndEdit; HWND hwndEdit;
@ -73,8 +73,8 @@ typedef struct
AUTOCOMPLETEOPTIONS options; AUTOCOMPLETEOPTIONS options;
} IAutoCompleteImpl; } IAutoCompleteImpl;
static struct ICOM_VTABLE(IAutoComplete) acvt; static struct IAutoCompleteVtbl acvt;
static struct ICOM_VTABLE(IAutoComplete2) ac2vt; static struct IAutoComplete2Vtbl ac2vt;
#define _IAutoComplete2_Offset ((int)(&(((IAutoCompleteImpl*)0)->lpvtblAutoComplete2))) #define _IAutoComplete2_Offset ((int)(&(((IAutoCompleteImpl*)0)->lpvtblAutoComplete2)))
#define _ICOM_THIS_From_IAutoComplete2(class, name) class* This = (class*)(((char*)name)-_IAutoComplete2_Offset); #define _ICOM_THIS_From_IAutoComplete2(class, name) class* This = (class*)(((char*)name)-_IAutoComplete2_Offset);
@ -132,7 +132,7 @@ static HRESULT WINAPI IAutoComplete_fnQueryInterface(
REFIID riid, REFIID riid,
LPVOID *ppvObj) LPVOID *ppvObj)
{ {
ICOM_THIS(IAutoCompleteImpl, iface); IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface;
TRACE("(%p)->(\n\tIID:\t%s,%p)\n", This, shdebugstr_guid(riid), ppvObj); TRACE("(%p)->(\n\tIID:\t%s,%p)\n", This, shdebugstr_guid(riid), ppvObj);
*ppvObj = NULL; *ppvObj = NULL;
@ -166,7 +166,7 @@ static HRESULT WINAPI IAutoComplete_fnQueryInterface(
static ULONG WINAPI IAutoComplete_fnAddRef( static ULONG WINAPI IAutoComplete_fnAddRef(
IAutoComplete * iface) IAutoComplete * iface)
{ {
ICOM_THIS(IAutoCompleteImpl,iface); IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface;
TRACE("(%p)->(%lu)\n",This,This->ref); TRACE("(%p)->(%lu)\n",This,This->ref);
return ++(This->ref); return ++(This->ref);
@ -178,7 +178,7 @@ static ULONG WINAPI IAutoComplete_fnAddRef(
static ULONG WINAPI IAutoComplete_fnRelease( static ULONG WINAPI IAutoComplete_fnRelease(
IAutoComplete * iface) IAutoComplete * iface)
{ {
ICOM_THIS(IAutoCompleteImpl,iface); IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface;
TRACE("(%p)->(%lu)\n",This,This->ref); TRACE("(%p)->(%lu)\n",This,This->ref);
@ -205,7 +205,7 @@ static HRESULT WINAPI IAutoComplete_fnEnable(
IAutoComplete * iface, IAutoComplete * iface,
BOOL fEnable) BOOL fEnable)
{ {
ICOM_THIS(IAutoCompleteImpl, iface); IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface;
HRESULT hr = S_OK; HRESULT hr = S_OK;
@ -226,7 +226,7 @@ static HRESULT WINAPI IAutoComplete_fnInit(
LPCOLESTR pwzsRegKeyPath, LPCOLESTR pwzsRegKeyPath,
LPCOLESTR pwszQuickComplete) LPCOLESTR pwszQuickComplete)
{ {
ICOM_THIS(IAutoCompleteImpl, iface); IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface;
static const WCHAR lbName[] = {'L','i','s','t','B','o','x',0}; static const WCHAR lbName[] = {'L','i','s','t','B','o','x',0};
TRACE("(%p)->(0x%08lx, %p, %s, %s)\n", TRACE("(%p)->(0x%08lx, %p, %s, %s)\n",
@ -310,9 +310,8 @@ static HRESULT WINAPI IAutoComplete_fnInit(
/************************************************************************** /**************************************************************************
* IAutoComplete_fnVTable * IAutoComplete_fnVTable
*/ */
static ICOM_VTABLE (IAutoComplete) acvt = static IAutoCompleteVtbl acvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IAutoComplete_fnQueryInterface, IAutoComplete_fnQueryInterface,
IAutoComplete_fnAddRef, IAutoComplete_fnAddRef,
IAutoComplete_fnRelease, IAutoComplete_fnRelease,
@ -431,9 +430,8 @@ static HRESULT WINAPI IAutoComplete2_fnSetOptions(
/************************************************************************** /**************************************************************************
* IAutoComplete2_fnVTable * IAutoComplete2_fnVTable
*/ */
static ICOM_VTABLE (IAutoComplete2) ac2vt = static IAutoComplete2Vtbl ac2vt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IAutoComplete2_fnQueryInterface, IAutoComplete2_fnQueryInterface,
IAutoComplete2_fnAddRef, IAutoComplete2_fnAddRef,
IAutoComplete2_fnRelease, IAutoComplete2_fnRelease,
@ -449,7 +447,7 @@ static ICOM_VTABLE (IAutoComplete2) ac2vt =
*/ */
static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
ICOM_THIS(IAutoCompleteImpl, GetWindowLongPtrW(hwnd, GWLP_USERDATA)); IAutoCompleteImpl *This = (IAutoCompleteImpl *)GetWindowLongPtrW(hwnd, GWLP_USERDATA);
LPOLESTR strs; LPOLESTR strs;
HRESULT hr; HRESULT hr;
WCHAR hwndText[255]; WCHAR hwndText[255];
@ -619,7 +617,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam,
static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
ICOM_THIS(IAutoCompleteImpl, GetWindowLongPtrW(hwnd, GWLP_USERDATA)); IAutoCompleteImpl *This = (IAutoCompleteImpl *)GetWindowLongPtrW(hwnd, GWLP_USERDATA);
WCHAR *msg; WCHAR *msg;
int sel = -1, len; int sel = -1, len;

75
reactos/lib/shell32/cpanelfolder.c
View file

@ -57,12 +57,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
*/ */
typedef struct { typedef struct {
ICOM_VFIELD(IShellFolder2); IShellFolder2Vtbl *lpVtbl;
DWORD ref; DWORD ref;
IPersistFolder2Vtbl *lpVtblPersistFolder2;
ICOM_VTABLE(IPersistFolder2)* lpVtblPersistFolder2; IShellExecuteHookWVtbl *lpVtblShellExecuteHookW;
ICOM_VTABLE(IShellExecuteHookW)* lpVtblShellExecuteHookW; IShellExecuteHookAVtbl *lpVtblShellExecuteHookA;
ICOM_VTABLE(IShellExecuteHookA)* lpVtblShellExecuteHookA;
IUnknown *pUnkOuter; /* used for aggregation */ IUnknown *pUnkOuter; /* used for aggregation */
@ -71,10 +70,10 @@ typedef struct {
int dwAttributes; /* attributes returned by GetAttributesOf FIXME: use it */ int dwAttributes; /* attributes returned by GetAttributesOf FIXME: use it */
} ICPanelImpl; } ICPanelImpl;
static ICOM_VTABLE(IShellFolder2) vt_ShellFolder2; static IShellFolder2Vtbl vt_ShellFolder2;
static ICOM_VTABLE(IPersistFolder2) vt_PersistFolder2; static IPersistFolder2Vtbl vt_PersistFolder2;
static ICOM_VTABLE(IShellExecuteHookW) vt_ShellExecuteHookW; static IShellExecuteHookWVtbl vt_ShellExecuteHookW;
static ICOM_VTABLE(IShellExecuteHookA) vt_ShellExecuteHookA; static IShellExecuteHookAVtbl vt_ShellExecuteHookA;
#define _IPersistFolder2_Offset ((int)(&(((ICPanelImpl*)0)->lpVtblPersistFolder2))) #define _IPersistFolder2_Offset ((int)(&(((ICPanelImpl*)0)->lpVtblPersistFolder2)))
#define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset);
@ -152,7 +151,7 @@ HRESULT WINAPI IControlPanel_Constructor(IUnknown* pUnkOuter, REFIID riid, LPVOI
*/ */
static HRESULT WINAPI ISF_ControlPanel_fnQueryInterface(IShellFolder2 * iface, REFIID riid, LPVOID * ppvObject) static HRESULT WINAPI ISF_ControlPanel_fnQueryInterface(IShellFolder2 * iface, REFIID riid, LPVOID * ppvObject)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
TRACE("(%p)->(%s,%p)\n", This, shdebugstr_guid(riid), ppvObject); TRACE("(%p)->(%s,%p)\n", This, shdebugstr_guid(riid), ppvObject);
@ -180,7 +179,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnQueryInterface(IShellFolder2 * iface, R
static ULONG WINAPI ISF_ControlPanel_fnAddRef(IShellFolder2 * iface) static ULONG WINAPI ISF_ControlPanel_fnAddRef(IShellFolder2 * iface)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
TRACE("(%p)->(count=%lu)\n", This, This->ref); TRACE("(%p)->(count=%lu)\n", This, This->ref);
@ -189,7 +188,7 @@ static ULONG WINAPI ISF_ControlPanel_fnAddRef(IShellFolder2 * iface)
static ULONG WINAPI ISF_ControlPanel_fnRelease(IShellFolder2 * iface) static ULONG WINAPI ISF_ControlPanel_fnRelease(IShellFolder2 * iface)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
TRACE("(%p)->(count=%lu)\n", This, This->ref); TRACE("(%p)->(count=%lu)\n", This, This->ref);
@ -213,7 +212,7 @@ ISF_ControlPanel_fnParseDisplayName(IShellFolder2 * iface,
LPOLESTR lpszDisplayName, LPOLESTR lpszDisplayName,
DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
HRESULT hr = E_INVALIDARG; HRESULT hr = E_INVALIDARG;
@ -448,7 +447,7 @@ static BOOL CreateCPanelEnumList(
static HRESULT WINAPI static HRESULT WINAPI
ISF_ControlPanel_fnEnumObjects(IShellFolder2 * iface, HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList) ISF_ControlPanel_fnEnumObjects(IShellFolder2 * iface, HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
TRACE("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); TRACE("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList);
@ -468,7 +467,7 @@ static HRESULT WINAPI
ISF_ControlPanel_fnBindToObject(IShellFolder2 * iface, LPCITEMIDLIST pidl, ISF_ControlPanel_fnBindToObject(IShellFolder2 * iface, LPCITEMIDLIST pidl,
LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) LPBC pbcReserved, REFIID riid, LPVOID * ppvOut)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
TRACE("(%p)->(pidl=%p,%p,%s,%p)\n", This, pidl, pbcReserved, shdebugstr_guid(riid), ppvOut); TRACE("(%p)->(pidl=%p,%p,%s,%p)\n", This, pidl, pbcReserved, shdebugstr_guid(riid), ppvOut);
@ -482,7 +481,7 @@ static HRESULT WINAPI
ISF_ControlPanel_fnBindToStorage(IShellFolder2 * iface, ISF_ControlPanel_fnBindToStorage(IShellFolder2 * iface,
LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
FIXME("(%p)->(pidl=%p,%p,%s,%p) stub\n", This, pidl, pbcReserved, shdebugstr_guid(riid), ppvOut); FIXME("(%p)->(pidl=%p,%p,%s,%p) stub\n", This, pidl, pbcReserved, shdebugstr_guid(riid), ppvOut);
@ -497,7 +496,7 @@ ISF_ControlPanel_fnBindToStorage(IShellFolder2 * iface,
static HRESULT WINAPI static HRESULT WINAPI
ISF_ControlPanel_fnCompareIDs(IShellFolder2 * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) ISF_ControlPanel_fnCompareIDs(IShellFolder2 * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
int nReturn; int nReturn;
@ -513,7 +512,7 @@ ISF_ControlPanel_fnCompareIDs(IShellFolder2 * iface, LPARAM lParam, LPCITEMIDLIS
static HRESULT WINAPI static HRESULT WINAPI
ISF_ControlPanel_fnCreateViewObject(IShellFolder2 * iface, HWND hwndOwner, REFIID riid, LPVOID * ppvOut) ISF_ControlPanel_fnCreateViewObject(IShellFolder2 * iface, HWND hwndOwner, REFIID riid, LPVOID * ppvOut)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
LPSHELLVIEW pShellView; LPSHELLVIEW pShellView;
HRESULT hr = E_INVALIDARG; HRESULT hr = E_INVALIDARG;
@ -547,7 +546,7 @@ ISF_ControlPanel_fnCreateViewObject(IShellFolder2 * iface, HWND hwndOwner, REFII
static HRESULT WINAPI static HRESULT WINAPI
ISF_ControlPanel_fnGetAttributesOf(IShellFolder2 * iface, UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) ISF_ControlPanel_fnGetAttributesOf(IShellFolder2 * iface, UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
HRESULT hr = S_OK; HRESULT hr = S_OK;
@ -587,7 +586,7 @@ ISF_ControlPanel_fnGetUIObjectOf(IShellFolder2 * iface,
HWND hwndOwner, HWND hwndOwner,
UINT cidl, LPCITEMIDLIST * apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) UINT cidl, LPCITEMIDLIST * apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
LPITEMIDLIST pidl; LPITEMIDLIST pidl;
IUnknown *pObj = NULL; IUnknown *pObj = NULL;
@ -638,7 +637,7 @@ ISF_ControlPanel_fnGetUIObjectOf(IShellFolder2 * iface,
*/ */
static HRESULT WINAPI ISF_ControlPanel_fnGetDisplayNameOf(IShellFolder2 * iface, LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) static HRESULT WINAPI ISF_ControlPanel_fnGetDisplayNameOf(IShellFolder2 * iface, LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
CHAR szPath[MAX_PATH*2]; CHAR szPath[MAX_PATH*2];
PIDLCPanelStruct* pcpanel; PIDLCPanelStruct* pcpanel;
@ -703,26 +702,26 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetDisplayNameOf(IShellFolder2 * iface,
static HRESULT WINAPI ISF_ControlPanel_fnSetNameOf(IShellFolder2 * iface, HWND hwndOwner, LPCITEMIDLIST pidl, /*simple pidl */ static HRESULT WINAPI ISF_ControlPanel_fnSetNameOf(IShellFolder2 * iface, HWND hwndOwner, LPCITEMIDLIST pidl, /*simple pidl */
LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
FIXME("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, debugstr_w(lpName), dwFlags, pPidlOut); FIXME("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, debugstr_w(lpName), dwFlags, pPidlOut);
return E_FAIL; return E_FAIL;
} }
static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultSearchGUID(IShellFolder2 * iface, GUID * pguid) static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultSearchGUID(IShellFolder2 * iface, GUID * pguid)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
FIXME("(%p)\n", This); FIXME("(%p)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI ISF_ControlPanel_fnEnumSearches(IShellFolder2 * iface, IEnumExtraSearch ** ppenum) static HRESULT WINAPI ISF_ControlPanel_fnEnumSearches(IShellFolder2 * iface, IEnumExtraSearch ** ppenum)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
FIXME("(%p)\n", This); FIXME("(%p)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultColumn(IShellFolder2 * iface, DWORD dwRes, ULONG * pSort, ULONG * pDisplay) static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultColumn(IShellFolder2 * iface, DWORD dwRes, ULONG * pSort, ULONG * pDisplay)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
@ -732,7 +731,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultColumn(IShellFolder2 * iface,
} }
static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultColumnState(IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags) static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultColumnState(IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
@ -742,14 +741,14 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultColumnState(IShellFolder2 * i
} }
static HRESULT WINAPI ISF_ControlPanel_fnGetDetailsEx(IShellFolder2 * iface, LPCITEMIDLIST pidl, const SHCOLUMNID * pscid, VARIANT * pv) static HRESULT WINAPI ISF_ControlPanel_fnGetDetailsEx(IShellFolder2 * iface, LPCITEMIDLIST pidl, const SHCOLUMNID * pscid, VARIANT * pv)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
FIXME("(%p)\n", This); FIXME("(%p)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI ISF_ControlPanel_fnGetDetailsOf(IShellFolder2 * iface, LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd) static HRESULT WINAPI ISF_ControlPanel_fnGetDetailsOf(IShellFolder2 * iface, LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd); TRACE("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd);
@ -781,14 +780,13 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetDetailsOf(IShellFolder2 * iface, LPC
} }
static HRESULT WINAPI ISF_ControlPanel_fnMapColumnToSCID(IShellFolder2 * iface, UINT column, SHCOLUMNID * pscid) static HRESULT WINAPI ISF_ControlPanel_fnMapColumnToSCID(IShellFolder2 * iface, UINT column, SHCOLUMNID * pscid)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
FIXME("(%p)\n", This); FIXME("(%p)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static ICOM_VTABLE(IShellFolder2) vt_ShellFolder2 = static IShellFolder2Vtbl vt_ShellFolder2 =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ISF_ControlPanel_fnQueryInterface, ISF_ControlPanel_fnQueryInterface,
ISF_ControlPanel_fnAddRef, ISF_ControlPanel_fnAddRef,
@ -893,9 +891,8 @@ static HRESULT WINAPI ICPanel_PersistFolder2_GetCurFolder(IPersistFolder2 * ifac
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IPersistFolder2) vt_PersistFolder2 = static IPersistFolder2Vtbl vt_PersistFolder2 =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ICPanel_PersistFolder2_QueryInterface, ICPanel_PersistFolder2_QueryInterface,
ICPanel_PersistFolder2_AddRef, ICPanel_PersistFolder2_AddRef,
@ -965,7 +962,7 @@ static ULONG STDMETHODCALLTYPE IShellExecuteHookW_fnRelease(IShellExecuteHookW*
static HRESULT WINAPI IShellExecuteHookW_fnExecute(IShellExecuteHookW* iface, LPSHELLEXECUTEINFOW psei) static HRESULT WINAPI IShellExecuteHookW_fnExecute(IShellExecuteHookW* iface, LPSHELLEXECUTEINFOW psei)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
SHELLEXECUTEINFOW sei_tmp; SHELLEXECUTEINFOW sei_tmp;
PIDLCPanelStruct* pcpanel; PIDLCPanelStruct* pcpanel;
@ -1003,9 +1000,8 @@ static HRESULT WINAPI IShellExecuteHookW_fnExecute(IShellExecuteHookW* iface, LP
return S_FALSE; return S_FALSE;
} }
static ICOM_VTABLE(IShellExecuteHookW) vt_ShellExecuteHookW = static IShellExecuteHookWVtbl vt_ShellExecuteHookW =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IShellExecuteHookW_fnQueryInterface, IShellExecuteHookW_fnQueryInterface,
IShellExecuteHookW_fnAddRef, IShellExecuteHookW_fnAddRef,
@ -1048,7 +1044,7 @@ static ULONG STDMETHODCALLTYPE IShellExecuteHookA_fnRelease(IShellExecuteHookA*
static HRESULT WINAPI IShellExecuteHookA_fnExecute(IShellExecuteHookA* iface, LPSHELLEXECUTEINFOA psei) static HRESULT WINAPI IShellExecuteHookA_fnExecute(IShellExecuteHookA* iface, LPSHELLEXECUTEINFOA psei)
{ {
ICOM_THIS(ICPanelImpl, iface); ICPanelImpl *This = (ICPanelImpl *)iface;
SHELLEXECUTEINFOA sei_tmp; SHELLEXECUTEINFOA sei_tmp;
PIDLCPanelStruct* pcpanel; PIDLCPanelStruct* pcpanel;
@ -1083,9 +1079,8 @@ static HRESULT WINAPI IShellExecuteHookA_fnExecute(IShellExecuteHookA* iface, LP
return S_FALSE; return S_FALSE;
} }
static ICOM_VTABLE(IShellExecuteHookA) vt_ShellExecuteHookA = static IShellExecuteHookAVtbl vt_ShellExecuteHookA =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IShellExecuteHookA_fnQueryInterface, IShellExecuteHookA_fnQueryInterface,
IShellExecuteHookA_fnAddRef, IShellExecuteHookA_fnAddRef,

50
reactos/lib/shell32/dataobject.c
View file

@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IEnumFORMATETC); IEnumFORMATETCVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IEnumFORMATETC fields */ /* IEnumFORMATETC fields */
UINT posFmt; UINT posFmt;
@ -56,9 +56,8 @@ static HRESULT WINAPI IEnumFORMATETC_fnSkip(LPENUMFORMATETC iface, ULONG celt);
static HRESULT WINAPI IEnumFORMATETC_fnReset(LPENUMFORMATETC iface); static HRESULT WINAPI IEnumFORMATETC_fnReset(LPENUMFORMATETC iface);
static HRESULT WINAPI IEnumFORMATETC_fnClone(LPENUMFORMATETC iface, LPENUMFORMATETC* ppenum); static HRESULT WINAPI IEnumFORMATETC_fnClone(LPENUMFORMATETC iface, LPENUMFORMATETC* ppenum);
static struct ICOM_VTABLE(IEnumFORMATETC) efvt = static struct IEnumFORMATETCVtbl efvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IEnumFORMATETC_fnQueryInterface, IEnumFORMATETC_fnQueryInterface,
IEnumFORMATETC_fnAddRef, IEnumFORMATETC_fnAddRef,
IEnumFORMATETC_fnRelease, IEnumFORMATETC_fnRelease,
@ -95,7 +94,7 @@ LPENUMFORMATETC IEnumFORMATETC_Constructor(UINT cfmt, const FORMATETC afmt[])
static HRESULT WINAPI IEnumFORMATETC_fnQueryInterface(LPENUMFORMATETC iface, REFIID riid, LPVOID* ppvObj) static HRESULT WINAPI IEnumFORMATETC_fnQueryInterface(LPENUMFORMATETC iface, REFIID riid, LPVOID* ppvObj)
{ {
ICOM_THIS(IEnumFORMATETCImpl,iface); IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface;
TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj);
*ppvObj = NULL; *ppvObj = NULL;
@ -122,14 +121,14 @@ static HRESULT WINAPI IEnumFORMATETC_fnQueryInterface(LPENUMFORMATETC iface, REF
static ULONG WINAPI IEnumFORMATETC_fnAddRef(LPENUMFORMATETC iface) static ULONG WINAPI IEnumFORMATETC_fnAddRef(LPENUMFORMATETC iface)
{ {
ICOM_THIS(IEnumFORMATETCImpl,iface); IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface;
TRACE("(%p)->(count=%lu)\n",This, This->ref); TRACE("(%p)->(count=%lu)\n",This, This->ref);
return ++(This->ref); return ++(This->ref);
} }
static ULONG WINAPI IEnumFORMATETC_fnRelease(LPENUMFORMATETC iface) static ULONG WINAPI IEnumFORMATETC_fnRelease(LPENUMFORMATETC iface)
{ {
ICOM_THIS(IEnumFORMATETCImpl,iface); IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface;
TRACE("(%p)->()\n",This); TRACE("(%p)->()\n",This);
if (!--(This->ref)) if (!--(This->ref))
@ -147,7 +146,7 @@ static ULONG WINAPI IEnumFORMATETC_fnRelease(LPENUMFORMATETC iface)
static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, FORMATETC *rgelt, ULONG *pceltFethed) static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, FORMATETC *rgelt, ULONG *pceltFethed)
{ {
ICOM_THIS(IEnumFORMATETCImpl,iface); IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface;
UINT i; UINT i;
TRACE("(%p)->(%lu,%p)\n", This, celt, rgelt); TRACE("(%p)->(%lu,%p)\n", This, celt, rgelt);
@ -168,7 +167,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, F
static HRESULT WINAPI IEnumFORMATETC_fnSkip(LPENUMFORMATETC iface, ULONG celt) static HRESULT WINAPI IEnumFORMATETC_fnSkip(LPENUMFORMATETC iface, ULONG celt)
{ {
ICOM_THIS(IEnumFORMATETCImpl,iface); IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface;
TRACE("(%p)->(num=%lu)\n", This, celt); TRACE("(%p)->(num=%lu)\n", This, celt);
if((This->posFmt + celt) >= This->countFmt) return S_FALSE; if((This->posFmt + celt) >= This->countFmt) return S_FALSE;
@ -178,7 +177,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnSkip(LPENUMFORMATETC iface, ULONG celt)
static HRESULT WINAPI IEnumFORMATETC_fnReset(LPENUMFORMATETC iface) static HRESULT WINAPI IEnumFORMATETC_fnReset(LPENUMFORMATETC iface)
{ {
ICOM_THIS(IEnumFORMATETCImpl,iface); IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface;
TRACE("(%p)->()\n", This); TRACE("(%p)->()\n", This);
This->posFmt = 0; This->posFmt = 0;
@ -187,7 +186,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnReset(LPENUMFORMATETC iface)
static HRESULT WINAPI IEnumFORMATETC_fnClone(LPENUMFORMATETC iface, LPENUMFORMATETC* ppenum) static HRESULT WINAPI IEnumFORMATETC_fnClone(LPENUMFORMATETC iface, LPENUMFORMATETC* ppenum)
{ {
ICOM_THIS(IEnumFORMATETCImpl,iface); IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface;
TRACE("(%p)->(ppenum=%p)\n", This, ppenum); TRACE("(%p)->(ppenum=%p)\n", This, ppenum);
if (!ppenum) return E_INVALIDARG; if (!ppenum) return E_INVALIDARG;
@ -208,7 +207,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnClone(LPENUMFORMATETC iface, LPENUMFORMAT
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDataObject); IDataObjectVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDataObject fields */ /* IDataObject fields */
@ -223,7 +222,7 @@ typedef struct
} IDataObjectImpl; } IDataObjectImpl;
static struct ICOM_VTABLE(IDataObject) dtovt; static struct IDataObjectVtbl dtovt;
/************************************************************************** /**************************************************************************
* IDataObject_Constructor * IDataObject_Constructor
@ -260,7 +259,7 @@ LPDATAOBJECT IDataObject_Constructor(HWND hwndOwner, LPCITEMIDLIST pMyPidl, LPCI
*/ */
static HRESULT WINAPI IDataObject_fnQueryInterface(LPDATAOBJECT iface, REFIID riid, LPVOID * ppvObj) static HRESULT WINAPI IDataObject_fnQueryInterface(LPDATAOBJECT iface, REFIID riid, LPVOID * ppvObj)
{ {
ICOM_THIS(IDataObjectImpl,iface); IDataObjectImpl *This = (IDataObjectImpl *)iface;
TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj);
*ppvObj = NULL; *ppvObj = NULL;
@ -289,7 +288,7 @@ static HRESULT WINAPI IDataObject_fnQueryInterface(LPDATAOBJECT iface, REFIID ri
*/ */
static ULONG WINAPI IDataObject_fnAddRef(LPDATAOBJECT iface) static ULONG WINAPI IDataObject_fnAddRef(LPDATAOBJECT iface)
{ {
ICOM_THIS(IDataObjectImpl,iface); IDataObjectImpl *This = (IDataObjectImpl *)iface;
TRACE("(%p)->(count=%lu)\n",This, This->ref); TRACE("(%p)->(count=%lu)\n",This, This->ref);
return ++(This->ref); return ++(This->ref);
} }
@ -299,7 +298,7 @@ static ULONG WINAPI IDataObject_fnAddRef(LPDATAOBJECT iface)
*/ */
static ULONG WINAPI IDataObject_fnRelease(LPDATAOBJECT iface) static ULONG WINAPI IDataObject_fnRelease(LPDATAOBJECT iface)
{ {
ICOM_THIS(IDataObjectImpl,iface); IDataObjectImpl *This = (IDataObjectImpl *)iface;
TRACE("(%p)->()\n",This); TRACE("(%p)->()\n",This);
if (!--(This->ref)) if (!--(This->ref))
@ -318,7 +317,7 @@ static ULONG WINAPI IDataObject_fnRelease(LPDATAOBJECT iface)
*/ */
static HRESULT WINAPI IDataObject_fnGetData(LPDATAOBJECT iface, LPFORMATETC pformatetcIn, STGMEDIUM *pmedium) static HRESULT WINAPI IDataObject_fnGetData(LPDATAOBJECT iface, LPFORMATETC pformatetcIn, STGMEDIUM *pmedium)
{ {
ICOM_THIS(IDataObjectImpl,iface); IDataObjectImpl *This = (IDataObjectImpl *)iface;
char szTemp[256]; char szTemp[256];
@ -362,14 +361,14 @@ static HRESULT WINAPI IDataObject_fnGetData(LPDATAOBJECT iface, LPFORMATETC pfor
static HRESULT WINAPI IDataObject_fnGetDataHere(LPDATAOBJECT iface, LPFORMATETC pformatetc, STGMEDIUM *pmedium) static HRESULT WINAPI IDataObject_fnGetDataHere(LPDATAOBJECT iface, LPFORMATETC pformatetc, STGMEDIUM *pmedium)
{ {
ICOM_THIS(IDataObjectImpl,iface); IDataObjectImpl *This = (IDataObjectImpl *)iface;
FIXME("(%p)->()\n", This); FIXME("(%p)->()\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDataObject_fnQueryGetData(LPDATAOBJECT iface, LPFORMATETC pformatetc) static HRESULT WINAPI IDataObject_fnQueryGetData(LPDATAOBJECT iface, LPFORMATETC pformatetc)
{ {
ICOM_THIS(IDataObjectImpl,iface); IDataObjectImpl *This = (IDataObjectImpl *)iface;
UINT i; UINT i;
TRACE("(%p)->(fmt=0x%08x tym=0x%08lx)\n", This, pformatetc->cfFormat, pformatetc->tymed); TRACE("(%p)->(fmt=0x%08x tym=0x%08lx)\n", This, pformatetc->cfFormat, pformatetc->tymed);
@ -392,21 +391,21 @@ static HRESULT WINAPI IDataObject_fnQueryGetData(LPDATAOBJECT iface, LPFORMATETC
static HRESULT WINAPI IDataObject_fnGetCanonicalFormatEtc(LPDATAOBJECT iface, LPFORMATETC pformatectIn, LPFORMATETC pformatetcOut) static HRESULT WINAPI IDataObject_fnGetCanonicalFormatEtc(LPDATAOBJECT iface, LPFORMATETC pformatectIn, LPFORMATETC pformatetcOut)
{ {
ICOM_THIS(IDataObjectImpl,iface); IDataObjectImpl *This = (IDataObjectImpl *)iface;
FIXME("(%p)->()\n", This); FIXME("(%p)->()\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDataObject_fnSetData(LPDATAOBJECT iface, LPFORMATETC pformatetc, STGMEDIUM *pmedium, BOOL fRelease) static HRESULT WINAPI IDataObject_fnSetData(LPDATAOBJECT iface, LPFORMATETC pformatetc, STGMEDIUM *pmedium, BOOL fRelease)
{ {
ICOM_THIS(IDataObjectImpl,iface); IDataObjectImpl *This = (IDataObjectImpl *)iface;
FIXME("(%p)->()\n", This); FIXME("(%p)->()\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDataObject_fnEnumFormatEtc(LPDATAOBJECT iface, DWORD dwDirection, IEnumFORMATETC **ppenumFormatEtc) static HRESULT WINAPI IDataObject_fnEnumFormatEtc(LPDATAOBJECT iface, DWORD dwDirection, IEnumFORMATETC **ppenumFormatEtc)
{ {
ICOM_THIS(IDataObjectImpl,iface); IDataObjectImpl *This = (IDataObjectImpl *)iface;
TRACE("(%p)->()\n", This); TRACE("(%p)->()\n", This);
*ppenumFormatEtc=NULL; *ppenumFormatEtc=NULL;
@ -423,26 +422,25 @@ static HRESULT WINAPI IDataObject_fnEnumFormatEtc(LPDATAOBJECT iface, DWORD dwDi
static HRESULT WINAPI IDataObject_fnDAdvise(LPDATAOBJECT iface, FORMATETC *pformatetc, DWORD advf, IAdviseSink *pAdvSink, DWORD *pdwConnection) static HRESULT WINAPI IDataObject_fnDAdvise(LPDATAOBJECT iface, FORMATETC *pformatetc, DWORD advf, IAdviseSink *pAdvSink, DWORD *pdwConnection)
{ {
ICOM_THIS(IDataObjectImpl,iface); IDataObjectImpl *This = (IDataObjectImpl *)iface;
FIXME("(%p)->()\n", This); FIXME("(%p)->()\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDataObject_fnDUnadvise(LPDATAOBJECT iface, DWORD dwConnection) static HRESULT WINAPI IDataObject_fnDUnadvise(LPDATAOBJECT iface, DWORD dwConnection)
{ {
ICOM_THIS(IDataObjectImpl,iface); IDataObjectImpl *This = (IDataObjectImpl *)iface;
FIXME("(%p)->()\n", This); FIXME("(%p)->()\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDataObject_fnEnumDAdvise(LPDATAOBJECT iface, IEnumSTATDATA **ppenumAdvise) static HRESULT WINAPI IDataObject_fnEnumDAdvise(LPDATAOBJECT iface, IEnumSTATDATA **ppenumAdvise)
{ {
ICOM_THIS(IDataObjectImpl,iface); IDataObjectImpl *This = (IDataObjectImpl *)iface;
FIXME("(%p)->()\n", This); FIXME("(%p)->()\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static struct ICOM_VTABLE(IDataObject) dtovt = static struct IDataObjectVtbl dtovt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDataObject_fnQueryInterface, IDataObject_fnQueryInterface,
IDataObject_fnAddRef, IDataObject_fnAddRef,
IDataObject_fnRelease, IDataObject_fnRelease,

23
reactos/lib/shell32/dragdrophelper.c
View file

@ -46,11 +46,11 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell);
*/ */
typedef struct { typedef struct {
ICOM_VFIELD (IDropTargetHelper); IDropTargetHelperVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IDropTargetHelperImpl; } IDropTargetHelperImpl;
static struct ICOM_VTABLE (IDropTargetHelper) vt_IDropTargetHelper; static struct IDropTargetHelperVtbl vt_IDropTargetHelper;
#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) #define _IUnknown_(This) (IUnknown*)&(This->lpVtbl)
#define _IDropTargetHelper_(This) (IDropTargetHelper*)&(This->lpVtbl) #define _IDropTargetHelper_(This) (IDropTargetHelper*)&(This->lpVtbl)
@ -89,7 +89,7 @@ HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid,
*/ */
static HRESULT WINAPI IDropTargetHelper_fnQueryInterface (IDropTargetHelper * iface, REFIID riid, LPVOID * ppvObj) static HRESULT WINAPI IDropTargetHelper_fnQueryInterface (IDropTargetHelper * iface, REFIID riid, LPVOID * ppvObj)
{ {
ICOM_THIS (IDropTargetHelperImpl, iface); IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface;
TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj);
@ -110,7 +110,7 @@ static HRESULT WINAPI IDropTargetHelper_fnQueryInterface (IDropTargetHelper * if
static ULONG WINAPI IDropTargetHelper_fnAddRef (IDropTargetHelper * iface) static ULONG WINAPI IDropTargetHelper_fnAddRef (IDropTargetHelper * iface)
{ {
ICOM_THIS (IDropTargetHelperImpl, iface); IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface;
TRACE ("(%p)->(count=%lu)\n", This, This->ref); TRACE ("(%p)->(count=%lu)\n", This, This->ref);
@ -119,7 +119,7 @@ static ULONG WINAPI IDropTargetHelper_fnAddRef (IDropTargetHelper * iface)
static ULONG WINAPI IDropTargetHelper_fnRelease (IDropTargetHelper * iface) static ULONG WINAPI IDropTargetHelper_fnRelease (IDropTargetHelper * iface)
{ {
ICOM_THIS (IDropTargetHelperImpl, iface); IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface;
TRACE ("(%p)->(count=%lu)\n", This, This->ref); TRACE ("(%p)->(count=%lu)\n", This, This->ref);
@ -138,42 +138,41 @@ static HRESULT WINAPI IDropTargetHelper_fnDragEnter (
POINT* ppt, POINT* ppt,
DWORD dwEffect) DWORD dwEffect)
{ {
ICOM_THIS (IDropTargetHelperImpl, iface); IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface;
FIXME ("(%p)->(%p %p %p 0x%08lx)\n", This,hwndTarget, pDataObject, ppt, dwEffect); FIXME ("(%p)->(%p %p %p 0x%08lx)\n", This,hwndTarget, pDataObject, ppt, dwEffect);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDropTargetHelper_fnDragLeave (IDropTargetHelper * iface) static HRESULT WINAPI IDropTargetHelper_fnDragLeave (IDropTargetHelper * iface)
{ {
ICOM_THIS (IDropTargetHelperImpl, iface); IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface;
FIXME ("(%p)->()\n", This); FIXME ("(%p)->()\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDropTargetHelper_fnDragOver (IDropTargetHelper * iface, POINT* ppt, DWORD dwEffect) static HRESULT WINAPI IDropTargetHelper_fnDragOver (IDropTargetHelper * iface, POINT* ppt, DWORD dwEffect)
{ {
ICOM_THIS (IDropTargetHelperImpl, iface); IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface;
FIXME ("(%p)->(%p 0x%08lx)\n", This, ppt, dwEffect); FIXME ("(%p)->(%p 0x%08lx)\n", This, ppt, dwEffect);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDropTargetHelper_fnDrop (IDropTargetHelper * iface, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect) static HRESULT WINAPI IDropTargetHelper_fnDrop (IDropTargetHelper * iface, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect)
{ {
ICOM_THIS (IDropTargetHelperImpl, iface); IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface;
FIXME ("(%p)->(%p %p 0x%08lx)\n", This, pDataObject, ppt, dwEffect); FIXME ("(%p)->(%p %p 0x%08lx)\n", This, pDataObject, ppt, dwEffect);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDropTargetHelper_fnShow (IDropTargetHelper * iface, BOOL fShow) static HRESULT WINAPI IDropTargetHelper_fnShow (IDropTargetHelper * iface, BOOL fShow)
{ {
ICOM_THIS (IDropTargetHelperImpl, iface); IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface;
FIXME ("(%p)->(%u)\n", This, fShow); FIXME ("(%p)->(%u)\n", This, fShow);
return E_NOTIMPL; return E_NOTIMPL;
} }
static ICOM_VTABLE (IDropTargetHelper) vt_IDropTargetHelper = static IDropTargetHelperVtbl vt_IDropTargetHelper =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDropTargetHelper_fnQueryInterface, IDropTargetHelper_fnQueryInterface,
IDropTargetHelper_fnAddRef, IDropTargetHelper_fnAddRef,
IDropTargetHelper_fnRelease, IDropTargetHelper_fnRelease,

25
reactos/lib/shell32/enumidlist.c
View file

@ -45,7 +45,7 @@ typedef struct tagENUMLIST
typedef struct typedef struct
{ {
ICOM_VFIELD(IEnumIDList); IEnumIDListVtbl *lpVtbl;
DWORD ref; DWORD ref;
LPENUMLIST mpFirst; LPENUMLIST mpFirst;
LPENUMLIST mpLast; LPENUMLIST mpLast;
@ -53,7 +53,7 @@ typedef struct
} IEnumIDListImpl; } IEnumIDListImpl;
static struct ICOM_VTABLE(IEnumIDList) eidlvt; static struct IEnumIDListVtbl eidlvt;
/************************************************************************** /**************************************************************************
* AddToEnumList() * AddToEnumList()
@ -62,7 +62,7 @@ BOOL AddToEnumList(
IEnumIDList * iface, IEnumIDList * iface,
LPITEMIDLIST pidl) LPITEMIDLIST pidl)
{ {
ICOM_THIS(IEnumIDListImpl,iface); IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
LPENUMLIST pNew; LPENUMLIST pNew;
@ -167,7 +167,7 @@ BOOL CreateFolderEnumList(
static BOOL DeleteList( static BOOL DeleteList(
IEnumIDList * iface) IEnumIDList * iface)
{ {
ICOM_THIS(IEnumIDListImpl,iface); IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
LPENUMLIST pDelete; LPENUMLIST pDelete;
@ -211,7 +211,7 @@ static HRESULT WINAPI IEnumIDList_fnQueryInterface(
REFIID riid, REFIID riid,
LPVOID *ppvObj) LPVOID *ppvObj)
{ {
ICOM_THIS(IEnumIDListImpl,iface); IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj);
@ -240,7 +240,7 @@ static HRESULT WINAPI IEnumIDList_fnQueryInterface(
static ULONG WINAPI IEnumIDList_fnAddRef( static ULONG WINAPI IEnumIDList_fnAddRef(
IEnumIDList * iface) IEnumIDList * iface)
{ {
ICOM_THIS(IEnumIDListImpl,iface); IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
TRACE("(%p)->(%lu)\n",This,This->ref); TRACE("(%p)->(%lu)\n",This,This->ref);
return ++(This->ref); return ++(This->ref);
} }
@ -250,7 +250,7 @@ static ULONG WINAPI IEnumIDList_fnAddRef(
static ULONG WINAPI IEnumIDList_fnRelease( static ULONG WINAPI IEnumIDList_fnRelease(
IEnumIDList * iface) IEnumIDList * iface)
{ {
ICOM_THIS(IEnumIDListImpl,iface); IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
TRACE("(%p)->(%lu)\n",This,This->ref); TRACE("(%p)->(%lu)\n",This,This->ref);
@ -273,7 +273,7 @@ static HRESULT WINAPI IEnumIDList_fnNext(
LPITEMIDLIST * rgelt, LPITEMIDLIST * rgelt,
ULONG *pceltFetched) ULONG *pceltFetched)
{ {
ICOM_THIS(IEnumIDListImpl,iface); IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
ULONG i; ULONG i;
HRESULT hr = S_OK; HRESULT hr = S_OK;
@ -318,7 +318,7 @@ static HRESULT WINAPI IEnumIDList_fnNext(
static HRESULT WINAPI IEnumIDList_fnSkip( static HRESULT WINAPI IEnumIDList_fnSkip(
IEnumIDList * iface,ULONG celt) IEnumIDList * iface,ULONG celt)
{ {
ICOM_THIS(IEnumIDListImpl,iface); IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
DWORD dwIndex; DWORD dwIndex;
HRESULT hr = S_OK; HRESULT hr = S_OK;
@ -340,7 +340,7 @@ static HRESULT WINAPI IEnumIDList_fnSkip(
static HRESULT WINAPI IEnumIDList_fnReset( static HRESULT WINAPI IEnumIDList_fnReset(
IEnumIDList * iface) IEnumIDList * iface)
{ {
ICOM_THIS(IEnumIDListImpl,iface); IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
This->mpCurrent = This->mpFirst; This->mpCurrent = This->mpFirst;
@ -352,7 +352,7 @@ static HRESULT WINAPI IEnumIDList_fnReset(
static HRESULT WINAPI IEnumIDList_fnClone( static HRESULT WINAPI IEnumIDList_fnClone(
IEnumIDList * iface,LPENUMIDLIST * ppenum) IEnumIDList * iface,LPENUMIDLIST * ppenum)
{ {
ICOM_THIS(IEnumIDListImpl,iface); IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
TRACE("(%p)->() to (%p)->() E_NOTIMPL\n",This,ppenum); TRACE("(%p)->() to (%p)->() E_NOTIMPL\n",This,ppenum);
return E_NOTIMPL; return E_NOTIMPL;
@ -361,9 +361,8 @@ static HRESULT WINAPI IEnumIDList_fnClone(
/************************************************************************** /**************************************************************************
* IEnumIDList_fnVTable * IEnumIDList_fnVTable
*/ */
static ICOM_VTABLE (IEnumIDList) eidlvt = static IEnumIDListVtbl eidlvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IEnumIDList_fnQueryInterface, IEnumIDList_fnQueryInterface,
IEnumIDList_fnAddRef, IEnumIDList_fnAddRef,
IEnumIDList_fnRelease, IEnumIDList_fnRelease,

37
reactos/lib/shell32/folders.c
View file

@ -44,16 +44,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
*/ */
typedef struct typedef struct
{ {
ICOM_VFIELD(IExtractIconW); IExtractIconWVtbl *lpVtbl;
DWORD ref; DWORD ref;
ICOM_VTABLE(IPersistFile)* lpvtblPersistFile; IPersistFileVtbl *lpvtblPersistFile;
ICOM_VTABLE(IExtractIconA)* lpvtblExtractIconA; IExtractIconAVtbl *lpvtblExtractIconA;
LPITEMIDLIST pidl; LPITEMIDLIST pidl;
} IExtractIconWImpl; } IExtractIconWImpl;
static struct ICOM_VTABLE(IExtractIconA) eiavt; static struct IExtractIconAVtbl eiavt;
static struct ICOM_VTABLE(IExtractIconW) eivt; static struct IExtractIconWVtbl eivt;
static struct ICOM_VTABLE(IPersistFile) pfvt; static struct IPersistFileVtbl pfvt;
#define _IPersistFile_Offset ((int)(&(((IExtractIconWImpl*)0)->lpvtblPersistFile))) #define _IPersistFile_Offset ((int)(&(((IExtractIconWImpl*)0)->lpvtblPersistFile)))
#define _ICOM_THIS_From_IPersistFile(class, name) class* This = (class*)(((char*)name)-_IPersistFile_Offset); #define _ICOM_THIS_From_IPersistFile(class, name) class* This = (class*)(((char*)name)-_IPersistFile_Offset);
@ -87,7 +87,7 @@ IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl)
*/ */
static HRESULT WINAPI IExtractIconW_fnQueryInterface(IExtractIconW *iface, REFIID riid, LPVOID *ppvObj) static HRESULT WINAPI IExtractIconW_fnQueryInterface(IExtractIconW *iface, REFIID riid, LPVOID *ppvObj)
{ {
ICOM_THIS(IExtractIconWImpl, iface); IExtractIconWImpl *This = (IExtractIconWImpl *)iface;
TRACE("(%p)->(\n\tIID:\t%s,%p)\n", This, debugstr_guid(riid), ppvObj); TRACE("(%p)->(\n\tIID:\t%s,%p)\n", This, debugstr_guid(riid), ppvObj);
@ -125,7 +125,7 @@ static HRESULT WINAPI IExtractIconW_fnQueryInterface(IExtractIconW *iface, REFII
*/ */
static ULONG WINAPI IExtractIconW_fnAddRef(IExtractIconW * iface) static ULONG WINAPI IExtractIconW_fnAddRef(IExtractIconW * iface)
{ {
ICOM_THIS(IExtractIconWImpl, iface); IExtractIconWImpl *This = (IExtractIconWImpl *)iface;
TRACE("(%p)->(count=%lu)\n",This, This->ref ); TRACE("(%p)->(count=%lu)\n",This, This->ref );
@ -136,7 +136,7 @@ static ULONG WINAPI IExtractIconW_fnAddRef(IExtractIconW * iface)
*/ */
static ULONG WINAPI IExtractIconW_fnRelease(IExtractIconW * iface) static ULONG WINAPI IExtractIconW_fnRelease(IExtractIconW * iface)
{ {
ICOM_THIS(IExtractIconWImpl, iface); IExtractIconWImpl *This = (IExtractIconWImpl *)iface;
TRACE("(%p)->()\n",This); TRACE("(%p)->()\n",This);
@ -165,7 +165,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(
int * piIndex, int * piIndex,
UINT * pwFlags) /* returned GIL_ flags */ UINT * pwFlags) /* returned GIL_ flags */
{ {
ICOM_THIS(IExtractIconWImpl, iface); IExtractIconWImpl *This = (IExtractIconWImpl *)iface;
char sTemp[MAX_PATH]; char sTemp[MAX_PATH];
DWORD dwNr; DWORD dwNr;
@ -328,7 +328,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(
*/ */
static HRESULT WINAPI IExtractIconW_fnExtract(IExtractIconW * iface, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) static HRESULT WINAPI IExtractIconW_fnExtract(IExtractIconW * iface, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize)
{ {
ICOM_THIS(IExtractIconWImpl, iface); IExtractIconWImpl *This = (IExtractIconWImpl *)iface;
FIXME("(%p) (file=%p index=%u %p %p size=%u) semi-stub\n", This, debugstr_w(pszFile), nIconIndex, phiconLarge, phiconSmall, nIconSize); FIXME("(%p) (file=%p index=%u %p %p size=%u) semi-stub\n", This, debugstr_w(pszFile), nIconIndex, phiconLarge, phiconSmall, nIconSize);
@ -341,9 +341,8 @@ static HRESULT WINAPI IExtractIconW_fnExtract(IExtractIconW * iface, LPCWSTR psz
return S_OK; return S_OK;
} }
static struct ICOM_VTABLE(IExtractIconW) eivt = static struct IExtractIconWVtbl eivt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IExtractIconW_fnQueryInterface, IExtractIconW_fnQueryInterface,
IExtractIconW_fnAddRef, IExtractIconW_fnAddRef,
IExtractIconW_fnRelease, IExtractIconW_fnRelease,
@ -356,7 +355,7 @@ static struct ICOM_VTABLE(IExtractIconW) eivt =
*/ */
IExtractIconA* IExtractIconA_Constructor(LPCITEMIDLIST pidl) IExtractIconA* IExtractIconA_Constructor(LPCITEMIDLIST pidl)
{ {
ICOM_THIS(IExtractIconWImpl, IExtractIconW_Constructor(pidl)); IExtractIconWImpl *This = (IExtractIconWImpl *)IExtractIconW_Constructor(pidl);
IExtractIconA *eia = (IExtractIconA *)&This->lpvtblExtractIconA; IExtractIconA *eia = (IExtractIconA *)&This->lpvtblExtractIconA;
TRACE("(%p)->(%p)\n", This, eia); TRACE("(%p)->(%p)\n", This, eia);
@ -434,9 +433,8 @@ static HRESULT WINAPI IExtractIconA_fnExtract(IExtractIconA * iface, LPCSTR pszF
return ret; return ret;
} }
static struct ICOM_VTABLE(IExtractIconA) eiavt = static struct IExtractIconAVtbl eiavt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IExtractIconA_fnQueryInterface, IExtractIconA_fnQueryInterface,
IExtractIconA_fnAddRef, IExtractIconA_fnAddRef,
IExtractIconA_fnRelease, IExtractIconA_fnRelease,
@ -507,9 +505,8 @@ static HRESULT WINAPI IEIPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFi
} }
static struct ICOM_VTABLE(IPersistFile) pfvt = static struct IPersistFileVtbl pfvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IEIPersistFile_fnQueryInterface, IEIPersistFile_fnQueryInterface,
IEIPersistFile_fnAddRef, IEIPersistFile_fnAddRef,
IEIPersistFile_fnRelease, IEIPersistFile_fnRelease,

33
reactos/lib/shell32/memorystream.c
View file

@ -55,9 +55,8 @@ static HRESULT WINAPI IStream_fnUnlockRegion (IStream * iface, ULARGE_INTEGER li
static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWORD grfStatFlag); static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWORD grfStatFlag);
static HRESULT WINAPI IStream_fnClone (IStream * iface, IStream** ppstm); static HRESULT WINAPI IStream_fnClone (IStream * iface, IStream** ppstm);
static ICOM_VTABLE(IStream) stvt = static IStreamVtbl stvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IStream_fnQueryInterface, IStream_fnQueryInterface,
IStream_fnAddRef, IStream_fnAddRef,
IStream_fnRelease, IStream_fnRelease,
@ -76,7 +75,7 @@ static ICOM_VTABLE(IStream) stvt =
}; };
typedef struct typedef struct
{ ICOM_VTABLE(IStream) *lpvtst; { IStreamVtbl *lpvtst;
DWORD ref; DWORD ref;
HANDLE handle; HANDLE handle;
} ISHFileStream; } ISHFileStream;
@ -129,7 +128,7 @@ HRESULT CreateStreamOnFile (LPCWSTR pszFilename, DWORD grfMode, IStream ** ppstm
*/ */
static HRESULT WINAPI IStream_fnQueryInterface(IStream *iface, REFIID riid, LPVOID *ppvObj) static HRESULT WINAPI IStream_fnQueryInterface(IStream *iface, REFIID riid, LPVOID *ppvObj)
{ {
ICOM_THIS(ISHFileStream, iface); ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj);
@ -156,7 +155,7 @@ static HRESULT WINAPI IStream_fnQueryInterface(IStream *iface, REFIID riid, LPVO
*/ */
static ULONG WINAPI IStream_fnAddRef(IStream *iface) static ULONG WINAPI IStream_fnAddRef(IStream *iface)
{ {
ICOM_THIS(ISHFileStream, iface); ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)->(count=%lu)\n",This, This->ref); TRACE("(%p)->(count=%lu)\n",This, This->ref);
@ -168,7 +167,7 @@ static ULONG WINAPI IStream_fnAddRef(IStream *iface)
*/ */
static ULONG WINAPI IStream_fnRelease(IStream *iface) static ULONG WINAPI IStream_fnRelease(IStream *iface)
{ {
ICOM_THIS(ISHFileStream, iface); ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)->()\n",This); TRACE("(%p)->()\n",This);
@ -183,7 +182,7 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface)
static HRESULT WINAPI IStream_fnRead (IStream * iface, void* pv, ULONG cb, ULONG* pcbRead) static HRESULT WINAPI IStream_fnRead (IStream * iface, void* pv, ULONG cb, ULONG* pcbRead)
{ {
ICOM_THIS(ISHFileStream, iface); ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)->(%p,0x%08lx,%p)\n",This, pv, cb, pcbRead); TRACE("(%p)->(%p,0x%08lx,%p)\n",This, pv, cb, pcbRead);
@ -199,7 +198,7 @@ static HRESULT WINAPI IStream_fnRead (IStream * iface, void* pv, ULONG cb, ULONG
static HRESULT WINAPI IStream_fnWrite (IStream * iface, const void* pv, ULONG cb, ULONG* pcbWritten) static HRESULT WINAPI IStream_fnWrite (IStream * iface, const void* pv, ULONG cb, ULONG* pcbWritten)
{ {
DWORD dummy_count; DWORD dummy_count;
ICOM_THIS(ISHFileStream, iface); ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
@ -220,7 +219,7 @@ static HRESULT WINAPI IStream_fnSeek (IStream * iface, LARGE_INTEGER dlibMove, D
{ {
DWORD pos, newposlo, newposhi; DWORD pos, newposlo, newposhi;
ICOM_THIS(ISHFileStream, iface); ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
@ -237,7 +236,7 @@ static HRESULT WINAPI IStream_fnSeek (IStream * iface, LARGE_INTEGER dlibMove, D
static HRESULT WINAPI IStream_fnSetSize (IStream * iface, ULARGE_INTEGER libNewSize) static HRESULT WINAPI IStream_fnSetSize (IStream * iface, ULARGE_INTEGER libNewSize)
{ {
ICOM_THIS(ISHFileStream, iface); ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
@ -251,7 +250,7 @@ static HRESULT WINAPI IStream_fnSetSize (IStream * iface, ULARGE_INTEGER libNewS
} }
static HRESULT WINAPI IStream_fnCopyTo (IStream * iface, IStream* pstm, ULARGE_INTEGER cb, ULARGE_INTEGER* pcbRead, ULARGE_INTEGER* pcbWritten) static HRESULT WINAPI IStream_fnCopyTo (IStream * iface, IStream* pstm, ULARGE_INTEGER cb, ULARGE_INTEGER* pcbRead, ULARGE_INTEGER* pcbWritten)
{ {
ICOM_THIS(ISHFileStream, iface); ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
@ -259,7 +258,7 @@ static HRESULT WINAPI IStream_fnCopyTo (IStream * iface, IStream* pstm, ULARGE_I
} }
static HRESULT WINAPI IStream_fnCommit (IStream * iface, DWORD grfCommitFlags) static HRESULT WINAPI IStream_fnCommit (IStream * iface, DWORD grfCommitFlags)
{ {
ICOM_THIS(ISHFileStream, iface); ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
@ -267,7 +266,7 @@ static HRESULT WINAPI IStream_fnCommit (IStream * iface, DWORD grfCommitFlags)
} }
static HRESULT WINAPI IStream_fnRevert (IStream * iface) static HRESULT WINAPI IStream_fnRevert (IStream * iface)
{ {
ICOM_THIS(ISHFileStream, iface); ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
@ -275,7 +274,7 @@ static HRESULT WINAPI IStream_fnRevert (IStream * iface)
} }
static HRESULT WINAPI IStream_fnLockRegion (IStream * iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) static HRESULT WINAPI IStream_fnLockRegion (IStream * iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType)
{ {
ICOM_THIS(ISHFileStream, iface); ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
@ -283,7 +282,7 @@ static HRESULT WINAPI IStream_fnLockRegion (IStream * iface, ULARGE_INTEGER libO
} }
static HRESULT WINAPI IStream_fnUnlockRegion (IStream * iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) static HRESULT WINAPI IStream_fnUnlockRegion (IStream * iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType)
{ {
ICOM_THIS(ISHFileStream, iface); ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
@ -291,7 +290,7 @@ static HRESULT WINAPI IStream_fnUnlockRegion (IStream * iface, ULARGE_INTEGER li
} }
static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWORD grfStatFlag) static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWORD grfStatFlag)
{ {
ICOM_THIS(ISHFileStream, iface); ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
@ -299,7 +298,7 @@ static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWOR
} }
static HRESULT WINAPI IStream_fnClone (IStream * iface, IStream** ppstm) static HRESULT WINAPI IStream_fnClone (IStream * iface, IStream** ppstm)
{ {
ICOM_THIS(ISHFileStream, iface); ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)\n",This); TRACE("(%p)\n",This);

77
reactos/lib/shell32/shelllink.c
View file

@ -112,21 +112,21 @@ typedef struct _LOCAL_VOLUME_INFO
#include "poppack.h" #include "poppack.h"
static ICOM_VTABLE(IShellLinkA) slvt; static IShellLinkAVtbl slvt;
static ICOM_VTABLE(IShellLinkW) slvtw; static IShellLinkWVtbl slvtw;
static ICOM_VTABLE(IPersistFile) pfvt; static IPersistFileVtbl pfvt;
static ICOM_VTABLE(IPersistStream) psvt; static IPersistStreamVtbl psvt;
/* IShellLink Implementation */ /* IShellLink Implementation */
typedef struct typedef struct
{ {
ICOM_VFIELD(IShellLinkA); IShellLinkAVtbl *lpVtbl;
DWORD ref; DWORD ref;
ICOM_VTABLE(IShellLinkW)* lpvtblw; IShellLinkWVtbl *lpvtblw;
ICOM_VTABLE(IPersistFile)* lpvtblPersistFile; IPersistFileVtbl *lpvtblPersistFile;
ICOM_VTABLE(IPersistStream)* lpvtblPersistStream; IPersistStreamVtbl *lpvtblPersistStream;
/* data structures according to the informations in the link */ /* data structures according to the informations in the link */
LPITEMIDLIST pPidl; LPITEMIDLIST pPidl;
@ -155,7 +155,6 @@ typedef struct
#define _IPersistStream_Offset ((int)(&(((IShellLinkImpl*)0)->lpvtblPersistStream))) #define _IPersistStream_Offset ((int)(&(((IShellLinkImpl*)0)->lpvtblPersistStream)))
#define _ICOM_THIS_From_IPersistStream(class, name) class* This = (class*)(((char*)name)-_IPersistStream_Offset) #define _ICOM_THIS_From_IPersistStream(class, name) class* This = (class*)(((char*)name)-_IPersistStream_Offset)
#define _IPersistStream_From_ICOM_THIS(class, name) class* StreamThis = (class*)(((char*)name)+_IPersistStream_Offset)
static HRESULT ShellLink_UpdatePath(LPWSTR sPathRel, LPCWSTR path, LPCWSTR sWorkDir, LPWSTR* psPath); static HRESULT ShellLink_UpdatePath(LPWSTR sPathRel, LPCWSTR path, LPCWSTR sWorkDir, LPWSTR* psPath);
@ -229,7 +228,7 @@ static HRESULT WINAPI IPersistFile_fnIsDirty(IPersistFile* iface)
static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFileName, DWORD dwMode) static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFileName, DWORD dwMode)
{ {
_ICOM_THIS_From_IPersistFile(IShellLinkImpl, iface); _ICOM_THIS_From_IPersistFile(IShellLinkImpl, iface);
_IPersistStream_From_ICOM_THIS(IPersistStream, This); IPersistStream *StreamThis = (IPersistStream *)&This->lpvtblPersistStream;
HRESULT r; HRESULT r;
IStream *stm; IStream *stm;
@ -282,7 +281,7 @@ static BOOL StartLinkProcessor( LPCOLESTR szLink )
static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFileName, BOOL fRemember) static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFileName, BOOL fRemember)
{ {
_ICOM_THIS_From_IPersistFile(IShellLinkImpl, iface); _ICOM_THIS_From_IPersistFile(IShellLinkImpl, iface);
_IPersistStream_From_ICOM_THIS(IPersistStream, This); IPersistStream *StreamThis = (IPersistStream *)&This->lpvtblPersistStream;
HRESULT r; HRESULT r;
IStream *stm; IStream *stm;
@ -326,9 +325,8 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *p
return NOERROR; return NOERROR;
} }
static ICOM_VTABLE(IPersistFile) pfvt = static IPersistFileVtbl pfvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IPersistFile_fnQueryInterface, IPersistFile_fnQueryInterface,
IPersistFile_fnAddRef, IPersistFile_fnAddRef,
IPersistFile_fnRelease, IPersistFile_fnRelease,
@ -768,9 +766,8 @@ static HRESULT WINAPI IPersistStream_fnGetSizeMax(
return E_NOTIMPL; return E_NOTIMPL;
} }
static ICOM_VTABLE(IPersistStream) psvt = static IPersistStreamVtbl psvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IPersistStream_fnQueryInterface, IPersistStream_fnQueryInterface,
IPersistStream_fnAddRef, IPersistStream_fnAddRef,
IPersistStream_fnRelease, IPersistStream_fnRelease,
@ -941,7 +938,7 @@ HRESULT WINAPI IShellLink_ConstructFromFile (
*/ */
static HRESULT WINAPI IShellLinkA_fnQueryInterface( IShellLinkA * iface, REFIID riid, LPVOID *ppvObj) static HRESULT WINAPI IShellLinkA_fnQueryInterface( IShellLinkA * iface, REFIID riid, LPVOID *ppvObj)
{ {
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(\n\tIID:\t%s)\n",This,debugstr_guid(riid)); TRACE("(%p)->(\n\tIID:\t%s)\n",This,debugstr_guid(riid));
@ -980,7 +977,7 @@ static HRESULT WINAPI IShellLinkA_fnQueryInterface( IShellLinkA * iface, REFIID
*/ */
static ULONG WINAPI IShellLinkA_fnAddRef(IShellLinkA * iface) static ULONG WINAPI IShellLinkA_fnAddRef(IShellLinkA * iface)
{ {
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(count=%lu)\n",This,This->ref); TRACE("(%p)->(count=%lu)\n",This,This->ref);
@ -992,7 +989,7 @@ static ULONG WINAPI IShellLinkA_fnAddRef(IShellLinkA * iface)
*/ */
static ULONG WINAPI IShellLinkA_fnRelease(IShellLinkA * iface) static ULONG WINAPI IShellLinkA_fnRelease(IShellLinkA * iface)
{ {
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(count=%lu)\n",This,This->ref); TRACE("(%p)->(count=%lu)\n",This,This->ref);
@ -1027,7 +1024,7 @@ static ULONG WINAPI IShellLinkA_fnRelease(IShellLinkA * iface)
static HRESULT WINAPI IShellLinkA_fnGetPath(IShellLinkA * iface, LPSTR pszFile, static HRESULT WINAPI IShellLinkA_fnGetPath(IShellLinkA * iface, LPSTR pszFile,
INT cchMaxPath, WIN32_FIND_DATAA *pfd, DWORD fFlags) INT cchMaxPath, WIN32_FIND_DATAA *pfd, DWORD fFlags)
{ {
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(pfile=%p len=%u find_data=%p flags=%lu)(%s)\n", TRACE("(%p)->(pfile=%p len=%u find_data=%p flags=%lu)(%s)\n",
This, pszFile, cchMaxPath, pfd, fFlags, debugstr_w(This->sPath)); This, pszFile, cchMaxPath, pfd, fFlags, debugstr_w(This->sPath));
@ -1049,7 +1046,7 @@ static HRESULT WINAPI IShellLinkA_fnGetPath(IShellLinkA * iface, LPSTR pszFile,
static HRESULT WINAPI IShellLinkA_fnGetIDList(IShellLinkA * iface, LPITEMIDLIST * ppidl) static HRESULT WINAPI IShellLinkA_fnGetIDList(IShellLinkA * iface, LPITEMIDLIST * ppidl)
{ {
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(ppidl=%p)\n",This, ppidl); TRACE("(%p)->(ppidl=%p)\n",This, ppidl);
@ -1060,7 +1057,7 @@ static HRESULT WINAPI IShellLinkA_fnGetIDList(IShellLinkA * iface, LPITEMIDLIST
static HRESULT WINAPI IShellLinkA_fnSetIDList(IShellLinkA * iface, LPCITEMIDLIST pidl) static HRESULT WINAPI IShellLinkA_fnSetIDList(IShellLinkA * iface, LPCITEMIDLIST pidl)
{ {
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(pidl=%p)\n",This, pidl); TRACE("(%p)->(pidl=%p)\n",This, pidl);
@ -1075,7 +1072,7 @@ static HRESULT WINAPI IShellLinkA_fnSetIDList(IShellLinkA * iface, LPCITEMIDLIST
static HRESULT WINAPI IShellLinkA_fnGetDescription(IShellLinkA * iface, LPSTR pszName,INT cchMaxName) static HRESULT WINAPI IShellLinkA_fnGetDescription(IShellLinkA * iface, LPSTR pszName,INT cchMaxName)
{ {
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(%p len=%u)\n",This, pszName, cchMaxName); TRACE("(%p)->(%p len=%u)\n",This, pszName, cchMaxName);
@ -1089,7 +1086,7 @@ static HRESULT WINAPI IShellLinkA_fnGetDescription(IShellLinkA * iface, LPSTR ps
} }
static HRESULT WINAPI IShellLinkA_fnSetDescription(IShellLinkA * iface, LPCSTR pszName) static HRESULT WINAPI IShellLinkA_fnSetDescription(IShellLinkA * iface, LPCSTR pszName)
{ {
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(pName=%s)\n", This, pszName); TRACE("(%p)->(pName=%s)\n", This, pszName);
@ -1106,7 +1103,7 @@ static HRESULT WINAPI IShellLinkA_fnSetDescription(IShellLinkA * iface, LPCSTR p
static HRESULT WINAPI IShellLinkA_fnGetWorkingDirectory(IShellLinkA * iface, LPSTR pszDir,INT cchMaxPath) static HRESULT WINAPI IShellLinkA_fnGetWorkingDirectory(IShellLinkA * iface, LPSTR pszDir,INT cchMaxPath)
{ {
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(%p len=%u)\n", This, pszDir, cchMaxPath); TRACE("(%p)->(%p len=%u)\n", This, pszDir, cchMaxPath);
@ -1121,7 +1118,7 @@ static HRESULT WINAPI IShellLinkA_fnGetWorkingDirectory(IShellLinkA * iface, LPS
static HRESULT WINAPI IShellLinkA_fnSetWorkingDirectory(IShellLinkA * iface, LPCSTR pszDir) static HRESULT WINAPI IShellLinkA_fnSetWorkingDirectory(IShellLinkA * iface, LPCSTR pszDir)
{ {
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(dir=%s)\n",This, pszDir); TRACE("(%p)->(dir=%s)\n",This, pszDir);
@ -1138,7 +1135,7 @@ static HRESULT WINAPI IShellLinkA_fnSetWorkingDirectory(IShellLinkA * iface, LPC
static HRESULT WINAPI IShellLinkA_fnGetArguments(IShellLinkA * iface, LPSTR pszArgs,INT cchMaxPath) static HRESULT WINAPI IShellLinkA_fnGetArguments(IShellLinkA * iface, LPSTR pszArgs,INT cchMaxPath)
{ {
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(%p len=%u)\n", This, pszArgs, cchMaxPath); TRACE("(%p)->(%p len=%u)\n", This, pszArgs, cchMaxPath);
@ -1153,7 +1150,7 @@ static HRESULT WINAPI IShellLinkA_fnGetArguments(IShellLinkA * iface, LPSTR pszA
static HRESULT WINAPI IShellLinkA_fnSetArguments(IShellLinkA * iface, LPCSTR pszArgs) static HRESULT WINAPI IShellLinkA_fnSetArguments(IShellLinkA * iface, LPCSTR pszArgs)
{ {
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(args=%s)\n",This, pszArgs); TRACE("(%p)->(args=%s)\n",This, pszArgs);
@ -1170,7 +1167,7 @@ static HRESULT WINAPI IShellLinkA_fnSetArguments(IShellLinkA * iface, LPCSTR psz
static HRESULT WINAPI IShellLinkA_fnGetHotkey(IShellLinkA * iface, WORD *pwHotkey) static HRESULT WINAPI IShellLinkA_fnGetHotkey(IShellLinkA * iface, WORD *pwHotkey)
{ {
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(%p)(0x%08x)\n",This, pwHotkey, This->wHotKey); TRACE("(%p)->(%p)(0x%08x)\n",This, pwHotkey, This->wHotKey);
@ -1181,7 +1178,7 @@ static HRESULT WINAPI IShellLinkA_fnGetHotkey(IShellLinkA * iface, WORD *pwHotke
static HRESULT WINAPI IShellLinkA_fnSetHotkey(IShellLinkA * iface, WORD wHotkey) static HRESULT WINAPI IShellLinkA_fnSetHotkey(IShellLinkA * iface, WORD wHotkey)
{ {
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(hotkey=%x)\n",This, wHotkey); TRACE("(%p)->(hotkey=%x)\n",This, wHotkey);
@ -1193,7 +1190,7 @@ static HRESULT WINAPI IShellLinkA_fnSetHotkey(IShellLinkA * iface, WORD wHotkey)
static HRESULT WINAPI IShellLinkA_fnGetShowCmd(IShellLinkA * iface, INT *piShowCmd) static HRESULT WINAPI IShellLinkA_fnGetShowCmd(IShellLinkA * iface, INT *piShowCmd)
{ {
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(%p)\n",This, piShowCmd); TRACE("(%p)->(%p)\n",This, piShowCmd);
*piShowCmd = This->iShowCmd; *piShowCmd = This->iShowCmd;
@ -1202,7 +1199,7 @@ static HRESULT WINAPI IShellLinkA_fnGetShowCmd(IShellLinkA * iface, INT *piShowC
static HRESULT WINAPI IShellLinkA_fnSetShowCmd(IShellLinkA * iface, INT iShowCmd) static HRESULT WINAPI IShellLinkA_fnSetShowCmd(IShellLinkA * iface, INT iShowCmd)
{ {
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p) %d\n",This, iShowCmd); TRACE("(%p) %d\n",This, iShowCmd);
@ -1237,7 +1234,7 @@ static HRESULT SHELL_PidlGeticonLocationA(IShellFolder* psf, LPITEMIDLIST pidl,
static HRESULT WINAPI IShellLinkA_fnGetIconLocation(IShellLinkA * iface, LPSTR pszIconPath, INT cchIconPath, INT *piIcon) static HRESULT WINAPI IShellLinkA_fnGetIconLocation(IShellLinkA * iface, LPSTR pszIconPath, INT cchIconPath, INT *piIcon)
{ {
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(%p len=%u iicon=%p)\n", This, pszIconPath, cchIconPath, piIcon); TRACE("(%p)->(%p len=%u iicon=%p)\n", This, pszIconPath, cchIconPath, piIcon);
@ -1285,7 +1282,7 @@ static HRESULT WINAPI IShellLinkA_fnGetIconLocation(IShellLinkA * iface, LPSTR p
static HRESULT WINAPI IShellLinkA_fnSetIconLocation(IShellLinkA * iface, LPCSTR pszIconPath, INT iIcon) static HRESULT WINAPI IShellLinkA_fnSetIconLocation(IShellLinkA * iface, LPCSTR pszIconPath, INT iIcon)
{ {
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(path=%s iicon=%u)\n",This, pszIconPath, iIcon); TRACE("(%p)->(path=%s iicon=%u)\n",This, pszIconPath, iIcon);
@ -1303,7 +1300,7 @@ static HRESULT WINAPI IShellLinkA_fnSetIconLocation(IShellLinkA * iface, LPCSTR
static HRESULT WINAPI IShellLinkA_fnSetRelativePath(IShellLinkA * iface, LPCSTR pszPathRel, DWORD dwReserved) static HRESULT WINAPI IShellLinkA_fnSetRelativePath(IShellLinkA * iface, LPCSTR pszPathRel, DWORD dwReserved)
{ {
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
FIXME("(%p)->(path=%s %lx)\n",This, pszPathRel, dwReserved); FIXME("(%p)->(path=%s %lx)\n",This, pszPathRel, dwReserved);
@ -1320,7 +1317,7 @@ static HRESULT WINAPI IShellLinkA_fnResolve(IShellLinkA * iface, HWND hwnd, DWOR
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
FIXME("(%p)->(hwnd=%p flags=%lx)\n",This, hwnd, fFlags); FIXME("(%p)->(hwnd=%p flags=%lx)\n",This, hwnd, fFlags);
@ -1359,7 +1356,7 @@ static HRESULT WINAPI IShellLinkA_fnResolve(IShellLinkA * iface, HWND hwnd, DWOR
static HRESULT WINAPI IShellLinkA_fnSetPath(IShellLinkA * iface, LPCSTR pszFile) static HRESULT WINAPI IShellLinkA_fnSetPath(IShellLinkA * iface, LPCSTR pszFile)
{ {
ICOM_THIS(IShellLinkImpl, iface); IShellLinkImpl *This = (IShellLinkImpl *)iface;
char buffer[MAX_PATH]; char buffer[MAX_PATH];
LPSTR fname; LPSTR fname;
@ -1384,9 +1381,8 @@ static HRESULT WINAPI IShellLinkA_fnSetPath(IShellLinkA * iface, LPCSTR pszFile)
* IShellLink Implementation * IShellLink Implementation
*/ */
static ICOM_VTABLE(IShellLinkA) slvt = static IShellLinkAVtbl slvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IShellLinkA_fnQueryInterface, IShellLinkA_fnQueryInterface,
IShellLinkA_fnAddRef, IShellLinkA_fnAddRef,
IShellLinkA_fnRelease, IShellLinkA_fnRelease,
@ -1821,9 +1817,8 @@ static HRESULT WINAPI IShellLinkW_fnSetPath(IShellLinkW * iface, LPCWSTR pszFile
* IShellLinkW Implementation * IShellLinkW Implementation
*/ */
static ICOM_VTABLE(IShellLinkW) slvtw = static IShellLinkWVtbl slvtw =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IShellLinkW_fnQueryInterface, IShellLinkW_fnQueryInterface,
IShellLinkW_fnAddRef, IShellLinkW_fnAddRef,
IShellLinkW_fnRelease, IShellLinkW_fnRelease,

24
reactos/lib/shell32/shellole.c
View file

@ -273,11 +273,11 @@ DWORD WINAPI SHCLSIDFromStringAW (LPVOID clsid, CLSID *id)
*/ */
/* set the vtable later */ /* set the vtable later */
static ICOM_VTABLE(IMalloc) VT_Shell_IMalloc32; static IMallocVtbl VT_Shell_IMalloc32;
/* this is the static object instance */ /* this is the static object instance */
typedef struct { typedef struct {
ICOM_VFIELD(IMalloc); IMallocVtbl *lpVtbl;
DWORD dummy; DWORD dummy;
} _ShellMalloc; } _ShellMalloc;
@ -381,9 +381,8 @@ static VOID WINAPI IShellMalloc_fnHeapMinimize(LPMALLOC iface)
TRACE("()\n"); TRACE("()\n");
} }
static ICOM_VTABLE(IMalloc) VT_Shell_IMalloc32 = static IMallocVtbl VT_Shell_IMalloc32 =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IShellMalloc_fnQueryInterface, IShellMalloc_fnQueryInterface,
IShellMalloc_fnAddRefRelease, IShellMalloc_fnAddRefRelease,
IShellMalloc_fnAddRefRelease, IShellMalloc_fnAddRefRelease,
@ -497,7 +496,7 @@ HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf)
typedef struct typedef struct
{ {
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD ref;
CLSID *rclsid; CLSID *rclsid;
LPFNCREATEINSTANCE lpfnCI; LPFNCREATEINSTANCE lpfnCI;
@ -505,7 +504,7 @@ typedef struct
ULONG * pcRefDll; /* pointer to refcounter in external dll (ugrrr...) */ ULONG * pcRefDll; /* pointer to refcounter in external dll (ugrrr...) */
} IDefClFImpl; } IDefClFImpl;
static ICOM_VTABLE(IClassFactory) dclfvt; static IClassFactoryVtbl dclfvt;
/************************************************************************** /**************************************************************************
* IDefClF_fnConstructor * IDefClF_fnConstructor
@ -533,7 +532,7 @@ IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll,
static HRESULT WINAPI IDefClF_fnQueryInterface( static HRESULT WINAPI IDefClF_fnQueryInterface(
LPCLASSFACTORY iface, REFIID riid, LPVOID *ppvObj) LPCLASSFACTORY iface, REFIID riid, LPVOID *ppvObj)
{ {
ICOM_THIS(IDefClFImpl,iface); IDefClFImpl *This = (IDefClFImpl *)iface;
TRACE("(%p)->(%s)\n",This,shdebugstr_guid(riid)); TRACE("(%p)->(%s)\n",This,shdebugstr_guid(riid));
@ -553,7 +552,7 @@ static HRESULT WINAPI IDefClF_fnQueryInterface(
*/ */
static ULONG WINAPI IDefClF_fnAddRef(LPCLASSFACTORY iface) static ULONG WINAPI IDefClF_fnAddRef(LPCLASSFACTORY iface)
{ {
ICOM_THIS(IDefClFImpl,iface); IDefClFImpl *This = (IDefClFImpl *)iface;
TRACE("(%p)->(count=%lu)\n",This,This->ref); TRACE("(%p)->(count=%lu)\n",This,This->ref);
return InterlockedIncrement(&This->ref); return InterlockedIncrement(&This->ref);
@ -563,7 +562,7 @@ static ULONG WINAPI IDefClF_fnAddRef(LPCLASSFACTORY iface)
*/ */
static ULONG WINAPI IDefClF_fnRelease(LPCLASSFACTORY iface) static ULONG WINAPI IDefClF_fnRelease(LPCLASSFACTORY iface)
{ {
ICOM_THIS(IDefClFImpl,iface); IDefClFImpl *This = (IDefClFImpl *)iface;
TRACE("(%p)->(count=%lu)\n",This,This->ref); TRACE("(%p)->(count=%lu)\n",This,This->ref);
if (!InterlockedDecrement(&This->ref)) if (!InterlockedDecrement(&This->ref))
@ -582,7 +581,7 @@ static ULONG WINAPI IDefClF_fnRelease(LPCLASSFACTORY iface)
static HRESULT WINAPI IDefClF_fnCreateInstance( static HRESULT WINAPI IDefClF_fnCreateInstance(
LPCLASSFACTORY iface, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObject) LPCLASSFACTORY iface, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObject)
{ {
ICOM_THIS(IDefClFImpl,iface); IDefClFImpl *This = (IDefClFImpl *)iface;
TRACE("%p->(%p,%s,%p)\n",This,pUnkOuter,shdebugstr_guid(riid),ppvObject); TRACE("%p->(%p,%s,%p)\n",This,pUnkOuter,shdebugstr_guid(riid),ppvObject);
@ -603,14 +602,13 @@ static HRESULT WINAPI IDefClF_fnCreateInstance(
*/ */
static HRESULT WINAPI IDefClF_fnLockServer(LPCLASSFACTORY iface, BOOL fLock) static HRESULT WINAPI IDefClF_fnLockServer(LPCLASSFACTORY iface, BOOL fLock)
{ {
ICOM_THIS(IDefClFImpl,iface); IDefClFImpl *This = (IDefClFImpl *)iface;
TRACE("%p->(0x%x), not implemented\n",This, fLock); TRACE("%p->(0x%x), not implemented\n",This, fLock);
return E_NOTIMPL; return E_NOTIMPL;
} }
static ICOM_VTABLE(IClassFactory) dclfvt = static IClassFactoryVtbl dclfvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDefClF_fnQueryInterface, IDefClF_fnQueryInterface,
IDefClF_fnAddRef, IDefClF_fnAddRef,
IDefClF_fnRelease, IDefClF_fnRelease,

47
reactos/lib/shell32/shfldr_desktop.c
View file

@ -58,7 +58,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell);
*/ */
typedef struct { typedef struct {
ICOM_VFIELD (IShellFolder2); IShellFolder2Vtbl *lpVtbl;
DWORD ref; DWORD ref;
CLSID *pclsid; CLSID *pclsid;
@ -76,7 +76,7 @@ typedef struct {
#define _IUnknown_(This) (IShellFolder*)&(This->lpVtbl) #define _IUnknown_(This) (IShellFolder*)&(This->lpVtbl)
#define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl) #define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl)
static struct ICOM_VTABLE (IShellFolder2) vt_MCFldr_ShellFolder2; static struct IShellFolder2Vtbl vt_MCFldr_ShellFolder2;
static shvheader DesktopSFHeader[] = { static shvheader DesktopSFHeader[] = {
{IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},
@ -132,7 +132,7 @@ HRESULT WINAPI ISF_Desktop_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOI
*/ */
static HRESULT WINAPI ISF_Desktop_fnQueryInterface (IShellFolder2 * iface, REFIID riid, LPVOID * ppvObj) static HRESULT WINAPI ISF_Desktop_fnQueryInterface (IShellFolder2 * iface, REFIID riid, LPVOID * ppvObj)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj);
@ -154,7 +154,7 @@ static HRESULT WINAPI ISF_Desktop_fnQueryInterface (IShellFolder2 * iface, REFII
static ULONG WINAPI ISF_Desktop_fnAddRef (IShellFolder2 * iface) static ULONG WINAPI ISF_Desktop_fnAddRef (IShellFolder2 * iface)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
TRACE ("(%p)->(count=%lu)\n", This, This->ref); TRACE ("(%p)->(count=%lu)\n", This, This->ref);
@ -163,7 +163,7 @@ static ULONG WINAPI ISF_Desktop_fnAddRef (IShellFolder2 * iface)
static ULONG WINAPI ISF_Desktop_fnRelease (IShellFolder2 * iface) static ULONG WINAPI ISF_Desktop_fnRelease (IShellFolder2 * iface)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
TRACE ("(%p)->(count=%lu)\n", This, This->ref); TRACE ("(%p)->(count=%lu)\n", This, This->ref);
@ -192,7 +192,7 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface,
LPOLESTR lpszDisplayName, LPOLESTR lpszDisplayName,
DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
WCHAR szElement[MAX_PATH]; WCHAR szElement[MAX_PATH];
LPCWSTR szNext = NULL; LPCWSTR szNext = NULL;
@ -322,7 +322,7 @@ static BOOL CreateDesktopEnumList(IEnumIDList *list, DWORD dwFlags)
static HRESULT WINAPI ISF_Desktop_fnEnumObjects (IShellFolder2 * iface, static HRESULT WINAPI ISF_Desktop_fnEnumObjects (IShellFolder2 * iface,
HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList) HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
TRACE ("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); TRACE ("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList);
@ -341,7 +341,7 @@ static HRESULT WINAPI ISF_Desktop_fnEnumObjects (IShellFolder2 * iface,
static HRESULT WINAPI ISF_Desktop_fnBindToObject (IShellFolder2 * iface, static HRESULT WINAPI ISF_Desktop_fnBindToObject (IShellFolder2 * iface,
LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut);
@ -354,7 +354,7 @@ static HRESULT WINAPI ISF_Desktop_fnBindToObject (IShellFolder2 * iface,
static HRESULT WINAPI ISF_Desktop_fnBindToStorage (IShellFolder2 * iface, static HRESULT WINAPI ISF_Desktop_fnBindToStorage (IShellFolder2 * iface,
LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
FIXME ("(%p)->(pidl=%p,%p,%s,%p) stub\n", This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); FIXME ("(%p)->(pidl=%p,%p,%s,%p) stub\n", This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut);
@ -369,7 +369,7 @@ static HRESULT WINAPI ISF_Desktop_fnBindToStorage (IShellFolder2 * iface,
static HRESULT WINAPI ISF_Desktop_fnCompareIDs (IShellFolder2 * iface, static HRESULT WINAPI ISF_Desktop_fnCompareIDs (IShellFolder2 * iface,
LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
int nReturn; int nReturn;
@ -385,7 +385,7 @@ static HRESULT WINAPI ISF_Desktop_fnCompareIDs (IShellFolder2 * iface,
static HRESULT WINAPI ISF_Desktop_fnCreateViewObject (IShellFolder2 * iface, static HRESULT WINAPI ISF_Desktop_fnCreateViewObject (IShellFolder2 * iface,
HWND hwndOwner, REFIID riid, LPVOID * ppvOut) HWND hwndOwner, REFIID riid, LPVOID * ppvOut)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
LPSHELLVIEW pShellView; LPSHELLVIEW pShellView;
HRESULT hr = E_INVALIDARG; HRESULT hr = E_INVALIDARG;
@ -419,7 +419,7 @@ static HRESULT WINAPI ISF_Desktop_fnCreateViewObject (IShellFolder2 * iface,
static HRESULT WINAPI ISF_Desktop_fnGetAttributesOf (IShellFolder2 * iface, static HRESULT WINAPI ISF_Desktop_fnGetAttributesOf (IShellFolder2 * iface,
UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
HRESULT hr = S_OK; HRESULT hr = S_OK;
@ -461,7 +461,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetUIObjectOf (IShellFolder2 * iface,
LPCITEMIDLIST * apidl, LPCITEMIDLIST * apidl,
REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) REFIID riid, UINT * prgfInOut, LPVOID * ppvOut)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
LPITEMIDLIST pidl; LPITEMIDLIST pidl;
IUnknown *pObj = NULL; IUnknown *pObj = NULL;
@ -518,7 +518,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetUIObjectOf (IShellFolder2 * iface,
static HRESULT WINAPI ISF_Desktop_fnGetDisplayNameOf (IShellFolder2 * iface, static HRESULT WINAPI ISF_Desktop_fnGetDisplayNameOf (IShellFolder2 * iface,
LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
CHAR szPath[MAX_PATH]; CHAR szPath[MAX_PATH];
GUID const *clsid; GUID const *clsid;
@ -611,7 +611,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetDisplayNameOf (IShellFolder2 * iface,
static HRESULT WINAPI ISF_Desktop_fnSetNameOf (IShellFolder2 * iface, HWND hwndOwner, LPCITEMIDLIST pidl, /*simple pidl */ static HRESULT WINAPI ISF_Desktop_fnSetNameOf (IShellFolder2 * iface, HWND hwndOwner, LPCITEMIDLIST pidl, /*simple pidl */
LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
FIXME ("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); FIXME ("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut);
@ -620,21 +620,21 @@ static HRESULT WINAPI ISF_Desktop_fnSetNameOf (IShellFolder2 * iface, HWND hwndO
static HRESULT WINAPI ISF_Desktop_fnGetDefaultSearchGUID (IShellFolder2 * iface, GUID * pguid) static HRESULT WINAPI ISF_Desktop_fnGetDefaultSearchGUID (IShellFolder2 * iface, GUID * pguid)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
FIXME ("(%p)\n", This); FIXME ("(%p)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI ISF_Desktop_fnEnumSearches (IShellFolder2 * iface, IEnumExtraSearch ** ppenum) static HRESULT WINAPI ISF_Desktop_fnEnumSearches (IShellFolder2 * iface, IEnumExtraSearch ** ppenum)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
FIXME ("(%p)\n", This); FIXME ("(%p)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI ISF_Desktop_fnGetDefaultColumn (IShellFolder2 * iface, static HRESULT WINAPI ISF_Desktop_fnGetDefaultColumn (IShellFolder2 * iface,
DWORD dwRes, ULONG * pSort, ULONG * pDisplay) DWORD dwRes, ULONG * pSort, ULONG * pDisplay)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
TRACE ("(%p)\n", This); TRACE ("(%p)\n", This);
@ -647,7 +647,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetDefaultColumn (IShellFolder2 * iface,
} }
static HRESULT WINAPI ISF_Desktop_fnGetDefaultColumnState (IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags) static HRESULT WINAPI ISF_Desktop_fnGetDefaultColumnState (IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
TRACE ("(%p)\n", This); TRACE ("(%p)\n", This);
@ -661,7 +661,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetDefaultColumnState (IShellFolder2 * iface
static HRESULT WINAPI ISF_Desktop_fnGetDetailsEx (IShellFolder2 * iface, static HRESULT WINAPI ISF_Desktop_fnGetDetailsEx (IShellFolder2 * iface,
LPCITEMIDLIST pidl, const SHCOLUMNID * pscid, VARIANT * pv) LPCITEMIDLIST pidl, const SHCOLUMNID * pscid, VARIANT * pv)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
FIXME ("(%p)\n", This); FIXME ("(%p)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
@ -669,7 +669,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetDetailsEx (IShellFolder2 * iface,
static HRESULT WINAPI ISF_Desktop_fnGetDetailsOf (IShellFolder2 * iface, static HRESULT WINAPI ISF_Desktop_fnGetDetailsOf (IShellFolder2 * iface,
LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd) LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
HRESULT hr = E_FAIL; HRESULT hr = E_FAIL;
@ -711,14 +711,13 @@ static HRESULT WINAPI ISF_Desktop_fnGetDetailsOf (IShellFolder2 * iface,
} }
static HRESULT WINAPI ISF_Desktop_fnMapColumnToSCID (IShellFolder2 * iface, UINT column, SHCOLUMNID * pscid) static HRESULT WINAPI ISF_Desktop_fnMapColumnToSCID (IShellFolder2 * iface, UINT column, SHCOLUMNID * pscid)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
FIXME ("(%p)\n", This); FIXME ("(%p)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static ICOM_VTABLE (IShellFolder2) vt_MCFldr_ShellFolder2 = static IShellFolder2Vtbl vt_MCFldr_ShellFolder2 =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ISF_Desktop_fnQueryInterface, ISF_Desktop_fnQueryInterface,
ISF_Desktop_fnAddRef, ISF_Desktop_fnAddRef,
ISF_Desktop_fnRelease, ISF_Desktop_fnRelease,

44
reactos/lib/shell32/shfldr_fs.c
View file

@ -58,12 +58,12 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell);
*/ */
typedef struct { typedef struct {
ICOM_VFIELD (IUnknown); IUnknownVtbl *lpVtbl;
DWORD ref; DWORD ref;
ICOM_VTABLE (IShellFolder2) * lpvtblShellFolder; IShellFolder2Vtbl *lpvtblShellFolder;
ICOM_VTABLE (IPersistFolder3) * lpvtblPersistFolder3; IPersistFolder3Vtbl *lpvtblPersistFolder3;
ICOM_VTABLE (IDropTarget) * lpvtblDropTarget; IDropTargetVtbl *lpvtblDropTarget;
ICOM_VTABLE (ISFHelper) * lpvtblSFHelper; ISFHelperVtbl *lpvtblSFHelper;
IUnknown *pUnkOuter; /* used for aggregation */ IUnknown *pUnkOuter; /* used for aggregation */
@ -80,11 +80,11 @@ typedef struct {
BOOL fAcceptFmt; /* flag for pending Drop */ BOOL fAcceptFmt; /* flag for pending Drop */
} IGenericSFImpl; } IGenericSFImpl;
static struct ICOM_VTABLE (IUnknown) unkvt; static struct IUnknownVtbl unkvt;
static struct ICOM_VTABLE (IShellFolder2) sfvt; static struct IShellFolder2Vtbl sfvt;
static struct ICOM_VTABLE (IPersistFolder3) vt_FSFldr_PersistFolder3; /* IPersistFolder3 for a FS_Folder */ static struct IPersistFolder3Vtbl vt_FSFldr_PersistFolder3; /* IPersistFolder3 for a FS_Folder */
static struct ICOM_VTABLE (IDropTarget) dtvt; static struct IDropTargetVtbl dtvt;
static struct ICOM_VTABLE (ISFHelper) shvt; static struct ISFHelperVtbl shvt;
#define _IShellFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpvtblShellFolder))) #define _IShellFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpvtblShellFolder)))
#define _ICOM_THIS_From_IShellFolder2(class, name) class* This = (class*)(((char*)name)-_IShellFolder2_Offset); #define _ICOM_THIS_From_IShellFolder2(class, name) class* This = (class*)(((char*)name)-_IShellFolder2_Offset);
@ -132,7 +132,7 @@ static void SF_RegisterClipFmt (IGenericSFImpl * This)
*/ */
static HRESULT WINAPI IUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, LPVOID * ppvObj) static HRESULT WINAPI IUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, LPVOID * ppvObj)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj);
@ -170,7 +170,7 @@ static HRESULT WINAPI IUnknown_fnQueryInterface (IUnknown * iface, REFIID riid,
static ULONG WINAPI IUnknown_fnAddRef (IUnknown * iface) static ULONG WINAPI IUnknown_fnAddRef (IUnknown * iface)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
TRACE ("(%p)->(count=%lu)\n", This, This->ref); TRACE ("(%p)->(count=%lu)\n", This, This->ref);
@ -179,7 +179,7 @@ static ULONG WINAPI IUnknown_fnAddRef (IUnknown * iface)
static ULONG WINAPI IUnknown_fnRelease (IUnknown * iface) static ULONG WINAPI IUnknown_fnRelease (IUnknown * iface)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
TRACE ("(%p)->(count=%lu)\n", This, This->ref); TRACE ("(%p)->(count=%lu)\n", This, This->ref);
@ -196,9 +196,9 @@ static ULONG WINAPI IUnknown_fnRelease (IUnknown * iface)
return This->ref; return This->ref;
} }
static ICOM_VTABLE (IUnknown) unkvt = static IUnknownVtbl unkvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IUnknown_fnQueryInterface, IUnknown_fnQueryInterface,
IUnknown_fnAddRef, IUnknown_fnAddRef,
IUnknown_fnRelease, IUnknown_fnRelease,
}; };
@ -858,9 +858,8 @@ static HRESULT WINAPI IShellFolder_fnMapColumnToSCID (IShellFolder2 * iface, UIN
return E_NOTIMPL; return E_NOTIMPL;
} }
static ICOM_VTABLE (IShellFolder2) sfvt = static IShellFolder2Vtbl sfvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IShellFolder_fnQueryInterface, IShellFolder_fnQueryInterface,
IShellFolder_fnAddRef, IShellFolder_fnAddRef,
IShellFolder_fnRelease, IShellFolder_fnRelease,
@ -1102,9 +1101,8 @@ ISFHelper_fnCopyItems (ISFHelper * iface, IShellFolder * pSFFrom, UINT cidl, LPC
return S_OK; return S_OK;
} }
static ICOM_VTABLE (ISFHelper) shvt = static ISFHelperVtbl shvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ISFHelper_fnQueryInterface, ISFHelper_fnQueryInterface,
ISFHelper_fnAddRef, ISFHelper_fnAddRef,
ISFHelper_fnRelease, ISFHelper_fnRelease,
@ -1278,9 +1276,8 @@ IFSFldr_PersistFolder3_GetFolderTargetInfo (IPersistFolder3 * iface, PERSIST_FOL
return E_NOTIMPL; return E_NOTIMPL;
} }
static ICOM_VTABLE (IPersistFolder3) vt_FSFldr_PersistFolder3 = static IPersistFolder3Vtbl vt_FSFldr_PersistFolder3 =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IFSFldr_PersistFolder3_QueryInterface, IFSFldr_PersistFolder3_QueryInterface,
IFSFldr_PersistFolder3_AddRef, IFSFldr_PersistFolder3_AddRef,
IFSFldr_PersistFolder3_Release, IFSFldr_PersistFolder3_Release,
@ -1393,8 +1390,7 @@ ISFDropTarget_Drop (IDropTarget * iface, IDataObject * pDataObject, DWORD dwKeyS
return E_NOTIMPL; return E_NOTIMPL;
} }
static struct ICOM_VTABLE (IDropTarget) dtvt = { static struct IDropTargetVtbl dtvt = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ISFDropTarget_QueryInterface, ISFDropTarget_QueryInterface,
ISFDropTarget_AddRef, ISFDropTarget_AddRef,
ISFDropTarget_Release, ISFDropTarget_Release,

56
reactos/lib/shell32/shfldr_mycomp.c
View file

@ -55,17 +55,17 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell);
*/ */
typedef struct { typedef struct {
ICOM_VFIELD (IShellFolder2); IShellFolder2Vtbl *lpVtbl;
DWORD ref; DWORD ref;
ICOM_VTABLE (IPersistFolder2) * lpVtblPersistFolder2; IPersistFolder2Vtbl *lpVtblPersistFolder2;
/* both paths are parsible from the desktop */ /* both paths are parsible from the desktop */
LPITEMIDLIST pidlRoot; /* absolute pidl */ LPITEMIDLIST pidlRoot; /* absolute pidl */
int dwAttributes; /* attributes returned by GetAttributesOf FIXME: use it */ int dwAttributes; /* attributes returned by GetAttributesOf FIXME: use it */
} IGenericSFImpl; } IGenericSFImpl;
static struct ICOM_VTABLE (IShellFolder2) vt_ShellFolder2; static struct IShellFolder2Vtbl vt_ShellFolder2;
static struct ICOM_VTABLE (IPersistFolder2) vt_PersistFolder2; static struct IPersistFolder2Vtbl vt_PersistFolder2;
#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) #define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2)))
#define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset);
@ -133,7 +133,7 @@ HRESULT WINAPI ISF_MyComputer_Constructor (IUnknown * pUnkOuter, REFIID riid, LP
*/ */
static HRESULT WINAPI ISF_MyComputer_fnQueryInterface (IShellFolder2 * iface, REFIID riid, LPVOID * ppvObj) static HRESULT WINAPI ISF_MyComputer_fnQueryInterface (IShellFolder2 * iface, REFIID riid, LPVOID * ppvObj)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj);
@ -158,7 +158,7 @@ static HRESULT WINAPI ISF_MyComputer_fnQueryInterface (IShellFolder2 * iface, RE
static ULONG WINAPI ISF_MyComputer_fnAddRef (IShellFolder2 * iface) static ULONG WINAPI ISF_MyComputer_fnAddRef (IShellFolder2 * iface)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
TRACE ("(%p)->(count=%lu)\n", This, This->ref); TRACE ("(%p)->(count=%lu)\n", This, This->ref);
@ -167,7 +167,7 @@ static ULONG WINAPI ISF_MyComputer_fnAddRef (IShellFolder2 * iface)
static ULONG WINAPI ISF_MyComputer_fnRelease (IShellFolder2 * iface) static ULONG WINAPI ISF_MyComputer_fnRelease (IShellFolder2 * iface)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
TRACE ("(%p)->(count=%lu)\n", This, This->ref); TRACE ("(%p)->(count=%lu)\n", This, This->ref);
@ -191,7 +191,7 @@ ISF_MyComputer_fnParseDisplayName (IShellFolder2 * iface,
LPOLESTR lpszDisplayName, LPOLESTR lpszDisplayName,
DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
HRESULT hr = E_INVALIDARG; HRESULT hr = E_INVALIDARG;
LPCWSTR szNext = NULL; LPCWSTR szNext = NULL;
@ -300,7 +300,7 @@ static BOOL CreateMyCompEnumList(IEnumIDList *list, DWORD dwFlags)
static HRESULT WINAPI static HRESULT WINAPI
ISF_MyComputer_fnEnumObjects (IShellFolder2 * iface, HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList) ISF_MyComputer_fnEnumObjects (IShellFolder2 * iface, HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
TRACE ("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); TRACE ("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList);
@ -320,7 +320,7 @@ static HRESULT WINAPI
ISF_MyComputer_fnBindToObject (IShellFolder2 * iface, LPCITEMIDLIST pidl, ISF_MyComputer_fnBindToObject (IShellFolder2 * iface, LPCITEMIDLIST pidl,
LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) LPBC pbcReserved, REFIID riid, LPVOID * ppvOut)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut);
@ -334,7 +334,7 @@ static HRESULT WINAPI
ISF_MyComputer_fnBindToStorage (IShellFolder2 * iface, ISF_MyComputer_fnBindToStorage (IShellFolder2 * iface,
LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
FIXME ("(%p)->(pidl=%p,%p,%s,%p) stub\n", This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); FIXME ("(%p)->(pidl=%p,%p,%s,%p) stub\n", This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut);
@ -349,7 +349,7 @@ ISF_MyComputer_fnBindToStorage (IShellFolder2 * iface,
static HRESULT WINAPI static HRESULT WINAPI
ISF_MyComputer_fnCompareIDs (IShellFolder2 * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) ISF_MyComputer_fnCompareIDs (IShellFolder2 * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
int nReturn; int nReturn;
@ -365,7 +365,7 @@ ISF_MyComputer_fnCompareIDs (IShellFolder2 * iface, LPARAM lParam, LPCITEMIDLIST
static HRESULT WINAPI static HRESULT WINAPI
ISF_MyComputer_fnCreateViewObject (IShellFolder2 * iface, HWND hwndOwner, REFIID riid, LPVOID * ppvOut) ISF_MyComputer_fnCreateViewObject (IShellFolder2 * iface, HWND hwndOwner, REFIID riid, LPVOID * ppvOut)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
LPSHELLVIEW pShellView; LPSHELLVIEW pShellView;
HRESULT hr = E_INVALIDARG; HRESULT hr = E_INVALIDARG;
@ -399,7 +399,7 @@ ISF_MyComputer_fnCreateViewObject (IShellFolder2 * iface, HWND hwndOwner, REFIID
static HRESULT WINAPI static HRESULT WINAPI
ISF_MyComputer_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) ISF_MyComputer_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
HRESULT hr = S_OK; HRESULT hr = S_OK;
@ -439,7 +439,7 @@ ISF_MyComputer_fnGetUIObjectOf (IShellFolder2 * iface,
HWND hwndOwner, HWND hwndOwner,
UINT cidl, LPCITEMIDLIST * apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) UINT cidl, LPCITEMIDLIST * apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
LPITEMIDLIST pidl; LPITEMIDLIST pidl;
IUnknown *pObj = NULL; IUnknown *pObj = NULL;
@ -492,7 +492,7 @@ ISF_MyComputer_fnGetUIObjectOf (IShellFolder2 * iface,
*/ */
static HRESULT WINAPI ISF_MyComputer_fnGetDisplayNameOf (IShellFolder2 * iface, LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) static HRESULT WINAPI ISF_MyComputer_fnGetDisplayNameOf (IShellFolder2 * iface, LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
char szPath[MAX_PATH], char szPath[MAX_PATH],
szDrive[18]; szDrive[18];
@ -617,26 +617,26 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDisplayNameOf (IShellFolder2 * iface,
static HRESULT WINAPI ISF_MyComputer_fnSetNameOf (IShellFolder2 * iface, HWND hwndOwner, LPCITEMIDLIST pidl, /*simple pidl */ static HRESULT WINAPI ISF_MyComputer_fnSetNameOf (IShellFolder2 * iface, HWND hwndOwner, LPCITEMIDLIST pidl, /*simple pidl */
LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
FIXME ("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); FIXME ("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut);
return E_FAIL; return E_FAIL;
} }
static HRESULT WINAPI ISF_MyComputer_fnGetDefaultSearchGUID (IShellFolder2 * iface, GUID * pguid) static HRESULT WINAPI ISF_MyComputer_fnGetDefaultSearchGUID (IShellFolder2 * iface, GUID * pguid)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
FIXME ("(%p)\n", This); FIXME ("(%p)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI ISF_MyComputer_fnEnumSearches (IShellFolder2 * iface, IEnumExtraSearch ** ppenum) static HRESULT WINAPI ISF_MyComputer_fnEnumSearches (IShellFolder2 * iface, IEnumExtraSearch ** ppenum)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
FIXME ("(%p)\n", This); FIXME ("(%p)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI ISF_MyComputer_fnGetDefaultColumn (IShellFolder2 * iface, DWORD dwRes, ULONG * pSort, ULONG * pDisplay) static HRESULT WINAPI ISF_MyComputer_fnGetDefaultColumn (IShellFolder2 * iface, DWORD dwRes, ULONG * pSort, ULONG * pDisplay)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
TRACE ("(%p)\n", This); TRACE ("(%p)\n", This);
@ -646,7 +646,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDefaultColumn (IShellFolder2 * iface,
} }
static HRESULT WINAPI ISF_MyComputer_fnGetDefaultColumnState (IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags) static HRESULT WINAPI ISF_MyComputer_fnGetDefaultColumnState (IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
TRACE ("(%p)\n", This); TRACE ("(%p)\n", This);
@ -656,7 +656,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDefaultColumnState (IShellFolder2 * if
} }
static HRESULT WINAPI ISF_MyComputer_fnGetDetailsEx (IShellFolder2 * iface, LPCITEMIDLIST pidl, const SHCOLUMNID * pscid, VARIANT * pv) static HRESULT WINAPI ISF_MyComputer_fnGetDetailsEx (IShellFolder2 * iface, LPCITEMIDLIST pidl, const SHCOLUMNID * pscid, VARIANT * pv)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
FIXME ("(%p)\n", This); FIXME ("(%p)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -664,7 +664,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDetailsEx (IShellFolder2 * iface, LPCI
/* FIXME: drive size >4GB is rolling over */ /* FIXME: drive size >4GB is rolling over */
static HRESULT WINAPI ISF_MyComputer_fnGetDetailsOf (IShellFolder2 * iface, LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd) static HRESULT WINAPI ISF_MyComputer_fnGetDetailsOf (IShellFolder2 * iface, LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
HRESULT hr; HRESULT hr;
TRACE ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd); TRACE ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd);
@ -713,14 +713,13 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDetailsOf (IShellFolder2 * iface, LPCI
} }
static HRESULT WINAPI ISF_MyComputer_fnMapColumnToSCID (IShellFolder2 * iface, UINT column, SHCOLUMNID * pscid) static HRESULT WINAPI ISF_MyComputer_fnMapColumnToSCID (IShellFolder2 * iface, UINT column, SHCOLUMNID * pscid)
{ {
ICOM_THIS (IGenericSFImpl, iface); IGenericSFImpl *This = (IGenericSFImpl *)iface;
FIXME ("(%p)\n", This); FIXME ("(%p)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static ICOM_VTABLE (IShellFolder2) vt_ShellFolder2 = static IShellFolder2Vtbl vt_ShellFolder2 =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ISF_MyComputer_fnQueryInterface, ISF_MyComputer_fnQueryInterface,
ISF_MyComputer_fnAddRef, ISF_MyComputer_fnAddRef,
ISF_MyComputer_fnRelease, ISF_MyComputer_fnRelease,
@ -823,9 +822,8 @@ static HRESULT WINAPI IMCFldr_PersistFolder2_GetCurFolder (IPersistFolder2 * ifa
return S_OK; return S_OK;
} }
static ICOM_VTABLE (IPersistFolder2) vt_PersistFolder2 = static IPersistFolder2Vtbl vt_PersistFolder2 =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IMCFldr_PersistFolder2_QueryInterface, IMCFldr_PersistFolder2_QueryInterface,
IMCFldr_PersistFolder2_AddRef, IMCFldr_PersistFolder2_AddRef,
IMCFldr_PersistFolder2_Release, IMCFldr_PersistFolder2_Release,

15
reactos/lib/shell32/shlfsbind.c
View file

@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(pidl);
*/ */
typedef struct typedef struct
{ {
ICOM_VFIELD(IFileSystemBindData); IFileSystemBindDataVtbl *lpVtbl;
DWORD ref; DWORD ref;
WIN32_FIND_DATAW findFile; WIN32_FIND_DATAW findFile;
} IFileSystemBindDataImpl; } IFileSystemBindDataImpl;
@ -52,9 +52,8 @@ static ULONG WINAPI IFileSystemBindData_fnRelease(IFileSystemBindData *iface);
static HRESULT WINAPI IFileSystemBindData_fnGetFindData(IFileSystemBindData *iface, WIN32_FIND_DATAW *pfd); static HRESULT WINAPI IFileSystemBindData_fnGetFindData(IFileSystemBindData *iface, WIN32_FIND_DATAW *pfd);
static HRESULT WINAPI IFileSystemBindData_fnSetFindData(IFileSystemBindData *iface, const WIN32_FIND_DATAW *pfd); static HRESULT WINAPI IFileSystemBindData_fnSetFindData(IFileSystemBindData *iface, const WIN32_FIND_DATAW *pfd);
static struct ICOM_VTABLE(IFileSystemBindData) sbvt = static struct IFileSystemBindDataVtbl sbvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IFileSystemBindData_fnQueryInterface, IFileSystemBindData_fnQueryInterface,
IFileSystemBindData_fnAddRef, IFileSystemBindData_fnAddRef,
IFileSystemBindData_fnRelease, IFileSystemBindData_fnRelease,
@ -152,7 +151,7 @@ HRESULT WINAPI FileSystemBindData_SetFindData(LPBC pbc, const WIN32_FIND_DATAW *
static HRESULT WINAPI IFileSystemBindData_fnQueryInterface(IFileSystemBindData *iface, REFIID riid, LPVOID *ppV) static HRESULT WINAPI IFileSystemBindData_fnQueryInterface(IFileSystemBindData *iface, REFIID riid, LPVOID *ppV)
{ {
ICOM_THIS(IFileSystemBindDataImpl, iface); IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface;
TRACE("(%p)->(\n\tIID:\t%s, %p)\n", This, debugstr_guid(riid), ppV); TRACE("(%p)->(\n\tIID:\t%s, %p)\n", This, debugstr_guid(riid), ppV);
*ppV = NULL; *ppV = NULL;
@ -178,14 +177,14 @@ static HRESULT WINAPI IFileSystemBindData_fnQueryInterface(IFileSystemBindData *
static ULONG WINAPI IFileSystemBindData_fnAddRef(IFileSystemBindData *iface) static ULONG WINAPI IFileSystemBindData_fnAddRef(IFileSystemBindData *iface)
{ {
ICOM_THIS(IFileSystemBindDataImpl, iface); IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
return InterlockedIncrement(&This->ref); return InterlockedIncrement(&This->ref);
} }
static ULONG WINAPI IFileSystemBindData_fnRelease(IFileSystemBindData *iface) static ULONG WINAPI IFileSystemBindData_fnRelease(IFileSystemBindData *iface)
{ {
ICOM_THIS(IFileSystemBindDataImpl, iface); IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
if (!InterlockedDecrement(&This->ref)) if (!InterlockedDecrement(&This->ref))
@ -199,7 +198,7 @@ static ULONG WINAPI IFileSystemBindData_fnRelease(IFileSystemBindData *iface)
static HRESULT WINAPI IFileSystemBindData_fnGetFindData(IFileSystemBindData *iface, WIN32_FIND_DATAW *pfd) static HRESULT WINAPI IFileSystemBindData_fnGetFindData(IFileSystemBindData *iface, WIN32_FIND_DATAW *pfd)
{ {
ICOM_THIS(IFileSystemBindDataImpl, iface); IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface;
TRACE("(%p), %p\n", This, pfd); TRACE("(%p), %p\n", This, pfd);
if (!pfd) if (!pfd)
@ -211,7 +210,7 @@ static HRESULT WINAPI IFileSystemBindData_fnGetFindData(IFileSystemBindData *ifa
static HRESULT WINAPI IFileSystemBindData_fnSetFindData(IFileSystemBindData *iface, const WIN32_FIND_DATAW *pfd) static HRESULT WINAPI IFileSystemBindData_fnSetFindData(IFileSystemBindData *iface, const WIN32_FIND_DATAW *pfd)
{ {
ICOM_THIS(IFileSystemBindDataImpl, iface); IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface;
TRACE("(%p), %p\n", This, pfd); TRACE("(%p), %p\n", This, pfd);
if (pfd) if (pfd)

70
reactos/lib/shell32/shlview.c
View file

@ -70,12 +70,13 @@ typedef struct
}LISTVIEW_SORT_INFO, *LPLISTVIEW_SORT_INFO; }LISTVIEW_SORT_INFO, *LPLISTVIEW_SORT_INFO;
typedef struct typedef struct
{ ICOM_VFIELD(IShellView); {
DWORD ref; IShellViewVtbl* lpVtbl;
ICOM_VTABLE(IOleCommandTarget)* lpvtblOleCommandTarget; DWORD ref;
ICOM_VTABLE(IDropTarget)* lpvtblDropTarget; IOleCommandTargetVtbl* lpvtblOleCommandTarget;
ICOM_VTABLE(IDropSource)* lpvtblDropSource; IDropTargetVtbl* lpvtblDropTarget;
ICOM_VTABLE(IViewObject)* lpvtblViewObject; IDropSourceVtbl* lpvtblDropSource;
IViewObjectVtbl* lpvtblViewObject;
IShellFolder* pSFParent; IShellFolder* pSFParent;
IShellFolder2* pSF2Parent; IShellFolder2* pSF2Parent;
IShellBrowser* pShellBrowser; IShellBrowser* pShellBrowser;
@ -93,21 +94,21 @@ typedef struct
HANDLE hAccel; HANDLE hAccel;
} IShellViewImpl; } IShellViewImpl;
static struct ICOM_VTABLE(IShellView) svvt; static struct IShellViewVtbl svvt;
static struct ICOM_VTABLE(IOleCommandTarget) ctvt; static struct IOleCommandTargetVtbl ctvt;
#define _IOleCommandTarget_Offset ((int)(&(((IShellViewImpl*)0)->lpvtblOleCommandTarget))) #define _IOleCommandTarget_Offset ((int)(&(((IShellViewImpl*)0)->lpvtblOleCommandTarget)))
#define _ICOM_THIS_From_IOleCommandTarget(class, name) class* This = (class*)(((char*)name)-_IOleCommandTarget_Offset); #define _ICOM_THIS_From_IOleCommandTarget(class, name) class* This = (class*)(((char*)name)-_IOleCommandTarget_Offset);
static struct ICOM_VTABLE(IDropTarget) dtvt; static struct IDropTargetVtbl dtvt;
#define _IDropTarget_Offset ((int)(&(((IShellViewImpl*)0)->lpvtblDropTarget))) #define _IDropTarget_Offset ((int)(&(((IShellViewImpl*)0)->lpvtblDropTarget)))
#define _ICOM_THIS_From_IDropTarget(class, name) class* This = (class*)(((char*)name)-_IDropTarget_Offset); #define _ICOM_THIS_From_IDropTarget(class, name) class* This = (class*)(((char*)name)-_IDropTarget_Offset);
static struct ICOM_VTABLE(IDropSource) dsvt; static struct IDropSourceVtbl dsvt;
#define _IDropSource_Offset ((int)(&(((IShellViewImpl*)0)->lpvtblDropSource))) #define _IDropSource_Offset ((int)(&(((IShellViewImpl*)0)->lpvtblDropSource)))
#define _ICOM_THIS_From_IDropSource(class, name) class* This = (class*)(((char*)name)-_IDropSource_Offset); #define _ICOM_THIS_From_IDropSource(class, name) class* This = (class*)(((char*)name)-_IDropSource_Offset);
static struct ICOM_VTABLE(IViewObject) vovt; static struct IViewObjectVtbl vovt;
#define _IViewObject_Offset ((int)(&(((IShellViewImpl*)0)->lpvtblViewObject))) #define _IViewObject_Offset ((int)(&(((IShellViewImpl*)0)->lpvtblViewObject)))
#define _ICOM_THIS_From_IViewObject(class, name) class* This = (class*)(((char*)name)-_IViewObject_Offset); #define _ICOM_THIS_From_IViewObject(class, name) class* This = (class*)(((char*)name)-_IViewObject_Offset);
@ -1588,7 +1589,7 @@ static LRESULT CALLBACK ShellView_WndProc(HWND hWnd, UINT uMessage, WPARAM wPara
*/ */
static HRESULT WINAPI IShellView_fnQueryInterface(IShellView * iface,REFIID riid, LPVOID *ppvObj) static HRESULT WINAPI IShellView_fnQueryInterface(IShellView * iface,REFIID riid, LPVOID *ppvObj)
{ {
ICOM_THIS(IShellViewImpl, iface); IShellViewImpl *This = (IShellViewImpl *)iface;
TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj);
@ -1634,7 +1635,7 @@ static HRESULT WINAPI IShellView_fnQueryInterface(IShellView * iface,REFIID riid
*/ */
static ULONG WINAPI IShellView_fnAddRef(IShellView * iface) static ULONG WINAPI IShellView_fnAddRef(IShellView * iface)
{ {
ICOM_THIS(IShellViewImpl, iface); IShellViewImpl *This = (IShellViewImpl *)iface;
TRACE("(%p)->(count=%lu)\n",This,This->ref); TRACE("(%p)->(count=%lu)\n",This,This->ref);
@ -1645,7 +1646,7 @@ static ULONG WINAPI IShellView_fnAddRef(IShellView * iface)
*/ */
static ULONG WINAPI IShellView_fnRelease(IShellView * iface) static ULONG WINAPI IShellView_fnRelease(IShellView * iface)
{ {
ICOM_THIS(IShellViewImpl, iface); IShellViewImpl *This = (IShellViewImpl *)iface;
TRACE("(%p)->()\n",This); TRACE("(%p)->()\n",This);
@ -1675,7 +1676,7 @@ static ULONG WINAPI IShellView_fnRelease(IShellView * iface)
*/ */
static HRESULT WINAPI IShellView_fnGetWindow(IShellView * iface,HWND * phWnd) static HRESULT WINAPI IShellView_fnGetWindow(IShellView * iface,HWND * phWnd)
{ {
ICOM_THIS(IShellViewImpl, iface); IShellViewImpl *This = (IShellViewImpl *)iface;
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
@ -1686,7 +1687,7 @@ static HRESULT WINAPI IShellView_fnGetWindow(IShellView * iface,HWND * phWnd)
static HRESULT WINAPI IShellView_fnContextSensitiveHelp(IShellView * iface,BOOL fEnterMode) static HRESULT WINAPI IShellView_fnContextSensitiveHelp(IShellView * iface,BOOL fEnterMode)
{ {
ICOM_THIS(IShellViewImpl, iface); IShellViewImpl *This = (IShellViewImpl *)iface;
FIXME("(%p) stub\n",This); FIXME("(%p) stub\n",This);
@ -1702,7 +1703,7 @@ static HRESULT WINAPI IShellView_fnContextSensitiveHelp(IShellView * iface,BOOL
static HRESULT WINAPI IShellView_fnTranslateAccelerator(IShellView * iface,LPMSG lpmsg) static HRESULT WINAPI IShellView_fnTranslateAccelerator(IShellView * iface,LPMSG lpmsg)
{ {
#if 0 #if 0
ICOM_THIS(IShellViewImpl, iface); IShellViewImpl *This = (IShellViewImpl *)iface;
FIXME("(%p)->(%p: hwnd=%x msg=%x lp=%lx wp=%x) stub\n",This,lpmsg, lpmsg->hwnd, lpmsg->message, lpmsg->lParam, lpmsg->wParam); FIXME("(%p)->(%p: hwnd=%x msg=%x lp=%lx wp=%x) stub\n",This,lpmsg, lpmsg->hwnd, lpmsg->message, lpmsg->lParam, lpmsg->wParam);
#endif #endif
@ -1716,7 +1717,7 @@ static HRESULT WINAPI IShellView_fnTranslateAccelerator(IShellView * iface,LPMSG
static HRESULT WINAPI IShellView_fnEnableModeless(IShellView * iface,BOOL fEnable) static HRESULT WINAPI IShellView_fnEnableModeless(IShellView * iface,BOOL fEnable)
{ {
ICOM_THIS(IShellViewImpl, iface); IShellViewImpl *This = (IShellViewImpl *)iface;
FIXME("(%p) stub\n",This); FIXME("(%p) stub\n",This);
@ -1725,7 +1726,7 @@ static HRESULT WINAPI IShellView_fnEnableModeless(IShellView * iface,BOOL fEnabl
static HRESULT WINAPI IShellView_fnUIActivate(IShellView * iface,UINT uState) static HRESULT WINAPI IShellView_fnUIActivate(IShellView * iface,UINT uState)
{ {
ICOM_THIS(IShellViewImpl, iface); IShellViewImpl *This = (IShellViewImpl *)iface;
/* /*
CHAR szName[MAX_PATH]; CHAR szName[MAX_PATH];
@ -1768,7 +1769,7 @@ static HRESULT WINAPI IShellView_fnUIActivate(IShellView * iface,UINT uState)
static HRESULT WINAPI IShellView_fnRefresh(IShellView * iface) static HRESULT WINAPI IShellView_fnRefresh(IShellView * iface)
{ {
ICOM_THIS(IShellViewImpl, iface); IShellViewImpl *This = (IShellViewImpl *)iface;
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
@ -1786,7 +1787,7 @@ static HRESULT WINAPI IShellView_fnCreateViewWindow(
RECT * prcView, RECT * prcView,
HWND *phWnd) HWND *phWnd)
{ {
ICOM_THIS(IShellViewImpl, iface); IShellViewImpl *This = (IShellViewImpl *)iface;
WNDCLASSA wc; WNDCLASSA wc;
*phWnd = 0; *phWnd = 0;
@ -1852,7 +1853,7 @@ static HRESULT WINAPI IShellView_fnCreateViewWindow(
static HRESULT WINAPI IShellView_fnDestroyViewWindow(IShellView * iface) static HRESULT WINAPI IShellView_fnDestroyViewWindow(IShellView * iface)
{ {
ICOM_THIS(IShellViewImpl, iface); IShellViewImpl *This = (IShellViewImpl *)iface;
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
@ -1874,7 +1875,7 @@ static HRESULT WINAPI IShellView_fnDestroyViewWindow(IShellView * iface)
static HRESULT WINAPI IShellView_fnGetCurrentInfo(IShellView * iface, LPFOLDERSETTINGS lpfs) static HRESULT WINAPI IShellView_fnGetCurrentInfo(IShellView * iface, LPFOLDERSETTINGS lpfs)
{ {
ICOM_THIS(IShellViewImpl, iface); IShellViewImpl *This = (IShellViewImpl *)iface;
TRACE("(%p)->(%p) vmode=%x flags=%x\n",This, lpfs, TRACE("(%p)->(%p) vmode=%x flags=%x\n",This, lpfs,
This->FolderSettings.ViewMode, This->FolderSettings.fFlags); This->FolderSettings.ViewMode, This->FolderSettings.fFlags);
@ -1887,7 +1888,7 @@ static HRESULT WINAPI IShellView_fnGetCurrentInfo(IShellView * iface, LPFOLDERSE
static HRESULT WINAPI IShellView_fnAddPropertySheetPages(IShellView * iface, DWORD dwReserved,LPFNADDPROPSHEETPAGE lpfn, LPARAM lparam) static HRESULT WINAPI IShellView_fnAddPropertySheetPages(IShellView * iface, DWORD dwReserved,LPFNADDPROPSHEETPAGE lpfn, LPARAM lparam)
{ {
ICOM_THIS(IShellViewImpl, iface); IShellViewImpl *This = (IShellViewImpl *)iface;
FIXME("(%p) stub\n",This); FIXME("(%p) stub\n",This);
@ -1896,7 +1897,7 @@ static HRESULT WINAPI IShellView_fnAddPropertySheetPages(IShellView * iface, DWO
static HRESULT WINAPI IShellView_fnSaveViewState(IShellView * iface) static HRESULT WINAPI IShellView_fnSaveViewState(IShellView * iface)
{ {
ICOM_THIS(IShellViewImpl, iface); IShellViewImpl *This = (IShellViewImpl *)iface;
FIXME("(%p) stub\n",This); FIXME("(%p) stub\n",This);
@ -1908,7 +1909,7 @@ static HRESULT WINAPI IShellView_fnSelectItem(
LPCITEMIDLIST pidl, LPCITEMIDLIST pidl,
UINT uFlags) UINT uFlags)
{ {
ICOM_THIS(IShellViewImpl, iface); IShellViewImpl *This = (IShellViewImpl *)iface;
int i; int i;
TRACE("(%p)->(pidl=%p, 0x%08x) stub\n",This, pidl, uFlags); TRACE("(%p)->(pidl=%p, 0x%08x) stub\n",This, pidl, uFlags);
@ -1957,7 +1958,7 @@ static HRESULT WINAPI IShellView_fnSelectItem(
static HRESULT WINAPI IShellView_fnGetItemObject(IShellView * iface, UINT uItem, REFIID riid, LPVOID *ppvOut) static HRESULT WINAPI IShellView_fnGetItemObject(IShellView * iface, UINT uItem, REFIID riid, LPVOID *ppvOut)
{ {
ICOM_THIS(IShellViewImpl, iface); IShellViewImpl *This = (IShellViewImpl *)iface;
TRACE("(%p)->(uItem=0x%08x,\n\tIID=%s, ppv=%p)\n",This, uItem, debugstr_guid(riid), ppvOut); TRACE("(%p)->(uItem=0x%08x,\n\tIID=%s, ppv=%p)\n",This, uItem, debugstr_guid(riid), ppvOut);
@ -1981,9 +1982,8 @@ static HRESULT WINAPI IShellView_fnGetItemObject(IShellView * iface, UINT uItem,
return S_OK; return S_OK;
} }
static struct ICOM_VTABLE(IShellView) svvt = static struct IShellViewVtbl svvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IShellView_fnQueryInterface, IShellView_fnQueryInterface,
IShellView_fnAddRef, IShellView_fnAddRef,
IShellView_fnRelease, IShellView_fnRelease,
@ -2094,9 +2094,8 @@ static HRESULT WINAPI ISVOleCmdTarget_Exec(
return OLECMDERR_E_UNKNOWNGROUP; return OLECMDERR_E_UNKNOWNGROUP;
} }
static ICOM_VTABLE(IOleCommandTarget) ctvt = static IOleCommandTargetVtbl ctvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ISVOleCmdTarget_QueryInterface, ISVOleCmdTarget_QueryInterface,
ISVOleCmdTarget_AddRef, ISVOleCmdTarget_AddRef,
ISVOleCmdTarget_Release, ISVOleCmdTarget_Release,
@ -2190,9 +2189,8 @@ static HRESULT WINAPI ISVDropTarget_Drop(
return E_NOTIMPL; return E_NOTIMPL;
} }
static struct ICOM_VTABLE(IDropTarget) dtvt = static struct IDropTargetVtbl dtvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ISVDropTarget_QueryInterface, ISVDropTarget_QueryInterface,
ISVDropTarget_AddRef, ISVDropTarget_AddRef,
ISVDropTarget_Release, ISVDropTarget_Release,
@ -2261,9 +2259,8 @@ static HRESULT WINAPI ISVDropSource_GiveFeedback(
return DRAGDROP_S_USEDEFAULTCURSORS; return DRAGDROP_S_USEDEFAULTCURSORS;
} }
static struct ICOM_VTABLE(IDropSource) dsvt = static struct IDropSourceVtbl dsvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ISVDropSource_QueryInterface, ISVDropSource_QueryInterface,
ISVDropSource_AddRef, ISVDropSource_AddRef,
ISVDropSource_Release, ISVDropSource_Release,
@ -2393,9 +2390,8 @@ static HRESULT WINAPI ISVViewObject_GetAdvise(
} }
static struct ICOM_VTABLE(IViewObject) vovt = static struct IViewObjectVtbl vovt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ISVViewObject_QueryInterface, ISVViewObject_QueryInterface,
ISVViewObject_AddRef, ISVViewObject_AddRef,
ISVViewObject_Release, ISVViewObject_Release,

25
reactos/lib/shell32/shv_bg_cmenu.c
View file

@ -41,13 +41,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
*/ */
typedef struct typedef struct
{ {
ICOM_VFIELD(IContextMenu2); IContextMenu2Vtbl *lpVtbl;
IShellFolder* pSFParent; IShellFolder* pSFParent;
DWORD ref; DWORD ref;
} BgCmImpl; } BgCmImpl;
static struct ICOM_VTABLE(IContextMenu2) cmvt; static struct IContextMenu2Vtbl cmvt;
/************************************************************************** /**************************************************************************
* ISVBgCm_Constructor() * ISVBgCm_Constructor()
@ -71,7 +71,7 @@ IContextMenu2 *ISvBgCm_Constructor(IShellFolder* pSFParent)
*/ */
static HRESULT WINAPI ISVBgCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj) static HRESULT WINAPI ISVBgCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj)
{ {
ICOM_THIS(BgCmImpl, iface); BgCmImpl *This = (BgCmImpl *)iface;
TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj);
@ -103,7 +103,7 @@ static HRESULT WINAPI ISVBgCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid
*/ */
static ULONG WINAPI ISVBgCm_fnAddRef(IContextMenu2 *iface) static ULONG WINAPI ISVBgCm_fnAddRef(IContextMenu2 *iface)
{ {
ICOM_THIS(BgCmImpl, iface); BgCmImpl *This = (BgCmImpl *)iface;
TRACE("(%p)->(count=%lu)\n",This, This->ref); TRACE("(%p)->(count=%lu)\n",This, This->ref);
@ -115,7 +115,7 @@ static ULONG WINAPI ISVBgCm_fnAddRef(IContextMenu2 *iface)
*/ */
static ULONG WINAPI ISVBgCm_fnRelease(IContextMenu2 *iface) static ULONG WINAPI ISVBgCm_fnRelease(IContextMenu2 *iface)
{ {
ICOM_THIS(BgCmImpl, iface); BgCmImpl *This = (BgCmImpl *)iface;
TRACE("(%p)->()\n",This); TRACE("(%p)->()\n",This);
@ -149,7 +149,7 @@ static HRESULT WINAPI ISVBgCm_fnQueryContextMenu(
UINT idMax; UINT idMax;
HRESULT hr; HRESULT hr;
ICOM_THIS(BgCmImpl, iface); BgCmImpl *This = (BgCmImpl *)iface;
TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n", TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",
This, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); This, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags);
@ -187,7 +187,7 @@ static void DoNewFolder(
IContextMenu2 *iface, IContextMenu2 *iface,
IShellView *psv) IShellView *psv)
{ {
ICOM_THIS(BgCmImpl, iface); BgCmImpl *This = (BgCmImpl *)iface;
ISFHelper * psfhlp; ISFHelper * psfhlp;
char szName[MAX_PATH]; char szName[MAX_PATH];
@ -217,7 +217,7 @@ static void DoNewFolder(
static BOOL DoPaste( static BOOL DoPaste(
IContextMenu2 *iface) IContextMenu2 *iface)
{ {
ICOM_THIS(BgCmImpl, iface); BgCmImpl *This = (BgCmImpl *)iface;
BOOL bSuccess = FALSE; BOOL bSuccess = FALSE;
IDataObject * pda; IDataObject * pda;
@ -315,7 +315,7 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand(
IContextMenu2 *iface, IContextMenu2 *iface,
LPCMINVOKECOMMANDINFO lpcmi) LPCMINVOKECOMMANDINFO lpcmi)
{ {
ICOM_THIS(BgCmImpl, iface); BgCmImpl *This = (BgCmImpl *)iface;
LPSHELLBROWSER lpSB; LPSHELLBROWSER lpSB;
LPSHELLVIEW lpSV = NULL; LPSHELLVIEW lpSV = NULL;
@ -388,7 +388,7 @@ static HRESULT WINAPI ISVBgCm_fnGetCommandString(
LPSTR lpszName, LPSTR lpszName,
UINT uMaxNameLen) UINT uMaxNameLen)
{ {
ICOM_THIS(BgCmImpl, iface); BgCmImpl *This = (BgCmImpl *)iface;
TRACE("(%p)->(idcom=%x flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); TRACE("(%p)->(idcom=%x flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen);
@ -420,7 +420,7 @@ static HRESULT WINAPI ISVBgCm_fnHandleMenuMsg(
WPARAM wParam, WPARAM wParam,
LPARAM lParam) LPARAM lParam)
{ {
ICOM_THIS(BgCmImpl, iface); BgCmImpl *This = (BgCmImpl *)iface;
FIXME("(%p)->(msg=%x wp=%x lp=%lx)\n",This, uMsg, wParam, lParam); FIXME("(%p)->(msg=%x wp=%x lp=%lx)\n",This, uMsg, wParam, lParam);
@ -431,9 +431,8 @@ static HRESULT WINAPI ISVBgCm_fnHandleMenuMsg(
* IContextMenu2 VTable * IContextMenu2 VTable
* *
*/ */
static struct ICOM_VTABLE(IContextMenu2) cmvt = static struct IContextMenu2Vtbl cmvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ISVBgCm_fnQueryInterface, ISVBgCm_fnQueryInterface,
ISVBgCm_fnAddRef, ISVBgCm_fnAddRef,
ISVBgCm_fnRelease, ISVBgCm_fnRelease,

29
reactos/lib/shell32/shv_item_cmenu.c
View file

@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
* IContextMenu Implementation * IContextMenu Implementation
*/ */
typedef struct typedef struct
{ ICOM_VFIELD(IContextMenu2); { IContextMenu2Vtbl *lpVtbl;
DWORD ref; DWORD ref;
IShellFolder* pSFParent; IShellFolder* pSFParent;
LPITEMIDLIST pidl; /* root pidl */ LPITEMIDLIST pidl; /* root pidl */
@ -51,7 +51,7 @@ typedef struct
} ItemCmImpl; } ItemCmImpl;
static struct ICOM_VTABLE(IContextMenu2) cmvt; static struct IContextMenu2Vtbl cmvt;
/************************************************************************** /**************************************************************************
* ISvItemCm_CanRenameItems() * ISvItemCm_CanRenameItems()
@ -107,7 +107,7 @@ IContextMenu2 *ISvItemCm_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST pidl
*/ */
static HRESULT WINAPI ISvItemCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj) static HRESULT WINAPI ISvItemCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj)
{ {
ICOM_THIS(ItemCmImpl, iface); ItemCmImpl *This = (ItemCmImpl *)iface;
TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj);
@ -139,7 +139,7 @@ static HRESULT WINAPI ISvItemCm_fnQueryInterface(IContextMenu2 *iface, REFIID ri
*/ */
static ULONG WINAPI ISvItemCm_fnAddRef(IContextMenu2 *iface) static ULONG WINAPI ISvItemCm_fnAddRef(IContextMenu2 *iface)
{ {
ICOM_THIS(ItemCmImpl, iface); ItemCmImpl *This = (ItemCmImpl *)iface;
TRACE("(%p)->(count=%lu)\n",This, This->ref); TRACE("(%p)->(count=%lu)\n",This, This->ref);
@ -151,7 +151,7 @@ static ULONG WINAPI ISvItemCm_fnAddRef(IContextMenu2 *iface)
*/ */
static ULONG WINAPI ISvItemCm_fnRelease(IContextMenu2 *iface) static ULONG WINAPI ISvItemCm_fnRelease(IContextMenu2 *iface)
{ {
ICOM_THIS(ItemCmImpl, iface); ItemCmImpl *This = (ItemCmImpl *)iface;
TRACE("(%p)->()\n",This); TRACE("(%p)->()\n",This);
@ -218,7 +218,7 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu(
UINT idCmdLast, UINT idCmdLast,
UINT uFlags) UINT uFlags)
{ {
ICOM_THIS(ItemCmImpl, iface); ItemCmImpl *This = (ItemCmImpl *)iface;
TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags);
@ -269,7 +269,7 @@ static void DoOpenExplore(
HWND hwnd, HWND hwnd,
LPCSTR verb) LPCSTR verb)
{ {
ICOM_THIS(ItemCmImpl, iface); ItemCmImpl *This = (ItemCmImpl *)iface;
UINT i, bFolderFound = FALSE; UINT i, bFolderFound = FALSE;
LPITEMIDLIST pidlFQ; LPITEMIDLIST pidlFQ;
@ -310,7 +310,7 @@ static void DoRename(
IContextMenu2 *iface, IContextMenu2 *iface,
HWND hwnd) HWND hwnd)
{ {
ICOM_THIS(ItemCmImpl, iface); ItemCmImpl *This = (ItemCmImpl *)iface;
LPSHELLBROWSER lpSB; LPSHELLBROWSER lpSB;
LPSHELLVIEW lpSV; LPSHELLVIEW lpSV;
@ -337,7 +337,7 @@ static void DoRename(
*/ */
static void DoDelete(IContextMenu2 *iface) static void DoDelete(IContextMenu2 *iface)
{ {
ICOM_THIS(ItemCmImpl, iface); ItemCmImpl *This = (ItemCmImpl *)iface;
ISFHelper * psfhlp; ISFHelper * psfhlp;
IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, (LPVOID*)&psfhlp); IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, (LPVOID*)&psfhlp);
@ -358,7 +358,7 @@ static BOOL DoCopyOrCut(
HWND hwnd, HWND hwnd,
BOOL bCut) BOOL bCut)
{ {
ICOM_THIS(ItemCmImpl, iface); ItemCmImpl *This = (ItemCmImpl *)iface;
LPSHELLBROWSER lpSB; LPSHELLBROWSER lpSB;
LPSHELLVIEW lpSV; LPSHELLVIEW lpSV;
@ -388,7 +388,7 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand(
IContextMenu2 *iface, IContextMenu2 *iface,
LPCMINVOKECOMMANDINFO lpcmi) LPCMINVOKECOMMANDINFO lpcmi)
{ {
ICOM_THIS(ItemCmImpl, iface); ItemCmImpl *This = (ItemCmImpl *)iface;
if (lpcmi->cbSize != sizeof(CMINVOKECOMMANDINFO)) if (lpcmi->cbSize != sizeof(CMINVOKECOMMANDINFO))
FIXME("Is an EX structure\n"); FIXME("Is an EX structure\n");
@ -455,7 +455,7 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString(
LPSTR lpszName, LPSTR lpszName,
UINT uMaxNameLen) UINT uMaxNameLen)
{ {
ICOM_THIS(ItemCmImpl, iface); ItemCmImpl *This = (ItemCmImpl *)iface;
HRESULT hr = E_INVALIDARG; HRESULT hr = E_INVALIDARG;
@ -510,16 +510,15 @@ static HRESULT WINAPI ISvItemCm_fnHandleMenuMsg(
WPARAM wParam, WPARAM wParam,
LPARAM lParam) LPARAM lParam)
{ {
ICOM_THIS(ItemCmImpl, iface); ItemCmImpl *This = (ItemCmImpl *)iface;
TRACE("(%p)->(msg=%x wp=%x lp=%lx)\n",This, uMsg, wParam, lParam); TRACE("(%p)->(msg=%x wp=%x lp=%lx)\n",This, uMsg, wParam, lParam);
return E_NOTIMPL; return E_NOTIMPL;
} }
static struct ICOM_VTABLE(IContextMenu2) cmvt = static struct IContextMenu2Vtbl cmvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ISvItemCm_fnQueryInterface, ISvItemCm_fnQueryInterface,
ISvItemCm_fnAddRef, ISvItemCm_fnAddRef,
ISvItemCm_fnRelease, ISvItemCm_fnRelease,