Skip to content

W
wine-winehq
Commit 314b99c4 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Removed some more uses of the non-standard ICOM_THIS macro.

parent 0e3df810
Expand all Show whitespace changes
Inline Side-by-side
Showing with 281 additions and 282 deletions
dlls/dinput/device.c
View file @ 314b99c4
......@@ -443,7 +443,7 @@ BOOL DIEnumDevicesCallbackAtoW(LPCDIDEVICEOBJECTINSTANCEA lpddi, LPVOID lpvRef)
HRESULT WINAPI IDirectInputDevice2AImpl_SetDataFormat(
LPDIRECTINPUTDEVICE8A iface,LPCDIDATAFORMAT df
) {
ICOM_THIS(IDirectInputDevice2AImpl,iface);
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
TRACE("(this=%p,%p)\n",This,df);
......@@ -455,7 +455,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetDataFormat(
HRESULT WINAPI IDirectInputDevice2AImpl_SetCooperativeLevel(
LPDIRECTINPUTDEVICE8A iface,HWND hwnd,DWORD dwflags
) {
ICOM_THIS(IDirectInputDevice2AImpl,iface);
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
TRACE("(this=%p,0x%08lx,0x%08lx)\n",This,(DWORD)hwnd,dwflags);
if (TRACE_ON(dinput)) {
TRACE(" cooperative level : ");
......@@ -467,14 +467,14 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetCooperativeLevel(
HRESULT WINAPI IDirectInputDevice2AImpl_SetEventNotification(
LPDIRECTINPUTDEVICE8A iface,HANDLE hnd
) {
ICOM_THIS(IDirectInputDevice2AImpl,iface);
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
FIXME("(this=%p,0x%08lx): stub\n",This,(DWORD)hnd);
return DI_OK;
}
ULONG WINAPI IDirectInputDevice2AImpl_Release(LPDIRECTINPUTDEVICE8A iface)
{
ICOM_THIS(IDirectInputDevice2AImpl,iface);
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
This->ref--;
if (This->ref)
return This->ref;
......@@ -486,7 +486,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface(
LPDIRECTINPUTDEVICE8A iface,REFIID riid,LPVOID *ppobj
)
{
ICOM_THIS(IDirectInputDevice2AImpl,iface);
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(riid),ppobj);
if (IsEqualGUID(&IID_IUnknown,riid)) {
......@@ -517,7 +517,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface(
LPDIRECTINPUTDEVICE8W iface,REFIID riid,LPVOID *ppobj
)
{
ICOM_THIS(IDirectInputDevice2AImpl,iface);
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(riid),ppobj);
if (IsEqualGUID(&IID_IUnknown,riid)) {
......@@ -547,7 +547,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface(
ULONG WINAPI IDirectInputDevice2AImpl_AddRef(
LPDIRECTINPUTDEVICE8A iface)
{
ICOM_THIS(IDirectInputDevice2AImpl,iface);
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
return ++This->ref;
}
......
dlls/dinput/dinput_main.c
View file @ 314b99c4
......@@ -236,7 +236,7 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices(
LPDIRECTINPUT7A iface, DWORD dwDevType, LPDIENUMDEVICESCALLBACKA lpCallback,
LPVOID pvRef, DWORD dwFlags)
{
ICOM_THIS(IDirectInputImpl,iface);
IDirectInputImpl *This = (IDirectInputImpl *)iface;
DIDEVICEINSTANCEA devInstance;
int i;
......@@ -263,7 +263,7 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices(
LPDIRECTINPUT7W iface, DWORD dwDevType, LPDIENUMDEVICESCALLBACKW lpCallback,
LPVOID pvRef, DWORD dwFlags)
{
ICOM_THIS(IDirectInputImpl,iface);
IDirectInputImpl *This = (IDirectInputImpl *)iface;
DIDEVICEINSTANCEW devInstance;
int i;
......@@ -286,13 +286,13 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices(
static ULONG WINAPI IDirectInputAImpl_AddRef(LPDIRECTINPUT7A iface)
{
ICOM_THIS(IDirectInputImpl,iface);
IDirectInputImpl *This = (IDirectInputImpl *)iface;
return ++(This->ref);
}
static ULONG WINAPI IDirectInputAImpl_Release(LPDIRECTINPUT7A iface)
{
ICOM_THIS(IDirectInputImpl,iface);
IDirectInputImpl *This = (IDirectInputImpl *)iface;
if (!(--This->ref)) {
HeapFree(GetProcessHeap(),0,This);
return 0;
......@@ -301,7 +301,7 @@ static ULONG WINAPI IDirectInputAImpl_Release(LPDIRECTINPUT7A iface)
}
static HRESULT WINAPI IDirectInputAImpl_QueryInterface(LPDIRECTINPUT7A iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectInputImpl,iface);
IDirectInputImpl *This = (IDirectInputImpl *)iface;
TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(riid),ppobj);
if (IsEqualGUID(&IID_IUnknown,riid) ||
......@@ -317,7 +317,7 @@ static HRESULT WINAPI IDirectInputAImpl_QueryInterface(LPDIRECTINPUT7A iface, RE
}
static HRESULT WINAPI IDirectInputWImpl_QueryInterface(LPDIRECTINPUT7W iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectInputImpl,iface);
IDirectInputImpl *This = (IDirectInputImpl *)iface;
TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(riid),ppobj);
if (IsEqualGUID(&IID_IUnknown,riid) ||
......@@ -336,7 +336,7 @@ static HRESULT WINAPI IDirectInputAImpl_CreateDevice(
LPDIRECTINPUT7A iface,REFGUID rguid,LPDIRECTINPUTDEVICEA* pdev,
LPUNKNOWN punk
) {
ICOM_THIS(IDirectInputImpl,iface);
IDirectInputImpl *This = (IDirectInputImpl *)iface;
HRESULT ret_value = DIERR_DEVICENOTREG;
int i;
......@@ -357,7 +357,7 @@ static HRESULT WINAPI IDirectInputAImpl_CreateDevice(
static HRESULT WINAPI IDirectInputWImpl_CreateDevice(LPDIRECTINPUT7A iface,
REFGUID rguid, LPDIRECTINPUTDEVICEW* pdev, LPUNKNOWN punk) {
ICOM_THIS(IDirectInputImpl,iface);
IDirectInputImpl *This = (IDirectInputImpl *)iface;
HRESULT ret_value = DIERR_DEVICENOTREG;
int i;
......@@ -382,7 +382,7 @@ static HRESULT WINAPI IDirectInputAImpl_Initialize(LPDIRECTINPUT7A iface, HINSTA
static HRESULT WINAPI IDirectInputAImpl_GetDeviceStatus(LPDIRECTINPUT7A iface,
REFGUID rguid) {
ICOM_THIS(IDirectInputImpl,iface);
IDirectInputImpl *This = (IDirectInputImpl *)iface;
FIXME("(%p)->(%s): stub\n",This,debugstr_guid(rguid));
......@@ -392,7 +392,7 @@ static HRESULT WINAPI IDirectInputAImpl_GetDeviceStatus(LPDIRECTINPUT7A iface,
static HRESULT WINAPI IDirectInputAImpl_RunControlPanel(LPDIRECTINPUT7A iface,
HWND hwndOwner,
DWORD dwFlags) {
ICOM_THIS(IDirectInputImpl,iface);
IDirectInputImpl *This = (IDirectInputImpl *)iface;
FIXME("(%p)->(%08lx,%08lx): stub\n",This, (DWORD) hwndOwner, dwFlags);
return DI_OK;
......@@ -400,7 +400,7 @@ static HRESULT WINAPI IDirectInputAImpl_RunControlPanel(LPDIRECTINPUT7A iface,
static HRESULT WINAPI IDirectInput2AImpl_FindDevice(LPDIRECTINPUT7A iface, REFGUID rguid,
LPCSTR pszName, LPGUID pguidInstance) {
ICOM_THIS(IDirectInputImpl,iface);
IDirectInputImpl *This = (IDirectInputImpl *)iface;
FIXME("(%p)->(%s, %s, %p): stub\n", This, debugstr_guid(rguid), pszName, pguidInstance);
return DI_OK;
......@@ -408,7 +408,7 @@ static HRESULT WINAPI IDirectInput2AImpl_FindDevice(LPDIRECTINPUT7A iface, REFGU
static HRESULT WINAPI IDirectInput2WImpl_FindDevice(LPDIRECTINPUT7W iface, REFGUID rguid,
LPCWSTR pszName, LPGUID pguidInstance) {
ICOM_THIS(IDirectInputImpl,iface);
IDirectInputImpl *This = (IDirectInputImpl *)iface;
FIXME("(%p)->(%s, %s, %p): stub\n", This, debugstr_guid(rguid), debugstr_w(pszName), pguidInstance);
return DI_OK;
......@@ -417,7 +417,7 @@ static HRESULT WINAPI IDirectInput2WImpl_FindDevice(LPDIRECTINPUT7W iface, REFGU
static HRESULT WINAPI IDirectInput7AImpl_CreateDeviceEx(LPDIRECTINPUT7A iface, REFGUID rguid,
REFIID riid, LPVOID* pvOut, LPUNKNOWN lpUnknownOuter)
{
ICOM_THIS(IDirectInputImpl,iface);
IDirectInputImpl *This = (IDirectInputImpl *)iface;
HRESULT ret_value = DIERR_DEVICENOTREG;
int i;
......@@ -439,7 +439,7 @@ static HRESULT WINAPI IDirectInput7AImpl_CreateDeviceEx(LPDIRECTINPUT7A iface, R
static HRESULT WINAPI IDirectInput7WImpl_CreateDeviceEx(LPDIRECTINPUT7W iface, REFGUID rguid,
REFIID riid, LPVOID* pvOut, LPUNKNOWN lpUnknownOuter)
{
ICOM_THIS(IDirectInputImpl,iface);
IDirectInputImpl *This = (IDirectInputImpl *)iface;
HRESULT ret_value = DIERR_DEVICENOTREG;
int i;
......@@ -459,7 +459,7 @@ static HRESULT WINAPI IDirectInput7WImpl_CreateDeviceEx(LPDIRECTINPUT7W iface, R
}
static HRESULT WINAPI IDirectInput8AImpl_QueryInterface(LPDIRECTINPUT8A iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectInputImpl,iface);
IDirectInputImpl *This = (IDirectInputImpl *)iface;
TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(riid),ppobj);
if (IsEqualGUID(&IID_IUnknown,riid) ||
......@@ -473,7 +473,7 @@ static HRESULT WINAPI IDirectInput8AImpl_QueryInterface(LPDIRECTINPUT8A iface, R
}
static HRESULT WINAPI IDirectInput8WImpl_QueryInterface(LPDIRECTINPUT8W iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectInputImpl,iface);
IDirectInputImpl *This = (IDirectInputImpl *)iface;
TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(riid),ppobj);
if (IsEqualGUID(&IID_IUnknown,riid) ||
......@@ -492,7 +492,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics(
LPVOID pvRef, DWORD dwFlags
)
{
ICOM_THIS(IDirectInputImpl,iface);
IDirectInputImpl *This = (IDirectInputImpl *)iface;
FIXME("(this=%p,%s,%p,%p,%p,%04lx): stub\n", This, ptszUserName, lpdiActionFormat,
lpCallback, pvRef, dwFlags);
......@@ -505,7 +505,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics(
LPVOID pvRef, DWORD dwFlags
)
{
ICOM_THIS(IDirectInputImpl,iface);
IDirectInputImpl *This = (IDirectInputImpl *)iface;
FIXME("(this=%p,%s,%p,%p,%p,%04lx): stub\n", This, debugstr_w(ptszUserName), lpdiActionFormat,
lpCallback, pvRef, dwFlags);
......@@ -517,7 +517,7 @@ static HRESULT WINAPI IDirectInput8AImpl_ConfigureDevices(
LPDICONFIGUREDEVICESPARAMSA lpdiCDParams, DWORD dwFlags, LPVOID pvRefData
)
{
ICOM_THIS(IDirectInputImpl,iface);
IDirectInputImpl *This = (IDirectInputImpl *)iface;
FIXME("(this=%p,%p,%p,%04lx,%p): stub\n", This, lpdiCallback, lpdiCDParams,
dwFlags, pvRefData);
......@@ -529,7 +529,7 @@ static HRESULT WINAPI IDirectInput8WImpl_ConfigureDevices(
LPDICONFIGUREDEVICESPARAMSW lpdiCDParams, DWORD dwFlags, LPVOID pvRefData
)
{
ICOM_THIS(IDirectInputImpl,iface);
IDirectInputImpl *This = (IDirectInputImpl *)iface;
FIXME("(this=%p,%p,%p,%04lx,%p): stub\n", This, lpdiCallback, lpdiCDParams,
dwFlags, pvRefData);
......@@ -628,19 +628,19 @@ typedef struct
} IClassFactoryImpl;
static HRESULT WINAPI DICF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface);
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj);
return E_NOINTERFACE;
}
static ULONG WINAPI DICF_AddRef(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface);
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
return ++(This->ref);
}
static ULONG WINAPI DICF_Release(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface);
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
/* static class, won't be freed */
return --(This->ref);
}
......@@ -648,7 +648,7 @@ static ULONG WINAPI DICF_Release(LPCLASSFACTORY iface) {
static HRESULT WINAPI DICF_CreateInstance(
LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj
) {
ICOM_THIS(IClassFactoryImpl,iface);
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj);
if ( IsEqualGUID( &IID_IDirectInputA, riid ) ||
......@@ -668,7 +668,7 @@ static HRESULT WINAPI DICF_CreateInstance(
}
static HRESULT WINAPI DICF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface);
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p)->(%d),stub!\n",This,dolock);
return S_OK;
}
......
dlls/dinput/joystick_linux.c
View file @ 314b99c4
......@@ -635,7 +635,7 @@ DECL_GLOBAL_CONSTRUCTOR(joydev_register) { dinput_register_device(&joydev); }
*/
static ULONG WINAPI JoystickAImpl_Release(LPDIRECTINPUTDEVICE8A iface)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
This->ref--;
if (This->ref)
......@@ -680,7 +680,7 @@ static HRESULT WINAPI JoystickAImpl_SetDataFormat(
LPDIRECTINPUTDEVICE8A iface,
LPCDIDATAFORMAT df)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
unsigned int i;
LPDIDATAFORMAT new_df = 0;
LPDIOBJECTDATAFORMAT new_rgodf = 0;
......@@ -747,7 +747,7 @@ FAILED:
*/
static HRESULT WINAPI JoystickAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
TRACE("(%p)\n",This);
......@@ -777,7 +777,7 @@ static HRESULT WINAPI JoystickAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
*/
static HRESULT WINAPI JoystickAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
TRACE("(%p)\n",This);
......@@ -964,7 +964,7 @@ static HRESULT WINAPI JoystickAImpl_GetDeviceState(
DWORD len,
LPVOID ptr)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
TRACE("(%p,0x%08lx,%p)\n",This,len,ptr);
......@@ -992,7 +992,7 @@ static HRESULT WINAPI JoystickAImpl_GetDeviceData(
LPDWORD entries,
DWORD flags)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
FIXME("(%p)->(dods=%ld,entries=%ld,fl=0x%08lx),STUB!\n",This,dodsize,*entries,flags);
......@@ -1037,7 +1037,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(
REFGUID rguid,
LPCDIPROPHEADER ph)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
int i;
TRACE("(%p,%s,%p)\n",This,debugstr_guid(rguid),ph);
......@@ -1118,7 +1118,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(
static HRESULT WINAPI JoystickAImpl_SetEventNotification(
LPDIRECTINPUTDEVICE8A iface, HANDLE hnd
) {
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
TRACE("(this=%p,0x%08lx)\n",This,(DWORD)hnd);
This->hEvent = hnd;
......@@ -1129,7 +1129,7 @@ static HRESULT WINAPI JoystickAImpl_GetCapabilities(
LPDIRECTINPUTDEVICE8A iface,
LPDIDEVCAPS lpDIDevCaps)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
int size;
TRACE("%p->(%p)\n",iface,lpDIDevCaps);
......@@ -1151,7 +1151,7 @@ static HRESULT WINAPI JoystickAImpl_GetCapabilities(
static HRESULT WINAPI JoystickAImpl_Poll(LPDIRECTINPUTDEVICE8A iface)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
TRACE("(%p)\n",This);
......@@ -1173,7 +1173,7 @@ static HRESULT WINAPI JoystickAImpl_EnumObjects(
LPVOID lpvRef,
DWORD dwFlags)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
DIDEVICEOBJECTINSTANCEA ddoi;
BYTE i;
int user_offset;
......@@ -1303,7 +1303,7 @@ static HRESULT WINAPI JoystickWImpl_EnumObjects(
LPVOID lpvRef,
DWORD dwFlags)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
device_enumobjects_AtoWcb_data data;
......@@ -1321,7 +1321,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(
REFGUID rguid,
LPDIPROPHEADER pdiph)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
TRACE("(%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph);
......@@ -1387,7 +1387,7 @@ HRESULT WINAPI JoystickAImpl_GetObjectInfo(
DWORD dwObj,
DWORD dwHow)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
DIDEVICEOBJECTINSTANCEA didoiA;
unsigned int i;
......@@ -1473,7 +1473,7 @@ HRESULT WINAPI JoystickAImpl_GetDeviceInfo(
LPDIRECTINPUTDEVICE8A iface,
LPDIDEVICEINSTANCEA pdidi)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
TRACE("(%p,%p)\n", iface, pdidi);
......
dlls/dinput/joystick_linuxinput.c
View file @ 314b99c4
......@@ -324,7 +324,7 @@ DECL_GLOBAL_CONSTRUCTOR(joydev_register) { dinput_register_device(&joydev); }
*/
static ULONG WINAPI JoystickAImpl_Release(LPDIRECTINPUTDEVICE8A iface)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
This->ref--;
if (This->ref)
......@@ -349,7 +349,7 @@ static HRESULT WINAPI JoystickAImpl_SetDataFormat(
LPDIRECTINPUTDEVICE8A iface,LPCDIDATAFORMAT df
)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
TRACE("(this=%p,%p)\n",This,df);
......@@ -370,7 +370,7 @@ static HRESULT WINAPI JoystickAImpl_SetDataFormat(
static HRESULT WINAPI JoystickAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
{
int i;
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
char buf[200];
TRACE("(this=%p)\n",This);
......@@ -428,7 +428,7 @@ static HRESULT WINAPI JoystickAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
*/
static HRESULT WINAPI JoystickAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
TRACE("(this=%p)\n",This);
if (This->joyfd!=-1) {
......@@ -625,7 +625,7 @@ static void joy_polldev(JoystickImpl *This) {
static HRESULT WINAPI JoystickAImpl_GetDeviceState(
LPDIRECTINPUTDEVICE8A iface,DWORD len,LPVOID ptr
) {
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
joy_polldev(This);
......@@ -649,7 +649,7 @@ static HRESULT WINAPI JoystickAImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A iface,
LPDWORD entries,
DWORD flags
) {
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
FIXME("(%p)->(dods=%ld,entries=%ld,fl=0x%08lx),STUB!\n",This,dodsize,*entries,flags);
......@@ -670,7 +670,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface,
REFGUID rguid,
LPCDIPROPHEADER ph)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
FIXME("(this=%p,%s,%p)\n",This,debugstr_guid(rguid),ph);
FIXME("ph.dwSize = %ld, ph.dwHeaderSize =%ld, ph.dwObj = %ld, ph.dwHow= %ld\n",ph->dwSize, ph->dwHeaderSize,ph->dwObj,ph->dwHow);
......@@ -724,7 +724,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface,
static HRESULT WINAPI JoystickAImpl_SetEventNotification(
LPDIRECTINPUTDEVICE8A iface, HANDLE hnd
) {
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
TRACE("(this=%p,0x%08lx)\n",This,(DWORD)hnd);
This->hEvent = hnd;
......@@ -735,7 +735,7 @@ static HRESULT WINAPI JoystickAImpl_GetCapabilities(
LPDIRECTINPUTDEVICE8A iface,
LPDIDEVCAPS lpDIDevCaps)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
int xfd = This->joyfd;
int i,axes,buttons;
int wasacquired = 1;
......@@ -765,7 +765,7 @@ static HRESULT WINAPI JoystickAImpl_GetCapabilities(
}
static HRESULT WINAPI JoystickAImpl_Poll(LPDIRECTINPUTDEVICE8A iface) {
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
TRACE("(),stub!\n");
joy_polldev(This);
......@@ -781,7 +781,7 @@ static HRESULT WINAPI JoystickAImpl_EnumObjects(
LPVOID lpvRef,
DWORD dwFlags)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
DIDEVICEOBJECTINSTANCEA ddoi;
int xfd = This->joyfd;
......@@ -942,7 +942,7 @@ static HRESULT WINAPI JoystickWImpl_EnumObjects(LPDIRECTINPUTDEVICE8W iface,
LPVOID lpvRef,
DWORD dwFlags)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
device_enumobjects_AtoWcb_data data;
......@@ -959,7 +959,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface,
REFGUID rguid,
LPDIPROPHEADER pdiph)
{
ICOM_THIS(JoystickImpl,iface);
JoystickImpl *This = (JoystickImpl *)iface;
TRACE("(this=%p,%s,%p): stub!\n",
iface, debugstr_guid(rguid), pdiph);
......
dlls/dinput/keyboard.c
View file @ 314b99c4
......@@ -296,7 +296,7 @@ DECL_GLOBAL_CONSTRUCTOR(keyboarddev_register) { dinput_register_device(&keyboard
static ULONG WINAPI SysKeyboardAImpl_Release(LPDIRECTINPUTDEVICE8A iface)
{
ICOM_THIS(SysKeyboardImpl,iface);
SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
This->ref--;
if (This->ref)
......@@ -323,7 +323,7 @@ static HRESULT WINAPI SysKeyboardAImpl_SetProperty(
LPDIRECTINPUTDEVICE8A iface,REFGUID rguid,LPCDIPROPHEADER ph
)
{
ICOM_THIS(SysKeyboardImpl,iface);
SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(rguid),ph);
TRACE("(size=%ld,headersize=%ld,obj=%ld,how=%ld\n",
......@@ -380,7 +380,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceData(
LPDWORD entries,DWORD flags
)
{
ICOM_THIS(SysKeyboardImpl,iface);
SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
int ret = DI_OK, i = 0;
TRACE("(this=%p,%ld,%p,%p(%ld)),0x%08lx)\n",
......@@ -441,7 +441,7 @@ static HRESULT WINAPI SysKeyboardAImpl_EnumObjects(
LPVOID lpvRef,
DWORD dwFlags)
{
ICOM_THIS(SysKeyboardImpl,iface);
SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
DIDEVICEOBJECTINSTANCEA ddoi;
int i;
......@@ -474,7 +474,7 @@ static HRESULT WINAPI SysKeyboardWImpl_EnumObjects(LPDIRECTINPUTDEVICE8W iface,
LPVOID lpvRef,
DWORD dwFlags)
{
ICOM_THIS(SysKeyboardImpl,iface);
SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
device_enumobjects_AtoWcb_data data;
......@@ -488,7 +488,7 @@ static HRESULT WINAPI SysKeyboardAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface);
static HRESULT WINAPI SysKeyboardAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
{
ICOM_THIS(SysKeyboardImpl,iface);
SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
TRACE("(this=%p)\n",This);
......@@ -522,7 +522,7 @@ static HRESULT WINAPI SysKeyboardAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
static HRESULT WINAPI SysKeyboardAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
{
ICOM_THIS(SysKeyboardImpl,iface);
SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
TRACE("(this=%p)\n",This);
if (This->acquired == 0)
......@@ -547,7 +547,7 @@ static HRESULT WINAPI SysKeyboardAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
static HRESULT WINAPI SysKeyboardAImpl_SetEventNotification(LPDIRECTINPUTDEVICE8A iface,
HANDLE hnd) {
ICOM_THIS(SysKeyboardImpl,iface);
SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
TRACE("(this=%p,0x%08lx)\n",This,(DWORD)hnd);
......@@ -562,7 +562,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetCapabilities(
LPDIRECTINPUTDEVICE8A iface,
LPDIDEVCAPS lpDIDevCaps)
{
ICOM_THIS(SysKeyboardImpl,iface);
SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
TRACE("(this=%p,%p)\n",This,lpDIDevCaps);
......@@ -599,7 +599,7 @@ SysKeyboardAImpl_GetObjectInfo(
DWORD dwObj,
DWORD dwHow)
{
ICOM_THIS(SysKeyboardImpl,iface);
SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
DIDEVICEOBJECTINSTANCEA ddoi;
DWORD dwSize = pdidoi->dwSize;
......@@ -632,7 +632,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface
DWORD dwObj,
DWORD dwHow)
{
ICOM_THIS(SysKeyboardImpl,iface);
SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
DIDEVICEOBJECTINSTANCEW ddoi;
DWORD dwSize = pdidoi->dwSize;
......@@ -667,7 +667,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceInfo(
LPDIRECTINPUTDEVICE8A iface,
LPDIDEVICEINSTANCEA pdidi)
{
ICOM_THIS(SysKeyboardImpl,iface);
SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
TRACE("(this=%p,%p)\n", This, pdidi);
if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEA)) {
......@@ -682,7 +682,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceInfo(
static HRESULT WINAPI SysKeyboardWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEINSTANCEW pdidi)
{
ICOM_THIS(SysKeyboardImpl,iface);
SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
TRACE("(this=%p,%p)\n", This, pdidi);
if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEW)) {
......
dlls/dinput/mouse.c
View file @ 314b99c4
......@@ -318,7 +318,7 @@ DECL_GLOBAL_CONSTRUCTOR(mousedev_register) { dinput_register_device(&mousedev);
*/
static ULONG WINAPI SysMouseAImpl_Release(LPDIRECTINPUTDEVICE8A iface)
{
ICOM_THIS(SysMouseImpl,iface);
SysMouseImpl *This = (SysMouseImpl *)iface;
This->ref--;
if (This->ref)
......@@ -354,7 +354,7 @@ static HRESULT WINAPI SysMouseAImpl_SetCooperativeLevel(
LPDIRECTINPUTDEVICE8A iface,HWND hwnd,DWORD dwflags
)
{
ICOM_THIS(SysMouseImpl,iface);
SysMouseImpl *This = (SysMouseImpl *)iface;
TRACE("(this=%p,0x%08lx,0x%08lx)\n",This,(DWORD)hwnd,dwflags);
......@@ -384,7 +384,7 @@ static HRESULT WINAPI SysMouseAImpl_SetDataFormat(
LPDIRECTINPUTDEVICE8A iface,LPCDIDATAFORMAT df
)
{
ICOM_THIS(SysMouseImpl,iface);
SysMouseImpl *This = (SysMouseImpl *)iface;
TRACE("(this=%p,%p)\n",This,df);
......@@ -572,7 +572,7 @@ static void dinput_window_check(SysMouseImpl* This) {
*/
static HRESULT WINAPI SysMouseAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
{
ICOM_THIS(SysMouseImpl,iface);
SysMouseImpl *This = (SysMouseImpl *)iface;
RECT rect;
TRACE("(this=%p)\n",This);
......@@ -635,7 +635,7 @@ static HRESULT WINAPI SysMouseAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
*/
static HRESULT WINAPI SysMouseAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
{
ICOM_THIS(SysMouseImpl,iface);
SysMouseImpl *This = (SysMouseImpl *)iface;
TRACE("(this=%p)\n",This);
......@@ -676,7 +676,7 @@ static HRESULT WINAPI SysMouseAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
static HRESULT WINAPI SysMouseAImpl_GetDeviceState(
LPDIRECTINPUTDEVICE8A iface,DWORD len,LPVOID ptr
) {
ICOM_THIS(SysMouseImpl,iface);
SysMouseImpl *This = (SysMouseImpl *)iface;
EnterCriticalSection(&(This->crit));
TRACE("(this=%p,0x%08lx,%p): \n",This,len,ptr);
......@@ -722,7 +722,7 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A iface,
LPDWORD entries,
DWORD flags
) {
ICOM_THIS(SysMouseImpl,iface);
SysMouseImpl *This = (SysMouseImpl *)iface;
DWORD len;
int nqtail;
......@@ -799,7 +799,7 @@ static HRESULT WINAPI SysMouseAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface,
REFGUID rguid,
LPCDIPROPHEADER ph)
{
ICOM_THIS(SysMouseImpl,iface);
SysMouseImpl *This = (SysMouseImpl *)iface;
TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(rguid),ph);
......@@ -839,7 +839,7 @@ static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface,
REFGUID rguid,
LPDIPROPHEADER pdiph)
{
ICOM_THIS(SysMouseImpl,iface);
SysMouseImpl *This = (SysMouseImpl *)iface;
TRACE("(this=%p,%s,%p): stub!\n",
iface, debugstr_guid(rguid), pdiph);
......@@ -898,7 +898,7 @@ static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface,
*/
static HRESULT WINAPI SysMouseAImpl_SetEventNotification(LPDIRECTINPUTDEVICE8A iface,
HANDLE hnd) {
ICOM_THIS(SysMouseImpl,iface);
SysMouseImpl *This = (SysMouseImpl *)iface;
TRACE("(this=%p,0x%08lx)\n",This,(DWORD)hnd);
......@@ -914,7 +914,7 @@ static HRESULT WINAPI SysMouseAImpl_GetCapabilities(
LPDIRECTINPUTDEVICE8A iface,
LPDIDEVCAPS lpDIDevCaps)
{
ICOM_THIS(SysMouseImpl,iface);
SysMouseImpl *This = (SysMouseImpl *)iface;
TRACE("(this=%p,%p)\n",This,lpDIDevCaps);
......@@ -950,7 +950,7 @@ static HRESULT WINAPI SysMouseAImpl_EnumObjects(
LPVOID lpvRef,
DWORD dwFlags)
{
ICOM_THIS(SysMouseImpl,iface);
SysMouseImpl *This = (SysMouseImpl *)iface;
DIDEVICEOBJECTINSTANCEA ddoi;
TRACE("(this=%p,%p,%p,%08lx)\n", This, lpCallback, lpvRef, dwFlags);
......@@ -1023,7 +1023,7 @@ static HRESULT WINAPI SysMouseAImpl_EnumObjects(
static HRESULT WINAPI SysMouseWImpl_EnumObjects(LPDIRECTINPUTDEVICE8W iface, LPDIENUMDEVICEOBJECTSCALLBACKW lpCallback, LPVOID lpvRef,DWORD dwFlags)
{
ICOM_THIS(SysMouseImpl,iface);
SysMouseImpl *This = (SysMouseImpl *)iface;
device_enumobjects_AtoWcb_data data;
......@@ -1040,7 +1040,7 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceInfo(
LPDIRECTINPUTDEVICE8A iface,
LPDIDEVICEINSTANCEA pdidi)
{
ICOM_THIS(SysMouseImpl,iface);
SysMouseImpl *This = (SysMouseImpl *)iface;
TRACE("(this=%p,%p)\n", This, pdidi);
if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEA)) {
......@@ -1055,7 +1055,7 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceInfo(
static HRESULT WINAPI SysMouseWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEINSTANCEW pdidi)
{
ICOM_THIS(SysMouseImpl,iface);
SysMouseImpl *This = (SysMouseImpl *)iface;
TRACE("(this=%p,%p)\n", This, pdidi);
if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEW)) {
......
dlls/dsound/dsound_main.c
View file @ 314b99c4
......@@ -438,7 +438,7 @@ HRESULT WINAPI DirectSoundEnumerateW(
static HRESULT WINAPI
DSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface);
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj);
return E_NOINTERFACE;
......@@ -446,13 +446,13 @@ DSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
static ULONG WINAPI
DSCF_AddRef(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface);
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE("(%p) ref was %ld\n", This, This->ref);
return ++(This->ref);
}
static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface);
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
/* static class, won't be freed */
TRACE("(%p) ref was %ld\n", This, This->ref);
return --(This->ref);
......@@ -461,7 +461,7 @@ static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) {
static HRESULT WINAPI DSCF_CreateInstance(
LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj
) {
ICOM_THIS(IClassFactoryImpl,iface);
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj);
if (ppobj == NULL) {
......@@ -482,7 +482,7 @@ static HRESULT WINAPI DSCF_CreateInstance(
}
static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface);
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p)->(%d),stub!\n",This,dolock);
return S_OK;
}
......@@ -503,7 +503,7 @@ static IClassFactoryImpl DSOUND_CF = { &DSCF_Vtbl, 1 };
static HRESULT WINAPI
DSPCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface);
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj);
return E_NOINTERFACE;
......@@ -511,14 +511,14 @@ DSPCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
static ULONG WINAPI
DSPCF_AddRef(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface);
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE("(%p) ref was %ld\n", This, This->ref);
return ++(This->ref);
}
static ULONG WINAPI
DSPCF_Release(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface);
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
/* static class, won't be freed */
TRACE("(%p) ref was %ld\n", This, This->ref);
return --(This->ref);
......@@ -528,7 +528,7 @@ static HRESULT WINAPI
DSPCF_CreateInstance(
LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj
) {
ICOM_THIS(IClassFactoryImpl,iface);
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj);
if (ppobj == NULL) {
......@@ -548,7 +548,7 @@ DSPCF_CreateInstance(
static HRESULT WINAPI
DSPCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface);
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p)->(%d),stub!\n",This,dolock);
return S_OK;
}
......
dlls/dsound/primary.c
View file @ 314b99c4
......@@ -337,7 +337,7 @@ HRESULT DSOUND_PrimaryGetPosition(IDirectSoundImpl *This, LPDWORD playpos, LPDWO
static HRESULT WINAPI PrimaryBufferImpl_SetFormat(
LPDIRECTSOUNDBUFFER8 iface,LPCWAVEFORMATEX wfex
) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
IDirectSoundImpl* dsound = This->dsound;
HRESULT err = DS_OK;
int i, alloc_size, cp_size;
......@@ -446,7 +446,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetFormat(
static HRESULT WINAPI PrimaryBufferImpl_SetVolume(
LPDIRECTSOUNDBUFFER8 iface,LONG vol
) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
IDirectSoundImpl* dsound = This->dsound;
DWORD ampfactors;
DSVOLUMEPAN volpan;
......@@ -493,7 +493,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetVolume(
static HRESULT WINAPI PrimaryBufferImpl_GetVolume(
LPDIRECTSOUNDBUFFER8 iface,LPLONG vol
) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
DWORD ampfactors;
DSVOLUMEPAN volpan;
TRACE("(%p,%p)\n",This,vol);
......@@ -519,7 +519,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetVolume(
static HRESULT WINAPI PrimaryBufferImpl_SetFrequency(
LPDIRECTSOUNDBUFFER8 iface,DWORD freq
) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
TRACE("(%p,%ld)\n",This,freq);
......@@ -531,7 +531,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetFrequency(
static HRESULT WINAPI PrimaryBufferImpl_Play(
LPDIRECTSOUNDBUFFER8 iface,DWORD reserved1,DWORD reserved2,DWORD flags
) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
IDirectSoundImpl* dsound = This->dsound;
TRACE("(%p,%08lx,%08lx,%08lx)\n",
......@@ -559,7 +559,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Play(
static HRESULT WINAPI PrimaryBufferImpl_Stop(LPDIRECTSOUNDBUFFER8 iface)
{
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
IDirectSoundImpl* dsound = This->dsound;
TRACE("(%p)\n",This);
......@@ -579,7 +579,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Stop(LPDIRECTSOUNDBUFFER8 iface)
}
static DWORD WINAPI PrimaryBufferImpl_AddRef(LPDIRECTSOUNDBUFFER8 iface) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
DWORD ref;
TRACE("(%p) ref was %ld, thread is %04lx\n",This, This->ref, GetCurrentThreadId());
......@@ -589,7 +589,7 @@ static DWORD WINAPI PrimaryBufferImpl_AddRef(LPDIRECTSOUNDBUFFER8 iface) {
}
static DWORD WINAPI PrimaryBufferImpl_Release(LPDIRECTSOUNDBUFFER8 iface) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
DWORD ref;
TRACE("(%p) ref was %ld, thread is %04lx\n",This, This->ref, GetCurrentThreadId());
......@@ -608,7 +608,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCurrentPosition(
LPDIRECTSOUNDBUFFER8 iface,LPDWORD playpos,LPDWORD writepos
) {
HRESULT hres;
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
IDirectSoundImpl* dsound = This->dsound;
TRACE("(%p,%p,%p)\n",This,playpos,writepos);
......@@ -630,7 +630,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCurrentPosition(
static HRESULT WINAPI PrimaryBufferImpl_GetStatus(
LPDIRECTSOUNDBUFFER8 iface,LPDWORD status
) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
TRACE("(%p,%p), thread is %04lx\n",This,status,GetCurrentThreadId());
if (status == NULL) {
......@@ -655,7 +655,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetFormat(
LPDWORD wfwritten)
{
DWORD size;
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
TRACE("(%p,%p,%ld,%p)\n",This,lpwf,wfsize,wfwritten);
size = sizeof(WAVEFORMATEX) + This->dsound->pwfx->cbSize;
......@@ -686,7 +686,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetFormat(
static HRESULT WINAPI PrimaryBufferImpl_Lock(
LPDIRECTSOUNDBUFFER8 iface,DWORD writecursor,DWORD writebytes,LPVOID lplpaudioptr1,LPDWORD audiobytes1,LPVOID lplpaudioptr2,LPDWORD audiobytes2,DWORD flags
) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
IDirectSoundImpl* dsound = This->dsound;
TRACE("(%p,%ld,%ld,%p,%p,%p,%p,0x%08lx) at %ld\n",
......@@ -760,7 +760,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Lock(
static HRESULT WINAPI PrimaryBufferImpl_SetCurrentPosition(
LPDIRECTSOUNDBUFFER8 iface,DWORD newpos
) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
TRACE("(%p,%ld)\n",This,newpos);
/* You cannot set the position of the primary buffer */
......@@ -771,7 +771,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetCurrentPosition(
static HRESULT WINAPI PrimaryBufferImpl_SetPan(
LPDIRECTSOUNDBUFFER8 iface,LONG pan
) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
IDirectSoundImpl* dsound = This->dsound;
DWORD ampfactors;
DSVOLUMEPAN volpan;
......@@ -819,7 +819,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetPan(
static HRESULT WINAPI PrimaryBufferImpl_GetPan(
LPDIRECTSOUNDBUFFER8 iface,LPLONG pan
) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
DWORD ampfactors;
DSVOLUMEPAN volpan;
TRACE("(%p,%p)\n",This,pan);
......@@ -845,7 +845,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetPan(
static HRESULT WINAPI PrimaryBufferImpl_Unlock(
LPDIRECTSOUNDBUFFER8 iface,LPVOID p1,DWORD x1,LPVOID p2,DWORD x2
) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
IDirectSoundImpl* dsound = This->dsound;
TRACE("(%p,%p,%ld,%p,%ld)\n", This,p1,x1,p2,x2);
......@@ -871,7 +871,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Unlock(
static HRESULT WINAPI PrimaryBufferImpl_Restore(
LPDIRECTSOUNDBUFFER8 iface
) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
FIXME("(%p):stub\n",This);
return DS_OK;
}
......@@ -879,7 +879,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Restore(
static HRESULT WINAPI PrimaryBufferImpl_GetFrequency(
LPDIRECTSOUNDBUFFER8 iface,LPDWORD freq
) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
TRACE("(%p,%p)\n",This,freq);
if (freq == NULL) {
......@@ -901,7 +901,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetFrequency(
static HRESULT WINAPI PrimaryBufferImpl_SetFX(
LPDIRECTSOUNDBUFFER8 iface,DWORD dwEffectsCount,LPDSEFFECTDESC pDSFXDesc,LPDWORD pdwResultCodes
) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
DWORD u;
FIXME("(%p,%lu,%p,%p): stub\n",This,dwEffectsCount,pDSFXDesc,pdwResultCodes);
......@@ -916,7 +916,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetFX(
static HRESULT WINAPI PrimaryBufferImpl_AcquireResources(
LPDIRECTSOUNDBUFFER8 iface,DWORD dwFlags,DWORD dwEffectsCount,LPDWORD pdwResultCodes
) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
DWORD u;
FIXME("(%p,%08lu,%lu,%p): stub\n",This,dwFlags,dwEffectsCount,pdwResultCodes);
......@@ -931,7 +931,7 @@ static HRESULT WINAPI PrimaryBufferImpl_AcquireResources(
static HRESULT WINAPI PrimaryBufferImpl_GetObjectInPath(
LPDIRECTSOUNDBUFFER8 iface,REFGUID rguidObject,DWORD dwIndex,REFGUID rguidInterface,LPVOID* ppObject
) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
FIXME("(%p,%s,%lu,%s,%p): stub\n",This,debugstr_guid(rguidObject),dwIndex,debugstr_guid(rguidInterface),ppObject);
......@@ -942,7 +942,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetObjectInPath(
static HRESULT WINAPI PrimaryBufferImpl_Initialize(
LPDIRECTSOUNDBUFFER8 iface,LPDIRECTSOUND dsound,LPCDSBUFFERDESC dbsd
) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
FIXME("(%p,%p,%p):stub\n",This,dsound,dbsd);
DPRINTF("Re-Init!!!\n");
WARN("already initialized\n");
......@@ -952,7 +952,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Initialize(
static HRESULT WINAPI PrimaryBufferImpl_GetCaps(
LPDIRECTSOUNDBUFFER8 iface,LPDSBCAPS caps
) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
TRACE("(%p)->(%p)\n",This,caps);
if (caps == NULL) {
......@@ -984,7 +984,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCaps(
static HRESULT WINAPI PrimaryBufferImpl_QueryInterface(
LPDIRECTSOUNDBUFFER8 iface,REFIID riid,LPVOID *ppobj
) {
ICOM_THIS(PrimaryBufferImpl,iface);
PrimaryBufferImpl *This = (PrimaryBufferImpl *)iface;
TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj);
if (ppobj == NULL) {
......
dlls/dsound/propset.c
View file @ 314b99c4
......@@ -65,7 +65,7 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_QueryInterface(
REFIID riid,
LPVOID *ppobj )
{
ICOM_THIS(IKsBufferPropertySetImpl,iface);
IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface;
TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj);
return IDirectSoundBuffer_QueryInterface((LPDIRECTSOUNDBUFFER8)This->dsb, riid, ppobj);
......@@ -73,7 +73,7 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_QueryInterface(
static ULONG WINAPI IKsBufferPropertySetImpl_AddRef(LPKSPROPERTYSET iface)
{
ICOM_THIS(IKsBufferPropertySetImpl,iface);
IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface;
ULONG ulReturn;
TRACE("(%p) ref was %ld\n", This, This->ref);
......@@ -83,7 +83,7 @@ static ULONG WINAPI IKsBufferPropertySetImpl_AddRef(LPKSPROPERTYSET iface)
static ULONG WINAPI IKsBufferPropertySetImpl_Release(LPKSPROPERTYSET iface)
{
ICOM_THIS(IKsBufferPropertySetImpl,iface);
IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface;
ULONG ulReturn;
TRACE("(%p) ref was %ld\n", This, This->ref);
......@@ -107,7 +107,7 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_Get(
ULONG cbPropData,
PULONG pcbReturned )
{
ICOM_THIS(IKsBufferPropertySetImpl,iface);
IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface;
PIDSDRIVERPROPERTYSET ps;
TRACE("(iface=%p,guidPropSet=%s,dwPropID=%ld,pInstanceData=%p,cbInstanceData=%ld,pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData,pcbReturned);
......@@ -142,7 +142,7 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_Set(
LPVOID pPropData,
ULONG cbPropData )
{
ICOM_THIS(IKsBufferPropertySetImpl,iface);
IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface;
PIDSDRIVERPROPERTYSET ps;
TRACE("(%p,%s,%ld,%p,%ld,%p,%ld)\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData);
......@@ -172,7 +172,7 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_QuerySupport(
ULONG dwPropID,
PULONG pTypeSupport )
{
ICOM_THIS(IKsBufferPropertySetImpl,iface);
IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface;
PIDSDRIVERPROPERTYSET ps;
TRACE("(%p,%s,%ld,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport);
......@@ -239,7 +239,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QueryInterface(
REFIID riid,
LPVOID *ppobj )
{
ICOM_THIS(IKsPrivatePropertySetImpl,iface);
IKsPrivatePropertySetImpl *This = (IKsPrivatePropertySetImpl *)iface;
TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj);
*ppobj = NULL;
......@@ -248,7 +248,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QueryInterface(
static ULONG WINAPI IKsPrivatePropertySetImpl_AddRef(LPKSPROPERTYSET iface)
{
ICOM_THIS(IKsPrivatePropertySetImpl,iface);
IKsPrivatePropertySetImpl *This = (IKsPrivatePropertySetImpl *)iface;
ULONG ulReturn;
TRACE("(%p) ref was %ld\n", This, This->ref);
......@@ -258,7 +258,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_AddRef(LPKSPROPERTYSET iface)
static ULONG WINAPI IKsPrivatePropertySetImpl_Release(LPKSPROPERTYSET iface)
{
ICOM_THIS(IKsPrivatePropertySetImpl,iface);
IKsPrivatePropertySetImpl *This = (IKsPrivatePropertySetImpl *)iface;
ULONG ulReturn;
TRACE("(%p) ref was %ld\n", This, This->ref);
......@@ -988,7 +988,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Get(
ULONG cbPropData,
PULONG pcbReturned
) {
ICOM_THIS(IKsPrivatePropertySetImpl,iface);
IKsPrivatePropertySetImpl *This = (IKsPrivatePropertySetImpl *)iface;
TRACE("(iface=%p,guidPropSet=%s,dwPropID=%ld,pInstanceData=%p,cbInstanceData=%ld,pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData,pcbReturned);
......@@ -1035,7 +1035,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Set(
LPVOID pPropData,
ULONG cbPropData )
{
ICOM_THIS(IKsPrivatePropertySetImpl,iface);
IKsPrivatePropertySetImpl *This = (IKsPrivatePropertySetImpl *)iface;
FIXME("(%p,%s,%ld,%p,%ld,%p,%ld), stub!\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData);
return E_PROP_ID_UNSUPPORTED;
......@@ -1047,7 +1047,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QuerySupport(
ULONG dwPropID,
PULONG pTypeSupport )
{
ICOM_THIS(IKsPrivatePropertySetImpl,iface);
IKsPrivatePropertySetImpl *This = (IKsPrivatePropertySetImpl *)iface;
TRACE("(%p,%s,%ld,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport);
if ( IsEqualGUID( &DSPROPSETID_DirectSoundDevice, guidPropSet) ) {
......
dlls/shell32/autocomplete.c
View file @ 314b99c4
......@@ -132,7 +132,7 @@ static HRESULT WINAPI IAutoComplete_fnQueryInterface(
REFIID riid,
LPVOID *ppvObj)
{
ICOM_THIS(IAutoCompleteImpl, iface);
IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface;
TRACE("(%p)->(\n\tIID:\t%s,%p)\n", This, shdebugstr_guid(riid), ppvObj);
*ppvObj = NULL;
......@@ -166,7 +166,7 @@ static HRESULT WINAPI IAutoComplete_fnQueryInterface(
static ULONG WINAPI IAutoComplete_fnAddRef(
IAutoComplete * iface)
{
ICOM_THIS(IAutoCompleteImpl,iface);
IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface;
TRACE("(%p)->(%lu)\n",This,This->ref);
return ++(This->ref);
......@@ -178,7 +178,7 @@ static ULONG WINAPI IAutoComplete_fnAddRef(
static ULONG WINAPI IAutoComplete_fnRelease(
IAutoComplete * iface)
{
ICOM_THIS(IAutoCompleteImpl,iface);
IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface;
TRACE("(%p)->(%lu)\n",This,This->ref);
......@@ -205,7 +205,7 @@ static HRESULT WINAPI IAutoComplete_fnEnable(
IAutoComplete * iface,
BOOL fEnable)
{
ICOM_THIS(IAutoCompleteImpl, iface);
IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface;
HRESULT hr = S_OK;
......@@ -226,7 +226,7 @@ static HRESULT WINAPI IAutoComplete_fnInit(
LPCOLESTR pwzsRegKeyPath,
LPCOLESTR pwszQuickComplete)
{
ICOM_THIS(IAutoCompleteImpl, iface);
IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface;
static const WCHAR lbName[] = {'L','i','s','t','B','o','x',0};
TRACE("(%p)->(0x%08lx, %p, %s, %s)\n",
......@@ -447,7 +447,7 @@ static IAutoComplete2Vtbl ac2vt =
*/
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;
HRESULT hr;
WCHAR hwndText[255];
......@@ -617,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)
{
ICOM_THIS(IAutoCompleteImpl, GetWindowLongPtrW(hwnd, GWLP_USERDATA));
IAutoCompleteImpl *This = (IAutoCompleteImpl *)GetWindowLongPtrW(hwnd, GWLP_USERDATA);
WCHAR *msg;
int sel = -1, len;
......
dlls/shell32/cpanelfolder.c
View file @ 314b99c4
......@@ -151,7 +151,7 @@ HRESULT WINAPI IControlPanel_Constructor(IUnknown* pUnkOuter, REFIID riid, LPVOI
*/
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);
......@@ -179,7 +179,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnQueryInterface(IShellFolder2 * iface, R
static ULONG WINAPI ISF_ControlPanel_fnAddRef(IShellFolder2 * iface)
{
ICOM_THIS(ICPanelImpl, iface);
ICPanelImpl *This = (ICPanelImpl *)iface;
TRACE("(%p)->(count=%lu)\n", This, This->ref);
......@@ -188,7 +188,7 @@ static ULONG WINAPI ISF_ControlPanel_fnAddRef(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);
......@@ -212,7 +212,7 @@ ISF_ControlPanel_fnParseDisplayName(IShellFolder2 * iface,
LPOLESTR lpszDisplayName,
DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes)
{
ICOM_THIS(ICPanelImpl, iface);
ICPanelImpl *This = (ICPanelImpl *)iface;
HRESULT hr = E_INVALIDARG;
......@@ -447,7 +447,7 @@ static BOOL CreateCPanelEnumList(
static HRESULT WINAPI
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);
......@@ -467,7 +467,7 @@ static HRESULT WINAPI
ISF_ControlPanel_fnBindToObject(IShellFolder2 * iface, LPCITEMIDLIST pidl,
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);
......@@ -481,7 +481,7 @@ static HRESULT WINAPI
ISF_ControlPanel_fnBindToStorage(IShellFolder2 * iface,
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);
......@@ -496,7 +496,7 @@ ISF_ControlPanel_fnBindToStorage(IShellFolder2 * iface,
static HRESULT WINAPI
ISF_ControlPanel_fnCompareIDs(IShellFolder2 * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2)
{
ICOM_THIS(ICPanelImpl, iface);
ICPanelImpl *This = (ICPanelImpl *)iface;
int nReturn;
......@@ -512,7 +512,7 @@ ISF_ControlPanel_fnCompareIDs(IShellFolder2 * iface, LPARAM lParam, LPCITEMIDLIS
static HRESULT WINAPI
ISF_ControlPanel_fnCreateViewObject(IShellFolder2 * iface, HWND hwndOwner, REFIID riid, LPVOID * ppvOut)
{
ICOM_THIS(ICPanelImpl, iface);
ICPanelImpl *This = (ICPanelImpl *)iface;
LPSHELLVIEW pShellView;
HRESULT hr = E_INVALIDARG;
......@@ -546,7 +546,7 @@ ISF_ControlPanel_fnCreateViewObject(IShellFolder2 * iface, HWND hwndOwner, REFII
static HRESULT WINAPI
ISF_ControlPanel_fnGetAttributesOf(IShellFolder2 * iface, UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut)
{
ICOM_THIS(ICPanelImpl, iface);
ICPanelImpl *This = (ICPanelImpl *)iface;
HRESULT hr = S_OK;
......@@ -586,7 +586,7 @@ ISF_ControlPanel_fnGetUIObjectOf(IShellFolder2 * iface,
HWND hwndOwner,
UINT cidl, LPCITEMIDLIST * apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut)
{
ICOM_THIS(ICPanelImpl, iface);
ICPanelImpl *This = (ICPanelImpl *)iface;
LPITEMIDLIST pidl;
IUnknown *pObj = NULL;
......@@ -637,7 +637,7 @@ ISF_ControlPanel_fnGetUIObjectOf(IShellFolder2 * iface,
*/
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];
PIDLCPanelStruct* pcpanel;
......@@ -702,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 */
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);
return E_FAIL;
}
static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultSearchGUID(IShellFolder2 * iface, GUID * pguid)
{
ICOM_THIS(ICPanelImpl, iface);
ICPanelImpl *This = (ICPanelImpl *)iface;
FIXME("(%p)\n", This);
return E_NOTIMPL;
}
static HRESULT WINAPI ISF_ControlPanel_fnEnumSearches(IShellFolder2 * iface, IEnumExtraSearch ** ppenum)
{
ICOM_THIS(ICPanelImpl, iface);
ICPanelImpl *This = (ICPanelImpl *)iface;
FIXME("(%p)\n", This);
return E_NOTIMPL;
}
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);
......@@ -731,7 +731,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultColumn(IShellFolder2 * iface,
}
static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultColumnState(IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags)
{
ICOM_THIS(ICPanelImpl, iface);
ICPanelImpl *This = (ICPanelImpl *)iface;
TRACE("(%p)\n", This);
......@@ -741,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)
{
ICOM_THIS(ICPanelImpl, iface);
ICPanelImpl *This = (ICPanelImpl *)iface;
FIXME("(%p)\n", This);
return E_NOTIMPL;
}
static HRESULT WINAPI ISF_ControlPanel_fnGetDetailsOf(IShellFolder2 * iface, LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd)
{
ICOM_THIS(ICPanelImpl, iface);
ICPanelImpl *This = (ICPanelImpl *)iface;
HRESULT hr;
TRACE("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd);
......@@ -780,7 +780,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetDetailsOf(IShellFolder2 * iface, LPC
}
static HRESULT WINAPI ISF_ControlPanel_fnMapColumnToSCID(IShellFolder2 * iface, UINT column, SHCOLUMNID * pscid)
{
ICOM_THIS(ICPanelImpl, iface);
ICPanelImpl *This = (ICPanelImpl *)iface;
FIXME("(%p)\n", This);
return E_NOTIMPL;
}
......@@ -962,7 +962,7 @@ static ULONG STDMETHODCALLTYPE IShellExecuteHookW_fnRelease(IShellExecuteHookW*
static HRESULT WINAPI IShellExecuteHookW_fnExecute(IShellExecuteHookW* iface, LPSHELLEXECUTEINFOW psei)
{
ICOM_THIS(ICPanelImpl, iface);
ICPanelImpl *This = (ICPanelImpl *)iface;
SHELLEXECUTEINFOW sei_tmp;
PIDLCPanelStruct* pcpanel;
......@@ -1044,7 +1044,7 @@ static ULONG STDMETHODCALLTYPE IShellExecuteHookA_fnRelease(IShellExecuteHookA*
static HRESULT WINAPI IShellExecuteHookA_fnExecute(IShellExecuteHookA* iface, LPSHELLEXECUTEINFOA psei)
{
ICOM_THIS(ICPanelImpl, iface);
ICPanelImpl *This = (ICPanelImpl *)iface;
SHELLEXECUTEINFOA sei_tmp;
PIDLCPanelStruct* pcpanel;
......
dlls/shell32/dataobject.c
View file @ 314b99c4
......@@ -94,7 +94,7 @@ LPENUMFORMATETC IEnumFORMATETC_Constructor(UINT cfmt, const FORMATETC afmt[])
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);
*ppvObj = NULL;
......@@ -121,14 +121,14 @@ static HRESULT WINAPI IEnumFORMATETC_fnQueryInterface(LPENUMFORMATETC iface, REF
static ULONG WINAPI IEnumFORMATETC_fnAddRef(LPENUMFORMATETC iface)
{
ICOM_THIS(IEnumFORMATETCImpl,iface);
IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface;
TRACE("(%p)->(count=%lu)\n",This, This->ref);
return ++(This->ref);
}
static ULONG WINAPI IEnumFORMATETC_fnRelease(LPENUMFORMATETC iface)
{
ICOM_THIS(IEnumFORMATETCImpl,iface);
IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface;
TRACE("(%p)->()\n",This);
if (!--(This->ref))
......@@ -146,7 +146,7 @@ static ULONG WINAPI IEnumFORMATETC_fnRelease(LPENUMFORMATETC iface)
static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, FORMATETC *rgelt, ULONG *pceltFethed)
{
ICOM_THIS(IEnumFORMATETCImpl,iface);
IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface;
UINT i;
TRACE("(%p)->(%lu,%p)\n", This, celt, rgelt);
......@@ -167,7 +167,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, F
static HRESULT WINAPI IEnumFORMATETC_fnSkip(LPENUMFORMATETC iface, ULONG celt)
{
ICOM_THIS(IEnumFORMATETCImpl,iface);
IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface;
TRACE("(%p)->(num=%lu)\n", This, celt);
if((This->posFmt + celt) >= This->countFmt) return S_FALSE;
......@@ -177,7 +177,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnSkip(LPENUMFORMATETC iface, ULONG celt)
static HRESULT WINAPI IEnumFORMATETC_fnReset(LPENUMFORMATETC iface)
{
ICOM_THIS(IEnumFORMATETCImpl,iface);
IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface;
TRACE("(%p)->()\n", This);
This->posFmt = 0;
......@@ -186,7 +186,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnReset(LPENUMFORMATETC iface)
static HRESULT WINAPI IEnumFORMATETC_fnClone(LPENUMFORMATETC iface, LPENUMFORMATETC* ppenum)
{
ICOM_THIS(IEnumFORMATETCImpl,iface);
IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface;
TRACE("(%p)->(ppenum=%p)\n", This, ppenum);
if (!ppenum) return E_INVALIDARG;
......@@ -259,7 +259,7 @@ LPDATAOBJECT IDataObject_Constructor(HWND hwndOwner, LPCITEMIDLIST pMyPidl, LPCI
*/
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);
*ppvObj = NULL;
......@@ -288,7 +288,7 @@ static HRESULT WINAPI IDataObject_fnQueryInterface(LPDATAOBJECT iface, REFIID ri
*/
static ULONG WINAPI IDataObject_fnAddRef(LPDATAOBJECT iface)
{
ICOM_THIS(IDataObjectImpl,iface);
IDataObjectImpl *This = (IDataObjectImpl *)iface;
TRACE("(%p)->(count=%lu)\n",This, This->ref);
return ++(This->ref);
}
......@@ -298,7 +298,7 @@ static ULONG WINAPI IDataObject_fnAddRef(LPDATAOBJECT iface)
*/
static ULONG WINAPI IDataObject_fnRelease(LPDATAOBJECT iface)
{
ICOM_THIS(IDataObjectImpl,iface);
IDataObjectImpl *This = (IDataObjectImpl *)iface;
TRACE("(%p)->()\n",This);
if (!--(This->ref))
......@@ -317,7 +317,7 @@ static ULONG WINAPI IDataObject_fnRelease(LPDATAOBJECT iface)
*/
static HRESULT WINAPI IDataObject_fnGetData(LPDATAOBJECT iface, LPFORMATETC pformatetcIn, STGMEDIUM *pmedium)
{
ICOM_THIS(IDataObjectImpl,iface);
IDataObjectImpl *This = (IDataObjectImpl *)iface;
char szTemp[256];
......@@ -361,14 +361,14 @@ static HRESULT WINAPI IDataObject_fnGetData(LPDATAOBJECT iface, LPFORMATETC pfor
static HRESULT WINAPI IDataObject_fnGetDataHere(LPDATAOBJECT iface, LPFORMATETC pformatetc, STGMEDIUM *pmedium)
{
ICOM_THIS(IDataObjectImpl,iface);
IDataObjectImpl *This = (IDataObjectImpl *)iface;
FIXME("(%p)->()\n", This);
return E_NOTIMPL;
}
static HRESULT WINAPI IDataObject_fnQueryGetData(LPDATAOBJECT iface, LPFORMATETC pformatetc)
{
ICOM_THIS(IDataObjectImpl,iface);
IDataObjectImpl *This = (IDataObjectImpl *)iface;
UINT i;
TRACE("(%p)->(fmt=0x%08x tym=0x%08lx)\n", This, pformatetc->cfFormat, pformatetc->tymed);
......@@ -391,21 +391,21 @@ static HRESULT WINAPI IDataObject_fnQueryGetData(LPDATAOBJECT iface, LPFORMATETC
static HRESULT WINAPI IDataObject_fnGetCanonicalFormatEtc(LPDATAOBJECT iface, LPFORMATETC pformatectIn, LPFORMATETC pformatetcOut)
{
ICOM_THIS(IDataObjectImpl,iface);
IDataObjectImpl *This = (IDataObjectImpl *)iface;
FIXME("(%p)->()\n", This);
return E_NOTIMPL;
}
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);
return E_NOTIMPL;
}
static HRESULT WINAPI IDataObject_fnEnumFormatEtc(LPDATAOBJECT iface, DWORD dwDirection, IEnumFORMATETC **ppenumFormatEtc)
{
ICOM_THIS(IDataObjectImpl,iface);
IDataObjectImpl *This = (IDataObjectImpl *)iface;
TRACE("(%p)->()\n", This);
*ppenumFormatEtc=NULL;
......@@ -422,19 +422,19 @@ static HRESULT WINAPI IDataObject_fnEnumFormatEtc(LPDATAOBJECT iface, DWORD dwDi
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);
return E_NOTIMPL;
}
static HRESULT WINAPI IDataObject_fnDUnadvise(LPDATAOBJECT iface, DWORD dwConnection)
{
ICOM_THIS(IDataObjectImpl,iface);
IDataObjectImpl *This = (IDataObjectImpl *)iface;
FIXME("(%p)->()\n", This);
return E_NOTIMPL;
}
static HRESULT WINAPI IDataObject_fnEnumDAdvise(LPDATAOBJECT iface, IEnumSTATDATA **ppenumAdvise)
{
ICOM_THIS(IDataObjectImpl,iface);
IDataObjectImpl *This = (IDataObjectImpl *)iface;
FIXME("(%p)->()\n", This);
return E_NOTIMPL;
}
......
dlls/shell32/enumidlist.c
View file @ 314b99c4
......@@ -62,7 +62,7 @@ BOOL AddToEnumList(
IEnumIDList * iface,
LPITEMIDLIST pidl)
{
ICOM_THIS(IEnumIDListImpl,iface);
IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
LPENUMLIST pNew;
......@@ -167,7 +167,7 @@ BOOL CreateFolderEnumList(
static BOOL DeleteList(
IEnumIDList * iface)
{
ICOM_THIS(IEnumIDListImpl,iface);
IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
LPENUMLIST pDelete;
......@@ -211,7 +211,7 @@ static HRESULT WINAPI IEnumIDList_fnQueryInterface(
REFIID riid,
LPVOID *ppvObj)
{
ICOM_THIS(IEnumIDListImpl,iface);
IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
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(
IEnumIDList * iface)
{
ICOM_THIS(IEnumIDListImpl,iface);
IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
TRACE("(%p)->(%lu)\n",This,This->ref);
return ++(This->ref);
}
......@@ -250,7 +250,7 @@ static ULONG WINAPI IEnumIDList_fnAddRef(
static ULONG WINAPI IEnumIDList_fnRelease(
IEnumIDList * iface)
{
ICOM_THIS(IEnumIDListImpl,iface);
IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
TRACE("(%p)->(%lu)\n",This,This->ref);
......@@ -273,7 +273,7 @@ static HRESULT WINAPI IEnumIDList_fnNext(
LPITEMIDLIST * rgelt,
ULONG *pceltFetched)
{
ICOM_THIS(IEnumIDListImpl,iface);
IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
ULONG i;
HRESULT hr = S_OK;
......@@ -318,7 +318,7 @@ static HRESULT WINAPI IEnumIDList_fnNext(
static HRESULT WINAPI IEnumIDList_fnSkip(
IEnumIDList * iface,ULONG celt)
{
ICOM_THIS(IEnumIDListImpl,iface);
IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
DWORD dwIndex;
HRESULT hr = S_OK;
......@@ -340,7 +340,7 @@ static HRESULT WINAPI IEnumIDList_fnSkip(
static HRESULT WINAPI IEnumIDList_fnReset(
IEnumIDList * iface)
{
ICOM_THIS(IEnumIDListImpl,iface);
IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
TRACE("(%p)\n",This);
This->mpCurrent = This->mpFirst;
......@@ -352,7 +352,7 @@ static HRESULT WINAPI IEnumIDList_fnReset(
static HRESULT WINAPI IEnumIDList_fnClone(
IEnumIDList * iface,LPENUMIDLIST * ppenum)
{
ICOM_THIS(IEnumIDListImpl,iface);
IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
TRACE("(%p)->() to (%p)->() E_NOTIMPL\n",This,ppenum);
return E_NOTIMPL;
......
dlls/shell32/folders.c
View file @ 314b99c4
......@@ -89,7 +89,7 @@ IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl)
*/
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);
......@@ -127,7 +127,7 @@ static HRESULT WINAPI IExtractIconW_fnQueryInterface(IExtractIconW *iface, REFII
*/
static ULONG WINAPI IExtractIconW_fnAddRef(IExtractIconW * iface)
{
ICOM_THIS(IExtractIconWImpl, iface);
IExtractIconWImpl *This = (IExtractIconWImpl *)iface;
TRACE("(%p)->(count=%lu)\n",This, This->ref );
......@@ -138,7 +138,7 @@ static ULONG WINAPI IExtractIconW_fnAddRef(IExtractIconW * iface)
*/
static ULONG WINAPI IExtractIconW_fnRelease(IExtractIconW * iface)
{
ICOM_THIS(IExtractIconWImpl, iface);
IExtractIconWImpl *This = (IExtractIconWImpl *)iface;
TRACE("(%p)->()\n",This);
......@@ -155,7 +155,7 @@ static ULONG WINAPI IExtractIconW_fnRelease(IExtractIconW * iface)
static HRESULT getIconLocationForFolder(IExtractIconW *iface, UINT uFlags,
LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags)
{
ICOM_THIS(IExtractIconWImpl, iface);
IExtractIconWImpl *This = (IExtractIconWImpl *)iface;
WCHAR path[MAX_PATH];
BOOL found = FALSE;
......@@ -242,7 +242,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(
int * piIndex,
UINT * pwFlags) /* returned GIL_ flags */
{
ICOM_THIS(IExtractIconWImpl, iface);
IExtractIconWImpl *This = (IExtractIconWImpl *)iface;
char sTemp[MAX_PATH];
DWORD dwNr;
......@@ -372,7 +372,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(
*/
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);
......@@ -399,7 +399,7 @@ static struct IExtractIconWVtbl eivt =
*/
IExtractIconA* IExtractIconA_Constructor(LPCITEMIDLIST pidl)
{
ICOM_THIS(IExtractIconWImpl, IExtractIconW_Constructor(pidl));
IExtractIconWImpl *This = (IExtractIconWImpl *)IExtractIconW_Constructor(pidl);
IExtractIconA *eia = (IExtractIconA *)&This->lpvtblExtractIconA;
TRACE("(%p)->(%p)\n", This, eia);
......
dlls/shell32/memorystream.c
View file @ 314b99c4
......@@ -128,7 +128,7 @@ HRESULT CreateStreamOnFile (LPCWSTR pszFilename, DWORD grfMode, IStream ** ppstm
*/
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);
......@@ -155,7 +155,7 @@ static HRESULT WINAPI IStream_fnQueryInterface(IStream *iface, REFIID riid, LPVO
*/
static ULONG WINAPI IStream_fnAddRef(IStream *iface)
{
ICOM_THIS(ISHFileStream, iface);
ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)->(count=%lu)\n",This, This->ref);
......@@ -167,7 +167,7 @@ static ULONG WINAPI IStream_fnAddRef(IStream *iface)
*/
static ULONG WINAPI IStream_fnRelease(IStream *iface)
{
ICOM_THIS(ISHFileStream, iface);
ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)->()\n",This);
......@@ -182,7 +182,7 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface)
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);
......@@ -198,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)
{
DWORD dummy_count;
ICOM_THIS(ISHFileStream, iface);
ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)\n",This);
......@@ -219,7 +219,7 @@ static HRESULT WINAPI IStream_fnSeek (IStream * iface, LARGE_INTEGER dlibMove, D
{
DWORD pos, newposlo, newposhi;
ICOM_THIS(ISHFileStream, iface);
ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)\n",This);
......@@ -236,7 +236,7 @@ static HRESULT WINAPI IStream_fnSeek (IStream * iface, LARGE_INTEGER dlibMove, D
static HRESULT WINAPI IStream_fnSetSize (IStream * iface, ULARGE_INTEGER libNewSize)
{
ICOM_THIS(ISHFileStream, iface);
ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)\n",This);
......@@ -250,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)
{
ICOM_THIS(ISHFileStream, iface);
ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)\n",This);
......@@ -258,7 +258,7 @@ static HRESULT WINAPI IStream_fnCopyTo (IStream * iface, IStream* pstm, ULARGE_I
}
static HRESULT WINAPI IStream_fnCommit (IStream * iface, DWORD grfCommitFlags)
{
ICOM_THIS(ISHFileStream, iface);
ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)\n",This);
......@@ -266,7 +266,7 @@ static HRESULT WINAPI IStream_fnCommit (IStream * iface, DWORD grfCommitFlags)
}
static HRESULT WINAPI IStream_fnRevert (IStream * iface)
{
ICOM_THIS(ISHFileStream, iface);
ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)\n",This);
......@@ -274,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)
{
ICOM_THIS(ISHFileStream, iface);
ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)\n",This);
......@@ -282,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)
{
ICOM_THIS(ISHFileStream, iface);
ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)\n",This);
......@@ -290,7 +290,7 @@ static HRESULT WINAPI IStream_fnUnlockRegion (IStream * iface, ULARGE_INTEGER li
}
static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWORD grfStatFlag)
{
ICOM_THIS(ISHFileStream, iface);
ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)\n",This);
......@@ -298,7 +298,7 @@ static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWOR
}
static HRESULT WINAPI IStream_fnClone (IStream * iface, IStream** ppstm)
{
ICOM_THIS(ISHFileStream, iface);
ISHFileStream *This = (ISHFileStream *)iface;
TRACE("(%p)\n",This);
......
dlls/shell32/shelllink.c
View file @ 314b99c4
......@@ -155,7 +155,6 @@ typedef struct
#define _IPersistStream_Offset ((int)(&(((IShellLinkImpl*)0)->lpvtblPersistStream)))
#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);
......@@ -229,7 +228,7 @@ static HRESULT WINAPI IPersistFile_fnIsDirty(IPersistFile* iface)
static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFileName, DWORD dwMode)
{
_ICOM_THIS_From_IPersistFile(IShellLinkImpl, iface);
_IPersistStream_From_ICOM_THIS(IPersistStream, This);
IPersistStream *StreamThis = (IPersistStream *)&This->lpvtblPersistStream;
HRESULT r;
IStream *stm;
......@@ -282,7 +281,7 @@ static BOOL StartLinkProcessor( LPCOLESTR szLink )
static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFileName, BOOL fRemember)
{
_ICOM_THIS_From_IPersistFile(IShellLinkImpl, iface);
_IPersistStream_From_ICOM_THIS(IPersistStream, This);
IPersistStream *StreamThis = (IPersistStream *)&This->lpvtblPersistStream;
HRESULT r;
IStream *stm;
......@@ -933,7 +932,7 @@ HRESULT WINAPI IShellLink_ConstructFromFile (
*/
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));
......@@ -971,7 +970,7 @@ static HRESULT WINAPI IShellLinkA_fnQueryInterface( IShellLinkA * iface, REFIID
*/
static ULONG WINAPI IShellLinkA_fnAddRef(IShellLinkA * iface)
{
ICOM_THIS(IShellLinkImpl, iface);
IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(count=%lu)\n",This,This->ref);
......@@ -982,7 +981,7 @@ static ULONG WINAPI IShellLinkA_fnAddRef(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);
......@@ -1017,7 +1016,7 @@ static ULONG WINAPI IShellLinkA_fnRelease(IShellLinkA * iface)
static HRESULT WINAPI IShellLinkA_fnGetPath(IShellLinkA * iface, LPSTR pszFile,
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",
This, pszFile, cchMaxPath, pfd, fFlags, debugstr_w(This->sPath));
......@@ -1033,7 +1032,7 @@ static HRESULT WINAPI IShellLinkA_fnGetPath(IShellLinkA * iface, LPSTR pszFile,
static HRESULT WINAPI IShellLinkA_fnGetIDList(IShellLinkA * iface, LPITEMIDLIST * ppidl)
{
ICOM_THIS(IShellLinkImpl, iface);
IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(ppidl=%p)\n",This, ppidl);
......@@ -1044,7 +1043,7 @@ static HRESULT WINAPI IShellLinkA_fnGetIDList(IShellLinkA * iface, LPITEMIDLIST
static HRESULT WINAPI IShellLinkA_fnSetIDList(IShellLinkA * iface, LPCITEMIDLIST pidl)
{
ICOM_THIS(IShellLinkImpl, iface);
IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(pidl=%p)\n",This, pidl);
......@@ -1058,7 +1057,7 @@ static HRESULT WINAPI IShellLinkA_fnSetIDList(IShellLinkA * iface, LPCITEMIDLIST
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);
......@@ -1072,7 +1071,7 @@ static HRESULT WINAPI IShellLinkA_fnGetDescription(IShellLinkA * iface, LPSTR ps
}
static HRESULT WINAPI IShellLinkA_fnSetDescription(IShellLinkA * iface, LPCSTR pszName)
{
ICOM_THIS(IShellLinkImpl, iface);
IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(pName=%s)\n", This, pszName);
......@@ -1089,7 +1088,7 @@ static HRESULT WINAPI IShellLinkA_fnSetDescription(IShellLinkA * iface, LPCSTR p
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);
......@@ -1104,7 +1103,7 @@ static HRESULT WINAPI IShellLinkA_fnGetWorkingDirectory(IShellLinkA * iface, LPS
static HRESULT WINAPI IShellLinkA_fnSetWorkingDirectory(IShellLinkA * iface, LPCSTR pszDir)
{
ICOM_THIS(IShellLinkImpl, iface);
IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(dir=%s)\n",This, pszDir);
......@@ -1121,7 +1120,7 @@ static HRESULT WINAPI IShellLinkA_fnSetWorkingDirectory(IShellLinkA * iface, LPC
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);
......@@ -1136,7 +1135,7 @@ static HRESULT WINAPI IShellLinkA_fnGetArguments(IShellLinkA * iface, LPSTR pszA
static HRESULT WINAPI IShellLinkA_fnSetArguments(IShellLinkA * iface, LPCSTR pszArgs)
{
ICOM_THIS(IShellLinkImpl, iface);
IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(args=%s)\n",This, pszArgs);
......@@ -1153,7 +1152,7 @@ static HRESULT WINAPI IShellLinkA_fnSetArguments(IShellLinkA * iface, LPCSTR psz
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);
......@@ -1164,7 +1163,7 @@ static HRESULT WINAPI IShellLinkA_fnGetHotkey(IShellLinkA * iface, WORD *pwHotke
static HRESULT WINAPI IShellLinkA_fnSetHotkey(IShellLinkA * iface, WORD wHotkey)
{
ICOM_THIS(IShellLinkImpl, iface);
IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(hotkey=%x)\n",This, wHotkey);
......@@ -1176,7 +1175,7 @@ static HRESULT WINAPI IShellLinkA_fnSetHotkey(IShellLinkA * iface, WORD wHotkey)
static HRESULT WINAPI IShellLinkA_fnGetShowCmd(IShellLinkA * iface, INT *piShowCmd)
{
ICOM_THIS(IShellLinkImpl, iface);
IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(%p)\n",This, piShowCmd);
*piShowCmd = This->iShowCmd;
......@@ -1185,7 +1184,7 @@ static HRESULT WINAPI IShellLinkA_fnGetShowCmd(IShellLinkA * iface, INT *piShowC
static HRESULT WINAPI IShellLinkA_fnSetShowCmd(IShellLinkA * iface, INT iShowCmd)
{
ICOM_THIS(IShellLinkImpl, iface);
IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p) %d\n",This, iShowCmd);
......@@ -1220,7 +1219,7 @@ static HRESULT SHELL_PidlGeticonLocationA(IShellFolder* psf, LPITEMIDLIST pidl,
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);
......@@ -1268,7 +1267,7 @@ static HRESULT WINAPI IShellLinkA_fnGetIconLocation(IShellLinkA * iface, LPSTR p
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);
......@@ -1286,7 +1285,7 @@ static HRESULT WINAPI IShellLinkA_fnSetIconLocation(IShellLinkA * iface, LPCSTR
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);
......@@ -1300,7 +1299,7 @@ static HRESULT WINAPI IShellLinkA_fnSetRelativePath(IShellLinkA * iface, LPCSTR
static HRESULT WINAPI IShellLinkA_fnResolve(IShellLinkA * iface, HWND hwnd, DWORD fFlags)
{
ICOM_THIS(IShellLinkImpl, iface);
IShellLinkImpl *This = (IShellLinkImpl *)iface;
FIXME("(%p)->(hwnd=%p flags=%lx)\n",This, hwnd, fFlags);
return S_OK;
......@@ -1308,7 +1307,7 @@ static HRESULT WINAPI IShellLinkA_fnResolve(IShellLinkA * iface, HWND hwnd, DWOR
static HRESULT WINAPI IShellLinkA_fnSetPath(IShellLinkA * iface, LPCSTR pszFile)
{
ICOM_THIS(IShellLinkImpl, iface);
IShellLinkImpl *This = (IShellLinkImpl *)iface;
TRACE("(%p)->(path=%s)\n",This, pszFile);
......
dlls/shell32/shellole.c
View file @ 314b99c4
......@@ -533,7 +533,7 @@ IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll,
static HRESULT WINAPI IDefClF_fnQueryInterface(
LPCLASSFACTORY iface, REFIID riid, LPVOID *ppvObj)
{
ICOM_THIS(IDefClFImpl,iface);
IDefClFImpl *This = (IDefClFImpl *)iface;
TRACE("(%p)->(%s)\n",This,shdebugstr_guid(riid));
......@@ -553,7 +553,7 @@ static HRESULT WINAPI IDefClF_fnQueryInterface(
*/
static ULONG WINAPI IDefClF_fnAddRef(LPCLASSFACTORY iface)
{
ICOM_THIS(IDefClFImpl,iface);
IDefClFImpl *This = (IDefClFImpl *)iface;
TRACE("(%p)->(count=%lu)\n",This,This->ref);
return InterlockedIncrement(&This->ref);
......@@ -563,7 +563,7 @@ static ULONG WINAPI IDefClF_fnAddRef(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);
if (!InterlockedDecrement(&This->ref))
......@@ -582,7 +582,7 @@ static ULONG WINAPI IDefClF_fnRelease(LPCLASSFACTORY iface)
static HRESULT WINAPI IDefClF_fnCreateInstance(
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);
......@@ -603,7 +603,7 @@ static HRESULT WINAPI IDefClF_fnCreateInstance(
*/
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);
return E_NOTIMPL;
}
......
dlls/shell32/shlfsbind.c
View file @ 314b99c4
......@@ -151,7 +151,7 @@ HRESULT WINAPI FileSystemBindData_SetFindData(LPBC pbc, const WIN32_FIND_DATAW *
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);
*ppV = NULL;
......@@ -177,14 +177,14 @@ static HRESULT WINAPI IFileSystemBindData_fnQueryInterface(IFileSystemBindData *
static ULONG WINAPI IFileSystemBindData_fnAddRef(IFileSystemBindData *iface)
{
ICOM_THIS(IFileSystemBindDataImpl, iface);
IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface;
TRACE("(%p)\n", This);
return InterlockedIncrement(&This->ref);
}
static ULONG WINAPI IFileSystemBindData_fnRelease(IFileSystemBindData *iface)
{
ICOM_THIS(IFileSystemBindDataImpl, iface);
IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface;
TRACE("(%p)\n", This);
if (!InterlockedDecrement(&This->ref))
......@@ -198,7 +198,7 @@ static ULONG WINAPI IFileSystemBindData_fnRelease(IFileSystemBindData *iface)
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);
if (!pfd)
......@@ -210,7 +210,7 @@ static HRESULT WINAPI IFileSystemBindData_fnGetFindData(IFileSystemBindData *ifa
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);
if (pfd)
......
dlls/shell32/shlview.c
View file @ 314b99c4
......@@ -1591,7 +1591,7 @@ static LRESULT CALLBACK ShellView_WndProc(HWND hWnd, UINT uMessage, WPARAM wPara
*/
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);
......@@ -1637,7 +1637,7 @@ static HRESULT WINAPI IShellView_fnQueryInterface(IShellView * iface,REFIID riid
*/
static ULONG WINAPI IShellView_fnAddRef(IShellView * iface)
{
ICOM_THIS(IShellViewImpl, iface);
IShellViewImpl *This = (IShellViewImpl *)iface;
TRACE("(%p)->(count=%lu)\n",This,This->ref);
......@@ -1648,7 +1648,7 @@ static ULONG WINAPI IShellView_fnAddRef(IShellView * iface)
*/
static ULONG WINAPI IShellView_fnRelease(IShellView * iface)
{
ICOM_THIS(IShellViewImpl, iface);
IShellViewImpl *This = (IShellViewImpl *)iface;
TRACE("(%p)->()\n",This);
......@@ -1678,7 +1678,7 @@ static ULONG WINAPI IShellView_fnRelease(IShellView * iface)
*/
static HRESULT WINAPI IShellView_fnGetWindow(IShellView * iface,HWND * phWnd)
{
ICOM_THIS(IShellViewImpl, iface);
IShellViewImpl *This = (IShellViewImpl *)iface;
TRACE("(%p)\n",This);
......@@ -1689,7 +1689,7 @@ static HRESULT WINAPI IShellView_fnGetWindow(IShellView * iface,HWND * phWnd)
static HRESULT WINAPI IShellView_fnContextSensitiveHelp(IShellView * iface,BOOL fEnterMode)
{
ICOM_THIS(IShellViewImpl, iface);
IShellViewImpl *This = (IShellViewImpl *)iface;
FIXME("(%p) stub\n",This);
......@@ -1705,7 +1705,7 @@ static HRESULT WINAPI IShellView_fnContextSensitiveHelp(IShellView * iface,BOOL
static HRESULT WINAPI IShellView_fnTranslateAccelerator(IShellView * iface,LPMSG lpmsg)
{
#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);
#endif
......@@ -1719,7 +1719,7 @@ static HRESULT WINAPI IShellView_fnTranslateAccelerator(IShellView * iface,LPMSG
static HRESULT WINAPI IShellView_fnEnableModeless(IShellView * iface,BOOL fEnable)
{
ICOM_THIS(IShellViewImpl, iface);
IShellViewImpl *This = (IShellViewImpl *)iface;
FIXME("(%p) stub\n",This);
......@@ -1728,7 +1728,7 @@ static HRESULT WINAPI IShellView_fnEnableModeless(IShellView * iface,BOOL fEnabl
static HRESULT WINAPI IShellView_fnUIActivate(IShellView * iface,UINT uState)
{
ICOM_THIS(IShellViewImpl, iface);
IShellViewImpl *This = (IShellViewImpl *)iface;
/*
CHAR szName[MAX_PATH];
......@@ -1771,7 +1771,7 @@ static HRESULT WINAPI IShellView_fnUIActivate(IShellView * iface,UINT uState)
static HRESULT WINAPI IShellView_fnRefresh(IShellView * iface)
{
ICOM_THIS(IShellViewImpl, iface);
IShellViewImpl *This = (IShellViewImpl *)iface;
TRACE("(%p)\n",This);
......@@ -1789,7 +1789,7 @@ static HRESULT WINAPI IShellView_fnCreateViewWindow(
RECT * prcView,
HWND *phWnd)
{
ICOM_THIS(IShellViewImpl, iface);
IShellViewImpl *This = (IShellViewImpl *)iface;
WNDCLASSA wc;
*phWnd = 0;
......@@ -1855,7 +1855,7 @@ static HRESULT WINAPI IShellView_fnCreateViewWindow(
static HRESULT WINAPI IShellView_fnDestroyViewWindow(IShellView * iface)
{
ICOM_THIS(IShellViewImpl, iface);
IShellViewImpl *This = (IShellViewImpl *)iface;
TRACE("(%p)\n",This);
......@@ -1877,7 +1877,7 @@ static HRESULT WINAPI IShellView_fnDestroyViewWindow(IShellView * iface)
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,
This->FolderSettings.ViewMode, This->FolderSettings.fFlags);
......@@ -1890,7 +1890,7 @@ static HRESULT WINAPI IShellView_fnGetCurrentInfo(IShellView * iface, LPFOLDERSE
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);
......@@ -1899,7 +1899,7 @@ static HRESULT WINAPI IShellView_fnAddPropertySheetPages(IShellView * iface, DWO
static HRESULT WINAPI IShellView_fnSaveViewState(IShellView * iface)
{
ICOM_THIS(IShellViewImpl, iface);
IShellViewImpl *This = (IShellViewImpl *)iface;
FIXME("(%p) stub\n",This);
......@@ -1911,7 +1911,7 @@ static HRESULT WINAPI IShellView_fnSelectItem(
LPCITEMIDLIST pidl,
UINT uFlags)
{
ICOM_THIS(IShellViewImpl, iface);
IShellViewImpl *This = (IShellViewImpl *)iface;
int i;
TRACE("(%p)->(pidl=%p, 0x%08x) stub\n",This, pidl, uFlags);
......@@ -1960,7 +1960,7 @@ static HRESULT WINAPI IShellView_fnSelectItem(
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);
......
dlls/shell32/shv_bg_cmenu.c
View file @ 314b99c4
......@@ -71,7 +71,7 @@ IContextMenu2 *ISvBgCm_Constructor(IShellFolder* pSFParent)
*/
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);
......@@ -103,7 +103,7 @@ static HRESULT WINAPI ISVBgCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid
*/
static ULONG WINAPI ISVBgCm_fnAddRef(IContextMenu2 *iface)
{
ICOM_THIS(BgCmImpl, iface);
BgCmImpl *This = (BgCmImpl *)iface;
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)
{
ICOM_THIS(BgCmImpl, iface);
BgCmImpl *This = (BgCmImpl *)iface;
TRACE("(%p)->()\n",This);
......@@ -149,7 +149,7 @@ static HRESULT WINAPI ISVBgCm_fnQueryContextMenu(
UINT idMax;
HRESULT hr;
ICOM_THIS(BgCmImpl, iface);
BgCmImpl *This = (BgCmImpl *)iface;
TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",
This, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags);
......@@ -187,7 +187,7 @@ static void DoNewFolder(
IContextMenu2 *iface,
IShellView *psv)
{
ICOM_THIS(BgCmImpl, iface);
BgCmImpl *This = (BgCmImpl *)iface;
ISFHelper * psfhlp;
char szName[MAX_PATH];
......@@ -217,7 +217,7 @@ static void DoNewFolder(
static BOOL DoPaste(
IContextMenu2 *iface)
{
ICOM_THIS(BgCmImpl, iface);
BgCmImpl *This = (BgCmImpl *)iface;
BOOL bSuccess = FALSE;
IDataObject * pda;
......@@ -315,7 +315,7 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand(
IContextMenu2 *iface,
LPCMINVOKECOMMANDINFO lpcmi)
{
ICOM_THIS(BgCmImpl, iface);
BgCmImpl *This = (BgCmImpl *)iface;
LPSHELLBROWSER lpSB;
LPSHELLVIEW lpSV = NULL;
......@@ -388,7 +388,7 @@ static HRESULT WINAPI ISVBgCm_fnGetCommandString(
LPSTR lpszName,
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);
......@@ -420,7 +420,7 @@ static HRESULT WINAPI ISVBgCm_fnHandleMenuMsg(
WPARAM wParam,
LPARAM lParam)
{
ICOM_THIS(BgCmImpl, iface);
BgCmImpl *This = (BgCmImpl *)iface;
FIXME("(%p)->(msg=%x wp=%x lp=%lx)\n",This, uMsg, wParam, lParam);
......
dlls/shell32/shv_item_cmenu.c
View file @ 314b99c4
......@@ -107,7 +107,7 @@ IContextMenu2 *ISvItemCm_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST pidl
*/
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);
......@@ -139,7 +139,7 @@ static HRESULT WINAPI ISvItemCm_fnQueryInterface(IContextMenu2 *iface, REFIID ri
*/
static ULONG WINAPI ISvItemCm_fnAddRef(IContextMenu2 *iface)
{
ICOM_THIS(ItemCmImpl, iface);
ItemCmImpl *This = (ItemCmImpl *)iface;
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)
{
ICOM_THIS(ItemCmImpl, iface);
ItemCmImpl *This = (ItemCmImpl *)iface;
TRACE("(%p)->()\n",This);
......@@ -216,7 +216,7 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu(
UINT idCmdLast,
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);
......@@ -265,7 +265,7 @@ static void DoOpenExplore(
HWND hwnd,
LPCSTR verb)
{
ICOM_THIS(ItemCmImpl, iface);
ItemCmImpl *This = (ItemCmImpl *)iface;
UINT i, bFolderFound = FALSE;
LPITEMIDLIST pidlFQ;
......@@ -306,7 +306,7 @@ static void DoRename(
IContextMenu2 *iface,
HWND hwnd)
{
ICOM_THIS(ItemCmImpl, iface);
ItemCmImpl *This = (ItemCmImpl *)iface;
LPSHELLBROWSER lpSB;
LPSHELLVIEW lpSV;
......@@ -333,7 +333,7 @@ static void DoRename(
*/
static void DoDelete(IContextMenu2 *iface)
{
ICOM_THIS(ItemCmImpl, iface);
ItemCmImpl *This = (ItemCmImpl *)iface;
ISFHelper * psfhlp;
IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, (LPVOID*)&psfhlp);
......@@ -354,7 +354,7 @@ static BOOL DoCopyOrCut(
HWND hwnd,
BOOL bCut)
{
ICOM_THIS(ItemCmImpl, iface);
ItemCmImpl *This = (ItemCmImpl *)iface;
LPSHELLBROWSER lpSB;
LPSHELLVIEW lpSV;
......@@ -384,7 +384,7 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand(
IContextMenu2 *iface,
LPCMINVOKECOMMANDINFO lpcmi)
{
ICOM_THIS(ItemCmImpl, iface);
ItemCmImpl *This = (ItemCmImpl *)iface;
if (lpcmi->cbSize != sizeof(CMINVOKECOMMANDINFO))
FIXME("Is an EX structure\n");
......@@ -451,7 +451,7 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString(
LPSTR lpszName,
UINT uMaxNameLen)
{
ICOM_THIS(ItemCmImpl, iface);
ItemCmImpl *This = (ItemCmImpl *)iface;
HRESULT hr = E_INVALIDARG;
......@@ -506,7 +506,7 @@ static HRESULT WINAPI ISvItemCm_fnHandleMenuMsg(
WPARAM wParam,
LPARAM lParam)
{
ICOM_THIS(ItemCmImpl, iface);
ItemCmImpl *This = (ItemCmImpl *)iface;
TRACE("(%p)->(msg=%x wp=%x lp=%lx)\n",This, uMsg, wParam, lParam);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment