take over Alexandre's better solution for LPSHELLEXECUTEINFOA

svn path=/trunk/; revision=7494
This commit is contained in:
Martin Fuchs 2004-01-06 22:15:15 +00:00
parent df4c7c8464
commit 4f28875a40
2 changed files with 12 additions and 14 deletions

View file

@ -140,7 +140,7 @@ typedef struct _SHELLEXECUTEINFOA {
DWORD dwHotKey; DWORD dwHotKey;
HANDLE hIcon; HANDLE hIcon;
HANDLE hProcess; HANDLE hProcess;
} SHELLEXECUTEINFOA; } SHELLEXECUTEINFOA, *LPSHELLEXECUTEINFOA;
typedef struct _SHELLEXECUTEINFOW { typedef struct _SHELLEXECUTEINFOW {
DWORD cbSize; DWORD cbSize;
ULONG fMask; ULONG fMask;
@ -157,7 +157,7 @@ typedef struct _SHELLEXECUTEINFOW {
DWORD dwHotKey; DWORD dwHotKey;
HANDLE hIcon; HANDLE hIcon;
HANDLE hProcess; HANDLE hProcess;
} SHELLEXECUTEINFOW; } SHELLEXECUTEINFOW, *LPSHELLEXECUTEINFOW;
typedef struct _SHFILEOPSTRUCTA { typedef struct _SHFILEOPSTRUCTA {
HWND hwnd; HWND hwnd;
UINT wFunc; UINT wFunc;

View file

@ -4117,8 +4117,7 @@ void __RPC_STUB IContextMenu3_HandleMenuMsg2_Stub(
typedef struct IShellExecuteHookA IShellExecuteHookA; typedef struct IShellExecuteHookA IShellExecuteHookA;
#endif #endif
typedef struct _SHELLEXECUTEINFOA *LPSHELLEXECUTEINFOA; struct _SHELLEXECUTEINFOA;
/***************************************************************************** /*****************************************************************************
* IShellExecuteHookA interface * IShellExecuteHookA interface
*/ */
@ -4130,7 +4129,7 @@ DEFINE_GUID(IID_IShellExecuteHookA, 0x000214f5, 0x0000, 0x0000, 0xc0,0x00, 0x00,
struct IShellExecuteHookA : public IUnknown struct IShellExecuteHookA : public IUnknown
{ {
virtual HRESULT STDMETHODCALLTYPE Execute( virtual HRESULT STDMETHODCALLTYPE Execute(
LPSHELLEXECUTEINFOA pei) = 0; struct _SHELLEXECUTEINFOA* pei) = 0;
}; };
#else #else
@ -4156,7 +4155,7 @@ struct IShellExecuteHookAVtbl {
/*** IShellExecuteHookA methods ***/ /*** IShellExecuteHookA methods ***/
HRESULT (STDMETHODCALLTYPE *Execute)( HRESULT (STDMETHODCALLTYPE *Execute)(
IShellExecuteHookA* This, IShellExecuteHookA* This,
LPSHELLEXECUTEINFOA pei); struct _SHELLEXECUTEINFOA* pei);
}; };
@ -4176,11 +4175,11 @@ struct IShellExecuteHookAVtbl {
STDMETHOD_(ULONG,AddRef)(THIS) PURE; \ STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
STDMETHOD_(ULONG,Release)(THIS) PURE; \ STDMETHOD_(ULONG,Release)(THIS) PURE; \
/*** IShellExecuteHookA methods ***/ \ /*** IShellExecuteHookA methods ***/ \
STDMETHOD_(HRESULT,Execute)(THIS_ LPSHELLEXECUTEINFOA pei) PURE; STDMETHOD_(HRESULT,Execute)(THIS_ struct _SHELLEXECUTEINFOA* pei) PURE;
HRESULT CALLBACK IShellExecuteHookA_Execute_Proxy( HRESULT CALLBACK IShellExecuteHookA_Execute_Proxy(
IShellExecuteHookA* This, IShellExecuteHookA* This,
LPSHELLEXECUTEINFOA pei); struct _SHELLEXECUTEINFOA* pei);
void __RPC_STUB IShellExecuteHookA_Execute_Stub( void __RPC_STUB IShellExecuteHookA_Execute_Stub(
struct IRpcStubBuffer* This, struct IRpcStubBuffer* This,
struct IRpcChannelBuffer* pRpcChannelBuffer, struct IRpcChannelBuffer* pRpcChannelBuffer,
@ -4194,8 +4193,7 @@ void __RPC_STUB IShellExecuteHookA_Execute_Stub(
typedef struct IShellExecuteHookW IShellExecuteHookW; typedef struct IShellExecuteHookW IShellExecuteHookW;
#endif #endif
typedef struct _SHELLEXECUTEINFOW *LPSHELLEXECUTEINFOW; struct _SHELLEXECUTEINFOW;
/***************************************************************************** /*****************************************************************************
* IShellExecuteHookW interface * IShellExecuteHookW interface
*/ */
@ -4207,7 +4205,7 @@ DEFINE_GUID(IID_IShellExecuteHookW, 0x000214fb, 0x0000, 0x0000, 0xc0,0x00, 0x00,
struct IShellExecuteHookW : public IUnknown struct IShellExecuteHookW : public IUnknown
{ {
virtual HRESULT STDMETHODCALLTYPE Execute( virtual HRESULT STDMETHODCALLTYPE Execute(
LPSHELLEXECUTEINFOW pei) = 0; struct _SHELLEXECUTEINFOW* pei) = 0;
}; };
#else #else
@ -4233,7 +4231,7 @@ struct IShellExecuteHookWVtbl {
/*** IShellExecuteHookW methods ***/ /*** IShellExecuteHookW methods ***/
HRESULT (STDMETHODCALLTYPE *Execute)( HRESULT (STDMETHODCALLTYPE *Execute)(
IShellExecuteHookW* This, IShellExecuteHookW* This,
LPSHELLEXECUTEINFOW pei); struct _SHELLEXECUTEINFOW* pei);
}; };
@ -4253,11 +4251,11 @@ struct IShellExecuteHookWVtbl {
STDMETHOD_(ULONG,AddRef)(THIS) PURE; \ STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
STDMETHOD_(ULONG,Release)(THIS) PURE; \ STDMETHOD_(ULONG,Release)(THIS) PURE; \
/*** IShellExecuteHookW methods ***/ \ /*** IShellExecuteHookW methods ***/ \
STDMETHOD_(HRESULT,Execute)(THIS_ LPSHELLEXECUTEINFOW pei) PURE; STDMETHOD_(HRESULT,Execute)(THIS_ struct _SHELLEXECUTEINFOW* pei) PURE;
HRESULT CALLBACK IShellExecuteHookW_Execute_Proxy( HRESULT CALLBACK IShellExecuteHookW_Execute_Proxy(
IShellExecuteHookW* This, IShellExecuteHookW* This,
LPSHELLEXECUTEINFOW pei); struct _SHELLEXECUTEINFOW* pei);
void __RPC_STUB IShellExecuteHookW_Execute_Stub( void __RPC_STUB IShellExecuteHookW_Execute_Stub(
struct IRpcStubBuffer* This, struct IRpcStubBuffer* This,
struct IRpcChannelBuffer* pRpcChannelBuffer, struct IRpcChannelBuffer* pRpcChannelBuffer,