diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-20 06:53:52 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-20 06:53:52 +0000 |
| commit | 3a09386ad170dafdce88c5dcd70275cc7d4081e9 (patch) | |
| tree | 0f9544da38cdb9c5cc20ad9d695588413b4cd5f9 /amarok/src/engine/helix/helix-sp | |
| parent | 36a9c1916513474b11c59a9060cbaf8770d1bbc0 (diff) | |
| download | amarok-3a09386a.tar.gz amarok-3a09386a.zip | |
Initial TQt conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1165727 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'amarok/src/engine/helix/helix-sp')
27 files changed, 973 insertions, 973 deletions
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/client/include/hxclsnk.h b/amarok/src/engine/helix/helix-sp/helix-include/client/include/hxclsnk.h index e79f7e90..a11b8db9 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/client/include/hxclsnk.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/client/include/hxclsnk.h @@ -49,7 +49,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -68,7 +68,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * Called to advise the client that the position or length of the * current playback context has changed. */ - STDMETHOD(OnPosLength) (THIS_ + STDQT_METHOD(OnPosLength) (THIS_ UINT32 ulPosition, UINT32 ulLength) PURE; @@ -78,7 +78,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * Purpose: * Called to advise the client a presentation has been opened. */ - STDMETHOD(OnPresentationOpened) (THIS) PURE; + STDQT_METHOD(OnPresentationOpened) (THIS) PURE; /************************************************************************ * Method: @@ -86,7 +86,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * Purpose: * Called to advise the client a presentation has been closed. */ - STDMETHOD(OnPresentationClosed) (THIS) PURE; + STDQT_METHOD(OnPresentationClosed) (THIS) PURE; /************************************************************************ * Method: @@ -95,7 +95,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * Called to advise the client that the presentation statistics * have changed. */ - STDMETHOD(OnStatisticsChanged) (THIS) PURE; + STDQT_METHOD(OnStatisticsChanged) (THIS) PURE; /************************************************************************ * Method: @@ -107,7 +107,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * time for the stream's time line after the seek will be completed. * */ - STDMETHOD(OnPreSeek) (THIS_ + STDQT_METHOD(OnPreSeek) (THIS_ ULONG32 ulOldTime, ULONG32 ulNewTime) PURE; @@ -121,7 +121,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * time for the stream's time line after the seek. * */ - STDMETHOD(OnPostSeek) (THIS_ + STDQT_METHOD(OnPostSeek) (THIS_ ULONG32 ulOldTime, ULONG32 ulNewTime) PURE; @@ -133,7 +133,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * just occurred. * */ - STDMETHOD(OnStop) (THIS) PURE; + STDQT_METHOD(OnStop) (THIS) PURE; /************************************************************************ * Method: @@ -144,7 +144,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * stream's time line before the pause. * */ - STDMETHOD(OnPause) (THIS_ + STDQT_METHOD(OnPause) (THIS_ ULONG32 ulTime) PURE; /************************************************************************ @@ -156,7 +156,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * for the stream's time line after the resume. * */ - STDMETHOD(OnBegin) (THIS_ + STDQT_METHOD(OnBegin) (THIS_ ULONG32 ulTime) PURE; /************************************************************************ @@ -170,7 +170,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * buffering process. * */ - STDMETHOD(OnBuffering) (THIS_ + STDQT_METHOD(OnBuffering) (THIS_ ULONG32 ulFlags, UINT16 unPercentComplete) PURE; @@ -182,7 +182,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * hosts(s). * */ - STDMETHOD(OnContacting) (THIS_ + STDQT_METHOD(OnContacting) (THIS_ const char* pHostName) PURE; }; @@ -222,7 +222,7 @@ DECLARE_INTERFACE_(IHXClientRequestSink, IUnknown) * modify RequestHeaders at this time. */ - STDMETHOD(OnNewRequest) (THIS_ IHXRequest* pNewRequest) PURE; + STDQT_METHOD(OnNewRequest) (THIS_ IHXRequest* pNewRequest) PURE; }; // $EndPrivate. diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/container/hxbuffer.h b/amarok/src/engine/helix/helix-sp/helix-include/common/container/hxbuffer.h index bcda2595..c52abde9 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/container/hxbuffer.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/container/hxbuffer.h @@ -121,7 +121,7 @@ public: /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); @@ -132,15 +132,15 @@ public: /* * IHXBuffer methods */ - STDMETHOD(Get) (THIS_ + STDQT_METHOD(Get) (THIS_ REF(UCHAR*) pData, REF(ULONG32) ulLength); - STDMETHOD(Set) (THIS_ + STDQT_METHOD(Set) (THIS_ const UCHAR* pData, ULONG32 ulLength); - STDMETHOD(SetSize) (THIS_ + STDQT_METHOD(SetSize) (THIS_ ULONG32 ulLength); STDMETHOD_(ULONG32,GetSize) (THIS); diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxausvc.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxausvc.h index a366ca3d..6041ef80 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxausvc.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxausvc.h @@ -107,7 +107,7 @@ DECLARE_INTERFACE_(IHXAudioPlayer, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -124,7 +124,7 @@ DECLARE_INTERFACE_(IHXAudioPlayer, IUnknown) * Purpose: * Call this to create an audio stream. */ - STDMETHOD(CreateAudioStream) (THIS_ + STDQT_METHOD(CreateAudioStream) (THIS_ IHXAudioStream** /*OUT*/ pAudioStream ) PURE; @@ -135,7 +135,7 @@ DECLARE_INTERFACE_(IHXAudioPlayer, IUnknown) * Call this to hook audio data after all audio streams in this * have been mixed. */ - STDMETHOD(AddPostMixHook) (THIS_ + STDQT_METHOD(AddPostMixHook) (THIS_ IHXAudioHook* /*IN*/ pHook, const HXBOOL /*IN*/ bDisableWrite, const HXBOOL /*IN*/ bFinal @@ -147,7 +147,7 @@ DECLARE_INTERFACE_(IHXAudioPlayer, IUnknown) * Purpose: * Call this to remove an already added post hook. */ - STDMETHOD(RemovePostMixHook) (THIS_ + STDQT_METHOD(RemovePostMixHook) (THIS_ IHXAudioHook* /*IN*/ pHook ) PURE; @@ -185,7 +185,7 @@ DECLARE_INTERFACE_(IHXAudioPlayer, IUnknown) * with the total number of audio streams associated with this * audio player. */ - STDMETHOD(SetStreamInfoResponse) (THIS_ + STDQT_METHOD(SetStreamInfoResponse) (THIS_ IHXAudioStreamInfoResponse* /*IN*/ pResponse ) PURE; @@ -195,7 +195,7 @@ DECLARE_INTERFACE_(IHXAudioPlayer, IUnknown) * Purpose: * Remove stream info response that was added earlier */ - STDMETHOD(RemoveStreamInfoResponse) (THIS_ + STDQT_METHOD(RemoveStreamInfoResponse) (THIS_ IHXAudioStreamInfoResponse* /*IN*/ pResponse ) PURE; @@ -250,7 +250,7 @@ DECLARE_INTERFACE_(IHXAudioPlayerResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -268,7 +268,7 @@ DECLARE_INTERFACE_(IHXAudioPlayerResponse, IUnknown) * Purpose: * This method is called with the current audio playback time. */ - STDMETHOD(OnTimeSync) (THIS_ + STDQT_METHOD(OnTimeSync) (THIS_ ULONG32 /*IN*/ ulTimeEnd ) PURE; @@ -301,7 +301,7 @@ DECLARE_INTERFACE_(IHXAudioStream, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -320,7 +320,7 @@ DECLARE_INTERFACE_(IHXAudioStream, IUnknown) * Initialize an audio stream with the given audio format. The * IHXValues contains stream identification information. */ - STDMETHOD(Init) (THIS_ + STDQT_METHOD(Init) (THIS_ const HXAudioFormat* /*IN*/ pAudioFormat, IHXValues* /*IN*/ pValues ) PURE; @@ -336,7 +336,7 @@ DECLARE_INTERFACE_(IHXAudioStream, IUnknown) * using a meaningful start time. Audio Services will play * silence where packets are missing. */ - STDMETHOD(Write) (THIS_ + STDQT_METHOD(Write) (THIS_ HXAudioData* /*IN*/ pAudioData ) PURE; @@ -349,7 +349,7 @@ DECLARE_INTERFACE_(IHXAudioStream, IUnknown) * from being mixed with other audio stream data associated * with this audio player. */ - STDMETHOD(AddPreMixHook) (THIS_ + STDQT_METHOD(AddPreMixHook) (THIS_ IHXAudioHook* /*IN*/ pHook, const HXBOOL /*IN*/ bDisableWrite ) PURE; @@ -360,7 +360,7 @@ DECLARE_INTERFACE_(IHXAudioStream, IUnknown) * Purpose: * Use this to remove an already added "hook". */ - STDMETHOD(RemovePreMixHook) (THIS_ + STDQT_METHOD(RemovePreMixHook) (THIS_ IHXAudioHook* /*IN*/ pHook ) PURE; @@ -371,7 +371,7 @@ DECLARE_INTERFACE_(IHXAudioStream, IUnknown) * Use this to add a notification response object to get * notifications when audio stream is running dry. */ - STDMETHOD(AddDryNotification) (THIS_ + STDQT_METHOD(AddDryNotification) (THIS_ IHXDryNotification* /*IN*/ pNotification ) PURE; @@ -421,7 +421,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -440,7 +440,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) * The caller calls this to open the audio device using the audio * format given. */ - STDMETHOD(Open) (THIS_ + STDQT_METHOD(Open) (THIS_ const HXAudioFormat* /*IN*/ pAudioFormat, IHXAudioDeviceResponse* /*IN*/ pStreamResponse) PURE; @@ -450,7 +450,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) * Purpose: * The caller calls this to close the audio device. */ - STDMETHOD(Close) (THIS_ + STDQT_METHOD(Close) (THIS_ const HXBOOL /*IN*/ bFlush ) PURE; /************************************************************************ @@ -459,7 +459,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) * Purpose: * The caller calls this to start or resume audio playback. */ - STDMETHOD(Resume) (THIS) PURE; + STDQT_METHOD(Resume) (THIS) PURE; /************************************************************************ * Method: @@ -469,7 +469,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) * TRUE, any buffers in the audio device will be flushed; otherwise, * the buffers are played. */ - STDMETHOD(Pause) (THIS) PURE; + STDQT_METHOD(Pause) (THIS) PURE; /************************************************************************ * Method: @@ -477,7 +477,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) * Purpose: * The caller calls this to write an audio buffer. */ - STDMETHOD(Write) (THIS_ + STDQT_METHOD(Write) (THIS_ const HXAudioData* /*IN*/ pAudioData) PURE; /************************************************************************ @@ -500,7 +500,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) * Purpose: * The caller calls this to set the audio device volume level. */ - STDMETHOD(SetVolume) (THIS_ + STDQT_METHOD(SetVolume) (THIS_ const UINT16 /*IN*/ uVolume) PURE; /************************************************************************ @@ -517,7 +517,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) * Purpose: * The caller calls this to reset the audio device. */ - STDMETHOD(Reset) (THIS) PURE; + STDQT_METHOD(Reset) (THIS) PURE; /************************************************************************ * Method: @@ -525,7 +525,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) * Purpose: * The caller calls this to drain the audio device. */ - STDMETHOD(Drain) (THIS) PURE; + STDQT_METHOD(Drain) (THIS) PURE; /************************************************************************ * Method: @@ -534,7 +534,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) * The caller calls this to check the input format with the * audio device format. */ - STDMETHOD(CheckFormat) (THIS_ + STDQT_METHOD(CheckFormat) (THIS_ const HXAudioFormat* /*IN*/ pAudioFormat ) PURE; /************************************************************************ @@ -543,7 +543,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) * Purpose: * The caller calls this to get current system audio time. */ - STDMETHOD(GetCurrentAudioTime) (THIS_ + STDQT_METHOD(GetCurrentAudioTime) (THIS_ REF(ULONG32) /*OUT*/ ulCurrentTime) PURE; }; @@ -574,7 +574,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -594,7 +594,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceResponse, IUnknown) * interface. This method is called by the IHXAudioDevice when * audio playback occurs. */ - STDMETHOD(OnTimeSync) (THIS_ + STDQT_METHOD(OnTimeSync) (THIS_ ULONG32 /*IN*/ ulTimeEnd) PURE; }; @@ -626,7 +626,7 @@ DECLARE_INTERFACE_(IHXAudioHook, IUnknown) /* * IUnknown methods! */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -644,7 +644,7 @@ DECLARE_INTERFACE_(IHXAudioHook, IUnknown) * Audio Services calls OnInit() with the audio data format of the * audio data that will be provided in the OnBuffer() method. */ - STDMETHOD(OnInit) (THIS_ + STDQT_METHOD(OnInit) (THIS_ HXAudioFormat* /*IN*/ pFormat) PURE; /************************************************************************ @@ -658,7 +658,7 @@ DECLARE_INTERFACE_(IHXAudioHook, IUnknown) * create its own IHXBuffer, modify the data and then associate * this buffer with the pAudioOutData->pData member. */ - STDMETHOD(OnBuffer) (THIS_ + STDQT_METHOD(OnBuffer) (THIS_ HXAudioData* /*IN*/ pAudioInData, HXAudioData* /*OUT*/ pAudioOutData) PURE; }; @@ -689,7 +689,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceHookManager, IUnknown) /* * IUnknown methods! */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -706,7 +706,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceHookManager, IUnknown) * Purpose: * Last chance to modify data being written to the audio device. */ - STDMETHOD(AddAudioDeviceHook) (THIS_ + STDQT_METHOD(AddAudioDeviceHook) (THIS_ IHXAudioHook* /*IN*/ pHook, AudioDeviceHookType /*IN*/ type ) PURE; @@ -717,7 +717,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceHookManager, IUnknown) * Purpose: * Removes the audio device hook that was set with AddAudioDeviceHook. */ - STDMETHOD(RemoveAudioDeviceHook) (THIS_ + STDQT_METHOD(RemoveAudioDeviceHook) (THIS_ IHXAudioHook* /*IN*/ pHook ) PURE; @@ -728,7 +728,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceHookManager, IUnknown) * Called by audio device implementations to process the hooks on a * given audio buffer */ - STDMETHOD(ProcessAudioDeviceHooks) (THIS_ + STDQT_METHOD(ProcessAudioDeviceHooks) (THIS_ IHXBuffer*& /*IN/OUT*/ pBuffer, HXBOOL& /*OUT*/ bChanged ) PURE; @@ -762,7 +762,7 @@ DECLARE_INTERFACE_(IHXAudioStreamInfoResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -787,7 +787,7 @@ DECLARE_INTERFACE_(IHXAudioStreamInfoResponse, IUnknown) * IHXAudioStreamInfoResponse object should be written to handle * OnStream() in the midst of the presentation as well. */ - STDMETHOD(OnStream) (THIS_ + STDQT_METHOD(OnStream) (THIS_ IHXAudioStream* /*IN*/ pAudioStream) PURE; }; @@ -824,7 +824,7 @@ DECLARE_INTERFACE_(IHXVolume, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -841,7 +841,7 @@ DECLARE_INTERFACE_(IHXVolume, IUnknown) * Purpose: * Call this to set the volume level. */ - STDMETHOD(SetVolume) (THIS_ + STDQT_METHOD(SetVolume) (THIS_ const UINT16 /*IN*/ uVolume ) PURE; /************************************************************************ @@ -858,7 +858,7 @@ DECLARE_INTERFACE_(IHXVolume, IUnknown) * Purpose: * Call this to mute the volume. */ - STDMETHOD(SetMute) (THIS_ + STDQT_METHOD(SetMute) (THIS_ const HXBOOL /*IN*/ bMute ) PURE; /************************************************************************ @@ -879,7 +879,7 @@ DECLARE_INTERFACE_(IHXVolume, IUnknown) * ever IHXVolume::SetVolume() and IHXVolume::SetMute() are * called. */ - STDMETHOD(AddAdviseSink) (THIS_ + STDQT_METHOD(AddAdviseSink) (THIS_ IHXVolumeAdviseSink* /*IN*/ pSink ) PURE; @@ -891,7 +891,7 @@ DECLARE_INTERFACE_(IHXVolume, IUnknown) * you are no longer interested in receiving volume or mute change * notifications. */ - STDMETHOD(RemoveAdviseSink) (THIS_ + STDQT_METHOD(RemoveAdviseSink) (THIS_ IHXVolumeAdviseSink* /*IN*/ pSink ) PURE; }; @@ -926,7 +926,7 @@ DECLARE_INTERFACE_(IHXVolumeAdviseSink, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -945,7 +945,7 @@ DECLARE_INTERFACE_(IHXVolumeAdviseSink, IUnknown) * This interface is called whenever the associated IHXVolume * SetVolume() is called. */ - STDMETHOD(OnVolumeChange) (THIS_ + STDQT_METHOD(OnVolumeChange) (THIS_ const UINT16 uVolume ) PURE; @@ -957,7 +957,7 @@ DECLARE_INTERFACE_(IHXVolumeAdviseSink, IUnknown) * SetMute() is called. * */ - STDMETHOD(OnMuteChange) (THIS_ + STDQT_METHOD(OnMuteChange) (THIS_ const HXBOOL bMute ) PURE; }; @@ -984,7 +984,7 @@ DECLARE_INTERFACE_(IHXAudioLevelNormalization, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -995,7 +995,7 @@ DECLARE_INTERFACE_(IHXAudioLevelNormalization, IUnknown) /* * IHXAudioLevelNormalization methods */ - STDMETHOD(SetSoundLevelOffset) (THIS_ INT16 nOffset) PURE; + STDQT_METHOD(SetSoundLevelOffset) (THIS_ INT16 nOffset) PURE; STDMETHOD_(INT16, GetSoundLevelOffset)(THIS) PURE; }; @@ -1026,7 +1026,7 @@ DECLARE_INTERFACE_(IHXDryNotification, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1048,7 +1048,7 @@ DECLARE_INTERFACE_(IHXDryNotification, IUnknown) * done synchronously within the call to this function. * It is OK to not write any data. Silence will be played instead. */ - STDMETHOD(OnDryNotification) (THIS_ + STDQT_METHOD(OnDryNotification) (THIS_ UINT32 /*IN*/ ulCurrentStreamTime, UINT32 /*IN*/ ulMinimumDurationRequired ) PURE; @@ -1081,7 +1081,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceManager, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1100,7 +1100,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceManager, IUnknown) * This is used to replace the default implementation of the audio * device by the given audio device interface. */ - STDMETHOD(Replace) (THIS_ + STDQT_METHOD(Replace) (THIS_ IHXAudioDevice* /*IN*/ pAudioDevice) PURE; /********************************************************************** @@ -1110,7 +1110,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceManager, IUnknown) * This is used to remove the audio device given to the manager in * the earlier call to Replace. */ - STDMETHOD(Remove) (THIS_ + STDQT_METHOD(Remove) (THIS_ IHXAudioDevice* /*IN*/ pAudioDevice) PURE; /************************************************************************ @@ -1122,7 +1122,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceManager, IUnknown) * is to be written to the audio device. This can be done in call * to OnInit() in IHXAudioHook. */ - STDMETHOD(SetFinalHook) (THIS_ + STDQT_METHOD(SetFinalHook) (THIS_ IHXAudioHook* /*IN*/ pHook ) PURE; @@ -1132,7 +1132,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceManager, IUnknown) * Purpose: * Remove final hook */ - STDMETHOD(RemoveFinalHook) (THIS_ + STDQT_METHOD(RemoveFinalHook) (THIS_ IHXAudioHook* /*IN*/ pHook ) PURE; @@ -1144,7 +1144,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceManager, IUnknown) * This function will fill in the pre-allocated HXAudioFormat * structure passed in. */ - STDMETHOD(GetAudioFormat) (THIS_ + STDQT_METHOD(GetAudioFormat) (THIS_ HXAudioFormat* /*IN/OUT*/pAudioFormat) PURE; }; @@ -1175,7 +1175,7 @@ DECLARE_INTERFACE_(IHXAudioCrossFade, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1202,7 +1202,7 @@ DECLARE_INTERFACE_(IHXAudioCrossFade, IUnknown) * to be done * */ - STDMETHOD(CrossFade) (THIS_ + STDQT_METHOD(CrossFade) (THIS_ IHXAudioStream* pStreamFrom, IHXAudioStream* pStreamTo, UINT32 ulFromCrossFadeStartTime, @@ -1236,7 +1236,7 @@ DECLARE_INTERFACE_(IHXAudioStream2, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1254,7 +1254,7 @@ DECLARE_INTERFACE_(IHXAudioStream2, IUnknown) * Use this to remove itself from the notification response object * during the stream switching. */ - STDMETHOD(RemoveDryNotification) (THIS_ + STDQT_METHOD(RemoveDryNotification) (THIS_ IHXDryNotification* /*IN*/ pNotification ) PURE; @@ -1266,7 +1266,7 @@ DECLARE_INTERFACE_(IHXAudioStream2, IUnknown) * renderer. This function will fill in the pre-allocated * HXAudioFormat structure passed in. */ - STDMETHOD(GetAudioFormat) (THIS_ + STDQT_METHOD(GetAudioFormat) (THIS_ HXAudioFormat* /*IN/OUT*/pAudioFormat) PURE; }; @@ -1297,7 +1297,7 @@ DECLARE_INTERFACE_(IHXAudioPushdown, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1316,7 +1316,7 @@ DECLARE_INTERFACE_(IHXAudioPushdown, IUnknown) * This is the amount of audio data that is being written * to the audio device before starting playback. */ - STDMETHOD(SetAudioPushdown) (THIS_ + STDQT_METHOD(SetAudioPushdown) (THIS_ UINT32 /*IN*/ ulAudioPushdown ) PURE; }; @@ -1348,7 +1348,7 @@ DECLARE_INTERFACE_(IHXAudioHookManager, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1365,7 +1365,7 @@ DECLARE_INTERFACE_(IHXAudioHookManager, IUnknown) * Purpose: * Use this to add a hook */ - STDMETHOD(AddHook) (THIS_ + STDQT_METHOD(AddHook) (THIS_ IHXAudioHook* /*IN*/ pHook ) PURE; @@ -1375,7 +1375,7 @@ DECLARE_INTERFACE_(IHXAudioHookManager, IUnknown) * Purpose: * Use this to remove a hook */ - STDMETHOD(RemoveHook) (THIS_ + STDQT_METHOD(RemoveHook) (THIS_ IHXAudioHook* /*IN*/ pHook ) PURE; }; @@ -1407,7 +1407,7 @@ DECLARE_INTERFACE_(IHXMultiPlayPauseSupport, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1447,7 +1447,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceManager2, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1496,7 +1496,7 @@ DECLARE_INTERFACE_(IHXAudioResampler, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1561,7 +1561,7 @@ DECLARE_INTERFACE_(IHXAudioResamplerManager, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1573,7 +1573,7 @@ DECLARE_INTERFACE_(IHXAudioResamplerManager, IUnknown) * IHXAudioResamplerManager methods * */ - STDMETHOD(CreateResampler) (THIS_ + STDQT_METHOD(CreateResampler) (THIS_ HXAudioFormat inAudioFormat, REF(HXAudioFormat) outAudioFormat, REF(IHXAudioResampler*) pResampler) PURE; @@ -1605,7 +1605,7 @@ DECLARE_INTERFACE_(IHXAudioPushdown2, IHXAudioPushdown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1621,7 +1621,7 @@ DECLARE_INTERFACE_(IHXAudioPushdown2, IHXAudioPushdown) * This is the amount of audio data that is being written * to the audio device before starting playback. */ - STDMETHOD(SetAudioPushdown) (THIS_ + STDQT_METHOD(SetAudioPushdown) (THIS_ UINT32 /*IN */ ulAudioPushdown) PURE; /************************************************************************ @@ -1632,7 +1632,7 @@ DECLARE_INTERFACE_(IHXAudioPushdown2, IHXAudioPushdown) * This is the amount of audio data that is being written * to the audio device before starting playback. */ - STDMETHOD(GetAudioPushdown) (THIS_ + STDQT_METHOD(GetAudioPushdown) (THIS_ REF(UINT32) /*OUT*/ ulAudioPushdown) PURE; /************************************************************************ @@ -1642,7 +1642,7 @@ DECLARE_INTERFACE_(IHXAudioPushdown2, IHXAudioPushdown) * Use this to get the audio pushed down to the audio device and haven't * been played yet */ - STDMETHOD(GetCurrentAudioDevicePushdown) (THIS_ + STDQT_METHOD(GetCurrentAudioDevicePushdown) (THIS_ REF(UINT32) /*OUT*/ ulAudioPusheddown) PURE; }; @@ -1672,7 +1672,7 @@ DECLARE_INTERFACE_(IHXAudioMultiChannel, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1698,14 +1698,14 @@ DEFINE_GUID(IID_IHXTimelineWatcher, #define INTERFACE IHXTimelineWatcher DECLARE_INTERFACE_(IHXTimelineWatcher, IUnknown) { - STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; - STDMETHOD(OnPause) (THIS) PURE; - STDMETHOD(OnResume) (THIS) PURE; - STDMETHOD(OnClose) (THIS) PURE; - STDMETHOD(OnTimeSync) (THIS_ UINT32 currentTime ) PURE; + STDQT_METHOD(OnPause) (THIS) PURE; + STDQT_METHOD(OnResume) (THIS) PURE; + STDQT_METHOD(OnClose) (THIS) PURE; + STDQT_METHOD(OnTimeSync) (THIS_ UINT32 currentTime ) PURE; }; // TimelineManager @@ -1716,12 +1716,12 @@ DEFINE_GUID(IID_IHXTimelineManager, #define INTERFACE IHXTimelineManager DECLARE_INTERFACE_(IHXTimelineManager, IUnknown) { - STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; - STDMETHOD(AddTimelineWatcher) (THIS_ IHXTimelineWatcher* ) PURE; - STDMETHOD(RemoveTimelineWatcher) (THIS_ IHXTimelineWatcher* ) PURE; + STDQT_METHOD(AddTimelineWatcher) (THIS_ IHXTimelineWatcher* ) PURE; + STDQT_METHOD(RemoveTimelineWatcher) (THIS_ IHXTimelineWatcher* ) PURE; }; #endif /* #if defined(HELIX_FEATURE_TIMELINE_WATCHER) */ diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxauth.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxauth.h index 903c835f..aad4aed4 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxauth.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxauth.h @@ -51,7 +51,7 @@ DEFINE_GUID(IID_IHXAuthenticator, 0x00001800, 0x901, 0x11d1, 0x8b, 0x6, 0x0, DECLARE_INTERFACE_(IHXAuthenticator, IUnknown) { - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -64,7 +64,7 @@ DECLARE_INTERFACE_(IHXAuthenticator, IUnknown) * object in order to pass it an IHXAuthenticatorRequest object, * usually implemented by the creator itself. */ - STDMETHOD(InitAuthenticator) (THIS_ + STDQT_METHOD(InitAuthenticator) (THIS_ IHXAuthenticatorRequest* pRequest) PURE; /* * Authenticate is called by a file object (and others??) @@ -78,21 +78,21 @@ DECLARE_INTERFACE_(IHXAuthenticator, IUnknown) * part of their Init() call, and not call InitDone until they receive * a response one way or the other. */ - STDMETHOD(Authenticate) (THIS_ + STDQT_METHOD(Authenticate) (THIS_ IHXValues* pValues, IHXAuthenticatorResponse* pResponse) PURE; /* GenerateAuthRequest is called by the creator of this object * when they want to send an authentication request to someone. */ - STDMETHOD(GenerateAuthRequest) (THIS_ + STDQT_METHOD(GenerateAuthRequest) (THIS_ UINT32 authType, REF(IHXValues*) pValues) PURE; /* * AuthValuesReady is called by IHXAuthenticatorRequest when it * is ready to respond to a GetAuthValues request. */ - STDMETHOD(AuthValuesReady) (THIS_ + STDQT_METHOD(AuthValuesReady) (THIS_ HX_RESULT result, IHXValues* pValues) PURE; }; @@ -122,7 +122,7 @@ DEFINE_GUID(IID_IHXAuthenticatorResponse, 0x00001801, 0x901, 0x11d1, 0x8b, 0x6, DECLARE_INTERFACE_(IHXAuthenticatorResponse, IUnknown) { - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -135,7 +135,7 @@ DECLARE_INTERFACE_(IHXAuthenticatorResponse, IUnknown) * then the values contain authorization information as generated by * IHXPassword. */ - STDMETHOD(AuthenticateDone) (THIS_ HX_RESULT result, + STDQT_METHOD(AuthenticateDone) (THIS_ HX_RESULT result, IHXValues* pAuthResponseValues) PURE; }; @@ -164,7 +164,7 @@ DEFINE_GUID(IID_IHXAuthenticatorRequest, 0x00001802, 0x901, 0x11d1, 0x8b, 0x6, 0 DECLARE_INTERFACE_(IHXAuthenticatorRequest, IUnknown) { - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -177,7 +177,7 @@ DECLARE_INTERFACE_(IHXAuthenticatorRequest, IUnknown) * * This object should call AuthValuesReady when ready. */ - STDMETHOD(GetAuthValues) (THIS_ IHXValues* pOrigValues) PURE; + STDQT_METHOD(GetAuthValues) (THIS_ IHXValues* pOrigValues) PURE; }; @@ -215,7 +215,7 @@ DECLARE_INTERFACE_(IHXPassword, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -227,11 +227,11 @@ DECLARE_INTERFACE_(IHXPassword, IUnknown) * IHXPassword methods */ - STDMETHOD(Crypt) (THIS_ IHXValues* pAuthentication) PURE; - STDMETHOD(Verify) (THIS_ IHXValues* pAuth1, IHXValues* pAuth2) PURE; + STDQT_METHOD(Crypt) (THIS_ IHXValues* pAuthentication) PURE; + STDQT_METHOD(Verify) (THIS_ IHXValues* pAuth1, IHXValues* pAuth2) PURE; - STDMETHOD(AsString) (THIS_ IHXValues* pAuth, REF(IHXBuffer*) pBuffer) PURE; - STDMETHOD(AsValues) (THIS_ const char* str, IHXValues* pValues) PURE; + STDQT_METHOD(AsString) (THIS_ IHXValues* pAuth, REF(IHXBuffer*) pBuffer) PURE; + STDQT_METHOD(AsValues) (THIS_ const char* str, IHXValues* pValues) PURE; /* * CreateBuffer is provided for the convenince of external users, @@ -239,12 +239,12 @@ DECLARE_INTERFACE_(IHXPassword, IUnknown) * just to create IHXBuffers. This method can be used instead, but * is not advisable if other means are available. */ - STDMETHOD(CreateBuffer) (THIS_ REF(IHXBuffer*) pBuffer) PURE; + STDQT_METHOD(CreateBuffer) (THIS_ REF(IHXBuffer*) pBuffer) PURE; /* * Ditto for CreateValues */ - STDMETHOD(CreateValues) (THIS_ REF(IHXValues*) pValues) PURE; + STDQT_METHOD(CreateValues) (THIS_ REF(IHXValues*) pValues) PURE; }; @@ -272,7 +272,7 @@ DEFINE_GUID(IID_IHXAuthenticationManager, 0x00001a00, 0x901, 0x11d1, DECLARE_INTERFACE_(IHXAuthenticationManager, IUnknown) { - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; @@ -281,7 +281,7 @@ DECLARE_INTERFACE_(IHXAuthenticationManager, IUnknown) /* HandleAuthenticationRequest is called when the core wants us to get * a username and password. */ - STDMETHOD(HandleAuthenticationRequest) ( + STDQT_METHOD(HandleAuthenticationRequest) ( THIS_ IHXAuthenticationManagerResponse* pResponse) PURE; }; @@ -316,7 +316,7 @@ DEFINE_GUID(IID_IHXAuthenticationManager2, DECLARE_INTERFACE_(IHXAuthenticationManager2, IUnknown) { - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; @@ -325,7 +325,7 @@ DECLARE_INTERFACE_(IHXAuthenticationManager2, IUnknown) /* HandleAuthenticationRequest2 is called when the core wants us to get * a username and password. */ - STDMETHOD(HandleAuthenticationRequest2) ( + STDQT_METHOD(HandleAuthenticationRequest2) ( THIS_ IHXAuthenticationManagerResponse* pResponse, IHXValues* pHeader) PURE; @@ -357,7 +357,7 @@ DEFINE_GUID(IID_IHXAuthenticationManagerResponse, 0x00001a01, 0x901, 0x11d1, DECLARE_INTERFACE_(IHXAuthenticationManagerResponse, IUnknown) { - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; @@ -366,7 +366,7 @@ DECLARE_INTERFACE_(IHXAuthenticationManagerResponse, IUnknown) /* HandleAuthenticationRequest is called when the core wants us to get * a username and password. */ - STDMETHOD(AuthenticationRequestDone) (THIS_ + STDQT_METHOD(AuthenticationRequestDone) (THIS_ HX_RESULT result, const char* pUserName, const char* pPassword) PURE; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxccf.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxccf.h index b99d4bdb..9b2f8f43 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxccf.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxccf.h @@ -47,7 +47,7 @@ DECLARE_INTERFACE_(IHXCommonClassFactory, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -74,7 +74,7 @@ DECLARE_INTERFACE_(IHXCommonClassFactory, IUnknown) * not passed to this function, and you do not need to code for this * situation. */ - STDMETHOD(CreateInstance) (THIS_ + STDQT_METHOD(CreateInstance) (THIS_ REFCLSID /*IN*/ rclsid, void** /*OUT*/ ppUnknown) PURE; @@ -95,7 +95,7 @@ DECLARE_INTERFACE_(IHXCommonClassFactory, IUnknown) * NOTE 2: The output interface is always the non-delegating * IUnknown. */ - STDMETHOD(CreateInstanceAggregatable) + STDQT_METHOD(CreateInstanceAggregatable) (THIS_ REFCLSID /*IN*/ rclsid, REF(IUnknown*) /*OUT*/ ppUnknown, diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcom.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcom.h index 9a5f6891..96ddd9a2 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcom.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcom.h @@ -59,7 +59,7 @@ * Use this for constant methods in an interface * Compiles away under C */ -#if !defined( CONSTMETHOD ) +#if !defined( CONSTQT_METHOD ) #if defined(__cplusplus) #define CONSTMETHOD const @@ -219,7 +219,7 @@ typedef unsigned int MMRESULT; #if defined(__cplusplus) && !defined(CINTERFACE) #define _INTERFACE struct -#define STDMETHOD(method) virtual HX_RESULT STDMETHODCALLTYPE method +#define STDQT_METHOD(method) virtual HX_RESULT STDMETHODCALLTYPE method #define STDMETHOD_(type,method) virtual type STDMETHODCALLTYPE method #define PURE = 0 #define THIS_ @@ -250,7 +250,7 @@ typedef unsigned int MMRESULT; #define _INTERFACE struct -#define STDMETHOD(method) HX_RESULT (STDMETHODCALLTYPE * method) +#define STDQT_METHOD(method) HX_RESULT (STDMETHODCALLTYPE * method) #define STDMETHOD_(type,method) type (STDMETHODCALLTYPE * method) #if !defined(BEGIN_INTERFACE) @@ -474,7 +474,7 @@ DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xC0, 0x00, DECLARE_INTERFACE(IUnknown) { - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -510,7 +510,7 @@ DECLARE_INTERFACE_(IMalloc, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcomm.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcomm.h index dc4c8ea4..b8a5b9f7 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcomm.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcomm.h @@ -58,7 +58,7 @@ DECLARE_INTERFACE_(IHXStatistics, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -77,7 +77,7 @@ DECLARE_INTERFACE_(IHXStatistics, IUnknown) * Pass registry ID to the caller * */ - STDMETHOD(InitializeStatistics) (THIS_ + STDQT_METHOD(InitializeStatistics) (THIS_ UINT32 /*IN*/ ulRegistryID) PURE; /************************************************************************ @@ -87,7 +87,7 @@ DECLARE_INTERFACE_(IHXStatistics, IUnknown) * Notify the client to update its statistics stored in the registry * */ - STDMETHOD(UpdateStatistics) (THIS) PURE; + STDQT_METHOD(UpdateStatistics) (THIS) PURE; }; @@ -119,7 +119,7 @@ DECLARE_INTERFACE_(IHXRegistryID, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -138,7 +138,7 @@ DECLARE_INTERFACE_(IHXRegistryID, IUnknown) * Get the registry ID of the object. * */ - STDMETHOD(GetID) (THIS_ + STDQT_METHOD(GetID) (THIS_ REF(UINT32) /*OUT*/ ulRegistryID) PURE; }; @@ -172,7 +172,7 @@ DECLARE_INTERFACE_(IHXServerFork, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -232,7 +232,7 @@ DECLARE_INTERFACE_(IHXServerControl, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -250,7 +250,7 @@ DECLARE_INTERFACE_(IHXServerControl, IUnknown) * Purpose: * Shutdown the server. */ - STDMETHOD(ShutdownServer) (THIS_ + STDQT_METHOD(ShutdownServer) (THIS_ UINT32 status) PURE; }; @@ -282,7 +282,7 @@ DECLARE_INTERFACE_(IHXServerControl2, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -302,7 +302,7 @@ DECLARE_INTERFACE_(IHXServerControl2, IUnknown) * Completely shutdown the server, then restart. Mainly used to * cause not hot setting config var changes to take effect. */ - STDMETHOD(RestartServer) (THIS) PURE; + STDQT_METHOD(RestartServer) (THIS) PURE; /************************************************************************ * IHXServerControl2::ReconfigServer @@ -312,7 +312,7 @@ DECLARE_INTERFACE_(IHXServerControl2, IUnknown) * Used to cause the server to re-read in config from file or registry * (however it was started) and attempt to use the values. */ - STDMETHOD(ReconfigServer) (THIS_ IHXReconfigServerResponse* pResp) PURE; + STDQT_METHOD(ReconfigServer) (THIS_ IHXReconfigServerResponse* pResp) PURE; }; @@ -344,7 +344,7 @@ DECLARE_INTERFACE_(IHXReconfigServerResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -359,7 +359,7 @@ DECLARE_INTERFACE_(IHXReconfigServerResponse, IUnknown) * * Notification that reconfiguring the server is done. */ - STDMETHOD(ReconfigServerDone) (THIS_ + STDQT_METHOD(ReconfigServerDone) (THIS_ HX_RESULT res, IHXBuffer** pInfo, UINT32 ulNumInfo) PURE; @@ -396,7 +396,7 @@ DECLARE_INTERFACE_(IHXServerReconfigNotification, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -411,7 +411,7 @@ DECLARE_INTERFACE_(IHXServerReconfigNotification, IUnknown) * * Tell the server that you want reconfig notification. */ - STDMETHOD(WantReconfigNotification) (THIS_ + STDQT_METHOD(WantReconfigNotification) (THIS_ IHXWantServerReconfigNotification* pResponse) PURE; /************************************************************************ @@ -421,7 +421,7 @@ DECLARE_INTERFACE_(IHXServerReconfigNotification, IUnknown) * * Tell the server that you no longer want reconfig notification. */ - STDMETHOD(CancelReconfigNotification) (THIS_ + STDQT_METHOD(CancelReconfigNotification) (THIS_ IHXWantServerReconfigNotification* pResponse) PURE; }; @@ -456,7 +456,7 @@ DECLARE_INTERFACE_(IHXWantServerReconfigNotification, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -472,7 +472,7 @@ DECLARE_INTERFACE_(IHXWantServerReconfigNotification, IUnknown) * Notify user that a server reconfig request had come in and it * is now your turn to do external (not server config) reconfiguration.* */ - STDMETHOD(ServerReconfig) (THIS_ + STDQT_METHOD(ServerReconfig) (THIS_ IHXReconfigServerResponse* pResponse) PURE; }; @@ -491,7 +491,7 @@ DECLARE_INTERFACE_(IHXResolverExec, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -499,7 +499,7 @@ DECLARE_INTERFACE_(IHXResolverExec, IUnknown) STDMETHOD_(ULONG32,Release) (THIS) PURE; - STDMETHOD(ResolverExec) (THIS_ int readfd, int writefd) PURE; + STDQT_METHOD(ResolverExec) (THIS_ int readfd, int writefd) PURE; }; @@ -530,7 +530,7 @@ DECLARE_INTERFACE_(IHXFastAlloc, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -606,7 +606,7 @@ DECLARE_INTERFACE_(IHXAccurateClock, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h index e76f85c4..872ce014 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h @@ -148,7 +148,7 @@ DECLARE_INTERFACE_(IHXStream, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -168,7 +168,7 @@ DECLARE_INTERFACE_(IHXStream, IUnknown) * a part of. * */ - STDMETHOD(GetSource) (THIS_ + STDQT_METHOD(GetSource) (THIS_ REF(IHXStreamSource*) pSource) PURE; /************************************************************************ @@ -219,7 +219,7 @@ DECLARE_INTERFACE_(IHXStream, IUnknown) * a unQuality of 100. * */ - STDMETHOD(ReportQualityOfService) (THIS_ + STDQT_METHOD(ReportQualityOfService) (THIS_ UINT8 unQuality) PURE; /************************************************************************ @@ -240,7 +240,7 @@ DECLARE_INTERFACE_(IHXStream, IUnknown) * 5,5. * */ - STDMETHOD(ReportRebufferStatus) (THIS_ + STDQT_METHOD(ReportRebufferStatus) (THIS_ UINT8 unNeeded, UINT8 unAvailable) PURE; @@ -253,7 +253,7 @@ DECLARE_INTERFACE_(IHXStream, IUnknown) * Valid to call before stream actually begins. Best to call during * IHXRenderer::OnHeader(). */ - STDMETHOD(SetGranularity) (THIS_ + STDQT_METHOD(SetGranularity) (THIS_ ULONG32 ulGranularity) PURE; /************************************************************************ @@ -271,7 +271,7 @@ DECLARE_INTERFACE_(IHXStream, IUnknown) * Purpose: * Returns the Nth renderer instance supported by this stream. */ - STDMETHOD(GetRenderer) (THIS_ + STDQT_METHOD(GetRenderer) (THIS_ UINT16 nIndex, REF(IUnknown*) pUnknown) PURE; }; @@ -315,7 +315,7 @@ DECLARE_INTERFACE_(IHXStream2, IHXStream) * * The rest semantic are the same between the 2 calls. */ - STDMETHOD(ReportAudioRebufferStatus) (THIS_ + STDQT_METHOD(ReportAudioRebufferStatus) (THIS_ UINT8 unNeeded, UINT8 unAvailable) PURE; }; @@ -347,7 +347,7 @@ DECLARE_INTERFACE_(IHXStreamSource, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -376,7 +376,7 @@ DECLARE_INTERFACE_(IHXStreamSource, IUnknown) * a part of. * */ - STDMETHOD(GetPlayer) (THIS_ + STDQT_METHOD(GetPlayer) (THIS_ REF(IHXPlayer*) pPlayer) PURE; /************************************************************************ @@ -405,7 +405,7 @@ DECLARE_INTERFACE_(IHXStreamSource, IUnknown) * Purpose: * Returns the Nth stream instance supported by this source. */ - STDMETHOD(GetStream) (THIS_ + STDQT_METHOD(GetStream) (THIS_ UINT16 nIndex, REF(IUnknown*) pUnknown) PURE; }; @@ -439,7 +439,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -459,7 +459,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * player is a part of. * */ - STDMETHOD(GetClientEngine) (THIS_ + STDQT_METHOD(GetClientEngine) (THIS_ REF(IHXClientEngine*) pEngine) PURE; /************************************************************************ @@ -496,7 +496,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * Tell the player to begin playback of all its sources. * */ - STDMETHOD(OpenURL) (THIS_ + STDQT_METHOD(OpenURL) (THIS_ const char* pURL) PURE; /************************************************************************ @@ -506,7 +506,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * Tell the player to begin playback of all its sources. * */ - STDMETHOD(Begin) (THIS) PURE; + STDQT_METHOD(Begin) (THIS) PURE; /************************************************************************ * Method: @@ -515,7 +515,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * Tell the player to stop playback of all its sources. * */ - STDMETHOD(Stop) (THIS) PURE; + STDQT_METHOD(Stop) (THIS) PURE; /************************************************************************ * Method: @@ -524,7 +524,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * Tell the player to pause playback of all its sources. * */ - STDMETHOD(Pause) (THIS) PURE; + STDQT_METHOD(Pause) (THIS) PURE; /************************************************************************ * Method: @@ -534,7 +534,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * sources. * */ - STDMETHOD(Seek) (THIS_ + STDQT_METHOD(Seek) (THIS_ ULONG32 ulTime) PURE; /************************************************************************ @@ -552,7 +552,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * Purpose: * Returns the Nth source instance supported by this player. */ - STDMETHOD(GetSource) (THIS_ + STDQT_METHOD(GetSource) (THIS_ UINT16 nIndex, REF(IUnknown*) pUnknown) PURE; @@ -564,7 +564,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * services to the core. This is traditionally called by the top * level client application. */ - STDMETHOD(SetClientContext) (THIS_ + STDQT_METHOD(SetClientContext) (THIS_ IUnknown* pUnknown) PURE; /************************************************************************ @@ -574,7 +574,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * Called to get the client context for this player. This is * set by the top level client application. */ - STDMETHOD(GetClientContext) (THIS_ + STDQT_METHOD(GetClientContext) (THIS_ REF(IUnknown*) pUnknown) PURE; /************************************************************************ @@ -584,7 +584,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * Call this method to add a client advise sink. * */ - STDMETHOD(AddAdviseSink) (THIS_ + STDQT_METHOD(AddAdviseSink) (THIS_ IHXClientAdviseSink* pAdviseSink) PURE; /************************************************************************ @@ -593,7 +593,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * Purpose: * Call this method to remove a client advise sink. */ - STDMETHOD(RemoveAdviseSink) (THIS_ + STDQT_METHOD(RemoveAdviseSink) (THIS_ IHXClientAdviseSink* pAdviseSink) PURE; }; @@ -624,7 +624,7 @@ DECLARE_INTERFACE_(IHXClientEngine, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -643,7 +643,7 @@ DECLARE_INTERFACE_(IHXClientEngine, IUnknown) * Creates a new IHXPlayer instance. * */ - STDMETHOD(CreatePlayer) (THIS_ + STDQT_METHOD(CreatePlayer) (THIS_ REF(IHXPlayer*) pPlayer) PURE; /************************************************************************ @@ -653,7 +653,7 @@ DECLARE_INTERFACE_(IHXClientEngine, IUnknown) * Called by the client when it is done using the player... * */ - STDMETHOD(ClosePlayer) (THIS_ + STDQT_METHOD(ClosePlayer) (THIS_ IHXPlayer* pPlayer) PURE; /************************************************************************ @@ -672,7 +672,7 @@ DECLARE_INTERFACE_(IHXClientEngine, IUnknown) * Returns the Nth IHXPlayer instances supported by this client * engine instance. */ - STDMETHOD(GetPlayer) (THIS_ + STDQT_METHOD(GetPlayer) (THIS_ UINT16 nPlayerNumber, REF(IUnknown*) pUnknown) PURE; @@ -683,7 +683,7 @@ DECLARE_INTERFACE_(IHXClientEngine, IUnknown) * Clients call this to pass OS events to all players. HXxEvent * defines a cross-platform event. */ - STDMETHOD(EventOccurred) (THIS_ + STDQT_METHOD(EventOccurred) (THIS_ HXxEvent* /*IN*/ pEvent) PURE; }; @@ -715,7 +715,7 @@ DECLARE_INTERFACE_(IHXClientEngineMapper, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -734,7 +734,7 @@ DECLARE_INTERFACE_(IHXClientEngineMapper, IUnknown) * Returns the IHXPlayer instance supported by this client * engine instance that contains the specified IHXSite. */ - STDMETHOD(GetPlayerBySite) (THIS_ + STDQT_METHOD(GetPlayerBySite) (THIS_ IHXSite* pSite, REF(IUnknown*) pUnknown) PURE; }; @@ -752,7 +752,7 @@ DECLARE_INTERFACE_(IHXClientEngineSelector, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -802,7 +802,7 @@ DECLARE_INTERFACE_(IHXClientEngineSetup, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -822,7 +822,7 @@ DECLARE_INTERFACE_(IHXClientEngineSetup, IUnknown) * interfaces implemented by the core. Current over-ridable * interfaces are: IHXPreferences, IHXHyperNavigate */ - STDMETHOD(Setup) (THIS_ + STDQT_METHOD(Setup) (THIS_ IUnknown* pContext) PURE; }; @@ -853,7 +853,7 @@ DECLARE_INTERFACE_(IHXInfoLogger, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -872,7 +872,7 @@ DECLARE_INTERFACE_(IHXInfoLogger, IUnknown) * Logs any user defined information in form of action and * associated data. */ - STDMETHOD(LogInformation) (THIS_ + STDQT_METHOD(LogInformation) (THIS_ const char* /*IN*/ pAction, const char* /*IN*/ pData) PURE; }; @@ -903,7 +903,7 @@ DECLARE_INTERFACE_(IHXPersistenceManager, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -927,7 +927,7 @@ DECLARE_INTERFACE_(IHXPersistenceManager, IUnknown) * b) All the groups within the current presentation have been * played. */ - STDMETHOD(AddPersistentComponent) (THIS_ + STDQT_METHOD(AddPersistentComponent) (THIS_ IUnknown* /*IN*/ pComponent) PURE; /************************************************************************ @@ -936,7 +936,7 @@ DECLARE_INTERFACE_(IHXPersistenceManager, IUnknown) * Purpose: * Remove an earlier registered persistent component. */ - STDMETHOD(RemovePersistentComponent) (THIS_ + STDQT_METHOD(RemovePersistentComponent) (THIS_ IUnknown* /*IN*/ pComponent) PURE; /************************************************************************ @@ -945,7 +945,7 @@ DECLARE_INTERFACE_(IHXPersistenceManager, IUnknown) * Purpose: * Return an earlier registered persistent component. */ - STDMETHOD(GetPersistentComponent) (THIS_ + STDQT_METHOD(GetPersistentComponent) (THIS_ REF(IUnknown*) /*OUT*/ pComponent) PURE; }; @@ -975,7 +975,7 @@ DECLARE_INTERFACE_(IHXDriverStreamManager, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -993,7 +993,7 @@ DECLARE_INTERFACE_(IHXDriverStreamManager, IUnknown) * Add a renderer advise sink * */ - STDMETHOD(AddRendererAdviseSink) (THIS_ + STDQT_METHOD(AddRendererAdviseSink) (THIS_ IHXRendererAdviseSink* pSink) PURE; /************************************************************************ @@ -1003,7 +1003,7 @@ DECLARE_INTERFACE_(IHXDriverStreamManager, IUnknown) * Remove an advise sink * */ - STDMETHOD(RemoveRendererAdviseSink) (THIS_ + STDQT_METHOD(RemoveRendererAdviseSink) (THIS_ IHXRendererAdviseSink* pSink) PURE; }; @@ -1033,7 +1033,7 @@ DECLARE_INTERFACE_(IHXRendererAdviseSink, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1045,19 +1045,19 @@ DECLARE_INTERFACE_(IHXRendererAdviseSink, IUnknown) * IHXRendererAdviseSink methods */ - STDMETHOD(TrackDurationSet) (THIS_ + STDQT_METHOD(TrackDurationSet) (THIS_ UINT32 ulGroupIndex, UINT32 ulTrackIndex, UINT32 ulDuration, UINT32 ulDelay, HXBOOL bIsLive) PURE; - STDMETHOD(RepeatedTrackDurationSet) (THIS_ + STDQT_METHOD(RepeatedTrackDurationSet) (THIS_ const char* pID, UINT32 ulDuration, HXBOOL bIsLive) PURE; - STDMETHOD(TrackUpdated) (THIS_ + STDQT_METHOD(TrackUpdated) (THIS_ UINT32 ulGroupIndex, UINT32 ulTrackIndex, IHXValues* pValues) PURE; @@ -1069,7 +1069,7 @@ DECLARE_INTERFACE_(IHXRendererAdviseSink, IUnknown) * Notification of renderer initialization * */ - STDMETHOD(RendererInitialized) (THIS_ + STDQT_METHOD(RendererInitialized) (THIS_ IHXRenderer* pRenderer, IUnknown* pStream, IHXValues* pInfo) PURE; @@ -1081,7 +1081,7 @@ DECLARE_INTERFACE_(IHXRendererAdviseSink, IUnknown) * Notification of renderer close * */ - STDMETHOD(RendererClosed) (THIS_ + STDQT_METHOD(RendererClosed) (THIS_ IHXRenderer* pRenderer, IHXValues* pInfo) PURE; }; @@ -1113,7 +1113,7 @@ DECLARE_INTERFACE_(IHXLayoutStream, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1133,7 +1133,7 @@ DECLARE_INTERFACE_(IHXLayoutStream, IUnknown) * * */ - STDMETHOD(GetProperties) (THIS_ + STDQT_METHOD(GetProperties) (THIS_ REF(IHXValues*) pValue) PURE; /************************************************************************ @@ -1143,7 +1143,7 @@ DECLARE_INTERFACE_(IHXLayoutStream, IUnknown) * Set layout stream property * */ - STDMETHOD(SetProperties) (THIS_ + STDQT_METHOD(SetProperties) (THIS_ IHXValues* pValue) PURE; }; @@ -1173,7 +1173,7 @@ DECLARE_INTERFACE_(IHXRendererUpgrade, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1203,7 +1203,7 @@ DECLARE_INTERFACE_(IHXRendererUpgrade, IUnknown) * Force an upgrade for any unloaded renderers * */ - STDMETHOD(ForceUpgrade) (THIS) PURE; + STDQT_METHOD(ForceUpgrade) (THIS) PURE; }; /**************************************************************************** @@ -1232,7 +1232,7 @@ DECLARE_INTERFACE_(IHXValidator, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1263,7 +1263,7 @@ DECLARE_INTERFACE_(IHXValidator, IUnknown) * * */ - STDMETHOD(ValidateMetaFile) (THIS_ + STDQT_METHOD(ValidateMetaFile) (THIS_ IHXRequest* pRequest, IHXBuffer* pContent) PURE; }; @@ -1299,7 +1299,7 @@ DECLARE_INTERFACE_(IHXPrivateStreamSource, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1344,7 +1344,7 @@ DECLARE_INTERFACE_(IHXPlayer2, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1358,7 +1358,7 @@ DECLARE_INTERFACE_(IHXPlayer2, IUnknown) * Purpose: * Call this method to set the minimum preroll of this clip */ - STDMETHOD(SetMinimumPreroll) (THIS_ + STDQT_METHOD(SetMinimumPreroll) (THIS_ UINT32 ulMinPreroll) PURE; /************************************************************************ @@ -1367,7 +1367,7 @@ DECLARE_INTERFACE_(IHXPlayer2, IUnknown) * Purpose: * Call this method to get the minimum preroll of this clip */ - STDMETHOD(GetMinimumPreroll) (THIS_ + STDQT_METHOD(GetMinimumPreroll) (THIS_ REF(UINT32) ulMinPreroll) PURE; /************************************************************************ @@ -1376,7 +1376,7 @@ DECLARE_INTERFACE_(IHXPlayer2, IUnknown) * Purpose: * Call this method to open the IHXRequest */ - STDMETHOD(OpenRequest) (THIS_ + STDQT_METHOD(OpenRequest) (THIS_ IHXRequest* pRequest) PURE; /************************************************************************ @@ -1385,7 +1385,7 @@ DECLARE_INTERFACE_(IHXPlayer2, IUnknown) * Purpose: * Call this method to get the IHXRequest */ - STDMETHOD(GetRequest) (THIS_ + STDQT_METHOD(GetRequest) (THIS_ REF(IHXRequest*) pRequest) PURE; }; @@ -1416,7 +1416,7 @@ DECLARE_INTERFACE_(IHXUpdateProperties, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1430,7 +1430,7 @@ DECLARE_INTERFACE_(IHXUpdateProperties, IUnknown) * Purpose: * Call this method to update the timestamp offset of cached packets */ - STDMETHOD(UpdatePacketTimeOffset) (THIS_ + STDQT_METHOD(UpdatePacketTimeOffset) (THIS_ INT32 lTimeOffset) PURE; /************************************************************************ @@ -1439,7 +1439,7 @@ DECLARE_INTERFACE_(IHXUpdateProperties, IUnknown) * Purpose: * Call this method to update properties */ - STDMETHOD(UpdatePlayTimes) (THIS_ + STDQT_METHOD(UpdatePlayTimes) (THIS_ IHXValues* pProps) PURE; }; @@ -1469,7 +1469,7 @@ DECLARE_INTERFACE_(IHXUpdateProperties2, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1483,7 +1483,7 @@ DECLARE_INTERFACE_(IHXUpdateProperties2, IUnknown) * Purpose: * Call this method to update the stream header */ - STDMETHOD(UpdateHeader) (THIS_ + STDQT_METHOD(UpdateHeader) (THIS_ IHXValues* pProps) PURE; }; // $EndPrivate. @@ -1514,7 +1514,7 @@ DECLARE_INTERFACE_(IHXPlayerNavigator, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1528,7 +1528,7 @@ DECLARE_INTERFACE_(IHXPlayerNavigator, IUnknown) * Purpose: * Add child player to the current player */ - STDMETHOD(AddChildPlayer) (THIS_ + STDQT_METHOD(AddChildPlayer) (THIS_ IHXPlayer* pPlayer) PURE; /************************************************************************ @@ -1537,7 +1537,7 @@ DECLARE_INTERFACE_(IHXPlayerNavigator, IUnknown) * Purpose: * Remove child player from the current player */ - STDMETHOD(RemoveChildPlayer) (THIS_ + STDQT_METHOD(RemoveChildPlayer) (THIS_ IHXPlayer* pPlayer) PURE; /************************************************************************ @@ -1554,7 +1554,7 @@ DECLARE_INTERFACE_(IHXPlayerNavigator, IUnknown) * Purpose: * Get Nth child player */ - STDMETHOD(GetChildPlayer) (THIS_ + STDQT_METHOD(GetChildPlayer) (THIS_ UINT16 uPlayerIndex, REF(IHXPlayer*) pPlayer) PURE; @@ -1564,7 +1564,7 @@ DECLARE_INTERFACE_(IHXPlayerNavigator, IUnknown) * Purpose: * Set the parent player */ - STDMETHOD(SetParentPlayer) (THIS_ + STDQT_METHOD(SetParentPlayer) (THIS_ IHXPlayer* pPlayer) PURE; /************************************************************************ @@ -1573,7 +1573,7 @@ DECLARE_INTERFACE_(IHXPlayerNavigator, IUnknown) * Purpose: * Remove the parent player */ - STDMETHOD(RemoveParentPlayer) (THIS_ + STDQT_METHOD(RemoveParentPlayer) (THIS_ IHXPlayer* pPlayer) PURE; /************************************************************************ @@ -1582,7 +1582,7 @@ DECLARE_INTERFACE_(IHXPlayerNavigator, IUnknown) * Purpose: * Get the parent player */ - STDMETHOD(GetParentPlayer) (THIS_ + STDQT_METHOD(GetParentPlayer) (THIS_ REF(IHXPlayer*) pPlayer) PURE; }; @@ -1613,7 +1613,7 @@ DECLARE_INTERFACE_(IHXPersistentComponentManager, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1627,7 +1627,7 @@ DECLARE_INTERFACE_(IHXPersistentComponentManager, IUnknown) * Purpose: * create persistent component */ - STDMETHOD(CreatePersistentComponent) (THIS_ + STDQT_METHOD(CreatePersistentComponent) (THIS_ REF(IHXPersistentComponent*) pPersistentComponent) PURE; @@ -1637,7 +1637,7 @@ DECLARE_INTERFACE_(IHXPersistentComponentManager, IUnknown) * Purpose: * add persistent component */ - STDMETHOD(AddPersistentComponent) (THIS_ + STDQT_METHOD(AddPersistentComponent) (THIS_ IHXPersistentComponent* pPersistentComponent) PURE; /************************************************************************ @@ -1646,7 +1646,7 @@ DECLARE_INTERFACE_(IHXPersistentComponentManager, IUnknown) * Purpose: * remove persistent component */ - STDMETHOD(RemovePersistentComponent) (THIS_ + STDQT_METHOD(RemovePersistentComponent) (THIS_ UINT32 ulPersistentComponentID) PURE; /************************************************************************ @@ -1655,7 +1655,7 @@ DECLARE_INTERFACE_(IHXPersistentComponentManager, IUnknown) * Purpose: * get persistent component information */ - STDMETHOD(GetPersistentComponent) (THIS_ + STDQT_METHOD(GetPersistentComponent) (THIS_ UINT32 ulPersistentComponentID, REF(IHXPersistentComponent*) pPersistentComponent) PURE; @@ -1665,7 +1665,7 @@ DECLARE_INTERFACE_(IHXPersistentComponentManager, IUnknown) * Purpose: * get persistent component information */ - STDMETHOD(AttachPersistentComponentLayout) (THIS_ + STDQT_METHOD(AttachPersistentComponentLayout) (THIS_ IUnknown* pLSG, IHXValues* pProps) PURE; }; @@ -1696,7 +1696,7 @@ DECLARE_INTERFACE_(IHXPersistentComponent, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1710,7 +1710,7 @@ DECLARE_INTERFACE_(IHXPersistentComponent, IUnknown) * Purpose: * initialize persistent component */ - STDMETHOD(Init) (THIS_ + STDQT_METHOD(Init) (THIS_ IHXPersistentRenderer* pPersistentRenderer) PURE; /************************************************************************ @@ -1719,7 +1719,7 @@ DECLARE_INTERFACE_(IHXPersistentComponent, IUnknown) * Purpose: * add renderer advise sink */ - STDMETHOD(AddRendererAdviseSink) (THIS_ + STDQT_METHOD(AddRendererAdviseSink) (THIS_ IHXRendererAdviseSink* pSink) PURE; /************************************************************************ @@ -1728,7 +1728,7 @@ DECLARE_INTERFACE_(IHXPersistentComponent, IUnknown) * Purpose: * remove renderer advise sink */ - STDMETHOD(RemoveRendererAdviseSink) (THIS_ + STDQT_METHOD(RemoveRendererAdviseSink) (THIS_ IHXRendererAdviseSink* pSink) PURE; /************************************************************************ @@ -1737,7 +1737,7 @@ DECLARE_INTERFACE_(IHXPersistentComponent, IUnknown) * Purpose: * add renderer advise sink */ - STDMETHOD(AddGroupSink) (THIS_ + STDQT_METHOD(AddGroupSink) (THIS_ IHXGroupSink* pSink) PURE; /************************************************************************ @@ -1746,7 +1746,7 @@ DECLARE_INTERFACE_(IHXPersistentComponent, IUnknown) * Purpose: * remove renderer advise sink */ - STDMETHOD(RemoveGroupSink) (THIS_ + STDQT_METHOD(RemoveGroupSink) (THIS_ IHXGroupSink* pSink) PURE; /************************************************************************ @@ -1755,7 +1755,7 @@ DECLARE_INTERFACE_(IHXPersistentComponent, IUnknown) * Purpose: * get persistent renderer */ - STDMETHOD(GetPersistentRenderer) (THIS_ + STDQT_METHOD(GetPersistentRenderer) (THIS_ REF(IHXPersistentRenderer*) pPersistentRenderer) PURE; /************************************************************************ @@ -1764,7 +1764,7 @@ DECLARE_INTERFACE_(IHXPersistentComponent, IUnknown) * Purpose: * get persistent component properties */ - STDMETHOD(GetPersistentProperties) (THIS_ + STDQT_METHOD(GetPersistentProperties) (THIS_ REF(IHXValues*) pProperties) PURE; }; @@ -1797,7 +1797,7 @@ DECLARE_INTERFACE_(IHXClientStatisticsGranularity, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1811,7 +1811,7 @@ DECLARE_INTERFACE_(IHXClientStatisticsGranularity, IUnknown) * Purpose: * Set the granularity */ - STDMETHOD(SetStatsGranularity) (THIS_ ULONG32 ulGranularity) PURE; + STDQT_METHOD(SetStatsGranularity) (THIS_ ULONG32 ulGranularity) PURE; }; // $EndPrivate. @@ -1850,7 +1850,7 @@ DECLARE_INTERFACE_(IHXSourceBufferingStats, IUnknown) * Get the current buffering information */ - STDMETHOD(GetCurrentBuffering) (THIS_ UINT16 uStreamNumber, + STDQT_METHOD(GetCurrentBuffering) (THIS_ UINT16 uStreamNumber, REF(INT64) llLowestTimestamp, REF(INT64) llHighestTimestamp, REF(UINT32) ulNumBytes, @@ -1889,7 +1889,7 @@ DECLARE_INTERFACE_(IHXSourceBufferingStats2, IHXSourceBufferingStats) * Purpose: * Get the amount of buffering in the transport */ - STDMETHOD(GetCurrentBuffering) (THIS_ UINT16 uStreamNumber, + STDQT_METHOD(GetCurrentBuffering) (THIS_ UINT16 uStreamNumber, REF(INT64) llLowestTimestamp, REF(INT64) llHighestTimestamp, REF(UINT32) ulNumBytes, @@ -1904,7 +1904,7 @@ DECLARE_INTERFACE_(IHXSourceBufferingStats2, IHXSourceBufferingStats) * the renderer */ - STDMETHOD(GetTotalBuffering) (THIS_ UINT16 uStreamNumber, + STDQT_METHOD(GetTotalBuffering) (THIS_ UINT16 uStreamNumber, REF(INT64) llLowestTimestamp, REF(INT64) llHighestTimestamp, REF(UINT32) ulNumBytes, @@ -1942,7 +1942,7 @@ DECLARE_INTERFACE_(IHXSourceLatencyStats, IUnknown) * Purpose: * set the live sync start time */ - STDMETHOD(SetLiveSyncOffset) (THIS_ UINT32 ulLiveSyncStartTime) PURE; + STDQT_METHOD(SetLiveSyncOffset) (THIS_ UINT32 ulLiveSyncStartTime) PURE; /************************************************************************ * Method: @@ -1951,7 +1951,7 @@ DECLARE_INTERFACE_(IHXSourceLatencyStats, IUnknown) * call this for each arriving packet! */ - STDMETHOD(NewPacketTimeStamp) (THIS_ UINT32 ulDueTimeStamp) PURE; + STDQT_METHOD(NewPacketTimeStamp) (THIS_ UINT32 ulDueTimeStamp) PURE; /************************************************************************ * Method: @@ -1960,7 +1960,7 @@ DECLARE_INTERFACE_(IHXSourceLatencyStats, IUnknown) * call this for each arriving packet! */ - STDMETHOD(GetLatencyStats) (THIS_ + STDQT_METHOD(GetLatencyStats) (THIS_ REF(UINT32) ulAverageLatency, REF(UINT32) ulMinimumLatency, REF(UINT32) ulMaximumLatency ) PURE; @@ -1973,7 +1973,7 @@ DECLARE_INTERFACE_(IHXSourceLatencyStats, IUnknown) * call this for each arriving packet! */ - STDMETHOD(ResetLatencyStats) (THIS_ ) PURE; + STDQT_METHOD(ResetLatencyStats) (THIS_ ) PURE; }; @@ -2010,7 +2010,7 @@ DECLARE_INTERFACE_(IHXPlayerPresentation, IUnknown) * Call this method to close the player's current presentation. This will free * all resources associated with the current presentation. */ - STDMETHOD(ClosePresentation) (THIS) PURE; + STDQT_METHOD(ClosePresentation) (THIS) PURE; }; // $EndPrivate. @@ -2047,7 +2047,7 @@ DECLARE_INTERFACE_(IHXCoreMutex, IUnknown) * Purpose: * Call this method to lock the client engine's core mutex. */ - STDMETHOD(LockCoreMutex) (THIS) PURE; + STDQT_METHOD(LockCoreMutex) (THIS) PURE; /************************************************************************ * Method: @@ -2055,7 +2055,7 @@ DECLARE_INTERFACE_(IHXCoreMutex, IUnknown) * Purpose: * Call this method to unlock the client engine's core mutex. */ - STDMETHOD(UnlockCoreMutex) (THIS) PURE; + STDQT_METHOD(UnlockCoreMutex) (THIS) PURE; }; @@ -2091,7 +2091,7 @@ DECLARE_INTERFACE_(IHXMacBlitMutex, IUnknown) * Purpose: * Call this method to lock the client engine's core mutex. */ - STDMETHOD(LockMacBlitMutex) (THIS) PURE; + STDQT_METHOD(LockMacBlitMutex) (THIS) PURE; /************************************************************************ * Method: @@ -2099,7 +2099,7 @@ DECLARE_INTERFACE_(IHXMacBlitMutex, IUnknown) * Purpose: * Call this method to unlock the client engine's core mutex. */ - STDMETHOD(UnlockMacBlitMutex) (THIS) PURE; + STDQT_METHOD(UnlockMacBlitMutex) (THIS) PURE; }; // $EndPrivate. diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxengin.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxengin.h index cc4d1b49..010a58a4 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxengin.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxengin.h @@ -104,7 +104,7 @@ DECLARE_INTERFACE_(IHXCallback, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -123,7 +123,7 @@ DECLARE_INTERFACE_(IHXCallback, IUnknown) * This is the function that will be called when a callback is * to be executed. */ - STDMETHOD(Func) (THIS) PURE; + STDQT_METHOD(Func) (THIS) PURE; }; @@ -162,7 +162,7 @@ DECLARE_INTERFACE_(IHXScheduler, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -202,7 +202,7 @@ DECLARE_INTERFACE_(IHXScheduler, IUnknown) * Purpose: * Remove a callback from the scheduler. */ - STDMETHOD(Remove) (THIS_ + STDQT_METHOD(Remove) (THIS_ CallbackHandle Handle) PURE; /************************************************************************ @@ -242,7 +242,7 @@ DECLARE_INTERFACE_(IHXTCPResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -260,7 +260,7 @@ DECLARE_INTERFACE_(IHXTCPResponse, IUnknown) * Purpose: * A Connect operation has been completed or an error has occurred. */ - STDMETHOD(ConnectDone) (THIS_ + STDQT_METHOD(ConnectDone) (THIS_ HX_RESULT status) PURE; /************************************************************************ @@ -270,7 +270,7 @@ DECLARE_INTERFACE_(IHXTCPResponse, IUnknown) * A Read operation has been completed or an error has occurred. * The data is returned in the IHXBuffer. */ - STDMETHOD(ReadDone) (THIS_ + STDQT_METHOD(ReadDone) (THIS_ HX_RESULT status, IHXBuffer* pBuffer) PURE; @@ -281,7 +281,7 @@ DECLARE_INTERFACE_(IHXTCPResponse, IUnknown) * This is the response method for WantWrite. * If HX_RESULT is ok, then the TCP channel is ok to Write to. */ - STDMETHOD(WriteReady) (THIS_ + STDQT_METHOD(WriteReady) (THIS_ HX_RESULT status) PURE; /************************************************************************ @@ -291,7 +291,7 @@ DECLARE_INTERFACE_(IHXTCPResponse, IUnknown) * This method is called to inform you that the TCP channel has * been closed by the peer or closed due to error. */ - STDMETHOD(Closed) (THIS_ + STDQT_METHOD(Closed) (THIS_ HX_RESULT status) PURE; }; @@ -322,7 +322,7 @@ DECLARE_INTERFACE_(IHXTCPSocket, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -337,27 +337,27 @@ DECLARE_INTERFACE_(IHXTCPSocket, IUnknown) * */ - STDMETHOD(Init) (THIS_ + STDQT_METHOD(Init) (THIS_ IHXTCPResponse* /*IN*/ pTCPResponse) PURE; - STDMETHOD(SetResponse) (THIS_ + STDQT_METHOD(SetResponse) (THIS_ IHXTCPResponse* pTCPResponse) PURE; - STDMETHOD(Bind) (THIS_ + STDQT_METHOD(Bind) (THIS_ UINT32 ulLocalAddr, UINT16 nPort) PURE; /* * pDestination is a string containing host name or dotted-ip notation */ - STDMETHOD(Connect) (THIS_ + STDQT_METHOD(Connect) (THIS_ const char* pDestination, UINT16 nPort) PURE; - STDMETHOD(Read) (THIS_ + STDQT_METHOD(Read) (THIS_ UINT16 Size) PURE; - STDMETHOD(Write) (THIS_ + STDQT_METHOD(Write) (THIS_ IHXBuffer* pBuffer) PURE; /************************************************************************ @@ -371,7 +371,7 @@ DECLARE_INTERFACE_(IHXTCPSocket, IUnknown) * written to, the response interfaces WriteReady method will be * called. */ - STDMETHOD(WantWrite) (THIS) PURE; + STDQT_METHOD(WantWrite) (THIS) PURE; /************************************************************************ * Method: @@ -380,10 +380,10 @@ DECLARE_INTERFACE_(IHXTCPSocket, IUnknown) * Returns the address of the other end of the TCP socket as a * ULONG32 in local host order */ - STDMETHOD(GetForeignAddress) (THIS_ + STDQT_METHOD(GetForeignAddress) (THIS_ REF(ULONG32) lAddress) PURE; - STDMETHOD(GetLocalAddress) (THIS_ + STDQT_METHOD(GetLocalAddress) (THIS_ REF(ULONG32) lAddress) PURE; /************************************************************************ @@ -393,10 +393,10 @@ DECLARE_INTERFACE_(IHXTCPSocket, IUnknown) * Returns the port of the other end of the TCP socket in local * host order. */ - STDMETHOD(GetForeignPort) (THIS_ + STDQT_METHOD(GetForeignPort) (THIS_ REF(UINT16) port) PURE; - STDMETHOD(GetLocalPort) (THIS_ + STDQT_METHOD(GetLocalPort) (THIS_ REF(UINT16) port) PURE; }; @@ -425,7 +425,7 @@ DECLARE_INTERFACE_(IHXTCPSecureSocket, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -436,7 +436,7 @@ DECLARE_INTERFACE_(IHXTCPSecureSocket, IUnknown) /* * IHXTCPSecureSocket method */ - STDMETHOD(SetSecure) (THIS_ + STDQT_METHOD(SetSecure) (THIS_ HXBOOL bSecure) PURE; }; // $EndPrivate. @@ -464,7 +464,7 @@ DECLARE_INTERFACE_(IHXSSL, IUnknown) * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -476,11 +476,11 @@ DECLARE_INTERFACE_(IHXSSL, IUnknown) * */ - STDMETHOD(Initialize) (THIS) PURE; + STDQT_METHOD(Initialize) (THIS) PURE; - STDMETHOD(Shutdown) (THIS) PURE; + STDQT_METHOD(Shutdown) (THIS) PURE; - STDMETHOD(PostConnect) (THIS_ + STDQT_METHOD(PostConnect) (THIS_ LONG32 nSocketNumber) PURE; STDMETHOD_(LONG32, Read) (THIS_ @@ -493,10 +493,10 @@ DECLARE_INTERFACE_(IHXSSL, IUnknown) void* buff, LONG32 buffLen) PURE; - STDMETHOD(Close) (THIS_ + STDQT_METHOD(Close) (THIS_ LONG32 nSocketNumber) PURE; - STDMETHOD(SetCallbacks) (THIS_ + STDQT_METHOD(SetCallbacks) (THIS_ void* readCallback, void* writeCallback, void* closeCallback) PURE; @@ -537,7 +537,7 @@ DECLARE_INTERFACE_(IHXBufferedSocket, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -549,12 +549,12 @@ DECLARE_INTERFACE_(IHXBufferedSocket, IUnknown) * IHXTCPSocket methods */ - STDMETHOD(BufferedWrite) (THIS_ + STDQT_METHOD(BufferedWrite) (THIS_ IHXBuffer* pBuffer) PURE; - STDMETHOD(FlushWrite) (THIS) PURE; + STDQT_METHOD(FlushWrite) (THIS) PURE; - STDMETHOD(SetDesiredPacketSize) (THIS_ + STDQT_METHOD(SetDesiredPacketSize) (THIS_ UINT32 ulPacketSize) PURE; }; @@ -588,7 +588,7 @@ DECLARE_INTERFACE_(IHXListenResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -600,7 +600,7 @@ DECLARE_INTERFACE_(IHXListenResponse, IUnknown) * IHXListenResponse methods */ - STDMETHOD(NewConnection) (THIS_ + STDQT_METHOD(NewConnection) (THIS_ HX_RESULT status, IHXTCPSocket* pTCPSocket) PURE; }; @@ -632,7 +632,7 @@ DECLARE_INTERFACE_(IHXListenSocket, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -644,7 +644,7 @@ DECLARE_INTERFACE_(IHXListenSocket, IUnknown) * IHXListenSocket methods */ - STDMETHOD(Init) (THIS_ + STDQT_METHOD(Init) (THIS_ UINT32 ulLocalAddr, UINT16 port, IHXListenResponse* /*IN*/ pListenResponse @@ -679,7 +679,7 @@ DECLARE_INTERFACE_(IHXNetworkServices, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -697,7 +697,7 @@ DECLARE_INTERFACE_(IHXNetworkServices, IUnknown) * Purpose: * Create a new TCP socket. */ - STDMETHOD(CreateTCPSocket) (THIS_ + STDQT_METHOD(CreateTCPSocket) (THIS_ IHXTCPSocket** /*OUT*/ ppTCPSocket) PURE; /************************************************************************ @@ -706,7 +706,7 @@ DECLARE_INTERFACE_(IHXNetworkServices, IUnknown) * Purpose: * Create a new UDP socket. */ - STDMETHOD(CreateUDPSocket) (THIS_ + STDQT_METHOD(CreateUDPSocket) (THIS_ IHXUDPSocket** /*OUT*/ ppUDPSocket) PURE; /************************************************************************ @@ -716,7 +716,7 @@ DECLARE_INTERFACE_(IHXNetworkServices, IUnknown) * Create a new TCP socket that will listen for connections on a * particular port. */ - STDMETHOD(CreateListenSocket) (THIS_ + STDQT_METHOD(CreateListenSocket) (THIS_ IHXListenSocket** /*OUT*/ ppListenSocket ) PURE; @@ -726,7 +726,7 @@ DECLARE_INTERFACE_(IHXNetworkServices, IUnknown) * Purpose: * Create a new resolver that can lookup host names */ - STDMETHOD(CreateResolver) (THIS_ + STDQT_METHOD(CreateResolver) (THIS_ IHXResolver** /*OUT*/ ppResolver) PURE; }; @@ -762,7 +762,7 @@ DECLARE_INTERFACE_(IHXNetworkServices2, IHXNetworkServices) * Purpose: * Create a new local bound TCP socket. */ - STDMETHOD(CreateLBoundTCPSocket) (THIS_ + STDQT_METHOD(CreateLBoundTCPSocket) (THIS_ IHXTCPSocket** /*OUT*/ ppTCPSocket) PURE; }; @@ -795,7 +795,7 @@ DECLARE_INTERFACE_(IHXUDPResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -807,7 +807,7 @@ DECLARE_INTERFACE_(IHXUDPResponse, IUnknown) * IHXUDPResponse methods */ - STDMETHOD(ReadDone) (THIS_ + STDQT_METHOD(ReadDone) (THIS_ HX_RESULT status, IHXBuffer* pBuffer, ULONG32 ulAddr, @@ -841,7 +841,7 @@ DECLARE_INTERFACE_(IHXUDPSocket, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -855,34 +855,34 @@ DECLARE_INTERFACE_(IHXUDPSocket, IUnknown) * Network addresses and ports are in native byte order */ - STDMETHOD(Init) (THIS_ + STDQT_METHOD(Init) (THIS_ ULONG32 ulAddr, UINT16 nPort, IHXUDPResponse* pUDPResponse) PURE; - STDMETHOD(Bind) (THIS_ + STDQT_METHOD(Bind) (THIS_ UINT32 ulLocalAddr, UINT16 nPort) PURE; - STDMETHOD(Read) (THIS_ + STDQT_METHOD(Read) (THIS_ UINT16 Size) PURE; - STDMETHOD(Write) (THIS_ + STDQT_METHOD(Write) (THIS_ IHXBuffer* pBuffer) PURE; - STDMETHOD(WriteTo) (THIS_ + STDQT_METHOD(WriteTo) (THIS_ ULONG32 ulAddr, UINT16 nPort, IHXBuffer* pBuffer) PURE; - STDMETHOD(GetLocalPort) (THIS_ + STDQT_METHOD(GetLocalPort) (THIS_ REF(UINT16) port) PURE; - STDMETHOD(JoinMulticastGroup) (THIS_ + STDQT_METHOD(JoinMulticastGroup) (THIS_ ULONG32 ulMulticastAddr, ULONG32 ulInterfaceAddr) PURE; - STDMETHOD(LeaveMulticastGroup) (THIS_ + STDQT_METHOD(LeaveMulticastGroup) (THIS_ ULONG32 ulMulticastAddr, ULONG32 ulInterfaceAddr) PURE; }; @@ -914,7 +914,7 @@ DECLARE_INTERFACE_(IHXResolver, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -926,10 +926,10 @@ DECLARE_INTERFACE_(IHXResolver, IUnknown) * IHXResolver methods */ - STDMETHOD(Init) (THIS_ + STDQT_METHOD(Init) (THIS_ IHXResolverResponse* pResponse) PURE; - STDMETHOD(GetHostByName) (THIS_ + STDQT_METHOD(GetHostByName) (THIS_ const char* pHostName) PURE; }; @@ -961,7 +961,7 @@ DECLARE_INTERFACE_(IHXResolverResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -973,7 +973,7 @@ DECLARE_INTERFACE_(IHXResolverResponse, IUnknown) * IHXResolverResponse methods */ - STDMETHOD(GetHostByNameDone) (THIS_ + STDQT_METHOD(GetHostByNameDone) (THIS_ HX_RESULT status, ULONG32 ulAddr) PURE; }; @@ -1010,7 +1010,7 @@ DECLARE_INTERFACE_(IHXInterruptSafe, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1063,7 +1063,7 @@ DECLARE_INTERFACE_(IHXAsyncIOSelection, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1084,7 +1084,7 @@ DECLARE_INTERFACE_(IHXAsyncIOSelection, IUnknown) * exception. This function is only available on Unix, and is * intended to replace the functionality of select(). */ - STDMETHOD(Add) (THIS_ + STDQT_METHOD(Add) (THIS_ IHXCallback* pCallback, INT32 lFileDescriptor, UINT32 ulType) PURE; @@ -1098,7 +1098,7 @@ DECLARE_INTERFACE_(IHXAsyncIOSelection, IUnknown) * This function is only available on Unix, and is intended to * replace the functionality of select(). */ - STDMETHOD(Remove) (THIS_ + STDQT_METHOD(Remove) (THIS_ INT32 lFileDescriptor, UINT32 ulType) PURE; }; @@ -1131,7 +1131,7 @@ DECLARE_INTERFACE_(IHXUDPMulticastInit, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1153,7 +1153,7 @@ DECLARE_INTERFACE_(IHXUDPMulticastInit, IUnknown) * the number of routers specified in the ulTTL parameter. */ - STDMETHOD(InitMulticast) (THIS_ + STDQT_METHOD(InitMulticast) (THIS_ UINT8 chTTL) PURE; }; @@ -1187,7 +1187,7 @@ DECLARE_INTERFACE_(IHXInterruptState, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1214,7 +1214,7 @@ DECLARE_INTERFACE_(IHXInterruptState, IUnknown) * Purpose: * This function is called when starting a deferred/interrupt task */ - STDMETHOD(EnterInterruptState) (THIS) PURE; + STDQT_METHOD(EnterInterruptState) (THIS) PURE; /************************************************************************ * Method: @@ -1222,7 +1222,7 @@ DECLARE_INTERFACE_(IHXInterruptState, IUnknown) * Purpose: * This function is called when leaving a deferred/interrupt task */ - STDMETHOD(LeaveInterruptState) (THIS) PURE; + STDQT_METHOD(LeaveInterruptState) (THIS) PURE; /************************************************************************ * Method: @@ -1231,7 +1231,7 @@ DECLARE_INTERFACE_(IHXInterruptState, IUnknown) * This function can be called to enable/disable interrupt time * processsing */ - STDMETHOD(EnableInterrupt) (THIS_ + STDQT_METHOD(EnableInterrupt) (THIS_ HXBOOL bEnable) PURE; /************************************************************************ @@ -1277,7 +1277,7 @@ DECLARE_INTERFACE_(IHXOptimizedScheduler, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1317,7 +1317,7 @@ DECLARE_INTERFACE_(IHXOptimizedScheduler, IUnknown) * Purpose: * Remove a callback from the scheduler. */ - STDMETHOD(Remove) (THIS_ + STDQT_METHOD(Remove) (THIS_ CallbackHandle Handle) PURE; /************************************************************************ @@ -1357,7 +1357,7 @@ DECLARE_INTERFACE_(IHXThreadSafeScheduler, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1398,7 +1398,7 @@ DECLARE_INTERFACE_(IHXThreadSafeScheduler, IUnknown) * Purpose: * Remove a callback from the scheduler. */ - STDMETHOD(Remove) (THIS_ + STDQT_METHOD(Remove) (THIS_ CallbackHandle Handle) PURE; }; @@ -1428,7 +1428,7 @@ DECLARE_INTERFACE_(IHXProcessEntryPoint, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1436,7 +1436,7 @@ DECLARE_INTERFACE_(IHXProcessEntryPoint, IUnknown) STDMETHOD_(ULONG32,Release) (THIS) PURE; - STDMETHOD(Func) (THIS_ + STDQT_METHOD(Func) (THIS_ IUnknown* pContext) PURE; }; @@ -1467,7 +1467,7 @@ DECLARE_INTERFACE_(IHXProcess, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1475,7 +1475,7 @@ DECLARE_INTERFACE_(IHXProcess, IUnknown) STDMETHOD_(ULONG32,Release) (THIS) PURE; - STDMETHOD(Start) (THIS_ + STDQT_METHOD(Start) (THIS_ const char* pProcessName, IHXProcessEntryPoint* pEntryPoint) PURE; }; @@ -1511,7 +1511,7 @@ DECLARE_INTERFACE_(IHXLoadBalancedListen, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1534,7 +1534,7 @@ DECLARE_INTERFACE_(IHXLoadBalancedListen, IUnknown) * two completely different plugins to listen on the same port using * the load balanced listener. */ - STDMETHOD(SetID) (THIS_ + STDQT_METHOD(SetID) (THIS_ REFIID ID) PURE; /************************************************************************ @@ -1545,7 +1545,7 @@ DECLARE_INTERFACE_(IHXLoadBalancedListen, IUnknown) * than reserve limit descriptors / sockets are left then a new * instance of the plugin will be created. */ - STDMETHOD(SetReserveLimit) (THIS_ + STDQT_METHOD(SetReserveLimit) (THIS_ UINT32 ulDescriptors, UINT32 ulSockets) PURE; }; @@ -1583,7 +1583,7 @@ DECLARE_INTERFACE_(IHXOverrideDefaultServices, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1602,7 +1602,7 @@ DECLARE_INTERFACE_(IHXOverrideDefaultServices, IUnknown) * Override default services provided by the G2 system. * */ - STDMETHOD(OverrideServices) (THIS_ + STDQT_METHOD(OverrideServices) (THIS_ IUnknown* pContext) PURE; }; @@ -1642,7 +1642,7 @@ DECLARE_INTERFACE_(IHXSetSocketOption, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1654,7 +1654,7 @@ DECLARE_INTERFACE_(IHXSetSocketOption, IUnknown) * IHXListenSocket methods */ - STDMETHOD(SetOption) (THIS_ + STDQT_METHOD(SetOption) (THIS_ HX_SOCKET_OPTION option, UINT32 ulValue) PURE; }; @@ -1786,7 +1786,7 @@ DECLARE_INTERFACE_(IHXThreadSafeMethods, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1840,7 +1840,7 @@ DECLARE_INTERFACE_(IHXMutex, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1853,11 +1853,11 @@ DECLARE_INTERFACE_(IHXMutex, IUnknown) */ /* XXXSMPNOW Comments */ - STDMETHOD(Lock) (THIS) PURE; + STDQT_METHOD(Lock) (THIS) PURE; - STDMETHOD(TryLock) (THIS) PURE; + STDQT_METHOD(TryLock) (THIS) PURE; - STDMETHOD(Unlock) (THIS) PURE; + STDQT_METHOD(Unlock) (THIS) PURE; }; // $Private: @@ -1887,7 +1887,7 @@ DECLARE_INTERFACE_(IHXFastPathNetWrite, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1900,7 +1900,7 @@ DECLARE_INTERFACE_(IHXFastPathNetWrite, IUnknown) * */ - STDMETHOD(FastWrite) (THIS_ + STDQT_METHOD(FastWrite) (THIS_ const UINT8* pBuffer, UINT32 ulLen) PURE; }; @@ -1929,7 +1929,7 @@ DECLARE_INTERFACE_(IHXWouldBlockResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1950,8 +1950,8 @@ DECLARE_INTERFACE_(IHXWouldBlockResponse, IUnknown) * WouldBlockCleared call. HXR_anythingelse to ignore. */ - STDMETHOD(WouldBlock) (THIS_ UINT32 id) PURE; - STDMETHOD(WouldBlockCleared)(THIS_ UINT32 id) PURE; + STDQT_METHOD(WouldBlock) (THIS_ UINT32 id) PURE; + STDQT_METHOD(WouldBlockCleared)(THIS_ UINT32 id) PURE; }; @@ -1981,7 +1981,7 @@ DECLARE_INTERFACE_(IHXWouldBlock, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1994,7 +1994,7 @@ DECLARE_INTERFACE_(IHXWouldBlock, IUnknown) * */ - STDMETHOD(WantWouldBlock) (THIS_ + STDQT_METHOD(WantWouldBlock) (THIS_ IHXWouldBlockResponse*, UINT32 id) PURE; }; @@ -2026,7 +2026,7 @@ DECLARE_INTERFACE_(IHXSharedUDPServices, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2037,11 +2037,11 @@ DECLARE_INTERFACE_(IHXSharedUDPServices, IUnknown) /* * IHXSharedUDPServices methods */ - STDMETHOD(RegisterSharedResponse) (THIS_ + STDQT_METHOD(RegisterSharedResponse) (THIS_ IHXUDPResponse* response, UINT16 sPortEnum) PURE; - STDMETHOD(UnregisterSharedResponse) (THIS) PURE; + STDQT_METHOD(UnregisterSharedResponse) (THIS) PURE; STDMETHOD_(UINT16, GetSharedPort) (THIS) PURE; @@ -2075,7 +2075,7 @@ DECLARE_INTERFACE_(IHXThreadLocal, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2130,7 +2130,7 @@ DECLARE_INTERFACE_(IHXMemoryServices, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2161,7 +2161,7 @@ DECLARE_INTERFACE_(IHXMemoryServices, IUnknown) * 0x00000002 do rudimentary checks on internal SharedMemory data arrays. * */ - STDMETHOD(ValidateMemory) (THIS_ + STDQT_METHOD(ValidateMemory) (THIS_ INT32 lStartPage, INT32 lPages, UINT32 ulFlags) PURE; @@ -2198,7 +2198,7 @@ DECLARE_INTERFACE_(IHXSetPrivateSocketOption, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2210,7 +2210,7 @@ DECLARE_INTERFACE_(IHXSetPrivateSocketOption, IUnknown) * IHXSetPrivateSocketOption methods */ - STDMETHOD(SetOption) (THIS_ + STDQT_METHOD(SetOption) (THIS_ HX_PRIVATE_SOCKET_OPTION option, UINT32 ulValue) PURE; }; @@ -2331,7 +2331,7 @@ DECLARE_INTERFACE_(IHXNetInterfaces, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2342,18 +2342,18 @@ DECLARE_INTERFACE_(IHXNetInterfaces, IUnknown) /* * IHXNetworkInterfaces methods */ - STDMETHOD(UpdateNetInterfaces) (THIS) PURE; + STDQT_METHOD(UpdateNetInterfaces) (THIS) PURE; STDMETHOD_(UINT32, GetNumOfNetInterfaces) (THIS) PURE; - STDMETHOD(GetNetInterfaces) (THIS_ + STDQT_METHOD(GetNetInterfaces) (THIS_ UINT16 lIndex, REF(NIInfo*) pNIInfo) PURE; - STDMETHOD(AddAdviseSink) (THIS_ + STDQT_METHOD(AddAdviseSink) (THIS_ IHXNetInterfacesAdviseSink* pSink) PURE; - STDMETHOD(RemoveAdviseSink) (THIS_ + STDQT_METHOD(RemoveAdviseSink) (THIS_ IHXNetInterfacesAdviseSink* pSink) PURE; }; @@ -2382,7 +2382,7 @@ DECLARE_INTERFACE_(IHXNetInterfacesAdviseSink, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2393,7 +2393,7 @@ DECLARE_INTERFACE_(IHXNetInterfacesAdviseSink, IUnknown) /* * IHXNetInterfacesAdviseSink methods */ - STDMETHOD(NetInterfacesUpdated) (THIS) PURE; + STDQT_METHOD(NetInterfacesUpdated) (THIS) PURE; }; // $EndPrivate. @@ -2424,7 +2424,7 @@ DECLARE_INTERFACE_(IHXNetworkInterfaceEnumerator, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; @@ -2440,7 +2440,7 @@ DECLARE_INTERFACE_(IHXNetworkInterfaceEnumerator, IUnknown) * If a buffer passed in is too small, it will return * HXR_BUFFERTOOSMALL with ulNumInterfaces updated. */ - STDMETHOD(EnumerateInterfaces) (THIS_ + STDQT_METHOD(EnumerateInterfaces) (THIS_ REF(UINT32*) pulInterfaces, REF(UINT32) ulNumInterfaces) PURE; }; @@ -2470,7 +2470,7 @@ DECLARE_INTERFACE_(IHXUDPConnectedSocket, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; @@ -2486,7 +2486,7 @@ DECLARE_INTERFACE_(IHXUDPConnectedSocket, IUnknown) * Connect to the foreign addr and port the socket already knows * about; this is implementation-dependent. */ - STDMETHOD(UDPConnect) (THIS) PURE; + STDQT_METHOD(UDPConnect) (THIS) PURE; /************************************************************************ * Method: @@ -2496,7 +2496,7 @@ DECLARE_INTERFACE_(IHXUDPConnectedSocket, IUnknown) * Usage: * Specify the host-ordered foreign addr and port to connect to. */ - STDMETHOD(UDPConnect) (THIS_ ULONG32 ulAddr, UINT16 nPort) PURE; + STDQT_METHOD(UDPConnect) (THIS_ ULONG32 ulAddr, UINT16 nPort) PURE; /************************************************************************ * Method: @@ -2504,7 +2504,7 @@ DECLARE_INTERFACE_(IHXUDPConnectedSocket, IUnknown) * Purpose: * Disconnect the udp socket */ - STDMETHOD(UDPDisconnect) (THIS) PURE; + STDQT_METHOD(UDPDisconnect) (THIS) PURE; /************************************************************************ * Method: @@ -2555,7 +2555,7 @@ DECLARE_INTERFACE_(IHXAutoBWDetection, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2566,11 +2566,11 @@ DECLARE_INTERFACE_(IHXAutoBWDetection, IUnknown) /* * IHXAutoBWDetection methods */ - STDMETHOD(InitAutoBWDetection) (THIS_ + STDQT_METHOD(InitAutoBWDetection) (THIS_ HXBOOL bEnabled) PURE; - STDMETHOD(AddAutoBWDetectionSink) (THIS_ + STDQT_METHOD(AddAutoBWDetectionSink) (THIS_ IHXAutoBWDetectionAdviseSink* pSink) PURE; - STDMETHOD(RemoveAutoBWDetectionSink) (THIS_ + STDQT_METHOD(RemoveAutoBWDetectionSink) (THIS_ IHXAutoBWDetectionAdviseSink* pSink) PURE; }; @@ -2599,7 +2599,7 @@ DECLARE_INTERFACE_(IHXAutoBWDetectionAdviseSink, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2610,7 +2610,7 @@ DECLARE_INTERFACE_(IHXAutoBWDetectionAdviseSink, IUnknown) /* * IHXAutoBWDetectionAdviseSink methods */ - STDMETHOD(AutoBWDetectionDone) (THIS_ + STDQT_METHOD(AutoBWDetectionDone) (THIS_ HX_RESULT status, UINT32 ulBW) PURE; }; @@ -2641,7 +2641,7 @@ DECLARE_INTERFACE_(IHXAutoBWCalibration, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2652,13 +2652,13 @@ DECLARE_INTERFACE_(IHXAutoBWCalibration, IUnknown) /* * IHXAutoBWCalibration methods */ - STDMETHOD(InitAutoBWCalibration) (THIS_ + STDQT_METHOD(InitAutoBWCalibration) (THIS_ IHXValues* pValues) PURE; - STDMETHOD(StartAutoBWCalibration) (THIS) PURE; - STDMETHOD(StopAutoBWCalibration) (THIS) PURE; - STDMETHOD(AddAutoBWCalibrationSink) (THIS_ + STDQT_METHOD(StartAutoBWCalibration) (THIS) PURE; + STDQT_METHOD(StopAutoBWCalibration) (THIS) PURE; + STDQT_METHOD(AddAutoBWCalibrationSink) (THIS_ IHXAutoBWCalibrationAdviseSink* pSink) PURE; - STDMETHOD(RemoveAutoBWCalibrationSink) (THIS_ + STDQT_METHOD(RemoveAutoBWCalibrationSink) (THIS_ IHXAutoBWCalibrationAdviseSink* pSink) PURE; }; @@ -2687,7 +2687,7 @@ DECLARE_INTERFACE_(IHXAutoBWCalibrationAdviseSink, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2698,9 +2698,9 @@ DECLARE_INTERFACE_(IHXAutoBWCalibrationAdviseSink, IUnknown) /* * IHXAutoBWCalibrationAdviseSink methods */ - STDMETHOD(AutoBWCalibrationStarted) (THIS_ + STDQT_METHOD(AutoBWCalibrationStarted) (THIS_ const char* pszServer) PURE; - STDMETHOD(AutoBWCalibrationDone) (THIS_ + STDQT_METHOD(AutoBWCalibrationDone) (THIS_ HX_RESULT status, UINT32 ulBW) PURE; }; @@ -2729,7 +2729,7 @@ DECLARE_INTERFACE_(IHXConnectionBWAdviseSink, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2740,7 +2740,7 @@ DECLARE_INTERFACE_(IHXConnectionBWAdviseSink, IUnknown) /* * IHXConnectionBWAdviseSink methods */ - STDMETHOD(NewConnectionBW)(THIS_ UINT32 uConnectionBW) PURE; + STDQT_METHOD(NewConnectionBW)(THIS_ UINT32 uConnectionBW) PURE; }; @@ -2769,7 +2769,7 @@ DECLARE_INTERFACE_(IHXConnectionBWInfo, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2780,9 +2780,9 @@ DECLARE_INTERFACE_(IHXConnectionBWInfo, IUnknown) /* * IHXConnectionBWInfo methods */ - STDMETHOD(AddABDInfo)(THIS_ IHXAutoBWDetection* pABD, + STDQT_METHOD(AddABDInfo)(THIS_ IHXAutoBWDetection* pABD, IHXPreferredTransport* pPrefTransport) PURE; - STDMETHOD(RemoveABDInfo)(THIS_ IHXAutoBWDetection* pABD) PURE; + STDQT_METHOD(RemoveABDInfo)(THIS_ IHXAutoBWDetection* pABD) PURE; /* * IHXConnectionBWInfo::GetConnectionBW() @@ -2803,10 +2803,10 @@ DECLARE_INTERFACE_(IHXConnectionBWInfo, IUnknown) * HXR_FAILED : No connection BW is available at this time * */ - STDMETHOD(GetConnectionBW)(THIS_ REF(UINT32) uBw, HXBOOL bDetectedBWOnly) PURE; + STDQT_METHOD(GetConnectionBW)(THIS_ REF(UINT32) uBw, HXBOOL bDetectedBWOnly) PURE; - STDMETHOD(AddSink)(THIS_ IHXConnectionBWAdviseSink* pSink) PURE; - STDMETHOD(RemoveSink)(THIS_ IHXConnectionBWAdviseSink* pSink) PURE; + STDQT_METHOD(AddSink)(THIS_ IHXConnectionBWAdviseSink* pSink) PURE; + STDQT_METHOD(RemoveSink)(THIS_ IHXConnectionBWAdviseSink* pSink) PURE; }; #endif /* _HXENGIN_H_ */ diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxerror.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxerror.h index b3d318c7..b01ad60d 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxerror.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxerror.h @@ -72,7 +72,7 @@ DECLARE_INTERFACE_(IHXErrorMessages, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -118,7 +118,7 @@ DECLARE_INTERFACE_(IHXErrorMessages, IUnknown) * User specific more info URL string. * */ - STDMETHOD(Report) (THIS_ + STDQT_METHOD(Report) (THIS_ const UINT8 unSeverity, HX_RESULT ulHXCode, const ULONG32 ulUserCode, @@ -166,7 +166,7 @@ DECLARE_INTERFACE_(IHXErrorSink, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -189,7 +189,7 @@ DECLARE_INTERFACE_(IHXErrorSink, IUnknown) * The meaning of the arguments is exactly as described in * hxerror.h */ - STDMETHOD(ErrorOccurred) (THIS_ + STDQT_METHOD(ErrorOccurred) (THIS_ const UINT8 unSeverity, const ULONG32 ulHXCode, const ULONG32 ulUserCode, @@ -226,7 +226,7 @@ DECLARE_INTERFACE_(IHXErrorSinkControl, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -253,7 +253,7 @@ DECLARE_INTERFACE_(IHXErrorSinkControl, IUnknown) * * The default severity range is HXLOG_EMERG to HXLOG_INFO (0-6). */ - STDMETHOD(AddErrorSink) (THIS_ + STDQT_METHOD(AddErrorSink) (THIS_ IHXErrorSink* pErrorSink, const UINT8 unLowSeverity, const UINT8 unHighSeverity) PURE; @@ -264,7 +264,7 @@ DECLARE_INTERFACE_(IHXErrorSinkControl, IUnknown) * Purpose: * Call this method to remove an error sink. */ - STDMETHOD(RemoveErrorSink) (THIS_ + STDQT_METHOD(RemoveErrorSink) (THIS_ IHXErrorSink* pErrorSink) PURE; }; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxfiles.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxfiles.h index f516af6b..ebaeb100 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxfiles.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxfiles.h @@ -140,7 +140,7 @@ DECLARE_INTERFACE_(IHXFileObject, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -161,7 +161,7 @@ DECLARE_INTERFACE_(IHXFileObject, IUnknown) * for validity of the object (for example by opening it if it is * a local file). */ - STDMETHOD(Init) (THIS_ + STDQT_METHOD(Init) (THIS_ ULONG32 /*IN*/ ulFlags, IHXFileResponse* /*IN*/ pFileResponse) PURE; @@ -177,7 +177,7 @@ DECLARE_INTERFACE_(IHXFileObject, IUnknown) * core (i.e. when you return control to the RMA core) * */ - STDMETHOD(GetFilename) (THIS_ + STDQT_METHOD(GetFilename) (THIS_ REF(const char*) /*OUT*/ pFilename) PURE; /************************************************************************ @@ -187,7 +187,7 @@ DECLARE_INTERFACE_(IHXFileObject, IUnknown) * Closes the file resource and releases all resources associated * with the object. */ - STDMETHOD(Close) (THIS) PURE; + STDQT_METHOD(Close) (THIS) PURE; /************************************************************************ * Method: @@ -197,7 +197,7 @@ DECLARE_INTERFACE_(IHXFileObject, IUnknown) * and asynchronously returns it to the caller via the * IHXFileResponse interface passed in to Init. */ - STDMETHOD(Read) (THIS_ + STDQT_METHOD(Read) (THIS_ ULONG32 ulCount) PURE; /************************************************************************ @@ -208,7 +208,7 @@ DECLARE_INTERFACE_(IHXFileObject, IUnknown) * the caller via the IHXFileResponse interface passed in to Init, * of the completeness of the operation. */ - STDMETHOD(Write) (THIS_ + STDQT_METHOD(Write) (THIS_ IHXBuffer* pBuffer) PURE; /************************************************************************ @@ -221,7 +221,7 @@ DECLARE_INTERFACE_(IHXFileObject, IUnknown) * If the bRelative flag is TRUE, it is a relative seek; else * an absolute seek. */ - STDMETHOD(Seek) (THIS_ + STDQT_METHOD(Seek) (THIS_ ULONG32 ulOffset, HXBOOL bRelative) PURE; @@ -232,7 +232,7 @@ DECLARE_INTERFACE_(IHXFileObject, IUnknown) * To pass information to the File Object advising it about usage * heuristics. */ - STDMETHOD(Advise) (THIS_ + STDQT_METHOD(Advise) (THIS_ ULONG32 ulInfo) PURE; }; @@ -263,7 +263,7 @@ DECLARE_INTERFACE_(IHXFileObjectExt, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -283,7 +283,7 @@ DECLARE_INTERFACE_(IHXFileObjectExt, IUnknown) * core (i.e. when you return control to the RMA core) * */ - STDMETHOD(GetFullFilename) (THIS_ + STDQT_METHOD(GetFullFilename) (THIS_ REF(IHXBuffer*) /*OUT*/ pFullFilename) PURE; }; @@ -314,7 +314,7 @@ DECLARE_INTERFACE_(IHXFileResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -336,7 +336,7 @@ DECLARE_INTERFACE_(IHXFileResponse, IUnknown) * for the file system, the status HXR_FAILED should be * returned. */ - STDMETHOD(InitDone) (THIS_ + STDQT_METHOD(InitDone) (THIS_ HX_RESULT status) PURE; /************************************************************************ @@ -347,7 +347,7 @@ DECLARE_INTERFACE_(IHXFileResponse, IUnknown) * interface. This method is called by the IHXFileObject when the * close of the file is complete. */ - STDMETHOD(CloseDone) (THIS_ + STDQT_METHOD(CloseDone) (THIS_ HX_RESULT status) PURE; /************************************************************************ @@ -358,7 +358,7 @@ DECLARE_INTERFACE_(IHXFileResponse, IUnknown) * interface. This method is called by the IHXFileObject when the * last read from the file is complete and a buffer is available. */ - STDMETHOD(ReadDone) (THIS_ + STDQT_METHOD(ReadDone) (THIS_ HX_RESULT status, IHXBuffer* pBuffer) PURE; @@ -370,7 +370,7 @@ DECLARE_INTERFACE_(IHXFileResponse, IUnknown) * interface. This method is called by the IHXFileObject when the * last write to the file is complete. */ - STDMETHOD(WriteDone) (THIS_ + STDQT_METHOD(WriteDone) (THIS_ HX_RESULT status) PURE; /************************************************************************ @@ -381,7 +381,7 @@ DECLARE_INTERFACE_(IHXFileResponse, IUnknown) * interface. This method is called by the IHXFileObject when the * last seek in the file is complete. */ - STDMETHOD(SeekDone) (THIS_ + STDQT_METHOD(SeekDone) (THIS_ HX_RESULT status) PURE; }; @@ -411,7 +411,7 @@ DECLARE_INTERFACE_(IHXAdvise, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -431,7 +431,7 @@ DECLARE_INTERFACE_(IHXAdvise, IUnknown) * usage heuristics. It should pass HX_FILERESPONSEADVISE_xxx * flags into this method. */ - STDMETHOD(Advise) (THIS_ ULONG32 ulInfo) PURE; + STDQT_METHOD(Advise) (THIS_ ULONG32 ulInfo) PURE; }; @@ -462,7 +462,7 @@ DECLARE_INTERFACE_(IHXFileSystemObject, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -484,21 +484,21 @@ DECLARE_INTERFACE_(IHXFileSystemObject, IUnknown) * pShortName should be a short, human readable name in the form * of "company-fsname". For example: pShortName = "pn-local". */ - STDMETHOD(GetFileSystemInfo) (THIS_ + STDQT_METHOD(GetFileSystemInfo) (THIS_ REF(const char*) /*OUT*/ pShortName, REF(const char*) /*OUT*/ pProtocol) PURE; - STDMETHOD(InitFileSystem) (THIS_ + STDQT_METHOD(InitFileSystem) (THIS_ IHXValues* pOptions) PURE; - STDMETHOD(CreateFile) (THIS_ + STDQT_METHOD(CreateFile) (THIS_ IUnknown** /*OUT*/ ppFileObject) PURE; /* * The following method is deprecated and should return HXR_NOTIMPL */ - STDMETHOD(CreateDir) (THIS_ + STDQT_METHOD(CreateDir) (THIS_ IUnknown** /*OUT*/ ppDirObject) PURE; }; @@ -530,7 +530,7 @@ DECLARE_INTERFACE_(IHXFileStat, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -542,7 +542,7 @@ DECLARE_INTERFACE_(IHXFileStat, IUnknown) * IHXFileStat methods */ - STDMETHOD(Stat) (THIS_ + STDQT_METHOD(Stat) (THIS_ IHXFileStatResponse* pFileStatResponse ) PURE; }; @@ -574,7 +574,7 @@ DECLARE_INTERFACE_(IHXFileStatResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -586,7 +586,7 @@ DECLARE_INTERFACE_(IHXFileStatResponse, IUnknown) * IHXFileStat methods */ - STDMETHOD(StatDone) (THIS_ + STDQT_METHOD(StatDone) (THIS_ HX_RESULT status, UINT32 ulSize, UINT32 ulCreationTime, @@ -623,7 +623,7 @@ DECLARE_INTERFACE_(IHXFileSystemManager, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -635,7 +635,7 @@ DECLARE_INTERFACE_(IHXFileSystemManager, IUnknown) * IHXFileSystemManager methods */ - STDMETHOD(Init) (THIS_ + STDQT_METHOD(Init) (THIS_ IHXFileSystemManagerResponse* /*IN*/ pFileManagerResponse ) PURE; @@ -643,7 +643,7 @@ DECLARE_INTERFACE_(IHXFileSystemManager, IUnknown) * method in each file system's objects, and returns that object through * FSManagerResponse->FileObjectReady */ - STDMETHOD(GetFileObject) (THIS_ + STDQT_METHOD(GetFileObject) (THIS_ IHXRequest* pRequest, IHXAuthenticator* pAuthenticator) PURE; @@ -653,11 +653,11 @@ DECLARE_INTERFACE_(IHXFileSystemManager, IUnknown) * which is then returned through FileObjectReady. This is especially * useful for those who wish to open a brand new file for writing. */ - STDMETHOD(GetNewFileObject) (THIS_ + STDQT_METHOD(GetNewFileObject) (THIS_ IHXRequest* pRequest, IHXAuthenticator* pAuthenticator) PURE; - STDMETHOD(GetRelativeFileObject) (THIS_ + STDQT_METHOD(GetRelativeFileObject) (THIS_ IUnknown* pOriginalObject, const char* pPath) PURE; @@ -665,7 +665,7 @@ DECLARE_INTERFACE_(IHXFileSystemManager, IUnknown) * The following method is deprecated and should return HXR_NOTIMPL */ - STDMETHOD(GetDirObjectFromURL) (THIS_ + STDQT_METHOD(GetDirObjectFromURL) (THIS_ const char* pURL) PURE; }; @@ -696,7 +696,7 @@ DECLARE_INTERFACE_(IHXFileSystemManagerResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -713,10 +713,10 @@ DECLARE_INTERFACE_(IHXFileSystemManagerResponse, IUnknown) * IHXFileSystemManagerResponse::InitDone * Purpose: */ - STDMETHOD(InitDone) (THIS_ + STDQT_METHOD(InitDone) (THIS_ HX_RESULT status) PURE; - STDMETHOD(FileObjectReady) (THIS_ + STDQT_METHOD(FileObjectReady) (THIS_ HX_RESULT status, IUnknown* pObject) PURE; @@ -724,7 +724,7 @@ DECLARE_INTERFACE_(IHXFileSystemManagerResponse, IUnknown) * The following method is deprecated and should return HXR_NOTIMPL */ - STDMETHOD(DirObjectReady) (THIS_ + STDQT_METHOD(DirObjectReady) (THIS_ HX_RESULT status, IUnknown* pDirObject) PURE; }; @@ -756,7 +756,7 @@ DECLARE_INTERFACE_(IHXFileExists, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -773,7 +773,7 @@ DECLARE_INTERFACE_(IHXFileExists, IUnknown) * IHXFileExists::DoesExist * Purpose: */ - STDMETHOD(DoesExist) (THIS_ + STDQT_METHOD(DoesExist) (THIS_ const char* /*IN*/ pPath, IHXFileExistsResponse* /*IN*/ pFileResponse) PURE; }; @@ -805,7 +805,7 @@ DECLARE_INTERFACE_(IHXFileExistsResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -817,7 +817,7 @@ DECLARE_INTERFACE_(IHXFileExistsResponse, IUnknown) * IHXFileExistsResponse methods */ - STDMETHOD(DoesExistDone) (THIS_ + STDQT_METHOD(DoesExistDone) (THIS_ HXBOOL bExist) PURE; }; @@ -849,7 +849,7 @@ DECLARE_INTERFACE_(IHXFileMimeMapper, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -866,7 +866,7 @@ DECLARE_INTERFACE_(IHXFileMimeMapper, IUnknown) * IHXFileMimeMapper::FindMimeType * Purpose: */ - STDMETHOD(FindMimeType) (THIS_ + STDQT_METHOD(FindMimeType) (THIS_ const char* /*IN*/ pURL, IHXFileMimeMapperResponse* /*IN*/ pMimeMapperResponse ) PURE; @@ -900,7 +900,7 @@ DECLARE_INTERFACE_(IHXFileMimeMapperResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -926,7 +926,7 @@ DECLARE_INTERFACE_(IHXFileMimeMapperResponse, IUnknown) * a mime type of NULL. * */ - STDMETHOD(MimeTypeFound) (THIS_ + STDQT_METHOD(MimeTypeFound) (THIS_ HX_RESULT status, const char* pMimeType) PURE; }; @@ -959,7 +959,7 @@ DECLARE_INTERFACE_(IHXBroadcastMapper, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -976,7 +976,7 @@ DECLARE_INTERFACE_(IHXBroadcastMapper, IUnknown) * IHXBroadcastMapper::FindBroadcastType * Purpose: */ - STDMETHOD(FindBroadcastType) (THIS_ + STDQT_METHOD(FindBroadcastType) (THIS_ const char* /*IN*/ pURL, IHXBroadcastMapperResponse* /*IN*/ pBroadcastMapperResponse) PURE; }; @@ -1009,7 +1009,7 @@ DECLARE_INTERFACE_(IHXBroadcastMapperResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1033,7 +1033,7 @@ DECLARE_INTERFACE_(IHXBroadcastMapperResponse, IUnknown) * with the broadcast type set to NULL. * */ - STDMETHOD(BroadcastTypeFound) (THIS_ + STDQT_METHOD(BroadcastTypeFound) (THIS_ HX_RESULT status, const char* pBroadcastType) PURE; }; @@ -1066,7 +1066,7 @@ DECLARE_INTERFACE_(IHXGetFileFromSamePool, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1084,7 +1084,7 @@ DECLARE_INTERFACE_(IHXGetFileFromSamePool, IUnknown) * Purpose: * To get another FileObject from the same pool. */ - STDMETHOD(GetFileObjectFromPool) (THIS_ + STDQT_METHOD(GetFileObjectFromPool) (THIS_ IHXGetFileFromSamePoolResponse*) PURE; }; @@ -1116,7 +1116,7 @@ DECLARE_INTERFACE_(IHXGetFileFromSamePoolResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1133,7 +1133,7 @@ DECLARE_INTERFACE_(IHXGetFileFromSamePoolResponse, IUnknown) * Purpose: * To return another FileObject from the same pool. */ - STDMETHOD(FileObjectReady) (THIS_ + STDQT_METHOD(FileObjectReady) (THIS_ HX_RESULT status, IUnknown* ppUnknown) PURE; }; @@ -1166,7 +1166,7 @@ DECLARE_INTERFACE_(IHXFileAuthenticator, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1177,10 +1177,10 @@ DECLARE_INTERFACE_(IHXFileAuthenticator, IUnknown) /* * IHXFileAuthenticator methods */ - STDMETHOD(SetAuthenticator) (THIS_ + STDQT_METHOD(SetAuthenticator) (THIS_ IHXAuthenticator* pAuthenticator) PURE; - STDMETHOD(GetAuthenticator) (THIS_ + STDQT_METHOD(GetAuthenticator) (THIS_ REF(IHXAuthenticator*) pAuthenticator) PURE; }; @@ -1213,7 +1213,7 @@ DECLARE_INTERFACE_(IHXRequestHandler, IUnknown) * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1227,7 +1227,7 @@ DECLARE_INTERFACE_(IHXRequestHandler, IUnknown) * Purpose: * Associates an IHXRequest with an object */ - STDMETHOD(SetRequest) (THIS_ + STDQT_METHOD(SetRequest) (THIS_ IHXRequest* /*IN*/ pRequest) PURE; /************************************************************************ @@ -1236,7 +1236,7 @@ DECLARE_INTERFACE_(IHXRequestHandler, IUnknown) * Purpose: * Gets the IHXRequest object associated with an object */ - STDMETHOD(GetRequest) (THIS_ + STDQT_METHOD(GetRequest) (THIS_ REF(IHXRequest*) /*OUT*/ pRequest) PURE; }; @@ -1270,7 +1270,7 @@ DECLARE_INTERFACE_(IHXRequestContext, IUnknown) * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1288,7 +1288,7 @@ DECLARE_INTERFACE_(IHXRequestContext, IUnknown) * Purpose: * Sets the Authenticated users Context. */ - STDMETHOD(SetUserContext) + STDQT_METHOD(SetUserContext) ( THIS_ IUnknown* pIUnknownNewContext @@ -1300,7 +1300,7 @@ DECLARE_INTERFACE_(IHXRequestContext, IUnknown) * Purpose: * Gets the Authenticated users Context. */ - STDMETHOD(GetUserContext) + STDQT_METHOD(GetUserContext) ( THIS_ REF(IUnknown*) pIUnknownCurrentContext @@ -1312,7 +1312,7 @@ DECLARE_INTERFACE_(IHXRequestContext, IUnknown) * Purpose: * Sets the Object that made the request. */ - STDMETHOD(SetRequester) + STDQT_METHOD(SetRequester) ( THIS_ IUnknown* pIUnknownNewRequester @@ -1324,7 +1324,7 @@ DECLARE_INTERFACE_(IHXRequestContext, IUnknown) * Purpose: * Gets the Object that made the request. */ - STDMETHOD(GetRequester) + STDQT_METHOD(GetRequester) ( THIS_ REF(IUnknown*) pIUnknownCurrentRequester @@ -1359,7 +1359,7 @@ DECLARE_INTERFACE_(IHXRequest, IUnknown) * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1378,7 +1378,7 @@ DECLARE_INTERFACE_(IHXRequest, IUnknown) * Sets the headers that will be sent in the RFC822 header section * of the request message */ - STDMETHOD(SetRequestHeaders) (THIS_ + STDQT_METHOD(SetRequestHeaders) (THIS_ IHXValues* pRequestHeaders) PURE; /************************************************************************ @@ -1388,7 +1388,7 @@ DECLARE_INTERFACE_(IHXRequest, IUnknown) * Gets the headers that were sent in the RFC822 header section * of the request message */ - STDMETHOD(GetRequestHeaders) (THIS_ + STDQT_METHOD(GetRequestHeaders) (THIS_ REF(IHXValues*) pRequestHeaders) PURE; /************************************************************************ @@ -1398,7 +1398,7 @@ DECLARE_INTERFACE_(IHXRequest, IUnknown) * Sets the headers that will be returned in the RFC822 header * section of the response message */ - STDMETHOD(SetResponseHeaders) (THIS_ + STDQT_METHOD(SetResponseHeaders) (THIS_ IHXValues* pResponseHeaders) PURE; /************************************************************************ @@ -1408,7 +1408,7 @@ DECLARE_INTERFACE_(IHXRequest, IUnknown) * Gets the headers that were returned in the RFC822 header section * of the response message */ - STDMETHOD(GetResponseHeaders) (THIS_ + STDQT_METHOD(GetResponseHeaders) (THIS_ REF(IHXValues*) pResponseHeaders) PURE; /************************************************************************ @@ -1419,7 +1419,7 @@ DECLARE_INTERFACE_(IHXRequest, IUnknown) * Note: On the server, this path does not include the file system * mount point. */ - STDMETHOD(SetURL) (THIS_ + STDQT_METHOD(SetURL) (THIS_ const char* pURL) PURE; /************************************************************************ @@ -1434,7 +1434,7 @@ DECLARE_INTERFACE_(IHXRequest, IUnknown) * caller returns from a function which was called from the RMA * core (i.e. when you return control to the RMA core) */ - STDMETHOD(GetURL) (THIS_ + STDQT_METHOD(GetURL) (THIS_ REF(const char*) pURL) PURE; }; @@ -1465,7 +1465,7 @@ DECLARE_INTERFACE_(IHXFileRename, IUnknown) * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1483,7 +1483,7 @@ DECLARE_INTERFACE_(IHXFileRename, IUnknown) * Purpose: * Renames a file to a new name. */ - STDMETHOD(Rename) (THIS_ + STDQT_METHOD(Rename) (THIS_ const char* pNewFileName) PURE; }; @@ -1516,7 +1516,7 @@ DECLARE_INTERFACE_(IHXFileMove, IUnknown) * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1534,7 +1534,7 @@ DECLARE_INTERFACE_(IHXFileMove, IUnknown) * Purpose: * Moves a file to a different location in the file system */ - STDMETHOD(Move) (THIS_ + STDQT_METHOD(Move) (THIS_ const char* pNewFilePathName) PURE; }; @@ -1564,7 +1564,7 @@ DECLARE_INTERFACE_(IHXDirHandler, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1583,7 +1583,7 @@ DECLARE_INTERFACE_(IHXDirHandler, IUnknown) * Associates a directory handler with the directory handler * response, it should notify of operation completness. */ - STDMETHOD(InitDirHandler) (THIS_ + STDQT_METHOD(InitDirHandler) (THIS_ IHXDirHandlerResponse* /*IN*/ pDirResponse) PURE; /************************************************************************ @@ -1593,7 +1593,7 @@ DECLARE_INTERFACE_(IHXDirHandler, IUnknown) * Closes the directory handler resource and releases all resources * associated with the object. */ - STDMETHOD(CloseDirHandler) (THIS) PURE; + STDQT_METHOD(CloseDirHandler) (THIS) PURE; /************************************************************************ * Method: @@ -1601,7 +1601,7 @@ DECLARE_INTERFACE_(IHXDirHandler, IUnknown) * Purpose: * Create the directory */ - STDMETHOD(MakeDir) (THIS) PURE; + STDQT_METHOD(MakeDir) (THIS) PURE; /************************************************************************ * Method: @@ -1609,7 +1609,7 @@ DECLARE_INTERFACE_(IHXDirHandler, IUnknown) * Purpose: * Get a dump of the directory */ - STDMETHOD(ReadDir) (THIS) PURE; + STDQT_METHOD(ReadDir) (THIS) PURE; }; @@ -1638,7 +1638,7 @@ DECLARE_INTERFACE_(IHXDirHandlerResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1658,7 +1658,7 @@ DECLARE_INTERFACE_(IHXDirHandlerResponse, IUnknown) * interface. This method is called by the IHXDirHandler when the * initialization of the object is complete. */ - STDMETHOD(InitDirHandlerDone) (THIS_ + STDQT_METHOD(InitDirHandlerDone) (THIS_ HX_RESULT status) PURE; /************************************************************************ @@ -1669,7 +1669,7 @@ DECLARE_INTERFACE_(IHXDirHandlerResponse, IUnknown) * interface. This method is called by the IHXDirHandler when the * close of the directory is complete. */ - STDMETHOD(CloseDirHandlerDone) (THIS_ + STDQT_METHOD(CloseDirHandlerDone) (THIS_ HX_RESULT status) PURE; /************************************************************************ @@ -1680,7 +1680,7 @@ DECLARE_INTERFACE_(IHXDirHandlerResponse, IUnknown) * interface. This method is called by the IHXDirHandler when the * attempt to create the directory is complete. */ - STDMETHOD(MakeDirDone) (THIS_ + STDQT_METHOD(MakeDirDone) (THIS_ HX_RESULT status) PURE; /************************************************************************ @@ -1691,7 +1691,7 @@ DECLARE_INTERFACE_(IHXDirHandlerResponse, IUnknown) * interface. This method is called by the IHXDirHandler when the * read from the directory is complete and a buffer is available. */ - STDMETHOD(ReadDirDone) (THIS_ + STDQT_METHOD(ReadDirDone) (THIS_ HX_RESULT status, IHXBuffer* pBuffer) PURE; }; @@ -1723,7 +1723,7 @@ DECLARE_INTERFACE_(IHXGetRecursionLevel, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1762,7 +1762,7 @@ DEFINE_GUID(IID_IHXFileRestrictor, 0x00000219, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0x DECLARE_INTERFACE_(IHXFileRestrictor, IUnknown) { /* IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; @@ -1803,7 +1803,7 @@ DECLARE_INTERFACE_(IHXFileRemove, IUnknown) * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1821,7 +1821,7 @@ DECLARE_INTERFACE_(IHXFileRemove, IUnknown) * Purpose: * Removes a file from the file system. */ - STDMETHOD(Remove) (THIS) PURE; + STDQT_METHOD(Remove) (THIS) PURE; }; @@ -1856,7 +1856,7 @@ DECLARE_INTERFACE_(IHXFastFileFactory, IUnknown) * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1876,7 +1876,7 @@ DECLARE_INTERFACE_(IHXFastFileFactory, IUnknown) * uninitialized) file object. * */ - STDMETHOD(Wrap) (THIS_ + STDQT_METHOD(Wrap) (THIS_ REF(IUnknown*) /*OUT*/ pWrapper, IUnknown* /*IN*/ pFileObj, UINT32 /*IN*/ ulBlockSize, @@ -1919,7 +1919,7 @@ DECLARE_INTERFACE_(IHXFastFileFactory2, IUnknown) * uninitialized) file object. * */ - STDMETHOD(Wrap) (THIS_ + STDQT_METHOD(Wrap) (THIS_ REF(IUnknown*) /*OUT*/ pWrapper, IUnknown* /*IN*/ pFileObj, UINT32 /*IN*/ ulBlockSize, @@ -1955,7 +1955,7 @@ DECLARE_INTERFACE_(IHXFilePlacementRead, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1966,7 +1966,7 @@ DECLARE_INTERFACE_(IHXFilePlacementRead, IUnknown) /* * IHXFilePlacementRead methods */ - STDMETHOD(Read) (THIS_ + STDQT_METHOD(Read) (THIS_ ULONG32 ulAmount, ULONG32 ulOffset, char* pBuffer, @@ -2014,7 +2014,7 @@ DECLARE_INTERFACE_(IHXFastFileStats, IUnknown) * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2026,7 +2026,7 @@ DECLARE_INTERFACE_(IHXFastFileStats, IUnknown) * IHXFastFileStats methods */ - STDMETHOD(UpdateFileObjectStats) (THIS_ + STDQT_METHOD(UpdateFileObjectStats) (THIS_ UINT32 /*IN*/ ulFastFileBytesSaved, UINT32 /*IN*/ ulFastFileBytesNeeded) PURE; }; @@ -2061,7 +2061,7 @@ DECLARE_INTERFACE_(IHXHTTPPostObject, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2082,7 +2082,7 @@ DECLARE_INTERFACE_(IHXHTTPPostObject, IUnknown) * for validity of the object (for example by opening it if it is * a local file). */ - STDMETHOD(Init) (THIS_ + STDQT_METHOD(Init) (THIS_ ULONG32 /*IN*/ ulFlags, IHXHTTPPostResponse* /*IN*/ pFileResponse) PURE; @@ -2093,7 +2093,7 @@ DECLARE_INTERFACE_(IHXHTTPPostObject, IUnknown) * Closes the file resource and releases all resources associated * with the object. */ - STDMETHOD(Close) (THIS) PURE; + STDQT_METHOD(Close) (THIS) PURE; /************************************************************************ * Method: @@ -2102,7 +2102,7 @@ DECLARE_INTERFACE_(IHXHTTPPostObject, IUnknown) * Tells the object to retrieve any response data from the POST. * Calls IHXHTTPPostResponse with ResponseReady(IHXValues*). */ - STDMETHOD(GetResponse) (THIS) PURE; + STDQT_METHOD(GetResponse) (THIS) PURE; /************************************************************************ @@ -2113,7 +2113,7 @@ DECLARE_INTERFACE_(IHXHTTPPostObject, IUnknown) * the caller via the IHXFileResponse interface passed in to Init, * of the completeness of the operation. */ - STDMETHOD(Post) (THIS_ + STDQT_METHOD(Post) (THIS_ IHXBuffer* pBuffer) PURE; /************************************************************************ @@ -2122,7 +2122,7 @@ DECLARE_INTERFACE_(IHXHTTPPostObject, IUnknown) * Purpose: * Set the total size of the Post(s) about to be made. */ - STDMETHOD(SetSize) (THIS_ + STDQT_METHOD(SetSize) (THIS_ ULONG32 ulLength) PURE; }; @@ -2153,7 +2153,7 @@ DECLARE_INTERFACE_(IHXHTTPPostResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2175,7 +2175,7 @@ DECLARE_INTERFACE_(IHXHTTPPostResponse, IUnknown) * for the file system, the status HXR_FAILED should be * returned. */ - STDMETHOD(InitDone) (THIS_ + STDQT_METHOD(InitDone) (THIS_ HX_RESULT status) PURE; /************************************************************************ @@ -2186,7 +2186,7 @@ DECLARE_INTERFACE_(IHXHTTPPostResponse, IUnknown) * interface. This method is called by the IHXHTTPPostObject when the * close of the file is complete. */ - STDMETHOD(CloseDone) (THIS_ + STDQT_METHOD(CloseDone) (THIS_ HX_RESULT status) PURE; /************************************************************************ @@ -2197,7 +2197,7 @@ DECLARE_INTERFACE_(IHXHTTPPostResponse, IUnknown) * interface. This method is called by the IHXHTTPPostObject when the * POST response data has been completely read. */ - STDMETHOD(ResponseReady) (THIS_ + STDQT_METHOD(ResponseReady) (THIS_ HX_RESULT status, IHXBuffer* pContentBuffer) PURE; @@ -2209,7 +2209,7 @@ DECLARE_INTERFACE_(IHXHTTPPostResponse, IUnknown) * interface. This method is called by the IHXHTTPPostObject when the * last write to the file is complete. */ - STDMETHOD(PostDone) (THIS_ + STDQT_METHOD(PostDone) (THIS_ HX_RESULT status) PURE; }; // $EndPrivate. @@ -2243,7 +2243,7 @@ DECLARE_INTERFACE_(IHXHTTPRedirect, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2261,7 +2261,7 @@ DECLARE_INTERFACE_(IHXHTTPRedirect, IUnknown) * Purpose: * Initialize the response object */ - STDMETHOD(Init) (THIS_ + STDQT_METHOD(Init) (THIS_ IHXHTTPRedirectResponse* pRedirectResponse) PURE; /************************************************************************ @@ -2270,7 +2270,7 @@ DECLARE_INTERFACE_(IHXHTTPRedirect, IUnknown) * Purpose: * Initialize the response object w/o calling Init */ - STDMETHOD(SetResponseObject) (THIS_ + STDQT_METHOD(SetResponseObject) (THIS_ IHXHTTPRedirectResponse* pRedirectResponse) PURE; }; @@ -2302,7 +2302,7 @@ DECLARE_INTERFACE_(IHXHTTPRedirectResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2320,7 +2320,7 @@ DECLARE_INTERFACE_(IHXHTTPRedirectResponse, IUnknown) * Purpose: * return the redirect URL */ - STDMETHOD(RedirectDone) (THIS_ + STDQT_METHOD(RedirectDone) (THIS_ IHXBuffer* pURL) PURE; }; @@ -2356,7 +2356,7 @@ DECLARE_INTERFACE_(IHXRM2Converter2, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; @@ -2365,13 +2365,13 @@ DECLARE_INTERFACE_(IHXRM2Converter2, IUnknown) /* * IHXRM2Converter2 methods */ - STDMETHOD(Init) (THIS_ + STDQT_METHOD(Init) (THIS_ IHXRM2Converter2Response* pResponse) PURE; // // AddStream takes a stream from an RM1 file and // adds it to the new RM2 multirate section // - STDMETHOD(AddStream) (THIS_ + STDQT_METHOD(AddStream) (THIS_ const char* pFilename, IHXFileObject* pFileObject, UINT16 nStreamNumber, @@ -2382,7 +2382,7 @@ DECLARE_INTERFACE_(IHXRM2Converter2, IUnknown) // RM1 file and adds it to the initial interleaved // backward compatibility section // - STDMETHOD(AddInterleavedStream) (THIS_ + STDQT_METHOD(AddInterleavedStream) (THIS_ const char* pFilename, IHXFileObject* pFileObject, UINT16 nStreamNumber) PURE; @@ -2392,7 +2392,7 @@ DECLARE_INTERFACE_(IHXRM2Converter2, IUnknown) // an RM1 file and adds them to the new RM2 // multirate section. // - STDMETHOD(AddFile) (THIS_ + STDQT_METHOD(AddFile) (THIS_ const char* pFilename, IHXFileObject* pFileObject) PURE; @@ -2400,13 +2400,13 @@ DECLARE_INTERFACE_(IHXRM2Converter2, IUnknown) // SetTitle,Author,Copyright, and Comment // should all be pretty self explanatory... // - STDMETHOD(SetTitle) (THIS_ + STDQT_METHOD(SetTitle) (THIS_ const char* pTitle) PURE; - STDMETHOD(SetAuthor) (THIS_ + STDQT_METHOD(SetAuthor) (THIS_ const char* pAuthor) PURE; - STDMETHOD(SetCopyright) (THIS_ + STDQT_METHOD(SetCopyright) (THIS_ const char* pCopyright) PURE; - STDMETHOD(SetComment) (THIS_ + STDQT_METHOD(SetComment) (THIS_ const char* pComment) PURE; // @@ -2415,19 +2415,19 @@ DECLARE_INTERFACE_(IHXRM2Converter2, IUnknown) // bandwidth (i.e. the sum of the stream // bandwidths involved). // - STDMETHOD(PairStreams) (THIS_ + STDQT_METHOD(PairStreams) (THIS_ const char* pFilename1, UINT16 nStreamNumber1, const char* pFilename2, UINT16 nStreamNumber2) PURE; - STDMETHOD(Merge) (THIS_ + STDQT_METHOD(Merge) (THIS_ const char* pFilename, IHXFileObject* pOutputFile, UINT32 ulBytesToWrite) PURE; - STDMETHOD(Reset) (THIS) PURE; - STDMETHOD(Done) (THIS) PURE; + STDQT_METHOD(Reset) (THIS) PURE; + STDQT_METHOD(Done) (THIS) PURE; }; @@ -2458,7 +2458,7 @@ DECLARE_INTERFACE_(IHXRM2Converter2Response, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; @@ -2467,15 +2467,15 @@ DECLARE_INTERFACE_(IHXRM2Converter2Response, IUnknown) /* * IHXRM2Converter2Response methods */ - STDMETHOD(InitDone) (THIS_ + STDQT_METHOD(InitDone) (THIS_ HX_RESULT status) PURE; - STDMETHOD(AddStreamDone) (THIS_ + STDQT_METHOD(AddStreamDone) (THIS_ HX_RESULT status) PURE; - STDMETHOD(AddInterleavedStreamDone) (THIS_ + STDQT_METHOD(AddInterleavedStreamDone) (THIS_ HX_RESULT status) PURE; - STDMETHOD(AddFileDone) (THIS_ + STDQT_METHOD(AddFileDone) (THIS_ HX_RESULT status) PURE; - STDMETHOD(MergeDone) (THIS_ + STDQT_METHOD(MergeDone) (THIS_ HX_RESULT status) PURE; }; @@ -2507,7 +2507,7 @@ DECLARE_INTERFACE_(IHXPoolPathAdjustment, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2518,7 +2518,7 @@ DECLARE_INTERFACE_(IHXPoolPathAdjustment, IUnknown) /* * IHXPoolPathAdjustment Methods. */ - STDMETHOD(AdjustAbsolutePath) (THIS_ + STDQT_METHOD(AdjustAbsolutePath) (THIS_ IHXBuffer* /*IN*/ pOldPath, REF(IHXBuffer*) /*OUT*/ pNewPath) PURE; @@ -2554,7 +2554,7 @@ DECLARE_INTERFACE_(IHXPostDataHandler, IUnknown) * IUnknownMethods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2564,7 +2564,7 @@ DECLARE_INTERFACE_(IHXPostDataHandler, IUnknown) /* * IHXPostDataHandler methods */ - STDMETHOD(PostData) (THIS_ + STDQT_METHOD(PostData) (THIS_ IHXBuffer* pBuf) PURE; }; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h index d2f9f8af..89c3d687 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h @@ -81,7 +81,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -102,7 +102,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * * pPropWatch - OUT - returns a new addref'ed IHXPropWatch object */ - STDMETHOD(CreatePropWatch) (THIS_ + STDQT_METHOD(CreatePropWatch) (THIS_ REF(IHXPropWatch*) pPropWatch) PURE; /************************************************************************ @@ -148,7 +148,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDMETHOD(GetIntByName) (THIS_ + STDQT_METHOD(GetIntByName) (THIS_ const char* pName, REF(INT32) nValue) const PURE; @@ -164,7 +164,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDMETHOD(GetIntById) (THIS_ + STDQT_METHOD(GetIntById) (THIS_ const UINT32 ulId, REF(INT32) nValue) const PURE; @@ -179,7 +179,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pName - IN - name of the Property whose value is to be set * nValue - IN - the new value of the Property which is going to be set */ - STDMETHOD(SetIntByName) (THIS_ + STDQT_METHOD(SetIntByName) (THIS_ const char* pName, const INT32 nValue) PURE; @@ -194,7 +194,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * ulId - IN - unique id of the Property whose value is to be set * nValue - IN - the new value of the Property which is going to be set */ - STDMETHOD(SetIntById) (THIS_ + STDQT_METHOD(SetIntById) (THIS_ const UINT32 id, const INT32 nValue) PURE; @@ -226,7 +226,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDMETHOD(GetStrByName) (THIS_ + STDQT_METHOD(GetStrByName) (THIS_ const char* pName, REF(IHXBuffer*) pValue) const PURE; @@ -242,7 +242,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDMETHOD(GetStrById) (THIS_ + STDQT_METHOD(GetStrById) (THIS_ const UINT32 ulId, REF(IHXBuffer*) pValue) const PURE; @@ -257,7 +257,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pName - IN - name of the Property whose value is to be set * pValue - IN - the new value of the Property which is going to be set */ - STDMETHOD(SetStrByName) (THIS_ + STDQT_METHOD(SetStrByName) (THIS_ const char* pName, IHXBuffer* pValue) PURE; @@ -272,7 +272,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * ulId - IN - unique id of the Property whose value is to be set * pValue - IN - the new value of the Property which is going to be set */ - STDMETHOD(SetStrById) (THIS_ + STDQT_METHOD(SetStrById) (THIS_ const UINT32 ulId, IHXBuffer* pValue) PURE; @@ -304,7 +304,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDMETHOD(GetBufByName) (THIS_ + STDQT_METHOD(GetBufByName) (THIS_ const char* pName, REF(IHXBuffer*) pValue) const PURE; @@ -320,7 +320,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDMETHOD(GetBufById) (THIS_ + STDQT_METHOD(GetBufById) (THIS_ const UINT32 ulId, REF(IHXBuffer*) pValue) const PURE; @@ -335,7 +335,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pName - IN - name of the Property whose value is to be set * pValue - IN - the new value of the Property which is going to be set */ - STDMETHOD(SetBufByName) (THIS_ + STDQT_METHOD(SetBufByName) (THIS_ const char* pName, IHXBuffer* pValue) PURE; @@ -350,7 +350,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * ulId - IN - unique id of the Property whose value is to be set * pValue - IN - the new value of the Property which is going to be set */ - STDMETHOD(SetBufById) (THIS_ + STDQT_METHOD(SetBufById) (THIS_ const UINT32 ulId, IHXBuffer* pValue) PURE; @@ -455,7 +455,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pName - OUT - parameter into which the Property name is going to be * returned */ - STDMETHOD(GetPropName) (THIS_ + STDQT_METHOD(GetPropName) (THIS_ const UINT32 ulId, REF(IHXBuffer*) pName) const PURE; @@ -481,7 +481,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pValues - OUT - list of property name and unique id at the * highest level (root) in the registry */ - STDMETHOD(GetPropListOfRoot) (THIS_ + STDQT_METHOD(GetPropListOfRoot) (THIS_ REF(IHXValues*) pValues) const PURE; /************************************************************************ @@ -496,7 +496,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pValues - OUT - list of property name and unique id under the * Property whose name is in "pName" */ - STDMETHOD(GetPropListByName) (THIS_ + STDQT_METHOD(GetPropListByName) (THIS_ const char* pName, REF(IHXValues*) pValues) const PURE; @@ -512,7 +512,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pValues - OUT - list of property name and unique id under the * Property whose is is in "ulId" */ - STDMETHOD(GetPropListById) (THIS_ + STDQT_METHOD(GetPropListById) (THIS_ const UINT32 ulId, REF(IHXValues*) pValues) const PURE; @@ -580,7 +580,7 @@ DECLARE_INTERFACE_(IHXPropWatch, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -603,7 +603,7 @@ DECLARE_INTERFACE_(IHXPropWatch, IUnknown) * initialize the IHXPropWatch object. the response * object gets AddRef'd in the Init method. */ - STDMETHOD(Init) (THIS_ + STDQT_METHOD(Init) (THIS_ IHXPropWatchResponse* pResponse) PURE; /************************************************************************ @@ -651,7 +651,7 @@ DECLARE_INTERFACE_(IHXPropWatch, IUnknown) * Purpose: * It clears the watch on the root of the registry. */ - STDMETHOD(ClearWatchOnRoot) (THIS) PURE; + STDQT_METHOD(ClearWatchOnRoot) (THIS) PURE; /************************************************************************ * Method: @@ -661,7 +661,7 @@ DECLARE_INTERFACE_(IHXPropWatch, IUnknown) * * pName - IN - name of Property whose watch point is to be cleared */ - STDMETHOD(ClearWatchByName) (THIS_ + STDQT_METHOD(ClearWatchByName) (THIS_ const char* pName) PURE; /************************************************************************ @@ -672,7 +672,7 @@ DECLARE_INTERFACE_(IHXPropWatch, IUnknown) * * ulId - IN - unique id of Property whose watch point is to be cleared */ - STDMETHOD(ClearWatchById) (THIS_ + STDQT_METHOD(ClearWatchById) (THIS_ const UINT32 ulId) PURE; }; @@ -704,7 +704,7 @@ DECLARE_INTERFACE_(IHXPropWatchResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -725,7 +725,7 @@ DECLARE_INTERFACE_(IHXPropWatchResponse, IUnknown) * added, its datatype and the id of its immediate parent COMPOSITE * property. */ - STDMETHOD(AddedProp) (THIS_ + STDQT_METHOD(AddedProp) (THIS_ const UINT32 ulId, const HXPropType propType, const UINT32 ulParentID) PURE; @@ -738,7 +738,7 @@ DECLARE_INTERFACE_(IHXPropWatchResponse, IUnknown) * the id of the Property just modified, its datatype and the * id of its immediate parent COMPOSITE property. */ - STDMETHOD(ModifiedProp) (THIS_ + STDQT_METHOD(ModifiedProp) (THIS_ const UINT32 ulId, const HXPropType propType, const UINT32 ulParentID) PURE; @@ -751,7 +751,7 @@ DECLARE_INTERFACE_(IHXPropWatchResponse, IUnknown) * seen, it returns the id of the Property just deleted and * its immediate parent COMPOSITE property. */ - STDMETHOD(DeletedProp) (THIS_ + STDQT_METHOD(DeletedProp) (THIS_ const UINT32 ulId, const UINT32 ulParentID) PURE; }; @@ -783,7 +783,7 @@ DECLARE_INTERFACE_(IHXActiveRegistry, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -797,7 +797,7 @@ DECLARE_INTERFACE_(IHXActiveRegistry, IUnknown) * Method to set prop pName to active and register pUser as * the active prop user. */ - STDMETHOD(SetAsActive) (THIS_ + STDQT_METHOD(SetAsActive) (THIS_ const char* pName, IHXActivePropUser* pUser) PURE; @@ -806,7 +806,7 @@ DECLARE_INTERFACE_(IHXActiveRegistry, IUnknown) * * Method to remove an IHXActiveUser from Prop activation. */ - STDMETHOD(SetAsInactive) (THIS_ + STDQT_METHOD(SetAsInactive) (THIS_ const char* pName, IHXActivePropUser* pUser) PURE; @@ -824,7 +824,7 @@ DECLARE_INTERFACE_(IHXActiveRegistry, IUnknown) * * Async request to set int pName to ul. */ - STDMETHOD(SetActiveInt) (THIS_ + STDQT_METHOD(SetActiveInt) (THIS_ const char* pName, UINT32 ul, IHXActivePropUserResponse* pResponse) PURE; @@ -834,7 +834,7 @@ DECLARE_INTERFACE_(IHXActiveRegistry, IUnknown) * * Async request to set string pName to string in pBuffer. */ - STDMETHOD(SetActiveStr) (THIS_ + STDQT_METHOD(SetActiveStr) (THIS_ const char* pName, IHXBuffer* pBuffer, IHXActivePropUserResponse* pResponse) PURE; @@ -844,7 +844,7 @@ DECLARE_INTERFACE_(IHXActiveRegistry, IUnknown) * * Async request to set buffer pName to buffer in pBuffer. */ - STDMETHOD(SetActiveBuf) (THIS_ + STDQT_METHOD(SetActiveBuf) (THIS_ const char* pName, IHXBuffer* pBuffer, IHXActivePropUserResponse* pResponse) PURE; @@ -854,7 +854,7 @@ DECLARE_INTERFACE_(IHXActiveRegistry, IUnknown) * * Async request to delete the active property. */ - STDMETHOD(DeleteActiveProp) (THIS_ + STDQT_METHOD(DeleteActiveProp) (THIS_ const char* pName, IHXActivePropUserResponse* pResponse) PURE; @@ -893,7 +893,7 @@ DECLARE_INTERFACE_(IHXActivePropUser, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -906,7 +906,7 @@ DECLARE_INTERFACE_(IHXActivePropUser, IUnknown) * * Async request to set int pName to ul. */ - STDMETHOD(SetActiveInt) (THIS_ + STDQT_METHOD(SetActiveInt) (THIS_ const char* pName, UINT32 ul, IHXActivePropUserResponse* pResponse) PURE; @@ -916,7 +916,7 @@ DECLARE_INTERFACE_(IHXActivePropUser, IUnknown) * * Async request to set string pName to string in pBuffer. */ - STDMETHOD(SetActiveStr) (THIS_ + STDQT_METHOD(SetActiveStr) (THIS_ const char* pName, IHXBuffer* pBuffer, IHXActivePropUserResponse* pResponse) PURE; @@ -926,7 +926,7 @@ DECLARE_INTERFACE_(IHXActivePropUser, IUnknown) * * Async request to set buffer pName to buffer in pBuffer. */ - STDMETHOD(SetActiveBuf) (THIS_ + STDQT_METHOD(SetActiveBuf) (THIS_ const char* pName, IHXBuffer* pBuffer, IHXActivePropUserResponse* pResponse) PURE; @@ -936,7 +936,7 @@ DECLARE_INTERFACE_(IHXActivePropUser, IUnknown) * * Async request to delete the active property. */ - STDMETHOD(DeleteActiveProp) (THIS_ + STDQT_METHOD(DeleteActiveProp) (THIS_ const char* pName, IHXActivePropUserResponse* pResponse) PURE; @@ -970,7 +970,7 @@ DECLARE_INTERFACE_(IHXActivePropUserResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -981,28 +981,28 @@ DECLARE_INTERFACE_(IHXActivePropUserResponse, IUnknown) /************************************************************************ * Called with status result on completion of set request. */ - STDMETHOD(SetActiveIntDone) (THIS_ + STDQT_METHOD(SetActiveIntDone) (THIS_ HX_RESULT res, const char* pName, UINT32 ul, IHXBuffer* pInfo[], UINT32 ulNumInfo) PURE; - STDMETHOD(SetActiveStrDone) (THIS_ + STDQT_METHOD(SetActiveStrDone) (THIS_ HX_RESULT res, const char* pName, IHXBuffer* pBuffer, IHXBuffer* pInfo[], UINT32 ulNumInfo) PURE; - STDMETHOD(SetActiveBufDone) (THIS_ + STDQT_METHOD(SetActiveBufDone) (THIS_ HX_RESULT res, const char* pName, IHXBuffer* pBuffer, IHXBuffer* pInfo[], UINT32 ulNumInfo) PURE; - STDMETHOD(DeleteActivePropDone) (THIS_ + STDQT_METHOD(DeleteActivePropDone) (THIS_ HX_RESULT res, const char* pName, IHXBuffer* pInfo[], @@ -1037,7 +1037,7 @@ DECLARE_INTERFACE_(IHXCopyRegistry, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1050,7 +1050,7 @@ DECLARE_INTERFACE_(IHXCopyRegistry, IUnknown) * * Here it is! The "Copy" method! */ - STDMETHOD (CopyByName) (THIS_ + STDQT_METHOD (CopyByName) (THIS_ const char* pFrom, const char* pTo) PURE; }; @@ -1083,7 +1083,7 @@ DECLARE_INTERFACE_(IHXRegistryAltStringHandling, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1100,7 +1100,7 @@ DECLARE_INTERFACE_(IHXRegistryAltStringHandling, IUnknown) * method it's ID. The property will now be accessible/setable as a, * but it will still be a string! */ - STDMETHOD (SetStringAccessAsBufferById) (THIS_ + STDQT_METHOD (SetStringAccessAsBufferById) (THIS_ UINT32 ulId) PURE; }; @@ -1140,7 +1140,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1161,7 +1161,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * * pPropWatch - OUT - returns a new addref'ed IHXPropWatch object */ - STDMETHOD(CreatePropWatch) (THIS_ + STDQT_METHOD(CreatePropWatch) (THIS_ REF(IHXPropWatch*) pPropWatch) PURE; /************************************************************************ @@ -1207,7 +1207,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDMETHOD(GetIntByName) (THIS_ + STDQT_METHOD(GetIntByName) (THIS_ const char* pName, REF(INT32) nValue) const PURE; @@ -1223,7 +1223,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDMETHOD(GetIntById) (THIS_ + STDQT_METHOD(GetIntById) (THIS_ const UINT32 ulId, REF(INT32) nValue) const PURE; @@ -1238,7 +1238,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pName - IN - name of the Property whose value is to be set * nValue - IN - the new value of the Property which is going to be set */ - STDMETHOD(SetIntByName) (THIS_ + STDQT_METHOD(SetIntByName) (THIS_ const char* pName, const INT32 nValue) PURE; @@ -1253,7 +1253,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * ulId - IN - unique id of the Property whose value is to be set * nValue - IN - the new value of the Property which is going to be set */ - STDMETHOD(SetIntById) (THIS_ + STDQT_METHOD(SetIntById) (THIS_ const UINT32 id, const INT32 nValue) PURE; @@ -1286,7 +1286,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDMETHOD(GetStrByName) (THIS_ + STDQT_METHOD(GetStrByName) (THIS_ const char* pName, REF(IHXBuffer*) pValue) const PURE; @@ -1302,7 +1302,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDMETHOD(GetStrById) (THIS_ + STDQT_METHOD(GetStrById) (THIS_ const UINT32 ulId, REF(IHXBuffer*) pValue) const PURE; @@ -1317,7 +1317,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pName - IN - name of the Property whose value is to be set * pValue - IN - the new value of the Property which is going to be set */ - STDMETHOD(SetStrByName) (THIS_ + STDQT_METHOD(SetStrByName) (THIS_ const char* pName, IHXBuffer* pValue) PURE; @@ -1332,7 +1332,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * ulId - IN - unique id of the Property whose value is to be set * pValue - IN - the new value of the Property which is going to be set */ - STDMETHOD(SetStrById) (THIS_ + STDQT_METHOD(SetStrById) (THIS_ const UINT32 ulId, IHXBuffer* pValue) PURE; @@ -1365,7 +1365,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDMETHOD(GetBufByName) (THIS_ + STDQT_METHOD(GetBufByName) (THIS_ const char* pName, REF(IHXBuffer*) pValue) const PURE; @@ -1381,7 +1381,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDMETHOD(GetBufById) (THIS_ + STDQT_METHOD(GetBufById) (THIS_ const UINT32 ulId, REF(IHXBuffer*) pValue) const PURE; @@ -1396,7 +1396,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pName - IN - name of the Property whose value is to be set * pValue - IN - the new value of the Property which is going to be set */ - STDMETHOD(SetBufByName) (THIS_ + STDQT_METHOD(SetBufByName) (THIS_ const char* pName, IHXBuffer* pValue) PURE; @@ -1411,7 +1411,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * ulId - IN - unique id of the Property whose value is to be set * pValue - IN - the new value of the Property which is going to be set */ - STDMETHOD(SetBufById) (THIS_ + STDQT_METHOD(SetBufById) (THIS_ const UINT32 ulId, IHXBuffer* pValue) PURE; @@ -1517,7 +1517,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pName - OUT - parameter into which the Property name is going to be * returned */ - STDMETHOD(GetPropName) (THIS_ + STDQT_METHOD(GetPropName) (THIS_ const UINT32 ulId, REF(IHXBuffer*) pName) const PURE; @@ -1543,7 +1543,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pValues - OUT - list of property name and unique id at the * highest level (root) in the registry */ - STDMETHOD(GetPropListOfRoot) (THIS_ + STDQT_METHOD(GetPropListOfRoot) (THIS_ REF(IHXValues*) pValues) const PURE; /************************************************************************ @@ -1558,7 +1558,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pValues - OUT - list of property name and unique id under the * Property whose name is in "pName" */ - STDMETHOD(GetPropListByName) (THIS_ + STDQT_METHOD(GetPropListByName) (THIS_ const char* pName, REF(IHXValues*) pValues) const PURE; @@ -1574,7 +1574,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pValues - OUT - list of property name and unique id under the * Property whose is is in "ulId" */ - STDMETHOD(GetPropListById) (THIS_ + STDQT_METHOD(GetPropListById) (THIS_ const UINT32 ulId, REF(IHXValues*) pValues) const PURE; @@ -1630,7 +1630,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned, after modification */ - STDMETHOD(ModifyIntByName) (THIS_ + STDQT_METHOD(ModifyIntByName) (THIS_ const char* pName, INT32 nDelta, REF(INT32) nValue) PURE; @@ -1651,7 +1651,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned, after modification */ - STDMETHOD(ModifyIntById) (THIS_ + STDQT_METHOD(ModifyIntById) (THIS_ const UINT32 id, INT32 nDelta, REF(INT32) nValue) PURE; @@ -1681,7 +1681,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned, after modification */ - STDMETHOD(BoundedModifyIntByName) (THIS_ + STDQT_METHOD(BoundedModifyIntByName) (THIS_ const char* pName, INT32 nDelta, REF(INT32) nValue, @@ -1713,7 +1713,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned, after modification */ - STDMETHOD(BoundedModifyIntById) (THIS_ + STDQT_METHOD(BoundedModifyIntById) (THIS_ const UINT32 id, INT32 nDelta, REF(INT32) nValue, @@ -1735,7 +1735,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nOldValue - OUT - parameter into which the previous value of the * Property is returned */ - STDMETHOD(SetAndReturnIntByName) (THIS_ + STDQT_METHOD(SetAndReturnIntByName) (THIS_ const char* pName, INT32 nValue, REF(INT32) nOldValue) PURE; @@ -1755,7 +1755,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nOldValue - OUT - parameter into which the previous value of the * Property is returned */ - STDMETHOD(SetAndReturnIntById) (THIS_ + STDQT_METHOD(SetAndReturnIntById) (THIS_ const UINT32 id, INT32 nValue, REF(INT32) nOldValue) PURE; @@ -1773,7 +1773,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pName - IN - name of the Property whose value is to be retrieved * pValue - OUT - the address of the integer value */ - STDMETHOD(GetIntRefByName) (THIS_ + STDQT_METHOD(GetIntRefByName) (THIS_ const char* pName, REF(INT32*) pValue) const PURE; @@ -1790,7 +1790,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pName - IN - name of the Property whose value is to be retrieved * pValue - OUT - the address of the integer value */ - STDMETHOD(GetIntRefById) (THIS_ + STDQT_METHOD(GetIntRefById) (THIS_ const UINT32 id, REF(INT32*) pValue) const PURE; @@ -1825,7 +1825,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDMETHOD(GetInt64ByName) (THIS_ + STDQT_METHOD(GetInt64ByName) (THIS_ const char* pName, REF(INT64) nValue) const PURE; @@ -1841,7 +1841,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDMETHOD(GetInt64ById) (THIS_ + STDQT_METHOD(GetInt64ById) (THIS_ const UINT32 ulId, REF(INT64) nValue) const PURE; @@ -1856,7 +1856,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pName - IN - name of the Property whose value is to be set * nValue - IN - the new value of the Property which is going to be set */ - STDMETHOD(SetInt64ByName) (THIS_ + STDQT_METHOD(SetInt64ByName) (THIS_ const char* pName, const INT64 nValue) PURE; @@ -1871,7 +1871,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * ulId - IN - unique id of the Property whose value is to be set * nValue - IN - the new value of the Property which is going to be set */ - STDMETHOD(SetInt64ById) (THIS_ + STDQT_METHOD(SetInt64ById) (THIS_ const UINT32 id, const INT64 nValue) PURE; @@ -1891,7 +1891,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned, after modification */ - STDMETHOD(ModifyInt64ByName) (THIS_ + STDQT_METHOD(ModifyInt64ByName) (THIS_ const char* pName, INT64 nDelta, REF(INT64) nValue) PURE; @@ -1912,7 +1912,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned, after modification */ - STDMETHOD(ModifyInt64ById) (THIS_ + STDQT_METHOD(ModifyInt64ById) (THIS_ const UINT32 id, INT64 nDelta, REF(INT64) nValue) PURE; @@ -1946,7 +1946,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * the default values should b changed from INT_MIN/MAX to their * appropriate 64-bit values */ - STDMETHOD(BoundedModifyInt64ByName) (THIS_ + STDQT_METHOD(BoundedModifyInt64ByName) (THIS_ const char* pName, INT64 nDelta, REF(INT64) nValue, @@ -1982,7 +1982,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * the default values should b changed from INT_MIN/MAX to their * appropriate 64-bit values */ - STDMETHOD(BoundedModifyInt64ById) (THIS_ + STDQT_METHOD(BoundedModifyInt64ById) (THIS_ const UINT32 id, INT64 nDelta, REF(INT64) nValue, @@ -2004,7 +2004,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nOldValue - OUT - parameter into which the previous value of the * Property is returned */ - STDMETHOD(SetAndReturnInt64ByName) (THIS_ + STDQT_METHOD(SetAndReturnInt64ByName) (THIS_ const char* pName, INT64 nValue, REF(INT64) nOldValue) PURE; @@ -2024,7 +2024,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nOldValue - OUT - parameter into which the previous value of the * Property is returned */ - STDMETHOD(SetAndReturnInt64ById) (THIS_ + STDQT_METHOD(SetAndReturnInt64ById) (THIS_ const UINT32 id, INT64 nValue, REF(INT64) nOldValue) PURE; @@ -2062,7 +2062,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pName - IN - name of the Property whose value is to be retrieved * pValue - OUT - the address of the integer value */ - STDMETHOD(GetInt64RefByName) (THIS_ + STDQT_METHOD(GetInt64RefByName) (THIS_ const char* pName, REF(INT64*) pValue) const PURE; @@ -2080,7 +2080,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pName - IN - name of the Property whose value is to be retrieved * pValue - OUT - the address of the integer value */ - STDMETHOD(GetInt64RefById) (THIS_ + STDQT_METHOD(GetInt64RefById) (THIS_ const UINT32 id, REF(INT64*) pValue) const PURE; @@ -2098,7 +2098,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * * Note: The array must be deleted by the user. */ - STDMETHOD(GetChildIdListByName) (THIS_ + STDQT_METHOD(GetChildIdListByName) (THIS_ const char* pName, REF(UINT32*) pValues, REF(UINT32) ulCount) const PURE; @@ -2117,7 +2117,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * * Note: The pValues array must be deleted by the user. */ - STDMETHOD(GetChildIdListById) (THIS_ + STDQT_METHOD(GetChildIdListById) (THIS_ const UINT32 ulId, REF(UINT32*) pValues, REF(UINT32) ulCount) const PURE; @@ -2137,7 +2137,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * HXR_FAIL if property does not exist. */ - STDMETHOD(GetPropStatusById) (THIS_ + STDQT_METHOD(GetPropStatusById) (THIS_ const UINT32 ulId) const PURE; @@ -2155,7 +2155,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * HXR_FAIL if property does not exist. */ - STDMETHOD(GetPropStatusByName) (THIS_ + STDQT_METHOD(GetPropStatusByName) (THIS_ const char* pName) const PURE; }; @@ -2191,7 +2191,7 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2215,7 +2215,7 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown) * bIsParentNotify - IN - TRUE if this is a parent notification. * pName - IN - name of the deleted Property (null-terminated) */ - STDMETHOD(DeletedComposite)(THIS_ + STDQT_METHOD(DeletedComposite)(THIS_ const UINT32 ulId, const UINT32 ulParentID, const HXBOOL bIsParentNotify, @@ -2233,7 +2233,7 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown) * pName - IN - name of the Property being deleted (null-terminated) * nValue - IN - integer value of the Property which has been deleted */ - STDMETHOD(DeletedInt) (THIS_ + STDQT_METHOD(DeletedInt) (THIS_ const UINT32 ulId, const UINT32 ulParentID, const HXBOOL bIsParentNotify, @@ -2255,7 +2255,7 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown) * pValue - IN - the pointer of the integer reference Property * which has been deleted */ - STDMETHOD(DeletedIntRef) (THIS_ + STDQT_METHOD(DeletedIntRef) (THIS_ const UINT32 ulId, const UINT32 ulParentID, const HXBOOL bIsParentNotify, @@ -2276,7 +2276,7 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown) * pName - IN - name of the deleted Property (null-terminated) * pValue - IN - value of the deleted Property */ - STDMETHOD(DeletedString) (THIS_ + STDQT_METHOD(DeletedString) (THIS_ const UINT32 ulId, const UINT32 ulParentID, const HXBOOL bIsParentNotify, @@ -2296,7 +2296,7 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown) * pName - IN - name of the deleted Property (null-terminated) * pValue - IN - buffer value of the deleted Property */ - STDMETHOD(DeletedBuffer) (THIS_ + STDQT_METHOD(DeletedBuffer) (THIS_ const UINT32 ulId, const UINT32 ulParentID, const HXBOOL bIsParentNotify, @@ -2318,7 +2318,7 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown) * pName - IN - name of the deleted Property (null-terminated) * nValue - IN - 64-bit integer value of the deleted Property */ - STDMETHOD(DeletedInt64) (THIS_ + STDQT_METHOD(DeletedInt64) (THIS_ const UINT32 ulId, const UINT32 ulParentID, const HXBOOL bIsParentNotify, @@ -2342,7 +2342,7 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown) * pValue - IN - the pointer of the 64-bit integer reference Property * which has been deleted */ - STDMETHOD(DeletedInt64Ref) (THIS_ + STDQT_METHOD(DeletedInt64Ref) (THIS_ const UINT32 ulId, const UINT32 ulParentID, const HXBOOL bIsParentNotify, diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxplugn.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxplugn.h index 80461212..179e23ee 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxplugn.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxplugn.h @@ -169,7 +169,7 @@ DECLARE_INTERFACE_(IHXPlugin, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -212,7 +212,7 @@ DECLARE_INTERFACE_(IHXPlugin, IUnknown) * pMoreInfoURL which is used in about UIs (can be NULL) * ulVersionNumber The version of this plugin. */ - STDMETHOD(GetPluginInfo) (THIS_ + STDQT_METHOD(GetPluginInfo) (THIS_ REF(HXBOOL) /*OUT*/ bMultipleLoad, REF(const char*) /*OUT*/ pDescription, REF(const char*) /*OUT*/ pCopyright, @@ -228,7 +228,7 @@ DECLARE_INTERFACE_(IHXPlugin, IUnknown) * so that the plugin can have access to the context for creation of * IHXBuffers and IMalloc. */ - STDMETHOD(InitPlugin) (THIS_ + STDQT_METHOD(InitPlugin) (THIS_ IUnknown* /*IN*/ pContext) PURE; }; @@ -261,7 +261,7 @@ DECLARE_INTERFACE_(IHXPluginEnumerator, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -290,7 +290,7 @@ DECLARE_INTERFACE_(IHXPluginEnumerator, IUnknown) * Return an instance (IUnknown) of the plugin * */ - STDMETHOD(GetPlugin) (THIS_ + STDQT_METHOD(GetPlugin) (THIS_ ULONG32 /*IN*/ ulIndex, REF(IUnknown*) /*OUT*/ pPlugin) PURE; @@ -330,7 +330,7 @@ DECLARE_INTERFACE_(IHXPluginGroupEnumerator, IUnknown) /* * IHXPluginGroupEnumerator methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -348,7 +348,7 @@ DECLARE_INTERFACE_(IHXPluginGroupEnumerator, IUnknown) * be called. * */ - STDMETHOD(Init) (THIS_ + STDQT_METHOD(Init) (THIS_ REFIID iid) PURE; @@ -371,7 +371,7 @@ DECLARE_INTERFACE_(IHXPluginGroupEnumerator, IUnknown) * Return an instance (IUnknown) of the plugin * */ - STDMETHOD(GetPlugin) (THIS_ + STDQT_METHOD(GetPlugin) (THIS_ UINT32 /*IN*/ ulIndex, REF(IUnknown*) /*OUT*/ pPlugin) PURE; @@ -404,7 +404,7 @@ DECLARE_INTERFACE_( IHXPluginSearchEnumerator, IUnknown ) /* * IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, void** ppvObj) PURE; + STDQT_METHOD(QueryInterface)(THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef)(THIS) PURE; STDMETHOD_(ULONG32,Release)(THIS) PURE; @@ -441,7 +441,7 @@ DECLARE_INTERFACE_( IHXPluginSearchEnumerator, IUnknown ) * Returns an instance of the next plugin in the collection * */ - STDMETHOD(GetNextPlugin)( THIS_ REF(IUnknown*) pIUnkResult, + STDQT_METHOD(GetNextPlugin)( THIS_ REF(IUnknown*) pIUnkResult, IUnknown* pIUnkOuter ) PURE; /************************************************************************ @@ -452,7 +452,7 @@ DECLARE_INTERFACE_( IHXPluginSearchEnumerator, IUnknown ) * Gets information about the next plugin in the list * */ - STDMETHOD(GetNextPluginInfo)( THIS_ REF(IHXValues*) pRetValues ) PURE; + STDQT_METHOD(GetNextPluginInfo)( THIS_ REF(IHXValues*) pRetValues ) PURE; /************************************************************************ @@ -463,7 +463,7 @@ DECLARE_INTERFACE_( IHXPluginSearchEnumerator, IUnknown ) * Returns an instance of a plugin at a specific index in the list * */ - STDMETHOD(GetPluginAt)( THIS_ UINT32 index, + STDQT_METHOD(GetPluginAt)( THIS_ UINT32 index, REF(IUnknown*) pIUnkResult, IUnknown* pIUnkOuter ) PURE; @@ -475,7 +475,7 @@ DECLARE_INTERFACE_( IHXPluginSearchEnumerator, IUnknown ) * Returns information about a plugin at a specific index in the list * */ - STDMETHOD(GetPluginInfoAt)( THIS_ UINT32 index, + STDQT_METHOD(GetPluginInfoAt)( THIS_ UINT32 index, REF(IHXValues*) pRetValues ) PURE; }; @@ -509,7 +509,7 @@ DECLARE_INTERFACE_(IHXPluginReloader, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -528,7 +528,7 @@ DECLARE_INTERFACE_(IHXPluginReloader, IUnknown) * Causes the client core to reload all plugins. * */ - STDMETHOD(ReloadPlugins) (THIS) PURE; + STDQT_METHOD(ReloadPlugins) (THIS) PURE; }; @@ -563,7 +563,7 @@ DECLARE_INTERFACE_(IHXPluginFactory, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -594,7 +594,7 @@ DECLARE_INTERFACE_(IHXPluginFactory, IUnknown) * Parameters: */ - STDMETHOD(GetPlugin) (THIS_ + STDQT_METHOD(GetPlugin) (THIS_ UINT16 uIndex, IUnknown** pPlugin) PURE; }; @@ -631,7 +631,7 @@ DECLARE_INTERFACE_(IHXPluginChallenger, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -655,7 +655,7 @@ DECLARE_INTERFACE_(IHXPluginChallenger, IUnknown) * tVal A time value which may be used to create the * challenge response. */ - STDMETHOD(Challenge) (THIS_ + STDQT_METHOD(Challenge) (THIS_ HXTimeval /*IN*/ tVal, REF(IHXBuffer*) /*OUT*/ pResponse) PURE; }; @@ -699,7 +699,7 @@ DECLARE_INTERFACE_(IHXPluginQuery, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -719,7 +719,7 @@ DECLARE_INTERFACE_(IHXPluginQuery, IUnknown) * Gets the number of plugins associated with a particular class id. * */ - STDMETHOD(GetNumPluginsGivenGroup) (THIS_ REFIID riid, + STDQT_METHOD(GetNumPluginsGivenGroup) (THIS_ REFIID riid, REF(UINT32) /*OUT*/ unNumPlugins) PURE; /************************************************************************ @@ -730,7 +730,7 @@ DECLARE_INTERFACE_(IHXPluginQuery, IUnknown) * Gets the info of a particular plugin. * */ - STDMETHOD(GetPluginInfo) (THIS_ REFIID riid, + STDQT_METHOD(GetPluginInfo) (THIS_ REFIID riid, UINT32 unIndex, REF(IHXValues*) /*OUT*/ Values) PURE; }; // $EndPrivate. @@ -764,7 +764,7 @@ DECLARE_INTERFACE_(IHXGenericPlugin, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -776,7 +776,7 @@ DECLARE_INTERFACE_(IHXGenericPlugin, IUnknown) * IHXGenericPlugin methods */ - STDMETHOD(IsGeneric) (THIS_ + STDQT_METHOD(IsGeneric) (THIS_ REF(HXBOOL) /*OUT*/ bIsGeneric) PURE; }; @@ -793,7 +793,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -813,7 +813,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * Specifies the context and sets the pluginhandler in motion. * */ - STDMETHOD(Init) (THIS_ IUnknown* pContext) PURE; + STDQT_METHOD(Init) (THIS_ IUnknown* pContext) PURE; /************************************************************************ * Method: @@ -833,7 +833,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * Gets the info of a particular plugin. * */ - STDMETHOD(GetPluginInfo) (THIS_ + STDQT_METHOD(GetPluginInfo) (THIS_ UINT32 unIndex, REF(IHXValues*) /*OUT*/ Values) PURE; @@ -846,7 +846,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * which currenltly have a refcount of 0. */ - STDMETHOD(FlushCache) (THIS) PURE; + STDQT_METHOD(FlushCache) (THIS) PURE; /************************************************************************ * Method: @@ -860,7 +860,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * cause performance problems. */ - STDMETHOD(SetCacheSize) (THIS_ ULONG32 nSizeKB) PURE; + STDQT_METHOD(SetCacheSize) (THIS_ ULONG32 nSizeKB) PURE; /************************************************************************ * Method: @@ -872,7 +872,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * */ - STDMETHOD(GetInstance) (THIS_ UINT32 index, REF(IUnknown*) pUnknown) PURE; + STDQT_METHOD(GetInstance) (THIS_ UINT32 index, REF(IUnknown*) pUnknown) PURE; /************************************************************************ * Method: @@ -885,7 +885,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * */ - STDMETHOD(FindIndexUsingValues) (THIS_ IHXValues*, + STDQT_METHOD(FindIndexUsingValues) (THIS_ IHXValues*, REF(UINT32) unIndex) PURE; /************************************************************************ @@ -898,7 +898,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * */ - STDMETHOD(FindPluginUsingValues) (THIS_ IHXValues*, + STDQT_METHOD(FindPluginUsingValues) (THIS_ IHXValues*, REF(IUnknown*) pUnk) PURE; /************************************************************************ @@ -912,7 +912,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * NOTE: that a max of two values may be given. */ - STDMETHOD(FindIndexUsingStrings) (THIS_ char* PropName1, + STDQT_METHOD(FindIndexUsingStrings) (THIS_ char* PropName1, char* PropVal1, char* PropName2, char* PropVal2, @@ -930,7 +930,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * NOTE: that a max of two values may be given. */ - STDMETHOD(FindPluginUsingStrings) (THIS_ char* PropName1, + STDQT_METHOD(FindPluginUsingStrings) (THIS_ char* PropName1, char* PropVal1, char* PropName2, char* PropVal2, @@ -947,7 +947,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * ClassID given. An instance of the Class is returned. */ - STDMETHOD(FindImplementationFromClassID) + STDQT_METHOD(FindImplementationFromClassID) ( THIS_ REFGUID GUIDClassID, @@ -964,7 +964,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * */ - STDMETHOD(Close) (THIS) PURE; + STDQT_METHOD(Close) (THIS) PURE; /************************************************************************ * Method: @@ -976,7 +976,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * */ - STDMETHOD(SetRequiredPlugins) (THIS_ const char** ppszRequiredPlugins) PURE; + STDQT_METHOD(SetRequiredPlugins) (THIS_ const char** ppszRequiredPlugins) PURE; }; @@ -1014,7 +1014,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Sets up the context without loading any plugin info * */ - STDMETHOD( RegisterContext )( THIS_ IUnknown* pContext ) PURE; + STDQT_METHOD( RegisterContext )( THIS_ IUnknown* pContext ) PURE; /************************************************************************ * Method: @@ -1024,7 +1024,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Sets up the plugins stored in this preferences object * */ - STDMETHOD( AddPluginMountPoint )( THIS_ const char* pName, UINT32 majorVersion, + STDQT_METHOD( AddPluginMountPoint )( THIS_ const char* pName, UINT32 majorVersion, UINT32 minorVersion, IHXBuffer* pPath ) PURE; @@ -1036,7 +1036,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Refreshes plugin information associated with this * preferences object */ - STDMETHOD( RefreshPluginMountPoint )( THIS_ const char* pName ) PURE; + STDQT_METHOD( RefreshPluginMountPoint )( THIS_ const char* pName ) PURE; /************************************************************************ @@ -1046,7 +1046,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Purpose: * Removes plugins associated with this preferences object */ - STDMETHOD( RemovePluginMountPoint )( THIS_ const char* pName ) PURE; + STDQT_METHOD( RemovePluginMountPoint )( THIS_ const char* pName ) PURE; /************************************************************************ @@ -1060,7 +1060,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * context */ - STDMETHOD( FindImplementationFromClassID )( THIS_ REFGUID GUIDClassID, + STDQT_METHOD( FindImplementationFromClassID )( THIS_ REFGUID GUIDClassID, REF(IUnknown*) pIUnknownInstance, IUnknown* pIUnkOuter, IUnknown* pContext ) PURE; @@ -1073,7 +1073,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Maps a text name to a CLSID based on information from * component plugins */ - STDMETHOD( FindCLSIDFromName )( THIS_ const char* pName, REF(IHXBuffer*) pCLSID ) PURE; + STDQT_METHOD( FindCLSIDFromName )( THIS_ const char* pName, REF(IHXBuffer*) pCLSID ) PURE; /************************************************************************ @@ -1084,7 +1084,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Builds a collection of plugins that match the criteria * */ - STDMETHOD(FindGroupOfPluginsUsingValues)(THIS_ IHXValues* pValues, + STDQT_METHOD(FindGroupOfPluginsUsingValues)(THIS_ IHXValues* pValues, REF(IHXPluginSearchEnumerator*) pIEnumerator) PURE; /************************************************************************ @@ -1095,7 +1095,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Builds a collection of plugins that match the criteria * */ - STDMETHOD(FindGroupOfPluginsUsingStrings)(THIS_ char* PropName1, + STDQT_METHOD(FindGroupOfPluginsUsingStrings)(THIS_ char* PropName1, char* PropVal1, char* PropName2, char* PropVal2, @@ -1112,7 +1112,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Allocates a plugin based on index. Supports aggregation * */ - STDMETHOD(GetPlugin)(THIS_ ULONG32 ulIndex, + STDQT_METHOD(GetPlugin)(THIS_ ULONG32 ulIndex, REF(IUnknown*) pIUnkResult, IUnknown* pIUnkOuter ) PURE; @@ -1124,7 +1124,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Allocates a plugin based on criteria. Supports aggregation * */ - STDMETHOD(FindPluginUsingValues)(THIS_ IHXValues*, + STDQT_METHOD(FindPluginUsingValues)(THIS_ IHXValues*, REF(IUnknown*) pIUnkResult, IUnknown* pIUnkOuter ) PURE; @@ -1137,7 +1137,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Allocates a plugin based on criteria. Supports aggregation * */ - STDMETHOD(FindPluginUsingStrings)(THIS_ char* PropName1, + STDQT_METHOD(FindPluginUsingStrings)(THIS_ char* PropName1, char* PropVal1, char* PropName2, char* PropVal2, @@ -1155,7 +1155,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * and returns TRUE in response to query */ - STDMETHOD( UnloadPluginFromClassID )( THIS_ REFGUID GUIDClassID ) PURE; + STDQT_METHOD( UnloadPluginFromClassID )( THIS_ REFGUID GUIDClassID ) PURE; /************************************************************************ * Method: @@ -1164,7 +1164,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Purpose: * finds a package from the name passed in and attempts to unload it. */ - STDMETHOD (UnloadPackageByName) (char const* pName) PURE; + STDQT_METHOD (UnloadPackageByName) (char const* pName) PURE; }; // $EndPrivate. @@ -1212,7 +1212,7 @@ DECLARE_INTERFACE_(IHXPluginDatabase, IUnknown) * Create a new index in the plugin-handler * */ - STDMETHOD( AddPluginIndex ) ( THIS_ const char* pKeyName, EPluginIndexType indexType, HXBOOL bScanExisting ) PURE; + STDQT_METHOD( AddPluginIndex ) ( THIS_ const char* pKeyName, EPluginIndexType indexType, HXBOOL bScanExisting ) PURE; /************************************************************************ * Method: @@ -1222,7 +1222,7 @@ DECLARE_INTERFACE_(IHXPluginDatabase, IUnknown) * Remove an index from the plugin handler * */ - STDMETHOD( RemovePluginIndex )( THIS_ const char* pKeyName ) PURE; + STDQT_METHOD( RemovePluginIndex )( THIS_ const char* pKeyName ) PURE; /************************************************************************ @@ -1234,7 +1234,7 @@ DECLARE_INTERFACE_(IHXPluginDatabase, IUnknown) * possible, otherwise defer to a linear search * */ - STDMETHOD( FindPluginInfoViaIndex )( THIS_ const char* pKeyName, const void* pValue, IHXValues** ppIInfo ) PURE; + STDQT_METHOD( FindPluginInfoViaIndex )( THIS_ const char* pKeyName, const void* pValue, IHXValues** ppIInfo ) PURE; /************************************************************************ * Method: @@ -1245,7 +1245,7 @@ DECLARE_INTERFACE_(IHXPluginDatabase, IUnknown) * Find a set of plugins matching a single attribute * */ - STDMETHOD( FindPluginSetViaIndex )( THIS_ const char* pKeyName, const void* pValue, IHXPluginSearchEnumerator** ppIEnumerator ) PURE; + STDQT_METHOD( FindPluginSetViaIndex )( THIS_ const char* pKeyName, const void* pValue, IHXPluginSearchEnumerator** ppIEnumerator ) PURE; /************************************************************************ * Method: @@ -1255,7 +1255,7 @@ DECLARE_INTERFACE_(IHXPluginDatabase, IUnknown) * Create a plugin based on a simple attribute. * */ - STDMETHOD( CreatePluginViaIndex )( THIS_ const char* pKeyName, const void* pValue, IUnknown** ppIUnkPlugin, IUnknown* pIUnkOuter ) PURE; + STDQT_METHOD( CreatePluginViaIndex )( THIS_ const char* pKeyName, const void* pValue, IUnknown** ppIUnkPlugin, IUnknown* pIUnkOuter ) PURE; }; // $EndPrivate. @@ -1289,7 +1289,7 @@ DECLARE_INTERFACE_(IHXProxiedPlugin, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1307,7 +1307,7 @@ DECLARE_INTERFACE_(IHXProxiedPlugin, IUnknown) * Purpose: * Gets the Actual Plugin being used... */ - STDMETHOD(GetProxiedPlugin)(THIS_ + STDQT_METHOD(GetProxiedPlugin)(THIS_ REF(IHXPlugin*) /*OUT*/ pPlugin) PURE; }; @@ -1368,14 +1368,14 @@ DECLARE_INTERFACE_(IHXComponentPlugin, IUnknown) * IHXComponentPlugin::GetPackageName * Purpose: */ - STDMETHOD_(char const*, GetPackageName)(THIS) CONSTMETHOD PURE; + STDMETHOD_(char const*, GetPackageName)(THIS) CONSTQT_METHOD PURE; /************************************************************************ * Method: * IHXComponentPlugin::GetComponentInfoAtIndex * Purpose: */ - STDMETHOD(GetComponentInfoAtIndex) (THIS_ + STDQT_METHOD(GetComponentInfoAtIndex) (THIS_ UINT32 /*IN*/ nIndex, REF(IHXValues*) /*OUT*/ pInfo) PURE; @@ -1384,7 +1384,7 @@ DECLARE_INTERFACE_(IHXComponentPlugin, IUnknown) * IHXComponentPlugin::CreateComponentInstance * Purpose: */ - STDMETHOD(CreateComponentInstance)(THIS_ + STDQT_METHOD(CreateComponentInstance)(THIS_ REFCLSID /*IN*/ rclsid, REF(IUnknown*) /*OUT*/ ppUnknown, IUnknown* /*IN*/ pUnkOuter) PURE; @@ -1415,7 +1415,7 @@ DECLARE_INTERFACE_(IHXPluginNamespace, IUnknown) * IHXPluginNamespace::GetPluginNamespace * Purpose: */ - STDMETHOD(GetPluginNamespace) (THIS_ + STDQT_METHOD(GetPluginNamespace) (THIS_ REF(IHXBuffer*) /*OUT*/ pBuffer) PURE; }; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxprefs.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxprefs.h index 4750c4c3..2a2b3a08 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxprefs.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxprefs.h @@ -114,7 +114,7 @@ DECLARE_INTERFACE_(IHXPreferences, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -132,7 +132,7 @@ DECLARE_INTERFACE_(IHXPreferences, IUnknown) * Purpose: * Read a preference from the registry or configuration. */ - STDMETHOD(ReadPref) (THIS_ + STDQT_METHOD(ReadPref) (THIS_ const char* pPrekKey, REF(IHXBuffer*) pBuffer) PURE; /************************************************************************ @@ -141,7 +141,7 @@ DECLARE_INTERFACE_(IHXPreferences, IUnknown) * Purpose: * TBD */ - STDMETHOD(WritePref) (THIS_ + STDQT_METHOD(WritePref) (THIS_ const char* pPrekKey, IHXBuffer* pBuffer) PURE; }; @@ -174,7 +174,7 @@ DECLARE_INTERFACE_(IHXPreferenceEnumerator, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -193,7 +193,7 @@ DECLARE_INTERFACE_(IHXPreferenceEnumerator, IUnknown) * TBD */ - STDMETHOD(BeginSubPref) (THIS_ const char* szSubPref) PURE; + STDQT_METHOD(BeginSubPref) (THIS_ const char* szSubPref) PURE; /************************************************************************ @@ -203,7 +203,7 @@ DECLARE_INTERFACE_(IHXPreferenceEnumerator, IUnknown) * TBD */ - STDMETHOD(EndSubPref) (THIS) PURE; + STDQT_METHOD(EndSubPref) (THIS) PURE; /************************************************************************ * Method: @@ -212,7 +212,7 @@ DECLARE_INTERFACE_(IHXPreferenceEnumerator, IUnknown) * TBD */ - STDMETHOD(GetPrefKey) (THIS_ UINT32 nIndex, REF(IHXBuffer*) pBuffer) PURE; + STDQT_METHOD(GetPrefKey) (THIS_ UINT32 nIndex, REF(IHXBuffer*) pBuffer) PURE; /************************************************************************ * Method: @@ -220,7 +220,7 @@ DECLARE_INTERFACE_(IHXPreferenceEnumerator, IUnknown) * Purpose: * TBD */ - STDMETHOD(ReadPref) (THIS_ + STDQT_METHOD(ReadPref) (THIS_ const char* pPrefKey, IHXBuffer*& pBuffer) PURE; }; @@ -255,7 +255,7 @@ DECLARE_INTERFACE_(IHXPreferences2, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -274,7 +274,7 @@ DECLARE_INTERFACE_(IHXPreferences2, IUnknown) * Read a preference from the registry or configuration. */ - STDMETHOD(GetPreferenceEnumerator)(THIS_ REF(IHXPreferenceEnumerator*) /*OUT*/ pEnum) PURE; + STDQT_METHOD(GetPreferenceEnumerator)(THIS_ REF(IHXPreferenceEnumerator*) /*OUT*/ pEnum) PURE; /************************************************************************ * Method: @@ -283,7 +283,7 @@ DECLARE_INTERFACE_(IHXPreferences2, IUnknown) * Reset the root of the preferences */ - STDMETHOD(ResetRoot)(THIS_ const char* pCompanyName, const char* pProductName, + STDQT_METHOD(ResetRoot)(THIS_ const char* pCompanyName, const char* pProductName, int nProdMajorVer, int nProdMinorVer) PURE; }; @@ -321,7 +321,7 @@ DECLARE_INTERFACE_(IHXPreferences3, IUnknown) * Open a specified collection of preferences */ - STDMETHOD( Open )(THIS_ const char* pCompanyName, const char* pProductName, + STDQT_METHOD( Open )(THIS_ const char* pCompanyName, const char* pProductName, ULONG32 nProdMajorVer, ULONG32 nProdMinorVer) PURE; /************************************************************************ @@ -331,7 +331,7 @@ DECLARE_INTERFACE_(IHXPreferences3, IUnknown) * Have this preference object read/write from the company wide * shared location for all products */ - STDMETHOD( OpenShared )( THIS_ const char* pCompanyName) PURE; + STDQT_METHOD( OpenShared )( THIS_ const char* pCompanyName) PURE; /************************************************************************ * Method: @@ -340,7 +340,7 @@ DECLARE_INTERFACE_(IHXPreferences3, IUnknown) * Delete a preference */ - STDMETHOD(DeletePref)( THIS_ const char* pPrekKey ) PURE; + STDQT_METHOD(DeletePref)( THIS_ const char* pPrekKey ) PURE; }; // $EndPrivate. diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtbuf.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtbuf.h index d7e1b92c..fcfff134 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtbuf.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtbuf.h @@ -44,7 +44,7 @@ DECLARE_INTERFACE_(IHXTimeStampedBuffer, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -57,7 +57,7 @@ DECLARE_INTERFACE_(IHXTimeStampedBuffer, IUnknown) */ STDMETHOD_(UINT32,GetTimeStamp)(THIS) PURE; - STDMETHOD(SetTimeStamp)(THIS_ + STDQT_METHOD(SetTimeStamp)(THIS_ UINT32 ulTimeStamp) PURE; }; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxvalue.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxvalue.h index 6d201641..de321d7e 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxvalue.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxvalue.h @@ -58,7 +58,7 @@ DECLARE_INTERFACE_(IHXKeyValueList, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -77,7 +77,7 @@ DECLARE_INTERFACE_(IHXKeyValueList, IUnknown) * Add a new key/value tuple to our list of strings. You can have * multiple strings for the same key. */ - STDMETHOD(AddKeyValue) (THIS_ + STDQT_METHOD(AddKeyValue) (THIS_ const char* pKey, IHXBuffer* pStr) PURE; @@ -88,7 +88,7 @@ DECLARE_INTERFACE_(IHXKeyValueList, IUnknown) * Return an iterator that allows you to iterate through all the * key/value tuples in our list of strings. */ - STDMETHOD(GetIter) (THIS_ + STDQT_METHOD(GetIter) (THIS_ REF(IHXKeyValueListIter*) pIter) PURE; @@ -99,7 +99,7 @@ DECLARE_INTERFACE_(IHXKeyValueList, IUnknown) * Return an iterator that allows you to iterate through all the * strings for a particular key. */ - STDMETHOD(GetIterOneKey) (THIS_ + STDQT_METHOD(GetIterOneKey) (THIS_ const char* pKey, REF(IHXKeyValueListIterOneKey*) pIter) PURE; @@ -110,7 +110,7 @@ DECLARE_INTERFACE_(IHXKeyValueList, IUnknown) * Append all the key/string tuples from another list to this list. * (You can have duplicate keys.) */ - STDMETHOD(AppendAllListItems) (THIS_ + STDQT_METHOD(AppendAllListItems) (THIS_ IHXKeyValueList* pList) PURE; /************************************************************************ * Method: @@ -127,7 +127,7 @@ DECLARE_INTERFACE_(IHXKeyValueList, IUnknown) * Purpose: * Create an empty object that is the same class as the current object. */ - STDMETHOD(CreateObject) (THIS_ + STDQT_METHOD(CreateObject) (THIS_ REF(IHXKeyValueList*) pNewList) PURE; /************************************************************************ @@ -139,7 +139,7 @@ DECLARE_INTERFACE_(IHXKeyValueList, IUnknown) * ULONGs and Buffers. You can have duplicate keys, and old data is * left untouched. */ - STDMETHOD(ImportValues) (THIS_ + STDQT_METHOD(ImportValues) (THIS_ IHXValues* pValues) PURE; }; @@ -174,7 +174,7 @@ DECLARE_INTERFACE_(IHXKeyValueListIter, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -195,7 +195,7 @@ DECLARE_INTERFACE_(IHXKeyValueListIter, IUnknown) * list of strings. Strings are returned in same order that they * were inserted. */ - STDMETHOD(GetNextPair) (THIS_ + STDQT_METHOD(GetNextPair) (THIS_ REF(const char*) pKey, REF(IHXBuffer*) pStr) PURE; @@ -206,7 +206,7 @@ DECLARE_INTERFACE_(IHXKeyValueListIter, IUnknown) * Replaces the value in the key/value tuple that was returned * in the last call to GetNextPair with a new string. */ - STDMETHOD(ReplaceCurr) (THIS_ + STDQT_METHOD(ReplaceCurr) (THIS_ IHXBuffer* pStr) PURE; }; @@ -241,7 +241,7 @@ DECLARE_INTERFACE_(IHXKeyValueListIterOneKey, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -263,7 +263,7 @@ DECLARE_INTERFACE_(IHXKeyValueListIterOneKey, IUnknown) * were inserted. * */ - STDMETHOD(GetNextString) (THIS_ + STDQT_METHOD(GetNextString) (THIS_ REF(IHXBuffer*) pStr) PURE; /************************************************************************ @@ -274,7 +274,7 @@ DECLARE_INTERFACE_(IHXKeyValueListIterOneKey, IUnknown) * in the last call to GetNextString with a new string. * */ - STDMETHOD(ReplaceCurr) (THIS_ + STDQT_METHOD(ReplaceCurr) (THIS_ IHXBuffer* pStr) PURE; }; @@ -310,7 +310,7 @@ DECLARE_INTERFACE_(IHXOptions, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -335,7 +335,7 @@ DECLARE_INTERFACE_(IHXOptions, IUnknown) * the current setting for that option. * */ - STDMETHOD(GetOptions) (THIS_ + STDQT_METHOD(GetOptions) (THIS_ REF(IHXValues*) pOptions) PURE; /************************************************************************ @@ -346,7 +346,7 @@ DECLARE_INTERFACE_(IHXOptions, IUnknown) * whether or not the SetOptionULONG32 call succeeded. * */ - STDMETHOD(SetOptionULONG32) (THIS_ + STDQT_METHOD(SetOptionULONG32) (THIS_ const char* pName, ULONG32 ulValue) PURE; @@ -358,7 +358,7 @@ DECLARE_INTERFACE_(IHXOptions, IUnknown) * whether or not the SetOptionCString call succeeded. * */ - STDMETHOD(SetOptionCString) (THIS_ + STDQT_METHOD(SetOptionCString) (THIS_ const char* pName, IHXBuffer* pValue) PURE; @@ -370,7 +370,7 @@ DECLARE_INTERFACE_(IHXOptions, IUnknown) * whether or not the SetOptionBuffer call succeeded. * */ - STDMETHOD(SetOptionBuffer) (THIS_ + STDQT_METHOD(SetOptionBuffer) (THIS_ const char* pName, IHXBuffer* pValue) PURE; }; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxvsrc.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxvsrc.h index 747aa319..f4d4c368 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxvsrc.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxvsrc.h @@ -59,20 +59,20 @@ DECLARE_INTERFACE_(IHXFileViewSource, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; /************************************************************************ * IHXFileViewSource */ - STDMETHOD(InitViewSource) (THIS_ + STDQT_METHOD(InitViewSource) (THIS_ IHXFileObject* /*IN*/ pFileObject, IHXFileViewSourceResponse* /*IN*/ pResp, SOURCE_TYPE /*IN*/ sourceType, IHXValues* /*IN*/ pOptions) PURE; - STDMETHOD(GetSource) (THIS) PURE; - STDMETHOD(Close) (THIS) PURE; + STDQT_METHOD(GetSource) (THIS) PURE; + STDQT_METHOD(Close) (THIS) PURE; }; /**************************************************************************** @@ -98,17 +98,17 @@ DECLARE_INTERFACE_(IHXFileViewSourceResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; /************************************************************************ * IHXFileViewSourceResoponse */ - STDMETHOD(InitDone) (THIS_ HX_RESULT status ) PURE; - STDMETHOD(SourceReady) (THIS_ HX_RESULT status, + STDQT_METHOD(InitDone) (THIS_ HX_RESULT status ) PURE; + STDQT_METHOD(SourceReady) (THIS_ HX_RESULT status, IHXBuffer* pSource ) PURE; - STDMETHOD(CloseDone) (THIS_ HX_RESULT) PURE; + STDQT_METHOD(CloseDone) (THIS_ HX_RESULT) PURE; }; /**************************************************************************** @@ -133,7 +133,7 @@ DECLARE_INTERFACE_(IHXViewSourceCommand, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; @@ -142,9 +142,9 @@ DECLARE_INTERFACE_(IHXViewSourceCommand, IUnknown) */ STDMETHOD_(HXBOOL, CanViewSource) (THIS_ IHXStreamSource* pStream) PURE; - STDMETHOD(DoViewSource) (THIS_ + STDQT_METHOD(DoViewSource) (THIS_ IHXStreamSource* pStream) PURE; - STDMETHOD(GetViewSourceURL) (THIS_ + STDQT_METHOD(GetViewSourceURL) (THIS_ IHXStreamSource* pSource, IHXViewSourceURLResponse* pResp) PURE; }; @@ -171,14 +171,14 @@ DECLARE_INTERFACE_(IHXViewSourceURLResponse, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; /************************************************************************ * IHXViewSourceURLResponse */ - STDMETHOD(ViewSourceURLReady) (THIS_ + STDQT_METHOD(ViewSourceURLReady) (THIS_ const char* /*out*/ pUrl) PURE; }; @@ -205,20 +205,20 @@ DECLARE_INTERFACE_(IHXClientViewSource, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; /************************************************************************ * IHXClientViewSource */ - STDMETHOD(DoViewSource) (THIS_ + STDQT_METHOD(DoViewSource) (THIS_ IUnknown* /*IN*/ pPlayerContext, IHXStreamSource* /*IN*/ pSource) PURE; STDMETHOD_(HXBOOL, CanViewSource) (THIS_ IHXStreamSource* /*IN*/ pSource) PURE; - STDMETHOD(GetViewSourceURL) (THIS_ + STDQT_METHOD(GetViewSourceURL) (THIS_ IUnknown* pPlayerContext, IHXStreamSource* pSource, IHXViewSourceURLResponse* pResp) PURE; @@ -247,14 +247,14 @@ DECLARE_INTERFACE_(IHXClientViewSourceSink, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; /************************************************************************ * IHXClientViewSourceSink */ - STDMETHOD(RegisterViewSourceHdlr) (THIS_ + STDQT_METHOD(RegisterViewSourceHdlr) (THIS_ IHXClientViewSource* /*in*/ pViewSourceHdlr) PURE; }; @@ -280,14 +280,14 @@ DECLARE_INTERFACE_(IHXClientViewRights, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; /************************************************************************ * IHXClientViewRights */ - STDMETHOD(ViewRights) (THIS_ + STDQT_METHOD(ViewRights) (THIS_ IUnknown* /*IN*/ pPlayerContext) PURE; STDMETHOD_(HXBOOL, CanViewRights) (THIS) PURE; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h index d7cd38fd..2aefb311 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h @@ -102,7 +102,7 @@ DECLARE_INTERFACE_(IHXSiteWindowed, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -122,21 +122,21 @@ DECLARE_INTERFACE_(IHXSiteWindowed, IUnknown) * of Site. * */ - STDMETHOD(AttachWindow) (THIS_ + STDQT_METHOD(AttachWindow) (THIS_ HXxWindow* /*IN*/ pWindow) PURE; - STDMETHOD(DetachWindow) (THIS) PURE; + STDQT_METHOD(DetachWindow) (THIS) PURE; /* * IHXSiteWindowed methods called by Owners of the site * in the event that want a default top level window created * for the site. */ - STDMETHOD(Create) (THIS_ + STDQT_METHOD(Create) (THIS_ void* ParentWindow, UINT32 style) PURE; - STDMETHOD(Destroy) (THIS) PURE; + STDQT_METHOD(Destroy) (THIS) PURE; /* * IHXSiteWindowed method. Returns actual window of the site. @@ -175,7 +175,7 @@ DECLARE_INTERFACE_(IHXSiteEventHandler, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -188,7 +188,7 @@ DECLARE_INTERFACE_(IHXSiteEventHandler, IUnknown) * The imeplementation of this interface must pass the events * on to the individual CHXSiteWindowed sites. */ - STDMETHOD(EventOccurred) (THIS_ HXxEvent* pEvent) PURE; + STDQT_METHOD(EventOccurred) (THIS_ HXxEvent* pEvent) PURE; }; // $EndPrivate. @@ -222,7 +222,7 @@ DECLARE_INTERFACE_(IHXSiteWindowless, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -233,7 +233,7 @@ DECLARE_INTERFACE_(IHXSiteWindowless, IUnknown) /* * IHXSiteWindowless methods called by owners of the site. */ - STDMETHOD(EventOccurred) (THIS_ + STDQT_METHOD(EventOccurred) (THIS_ HXxEvent* /*IN*/ pEvent) PURE; /* @@ -271,7 +271,7 @@ DECLARE_INTERFACE_(IHXSite, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -284,19 +284,19 @@ DECLARE_INTERFACE_(IHXSite, IUnknown) * associate users with the site, and to create child sites * as appropriate. */ - STDMETHOD(AttachUser) (THIS_ + STDQT_METHOD(AttachUser) (THIS_ IHXSiteUser* /*IN*/ pUser) PURE; - STDMETHOD(DetachUser) (THIS) PURE; + STDQT_METHOD(DetachUser) (THIS) PURE; - STDMETHOD(GetUser) (THIS_ + STDQT_METHOD(GetUser) (THIS_ REF(IHXSiteUser*) /*OUT*/ pUser) PURE; - STDMETHOD(CreateChild) (THIS_ + STDQT_METHOD(CreateChild) (THIS_ REF(IHXSite*) /*OUT*/ pChildSite) PURE; - STDMETHOD(DestroyChild) (THIS_ + STDQT_METHOD(DestroyChild) (THIS_ IHXSite* /*IN*/ pChildSite) PURE; /* @@ -304,34 +304,34 @@ DECLARE_INTERFACE_(IHXSite, IUnknown) * is displayed in order to manage its position. Site users should * not generally call these methods. */ - STDMETHOD(AttachWatcher) (THIS_ + STDQT_METHOD(AttachWatcher) (THIS_ IHXSiteWatcher* /*IN*/ pWatcher) PURE; - STDMETHOD(DetachWatcher) (THIS) PURE; + STDQT_METHOD(DetachWatcher) (THIS) PURE; - STDMETHOD(SetPosition) (THIS_ + STDQT_METHOD(SetPosition) (THIS_ HXxPoint position) PURE; - STDMETHOD(GetPosition) (THIS_ + STDQT_METHOD(GetPosition) (THIS_ REF(HXxPoint) position) PURE; /* * IHXSite methods called by the user of the site to get * information about the site, and to manipulate the site. */ - STDMETHOD(SetSize) (THIS_ + STDQT_METHOD(SetSize) (THIS_ HXxSize size) PURE; - STDMETHOD(GetSize) (THIS_ + STDQT_METHOD(GetSize) (THIS_ REF(HXxSize) size) PURE; - STDMETHOD(DamageRect) (THIS_ + STDQT_METHOD(DamageRect) (THIS_ HXxRect rect) PURE; - STDMETHOD(DamageRegion) (THIS_ + STDQT_METHOD(DamageRegion) (THIS_ HXxRegion region) PURE; - STDMETHOD(ForceRedraw) (THIS) PURE; + STDQT_METHOD(ForceRedraw) (THIS) PURE; }; @@ -362,15 +362,15 @@ DEFINE_GUID(IID_IHXSiteComposition, 0x00000D19, 0x901, 0x11d1, 0x8b, 0x6, 0x0, DECLARE_INTERFACE_(IHXSiteComposition, IUnknown) { /* IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; /* IHXSiteComposition methods. */ - STDMETHOD(LockComposition) (THIS) PURE; - STDMETHOD(UnlockComposition) (THIS) PURE; - STDMETHOD(BltComposition) (THIS) PURE; - STDMETHOD(SetCompositionMode) (THIS_ HXBOOL OnOrOff) PURE; + STDQT_METHOD(LockComposition) (THIS) PURE; + STDQT_METHOD(UnlockComposition) (THIS) PURE; + STDQT_METHOD(BltComposition) (THIS) PURE; + STDQT_METHOD(SetCompositionMode) (THIS_ HXBOOL OnOrOff) PURE; STDMETHOD_(HXBOOL, IsCompositionLocked) (THIS) PURE; STDMETHOD_(HXBOOL, IsCompositionMode) (THIS) PURE; }; @@ -403,7 +403,7 @@ DECLARE_INTERFACE_(IHXSiteUser, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -415,15 +415,15 @@ DECLARE_INTERFACE_(IHXSiteUser, IUnknown) * IHXSiteUser methods usually called by the "context" to * associate users with the site. */ - STDMETHOD(AttachSite) (THIS_ + STDQT_METHOD(AttachSite) (THIS_ IHXSite* /*IN*/ pSite) PURE; - STDMETHOD(DetachSite) (THIS) PURE; + STDQT_METHOD(DetachSite) (THIS) PURE; /* * IHXSiteUser methods called to inform user of an event. */ - STDMETHOD(HandleEvent) (THIS_ + STDQT_METHOD(HandleEvent) (THIS_ HXxEvent* /*IN*/ pEvent) PURE; STDMETHOD_(HXBOOL,NeedsWindowedSites) (THIS) PURE; @@ -455,7 +455,7 @@ DECLARE_INTERFACE_(IHXSiteWatcher, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -467,10 +467,10 @@ DECLARE_INTERFACE_(IHXSiteWatcher, IUnknown) * IHXSiteWatcher methods called by the site when a watcher * is attached to or detached from it. */ - STDMETHOD(AttachSite) (THIS_ + STDQT_METHOD(AttachSite) (THIS_ IHXSite* /*IN*/ pSite) PURE; - STDMETHOD(DetachSite) (THIS) PURE; + STDQT_METHOD(DetachSite) (THIS) PURE; /* * IHXSiteWatcher methods called by the site an attempt is @@ -480,11 +480,11 @@ DECLARE_INTERFACE_(IHXSiteWatcher, IUnknown) * will not change. The site watcher can also modify the new * size of position. */ - STDMETHOD(ChangingPosition) (THIS_ + STDQT_METHOD(ChangingPosition) (THIS_ HXxPoint posOld, REF(HXxPoint)/*IN-OUT*/ posNew) PURE; - STDMETHOD(ChangingSize) (THIS_ + STDQT_METHOD(ChangingSize) (THIS_ HXxSize sizeOld, REF(HXxSize) /*IN-OUT*/ sizeNew) PURE; }; @@ -517,7 +517,7 @@ DECLARE_INTERFACE_(IHXSiteUserSupplier, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -530,10 +530,10 @@ DECLARE_INTERFACE_(IHXSiteUserSupplier, IUnknown) * "context" to ask for additional or to release previously * created site users. */ - STDMETHOD(CreateSiteUser) (THIS_ + STDQT_METHOD(CreateSiteUser) (THIS_ REF(IHXSiteUser*)/*OUT*/ pSiteUser) PURE; - STDMETHOD(DestroySiteUser) (THIS_ + STDQT_METHOD(DestroySiteUser) (THIS_ IHXSiteUser* /*IN*/ pSiteUser) PURE; STDMETHOD_(HXBOOL,NeedsWindowedSites) (THIS) PURE; @@ -568,7 +568,7 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -592,7 +592,7 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown) * the client core will inform the site supplier when this requested * site is no longer needed. */ - STDMETHOD(SitesNeeded) (THIS_ + STDQT_METHOD(SitesNeeded) (THIS_ UINT32 uReqestID, IHXValues* pSiteProps) PURE; @@ -606,7 +606,7 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown) * to fulfill a request for sites it should call the site manager * and remove those sites. */ - STDMETHOD(SitesNotNeeded) (THIS_ + STDQT_METHOD(SitesNotNeeded) (THIS_ UINT32 uReqestID) PURE; @@ -618,7 +618,7 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown) * it can expect to receive SitesNeeded() and SitesNotNeeded() calls * while a layout change is in progress, */ - STDMETHOD(BeginChangeLayout) (THIS) PURE; + STDQT_METHOD(BeginChangeLayout) (THIS) PURE; /************************************************************************ * Method: @@ -627,7 +627,7 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown) * Called to inform the site supplier the layout change has been * completed. */ - STDMETHOD(DoneChangeLayout) (THIS) PURE; + STDQT_METHOD(DoneChangeLayout) (THIS) PURE; }; @@ -660,7 +660,7 @@ DECLARE_INTERFACE_(IHXSiteManager, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -678,7 +678,7 @@ DECLARE_INTERFACE_(IHXSiteManager, IUnknown) * Purpose: * Called to inform the site manager of the existence of a site. */ - STDMETHOD(AddSite) (THIS_ + STDQT_METHOD(AddSite) (THIS_ IHXSite* pSite) PURE; /************************************************************************ @@ -688,7 +688,7 @@ DECLARE_INTERFACE_(IHXSiteManager, IUnknown) * Called to inform the site manager that a site is no longer * available. */ - STDMETHOD(RemoveSite) (THIS_ + STDQT_METHOD(RemoveSite) (THIS_ IHXSite* pSite) PURE; }; @@ -730,7 +730,7 @@ DECLARE_INTERFACE_(IHXSiteManager2, IUnknown) * Called to get the number of sites that the site mananger currently * knows about. */ - STDMETHOD(GetNumberOfSites) (THIS_ REF(UINT32) nNumSites ) PURE; + STDQT_METHOD(GetNumberOfSites) (THIS_ REF(UINT32) nNumSites ) PURE; /************************************************************************ * Method: @@ -739,7 +739,7 @@ DECLARE_INTERFACE_(IHXSiteManager2, IUnknown) * Used to iterate over the sites. * */ - STDMETHOD(GetSiteAt) (THIS_ UINT32 nIndex, REF(IHXSite*) pSite) PURE; + STDQT_METHOD(GetSiteAt) (THIS_ UINT32 nIndex, REF(IHXSite*) pSite) PURE; }; // $EndPrivate. @@ -780,7 +780,7 @@ DECLARE_INTERFACE_(IHXMultiInstanceSiteUserSupplier, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -791,10 +791,10 @@ DECLARE_INTERFACE_(IHXMultiInstanceSiteUserSupplier, IUnknown) /* * IHXMultiInstanceSiteUserSupplier methods called by site users. */ - STDMETHOD(SetSingleSiteUser) (THIS_ + STDQT_METHOD(SetSingleSiteUser) (THIS_ IUnknown* pUnknown) PURE; - STDMETHOD(ReleaseSingleSiteUser) (THIS) PURE; + STDQT_METHOD(ReleaseSingleSiteUser) (THIS) PURE; }; @@ -828,7 +828,7 @@ DECLARE_INTERFACE_(IHXSiteEnumerator, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -849,7 +849,7 @@ DECLARE_INTERFACE_(IHXSiteEnumerator, IUnknown) * sitePosition with the position of the next site (if any). * Returns HXR_OK if the first site is available, HXR_FAIL if not. */ - STDMETHOD(GetFirstSite) (THIS_ + STDQT_METHOD(GetFirstSite) (THIS_ REF(IHXSite*) /* OUT */ pFirstSite, REF(SitePosition) /* OUT */ nextPosition) PURE; @@ -862,7 +862,7 @@ DECLARE_INTERFACE_(IHXSiteEnumerator, IUnknown) * following site (if any). * Returns HXR_OK if the first site is available, HXR_FAIL if not. */ - STDMETHOD(GetNextSite) (THIS_ + STDQT_METHOD(GetNextSite) (THIS_ REF(IHXSite*) pNextSite, REF(SitePosition) /* IN/OUT */ nextPosition) PURE; }; @@ -893,7 +893,7 @@ DECLARE_INTERFACE_(IHXSiteFullScreen, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -904,11 +904,11 @@ DECLARE_INTERFACE_(IHXSiteFullScreen, IUnknown) /* * IHXSiteFullScreen methods */ - STDMETHOD(EnterFullScreen) (THIS) PURE; + STDQT_METHOD(EnterFullScreen) (THIS) PURE; - STDMETHOD(ExitFullScreen) (THIS) PURE; + STDQT_METHOD(ExitFullScreen) (THIS) PURE; - STDMETHOD(TestFullScreen) (THIS_ + STDQT_METHOD(TestFullScreen) (THIS_ void* hTestBitmap,const char* pszStatusText) PURE; STDMETHOD_(HXBOOL, IsFullScreen) (THIS) PURE; @@ -941,7 +941,7 @@ DECLARE_INTERFACE_(IHXLayoutSiteGroupManager, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -952,10 +952,10 @@ DECLARE_INTERFACE_(IHXLayoutSiteGroupManager, IUnknown) /* * IHXLayoutSiteGroupManager methods */ - STDMETHOD(AddLayoutSiteGroup) (THIS_ + STDQT_METHOD(AddLayoutSiteGroup) (THIS_ IUnknown* pLSG) PURE; - STDMETHOD(RemoveLayoutSiteGroup) (THIS_ + STDQT_METHOD(RemoveLayoutSiteGroup) (THIS_ IUnknown* pLSG) PURE; }; // $EndPrivate. @@ -986,7 +986,7 @@ DECLARE_INTERFACE_(IHXEventHookMgr, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -997,12 +997,12 @@ DECLARE_INTERFACE_(IHXEventHookMgr, IUnknown) /* * IHXEventHookMgr methods */ - STDMETHOD(AddHook) (THIS_ + STDQT_METHOD(AddHook) (THIS_ IHXEventHook* pHook, const char* pRegionName, UINT16 uLayer) PURE; - STDMETHOD(RemoveHook) (THIS_ + STDQT_METHOD(RemoveHook) (THIS_ IHXEventHook* pHook, const char* pRegionName, UINT16 uLayer) PURE; @@ -1033,7 +1033,7 @@ DECLARE_INTERFACE_(IHXEventHook, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1044,12 +1044,12 @@ DECLARE_INTERFACE_(IHXEventHook, IUnknown) /* * IHXEventHook methods */ - STDMETHOD(SiteAdded) (THIS_ + STDQT_METHOD(SiteAdded) (THIS_ IHXSite* pSite) PURE; - STDMETHOD(HandleEvent) (THIS_ + STDQT_METHOD(HandleEvent) (THIS_ IHXSite* pSite, HXxEvent* pEvent) PURE; - STDMETHOD(SiteRemoved) (THIS_ + STDQT_METHOD(SiteRemoved) (THIS_ IHXSite* pSite) PURE; }; @@ -1079,7 +1079,7 @@ DECLARE_INTERFACE_(IHXStatusMessage, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1091,7 +1091,7 @@ DECLARE_INTERFACE_(IHXStatusMessage, IUnknown) * IHXStatusMessage methods */ - STDMETHOD(SetStatus) (THIS_ const char* pText) PURE; + STDQT_METHOD(SetStatus) (THIS_ const char* pText) PURE; }; // $Private: @@ -1123,7 +1123,7 @@ DECLARE_INTERFACE_(IHXSiteTransition, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1131,10 +1131,10 @@ DECLARE_INTERFACE_(IHXSiteTransition, IUnknown) STDMETHOD_(ULONG32,Release) (THIS) PURE; - STDMETHOD(Initialize) (THIS_ + STDQT_METHOD(Initialize) (THIS_ IHXValues* pParams) PURE; - STDMETHOD(SetPercentage) (THIS_ + STDQT_METHOD(SetPercentage) (THIS_ UINT32 nThousandnthsComplete) PURE; }; @@ -1174,7 +1174,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * This function creates a rectangular region. * */ - STDMETHOD(SetRect) (THIS_ HXxRect* pRect) PURE; + STDQT_METHOD(SetRect) (THIS_ HXxRect* pRect) PURE; /************************************************************************ * Method: @@ -1183,7 +1183,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * This function creates a rectangular region. * */ - STDMETHOD(SetRect) (THIS_ int x, int y, int x1, int y1) PURE; + STDQT_METHOD(SetRect) (THIS_ int x, int y, int x1, int y1) PURE; /************************************************************************ * Method: @@ -1193,7 +1193,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * */ - STDMETHOD(SetPoly) (THIS_ HXxPoint** pRect, HXBOOL bUseWinding) PURE; + STDQT_METHOD(SetPoly) (THIS_ HXxPoint** pRect, HXBOOL bUseWinding) PURE; /************************************************************************ * Method: @@ -1213,7 +1213,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * */ - STDMETHOD(GetExtents) (THIS_ REF(HXxRect) rExtents) PURE; + STDQT_METHOD(GetExtents) (THIS_ REF(HXxRect) rExtents) PURE; /************************************************************************ * Method: @@ -1223,7 +1223,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * */ - STDMETHOD(Offset) (THIS_ HXxPoint* pOrigin) PURE; + STDQT_METHOD(Offset) (THIS_ HXxPoint* pOrigin) PURE; /************************************************************************ * Method: @@ -1267,7 +1267,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * */ - STDMETHOD(GetRectAtIndex) (THIS_ UINT32 nRectIndex, REF(HXxRect) rRect) PURE; + STDQT_METHOD(GetRectAtIndex) (THIS_ UINT32 nRectIndex, REF(HXxRect) rRect) PURE; /************************************************************************ * Method: @@ -1278,7 +1278,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * */ - STDMETHOD(UnionRegion) (THIS_ REF(IHXRegion*) pDest, IHXRegion* pSrc1) PURE; + STDQT_METHOD(UnionRegion) (THIS_ REF(IHXRegion*) pDest, IHXRegion* pSrc1) PURE; /************************************************************************ * Method: @@ -1288,7 +1288,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * */ - STDMETHOD(CopyRegion) (THIS_ REF(IHXRegion*) pDest) PURE; + STDQT_METHOD(CopyRegion) (THIS_ REF(IHXRegion*) pDest) PURE; /************************************************************************ * Method: @@ -1298,7 +1298,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * */ - STDMETHOD(DiffRegion) (THIS_ REF(IHXRegion*) pDest, IHXRegion* pSrc1) PURE; + STDQT_METHOD(DiffRegion) (THIS_ REF(IHXRegion*) pDest, IHXRegion* pSrc1) PURE; /************************************************************************ * Method: @@ -1308,7 +1308,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * */ - STDMETHOD(AndRegion) (THIS_ REF(IHXRegion*) pDest, IHXRegion* pSrc1) PURE; + STDQT_METHOD(AndRegion) (THIS_ REF(IHXRegion*) pDest, IHXRegion* pSrc1) PURE; /************************************************************************ * Method: @@ -1318,7 +1318,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * */ - STDMETHOD(XORRegion) (THIS_ REF(IHXRegion*) pDest, IHXRegion* pSrc1) PURE; + STDQT_METHOD(XORRegion) (THIS_ REF(IHXRegion*) pDest, IHXRegion* pSrc1) PURE; /************************************************************************ * Method: @@ -1361,7 +1361,7 @@ DECLARE_INTERFACE_(IHXColorConverterManager, IUnknown) * Get ColorConverter is called to obtain a color converter to convert * from a particular bitmap to another bitmap. */ - STDMETHOD(GetColorConverter) (THIS_ + STDQT_METHOD(GetColorConverter) (THIS_ HXBitmapInfoHeader* /*IN*/ pBitmapInfoIn, HXBitmapInfoHeader* /*IN*/ pBitmapInfoOut, REF(IHXColorConverter*) /*OUT*/ pConverter) PURE; @@ -1396,7 +1396,7 @@ DECLARE_INTERFACE_(IHXColorConverter, IUnknown) * ColorConvert converts the pBitsIn from one color format to * the format of pBitsOut */ - STDMETHOD(ColorConvert) (THIS_ + STDQT_METHOD(ColorConvert) (THIS_ UCHAR* pBitsIn, UCHAR* pBitsOut, HXxRect* pRectIn, @@ -1430,8 +1430,8 @@ DEFINE_GUID(IID_IHXOverlayResponse, 0x00000D22, 0x903, 0x11d1, 0x8b, DECLARE_INTERFACE_(IHXOverlayResponse, IUnknown) { - STDMETHOD(OverlayGranted) (THIS ) PURE; - STDMETHOD(OverlayRevoked) (THIS ) PURE; + STDQT_METHOD(OverlayGranted) (THIS ) PURE; + STDQT_METHOD(OverlayRevoked) (THIS ) PURE; }; @@ -1460,17 +1460,17 @@ DEFINE_GUID(IID_IHXOverlayManager, 0x00000D21, 0x903, 0x11d1, 0x8b, DECLARE_INTERFACE_(IHXOverlayManager, IUnknown) { - STDMETHOD(HasOverlay) (THIS_ + STDQT_METHOD(HasOverlay) (THIS_ IHXOverlayResponse* pResp ) PURE; - STDMETHOD(AddStats) (THIS_ + STDQT_METHOD(AddStats) (THIS_ IHXOverlayResponse* pResp, UINT32 ulNumPixels ) PURE; - STDMETHOD(RemoveOverlayRequest)(THIS_ IHXOverlayResponse* pResp ) PURE; + STDQT_METHOD(RemoveOverlayRequest)(THIS_ IHXOverlayResponse* pResp ) PURE; }; @@ -1500,8 +1500,8 @@ DEFINE_GUID(IID_IHXKeyBoardFocus, 0x00000D23, 0x903, 0x11d1, 0x8b, DECLARE_INTERFACE_(IHXKeyBoardFocus, IUnknown) { - STDMETHOD(SetKeyboardFocus)(THIS_ IHXSiteUser* pSiteUser ) PURE; - STDMETHOD(GetKeyboardFocus)(THIS_ IHXSiteUser* &pSiteUser ) PURE; + STDQT_METHOD(SetKeyboardFocus)(THIS_ IHXSiteUser* pSiteUser ) PURE; + STDQT_METHOD(GetKeyboardFocus)(THIS_ IHXSiteUser* &pSiteUser ) PURE; }; @@ -1557,7 +1557,7 @@ DECLARE_INTERFACE_(IHXDrawFocus, IUnknown) * CUSTOM_LINE_ENTRIES equals 4. Secondary pixels are not * drawn if RED_OFF, GREEN_OFF, and BLUE_OFF are not set. */ - STDMETHOD(SetStyle) (THIS_ IHXValues* pProperties) PURE; + STDQT_METHOD(SetStyle) (THIS_ IHXValues* pProperties) PURE; /************************************************************************ * Method: @@ -1565,7 +1565,7 @@ DECLARE_INTERFACE_(IHXDrawFocus, IUnknown) * Purpose: * Ask the site to clear the current focus drawing. */ - STDMETHOD(ClearFocus)(THIS) PURE; + STDQT_METHOD(ClearFocus)(THIS) PURE; /************************************************************************ * Method: @@ -1573,7 +1573,7 @@ DECLARE_INTERFACE_(IHXDrawFocus, IUnknown) * Purpose: * Ask the site to draw polygon around focus */ - STDMETHOD(SetFocusPolygon)(THIS_ HXxPoint* pPoints, ULONG32 numPoints) PURE; + STDQT_METHOD(SetFocusPolygon)(THIS_ HXxPoint* pPoints, ULONG32 numPoints) PURE; /************************************************************************ * Method: @@ -1581,7 +1581,7 @@ DECLARE_INTERFACE_(IHXDrawFocus, IUnknown) * Purpose: * Ask the site to draw rectangle around focus */ - STDMETHOD(SetFocusRect) (THIS_ HXxRect* pRect) PURE; + STDQT_METHOD(SetFocusRect) (THIS_ HXxRect* pRect) PURE; /************************************************************************ * Method: @@ -1589,7 +1589,7 @@ DECLARE_INTERFACE_(IHXDrawFocus, IUnknown) * Purpose: * Ask the site to draw ellipse around focus */ - STDMETHOD(SetFocusEllipse) (THIS_ HXxRect* pRect) PURE; + STDQT_METHOD(SetFocusEllipse) (THIS_ HXxRect* pRect) PURE; }; // $Private: @@ -1625,17 +1625,17 @@ DECLARE_INTERFACE_(IHXSubRectSite, IHXSite) * These messages contain actuall dirty rects so that the renderer * does not need to BLT the entire frame. */ - STDMETHOD(SendSubRectMessages) (THIS_ HXBOOL bRet ) PURE; + STDQT_METHOD(SendSubRectMessages) (THIS_ HXBOOL bRet ) PURE; /* * New damage region call that takes the cross platfrom region * defined in hxwintyp.h and invalidates the rects in it */ - STDMETHOD(SubRectDamageRegion) (THIS_ HXxBoxRegion* pRegion ) PURE; + STDQT_METHOD(SubRectDamageRegion) (THIS_ HXxBoxRegion* pRegion ) PURE; /* * Method to get the new video surface that comes with the sub * rect BLT'ing support. */ - STDMETHOD(GetSubRectVideoSurface) (THIS_ + STDQT_METHOD(GetSubRectVideoSurface) (THIS_ REF(IHXSubRectVideoSurface*) pSurface ) PURE; }; @@ -1672,7 +1672,7 @@ DECLARE_INTERFACE_(IHXFocusNavigation, IUnknown) * Purpose: * Ask the renderer to set the focus to the given item. */ - STDMETHOD(SetFocus) (THIS_ HXFocusContext eFocus) PURE; + STDQT_METHOD(SetFocus) (THIS_ HXFocusContext eFocus) PURE; /************************************************************************ * Method: @@ -1680,7 +1680,7 @@ DECLARE_INTERFACE_(IHXFocusNavigation, IUnknown) * Purpose: * Ask the renderer to clear the current focus. */ - STDMETHOD(ClearFocus) (THIS) PURE; + STDQT_METHOD(ClearFocus) (THIS) PURE; /************************************************************************ * Method: @@ -1689,7 +1689,7 @@ DECLARE_INTERFACE_(IHXFocusNavigation, IUnknown) * Ask the renderer to activate the focused link. Do nothing if * there is no focus point. */ - STDMETHOD(ActivateFocus) (THIS) PURE; + STDQT_METHOD(ActivateFocus) (THIS) PURE; /************************************************************************ * Method: diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/ihxpckts.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/ihxpckts.h index c4a927a8..774fd405 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/ihxpckts.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/ihxpckts.h @@ -59,7 +59,7 @@ DECLARE_INTERFACE_(IHXBuffer, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -70,15 +70,15 @@ DECLARE_INTERFACE_(IHXBuffer, IUnknown) /* * IHXBuffer methods */ - STDMETHOD(Get) (THIS_ + STDQT_METHOD(Get) (THIS_ REF(UCHAR*) pData, REF(ULONG32) ulLength) PURE; - STDMETHOD(Set) (THIS_ + STDQT_METHOD(Set) (THIS_ const UCHAR* pData, ULONG32 ulLength) PURE; - STDMETHOD(SetSize) (THIS_ + STDQT_METHOD(SetSize) (THIS_ ULONG32 ulLength) PURE; STDMETHOD_(ULONG32,GetSize) (THIS) PURE; @@ -119,7 +119,7 @@ DECLARE_INTERFACE_(IHXPacket, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -130,7 +130,7 @@ DECLARE_INTERFACE_(IHXPacket, IUnknown) /* * IHXPacket methods */ - STDMETHOD(Get) (THIS_ + STDQT_METHOD(Get) (THIS_ REF(IHXBuffer*) pBuffer, REF(UINT32) ulTime, REF(UINT16) unStreamNumber, @@ -150,9 +150,9 @@ DECLARE_INTERFACE_(IHXPacket, IUnknown) STDMETHOD_(HXBOOL,IsLost) (THIS) PURE; - STDMETHOD(SetAsLost) (THIS) PURE; + STDQT_METHOD(SetAsLost) (THIS) PURE; - STDMETHOD(Set) (THIS_ + STDQT_METHOD(Set) (THIS_ IHXBuffer* pBuffer, UINT32 ulTime, UINT16 uStreamNumber, @@ -194,7 +194,7 @@ DECLARE_INTERFACE_(IHXRTPPacket, IHXPacket) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -205,7 +205,7 @@ DECLARE_INTERFACE_(IHXRTPPacket, IHXPacket) /* * IHXPacket methods */ - STDMETHOD(Get) (THIS_ + STDQT_METHOD(Get) (THIS_ REF(IHXBuffer*) pBuffer, REF(UINT32) ulTime, REF(UINT16) unStreamNumber, @@ -225,9 +225,9 @@ DECLARE_INTERFACE_(IHXRTPPacket, IHXPacket) STDMETHOD_(HXBOOL,IsLost) (THIS) PURE; - STDMETHOD(SetAsLost) (THIS) PURE; + STDQT_METHOD(SetAsLost) (THIS) PURE; - STDMETHOD(Set) (THIS_ + STDQT_METHOD(Set) (THIS_ IHXBuffer* pBuffer, UINT32 ulTime, UINT16 uStreamNumber, @@ -240,7 +240,7 @@ DECLARE_INTERFACE_(IHXRTPPacket, IHXPacket) */ STDMETHOD_(ULONG32,GetRTPTime) (THIS) PURE; - STDMETHOD(GetRTP) (THIS_ + STDQT_METHOD(GetRTP) (THIS_ REF(IHXBuffer*) pBuffer, REF(UINT32) ulTime, REF(UINT32) ulRTPTime, @@ -249,7 +249,7 @@ DECLARE_INTERFACE_(IHXRTPPacket, IHXPacket) REF(UINT16) unASMRuleNumber ) PURE; - STDMETHOD(SetRTP) (THIS_ + STDQT_METHOD(SetRTP) (THIS_ IHXBuffer* pBuffer, UINT32 ulTime, UINT32 ulRTPTime, @@ -285,7 +285,7 @@ DECLARE_INTERFACE_(IHXRTPPacketInfo, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; @@ -294,37 +294,37 @@ DECLARE_INTERFACE_(IHXRTPPacketInfo, IUnknown) */ STDMETHOD_(UINT8, GetVersion) (THIS) PURE; - STDMETHOD(GetPaddingBit) (THIS_ REF(HXBOOL)bPadding) PURE; - STDMETHOD(SetPaddingBit) (THIS_ HXBOOL bPadding) PURE; + STDQT_METHOD(GetPaddingBit) (THIS_ REF(HXBOOL)bPadding) PURE; + STDQT_METHOD(SetPaddingBit) (THIS_ HXBOOL bPadding) PURE; - STDMETHOD(GetExtensionBit) (THIS_ REF(HXBOOL)bExtension) PURE; - STDMETHOD(SetExtensionBit) (THIS_ HXBOOL bExtension) PURE; + STDQT_METHOD(GetExtensionBit) (THIS_ REF(HXBOOL)bExtension) PURE; + STDQT_METHOD(SetExtensionBit) (THIS_ HXBOOL bExtension) PURE; - STDMETHOD(GetCSRCCount) (THIS_ REF(UINT8)unCSRCCount) PURE; - STDMETHOD(SetCSRCCount) (THIS_ UINT8 unCSRCCount) PURE; + STDQT_METHOD(GetCSRCCount) (THIS_ REF(UINT8)unCSRCCount) PURE; + STDQT_METHOD(SetCSRCCount) (THIS_ UINT8 unCSRCCount) PURE; - STDMETHOD(GetMarkerBit) (THIS_ REF(HXBOOL)bMarker) PURE; - STDMETHOD(SetMarkerBit) (THIS_ HXBOOL bMarker) PURE; + STDQT_METHOD(GetMarkerBit) (THIS_ REF(HXBOOL)bMarker) PURE; + STDQT_METHOD(SetMarkerBit) (THIS_ HXBOOL bMarker) PURE; - STDMETHOD(GetPayloadType) (THIS_ REF(UINT8)unPayloadType) PURE; - STDMETHOD(SetPayloadType) (THIS_ UINT8 unPayloadType) PURE; + STDQT_METHOD(GetPayloadType) (THIS_ REF(UINT8)unPayloadType) PURE; + STDQT_METHOD(SetPayloadType) (THIS_ UINT8 unPayloadType) PURE; - STDMETHOD(GetSequenceNumber) (THIS_ REF(UINT16)unSeqNo) PURE; - STDMETHOD(SetSequenceNumber) (THIS_ UINT16 unSeqNo) PURE; + STDQT_METHOD(GetSequenceNumber) (THIS_ REF(UINT16)unSeqNo) PURE; + STDQT_METHOD(SetSequenceNumber) (THIS_ UINT16 unSeqNo) PURE; - STDMETHOD(GetTimeStamp) (THIS_ REF(UINT32)ulTS) PURE; - STDMETHOD(SetTimeStamp) (THIS_ UINT32 ulTS) PURE; + STDQT_METHOD(GetTimeStamp) (THIS_ REF(UINT32)ulTS) PURE; + STDQT_METHOD(SetTimeStamp) (THIS_ UINT32 ulTS) PURE; - STDMETHOD(GetSSRC) (THIS_ REF(UINT32)ulSSRC) PURE; - STDMETHOD(SetSSRC) (THIS_ UINT32 ulSSRC) PURE; + STDQT_METHOD(GetSSRC) (THIS_ REF(UINT32)ulSSRC) PURE; + STDQT_METHOD(SetSSRC) (THIS_ UINT32 ulSSRC) PURE; - STDMETHOD(GetCSRCList) (THIS_ REF(const char*) pulCSRC) PURE; - STDMETHOD(SetCSRCList) (THIS_ const char* pCSRCList, UINT32 ulSize) PURE; - STDMETHOD(GetPadding) (THIS_ REF(const char*) pPadding) PURE; - STDMETHOD(SetPadding) (THIS_ const char* pPadding, UINT32 ulSize) PURE; - STDMETHOD(GetExtension) (THIS_ REF(const char*) pExtension) PURE; - STDMETHOD(SetExtension) (THIS_ const char* pExtension, UINT32 ulSize) PURE; + STDQT_METHOD(GetCSRCList) (THIS_ REF(const char*) pulCSRC) PURE; + STDQT_METHOD(SetCSRCList) (THIS_ const char* pCSRCList, UINT32 ulSize) PURE; + STDQT_METHOD(GetPadding) (THIS_ REF(const char*) pPadding) PURE; + STDQT_METHOD(SetPadding) (THIS_ const char* pPadding, UINT32 ulSize) PURE; + STDQT_METHOD(GetExtension) (THIS_ REF(const char*) pExtension) PURE; + STDQT_METHOD(SetExtension) (THIS_ const char* pExtension, UINT32 ulSize) PURE; }; @@ -361,7 +361,7 @@ DECLARE_INTERFACE_(IHXValues, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -382,51 +382,51 @@ DECLARE_INTERFACE_(IHXValues, IUnknown) * RMA core (i.e. you exit whatever function gave you a time slice). */ - STDMETHOD(SetPropertyULONG32) (THIS_ + STDQT_METHOD(SetPropertyULONG32) (THIS_ const char* pPropertyName, ULONG32 uPropertyValue) PURE; - STDMETHOD(GetPropertyULONG32) (THIS_ + STDQT_METHOD(GetPropertyULONG32) (THIS_ const char* pPropertyName, REF(ULONG32) uPropertyName) PURE; - STDMETHOD(GetFirstPropertyULONG32) (THIS_ + STDQT_METHOD(GetFirstPropertyULONG32) (THIS_ REF(const char*) pPropertyName, REF(ULONG32) uPropertyValue) PURE; - STDMETHOD(GetNextPropertyULONG32) (THIS_ + STDQT_METHOD(GetNextPropertyULONG32) (THIS_ REF(const char*) pPropertyName, REF(ULONG32) uPropertyValue) PURE; - STDMETHOD(SetPropertyBuffer) (THIS_ + STDQT_METHOD(SetPropertyBuffer) (THIS_ const char* pPropertyName, IHXBuffer* pPropertyValue) PURE; - STDMETHOD(GetPropertyBuffer) (THIS_ + STDQT_METHOD(GetPropertyBuffer) (THIS_ const char* pPropertyName, REF(IHXBuffer*) pPropertyValue) PURE; - STDMETHOD(GetFirstPropertyBuffer) (THIS_ + STDQT_METHOD(GetFirstPropertyBuffer) (THIS_ REF(const char*) pPropertyName, REF(IHXBuffer*) pPropertyValue) PURE; - STDMETHOD(GetNextPropertyBuffer) (THIS_ + STDQT_METHOD(GetNextPropertyBuffer) (THIS_ REF(const char*) pPropertyName, REF(IHXBuffer*) pPropertyValue) PURE; - STDMETHOD(SetPropertyCString) (THIS_ + STDQT_METHOD(SetPropertyCString) (THIS_ const char* pPropertyName, IHXBuffer* pPropertyValue) PURE; - STDMETHOD(GetPropertyCString) (THIS_ + STDQT_METHOD(GetPropertyCString) (THIS_ const char* pPropertyName, REF(IHXBuffer*) pPropertyValue) PURE; - STDMETHOD(GetFirstPropertyCString) (THIS_ + STDQT_METHOD(GetFirstPropertyCString) (THIS_ REF(const char*) pPropertyName, REF(IHXBuffer*) pPropertyValue) PURE; - STDMETHOD(GetNextPropertyCString) (THIS_ + STDQT_METHOD(GetNextPropertyCString) (THIS_ REF(const char*) pPropertyName, REF(IHXBuffer*) pPropertyValue) PURE; }; @@ -460,19 +460,19 @@ DECLARE_INTERFACE_(IHXValues2, IHXValues) * IHXValues2 methods */ - STDMETHOD(SetPropertyObject) (THIS_ + STDQT_METHOD(SetPropertyObject) (THIS_ const char* pPropertyName, IUnknown* pPropertyValue) PURE; - STDMETHOD(GetPropertyObject) (THIS_ + STDQT_METHOD(GetPropertyObject) (THIS_ const char* pPropertyName, REF(IUnknown*) pPropertyValue) PURE; - STDMETHOD(GetFirstPropertyObject) (THIS_ + STDQT_METHOD(GetFirstPropertyObject) (THIS_ REF(const char*) pPropertyName, REF(IUnknown*) pPropertyValue) PURE; - STDMETHOD(GetNextPropertyObject) (THIS_ + STDQT_METHOD(GetNextPropertyObject) (THIS_ REF(const char*) pPropertyName, REF(IUnknown*) pPropertyValue) PURE; @@ -483,7 +483,7 @@ DECLARE_INTERFACE_(IHXValues2, IHXValues) * Remove all items matching pKey. (If you know what datatype you saved * the key as, use the specific method.) */ - STDMETHOD(Remove) (const char* pKey) PURE; + STDQT_METHOD(Remove) (const char* pKey) PURE; /************************************************************************ * Method: @@ -491,7 +491,7 @@ DECLARE_INTERFACE_(IHXValues2, IHXValues) * Purpose: * Remove all ULONG32 items matching pKey. */ - STDMETHOD(RemoveULONG32) (const char* pKey) PURE; + STDQT_METHOD(RemoveULONG32) (const char* pKey) PURE; /************************************************************************ * Method: @@ -499,7 +499,7 @@ DECLARE_INTERFACE_(IHXValues2, IHXValues) * Purpose: * Remove all Buffer items matching pKey. */ - STDMETHOD(RemoveBuffer) (const char* pKey) PURE; + STDQT_METHOD(RemoveBuffer) (const char* pKey) PURE; /************************************************************************ * Method: @@ -507,7 +507,7 @@ DECLARE_INTERFACE_(IHXValues2, IHXValues) * Purpose: * Remove all CString items matching pKey. */ - STDMETHOD(RemoveCString) (const char* pKey) PURE; + STDQT_METHOD(RemoveCString) (const char* pKey) PURE; /************************************************************************ * Method: @@ -515,7 +515,7 @@ DECLARE_INTERFACE_(IHXValues2, IHXValues) * Purpose: * Remove all IUnknown items matching pKey. */ - STDMETHOD(RemoveObject) (const char* pKey) PURE; + STDQT_METHOD(RemoveObject) (const char* pKey) PURE; }; /**************************************************************************** @@ -553,7 +553,7 @@ DECLARE_INTERFACE_(IHXValuesRemove, IUnknown) /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -572,7 +572,7 @@ DECLARE_INTERFACE_(IHXValuesRemove, IUnknown) * Remove all items matching pKey. (If you know what datatype you saved * the key as, use the specific method.) */ - STDMETHOD(Remove) (const char* pKey) PURE; + STDQT_METHOD(Remove) (const char* pKey) PURE; /************************************************************************ * Method: @@ -580,7 +580,7 @@ DECLARE_INTERFACE_(IHXValuesRemove, IUnknown) * Purpose: * Remove all ULONG32 items matching pKey. */ - STDMETHOD(RemoveULONG32) (const char* pKey) PURE; + STDQT_METHOD(RemoveULONG32) (const char* pKey) PURE; /************************************************************************ * Method: @@ -588,7 +588,7 @@ DECLARE_INTERFACE_(IHXValuesRemove, IUnknown) * Purpose: * Remove all Buffer items matching pKey. */ - STDMETHOD(RemoveBuffer) (const char* pKey) PURE; + STDQT_METHOD(RemoveBuffer) (const char* pKey) PURE; /************************************************************************ * Method: @@ -596,7 +596,7 @@ DECLARE_INTERFACE_(IHXValuesRemove, IUnknown) * Purpose: * Remove all CString items matching pKey. */ - STDMETHOD(RemoveCString) (const char* pKey) PURE; + STDQT_METHOD(RemoveCString) (const char* pKey) PURE; }; // $Private: @@ -612,7 +612,7 @@ DECLARE_INTERFACE_(IHXClientPacket, IUnknown) * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -633,7 +633,7 @@ DECLARE_INTERFACE_(IHXBroadcastDistPktExt, IUnknown) * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -648,10 +648,10 @@ DECLARE_INTERFACE_(IHXBroadcastDistPktExt, IUnknown) STDMETHOD_(UINT16,GetRuleSeqNoArraySize) (THIS) PURE; STDMETHOD_(UINT16*,GetRuleSeqNoArray) (THIS) PURE; - STDMETHOD(SetSeqNo) (THIS_ UINT32 ulSeqNo) PURE; - STDMETHOD(SetStreamSeqNo) (THIS_ UINT32 ulStreamSeqNo) PURE; - STDMETHOD(SetIsLostRelaying) (THIS_ HXBOOL bLostRelay) PURE; - STDMETHOD(SetRuleSeqNoArray) (THIS_ UINT16* pRuleSeqNoArray, UINT16 uSize) PURE; + STDQT_METHOD(SetSeqNo) (THIS_ UINT32 ulSeqNo) PURE; + STDQT_METHOD(SetStreamSeqNo) (THIS_ UINT32 ulStreamSeqNo) PURE; + STDQT_METHOD(SetIsLostRelaying) (THIS_ HXBOOL bLostRelay) PURE; + STDQT_METHOD(SetRuleSeqNoArray) (THIS_ UINT16* pRuleSeqNoArray, UINT16 uSize) PURE; }; // $EndPrivate. diff --git a/amarok/src/engine/helix/helix-sp/helix-sp.cpp b/amarok/src/engine/helix/helix-sp/helix-sp.cpp index c7ac5943..f2e947af 100644 --- a/amarok/src/engine/helix/helix-sp/helix-sp.cpp +++ b/amarok/src/engine/helix/helix-sp/helix-sp.cpp @@ -77,7 +77,7 @@ public: /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); @@ -88,7 +88,7 @@ public: /* * IHXAudioStreamInfoResponse methods */ - STDMETHOD(OnStream) (THIS_ + STDQT_METHOD(OnStream) (THIS_ IHXAudioStream *pAudioStream ); private: diff --git a/amarok/src/engine/helix/helix-sp/hspadvisesink.h b/amarok/src/engine/helix/helix-sp/hspadvisesink.h index 6816e75a..1a5f7f87 100644 --- a/amarok/src/engine/helix/helix-sp/hspadvisesink.h +++ b/amarok/src/engine/helix/helix-sp/hspadvisesink.h @@ -61,7 +61,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); @@ -80,7 +80,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * Called to advise the client that the position or length of the * current playback context has changed. */ - STDMETHOD(OnPosLength) (THIS_ + STDQT_METHOD(OnPosLength) (THIS_ UINT32 ulPosition, UINT32 ulLength); @@ -90,7 +90,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * Purpose: * Called to advise the client a presentation has been opened. */ - STDMETHOD(OnPresentationOpened) (THIS); + STDQT_METHOD(OnPresentationOpened) (THIS); /************************************************************************ * Method: @@ -98,7 +98,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * Purpose: * Called to advise the client a presentation has been closed. */ - STDMETHOD(OnPresentationClosed) (THIS); + STDQT_METHOD(OnPresentationClosed) (THIS); /************************************************************************ * Method: @@ -107,7 +107,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * Called to advise the client that the presentation statistics * have changed. */ - STDMETHOD(OnStatisticsChanged) (THIS); + STDQT_METHOD(OnStatisticsChanged) (THIS); /************************************************************************ * Method: @@ -119,7 +119,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * time for the stream's time line after the seek will be completed. * */ - STDMETHOD (OnPreSeek) (THIS_ + STDQT_METHOD (OnPreSeek) (THIS_ ULONG32 ulOldTime, ULONG32 ulNewTime); @@ -133,7 +133,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * time for the stream's time line after the seek. * */ - STDMETHOD (OnPostSeek) (THIS_ + STDQT_METHOD (OnPostSeek) (THIS_ ULONG32 ulOldTime, ULONG32 ulNewTime); @@ -145,7 +145,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * just occurred. * */ - STDMETHOD (OnStop) (THIS); + STDQT_METHOD (OnStop) (THIS); /************************************************************************ * Method: @@ -156,7 +156,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * stream's time line before the pause. * */ - STDMETHOD (OnPause) (THIS_ + STDQT_METHOD (OnPause) (THIS_ ULONG32 ulTime); /************************************************************************ @@ -168,7 +168,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * for the stream's time line after the resume. * */ - STDMETHOD (OnBegin) (THIS_ + STDQT_METHOD (OnBegin) (THIS_ ULONG32 ulTime); /************************************************************************ @@ -182,7 +182,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * buffering process. * */ - STDMETHOD (OnBuffering) (THIS_ + STDQT_METHOD (OnBuffering) (THIS_ ULONG32 ulFlags, UINT16 unPercentComplete); @@ -195,7 +195,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * hosts(s). * */ - STDMETHOD (OnContacting) (THIS_ + STDQT_METHOD (OnContacting) (THIS_ const char* pHostName); }; diff --git a/amarok/src/engine/helix/helix-sp/hspalsadevice.h b/amarok/src/engine/helix/helix-sp/hspalsadevice.h index b237e322..23eadae9 100644 --- a/amarok/src/engine/helix/helix-sp/hspalsadevice.h +++ b/amarok/src/engine/helix/helix-sp/hspalsadevice.h @@ -51,7 +51,7 @@ public: /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); STDMETHOD_(ULONG32,AddRef) (THIS); @@ -59,21 +59,21 @@ public: /* * IHXAudioDevice methods */ - STDMETHOD(CheckFormat) ( + STDQT_METHOD(CheckFormat) ( THIS_ const HXAudioFormat* pAudioFormat ); - STDMETHOD(Close) ( + STDQT_METHOD(Close) ( THIS_ const BOOL bFlush ); - STDMETHOD(Drain) ( + STDQT_METHOD(Drain) ( THIS ); - STDMETHOD(GetCurrentAudioTime) ( + STDQT_METHOD(GetCurrentAudioTime) ( THIS_ REF(ULONG32) ulCurrentTime ); @@ -88,30 +88,30 @@ public: const UINT16 uMaxVolume ); - STDMETHOD(Open) ( + STDQT_METHOD(Open) ( THIS_ const HXAudioFormat* pAudioFormat, IHXAudioDeviceResponse* pStreamResponse ); - STDMETHOD(Pause) ( + STDQT_METHOD(Pause) ( THIS ); - STDMETHOD(Reset) ( + STDQT_METHOD(Reset) ( THIS ); - STDMETHOD(Resume) ( + STDQT_METHOD(Resume) ( THIS ); - STDMETHOD(SetVolume) ( + STDQT_METHOD(SetVolume) ( THIS_ const UINT16 uVolume ); - STDMETHOD(Write) ( + STDQT_METHOD(Write) ( THIS_ const HXAudioData* pAudioData ); diff --git a/amarok/src/engine/helix/helix-sp/hspauthmgr.h b/amarok/src/engine/helix/helix-sp/hspauthmgr.h index 55d95cb7..441e8bbc 100644 --- a/amarok/src/engine/helix/helix-sp/hspauthmgr.h +++ b/amarok/src/engine/helix/helix-sp/hspauthmgr.h @@ -28,10 +28,10 @@ private: public: HSPAuthenticationManager(HelixSimplePlayer *pSplay); virtual ~HSPAuthenticationManager(); - STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); STDMETHOD_(UINT32,AddRef) (THIS); STDMETHOD_(UINT32,Release) (THIS); - STDMETHOD(HandleAuthenticationRequest) (IHXAuthenticationManagerResponse* pResponse); + STDQT_METHOD(HandleAuthenticationRequest) (IHXAuthenticationManagerResponse* pResponse); }; #endif diff --git a/amarok/src/engine/helix/helix-sp/hspcontext.h b/amarok/src/engine/helix/helix-sp/hspcontext.h index 2d4f5000..067ccdfe 100644 --- a/amarok/src/engine/helix/helix-sp/hspcontext.h +++ b/amarok/src/engine/helix/helix-sp/hspcontext.h @@ -32,7 +32,7 @@ public: /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); @@ -42,9 +42,9 @@ public: /* * IHXPreferences methods */ - STDMETHOD(ReadPref) (THIS_ const char* pref_key, + STDQT_METHOD(ReadPref) (THIS_ const char* pref_key, IHXBuffer*& buffer); - STDMETHOD(WritePref) (THIS_ const char* pref_key, + STDQT_METHOD(WritePref) (THIS_ const char* pref_key, IHXBuffer* buffer); private: @@ -82,7 +82,7 @@ public: /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); @@ -92,9 +92,9 @@ public: /* * IHXPreferences methods */ - STDMETHOD(ReadPref) (THIS_ const char* pref_key, + STDQT_METHOD(ReadPref) (THIS_ const char* pref_key, IHXBuffer*& buffer); - STDMETHOD(WritePref) (THIS_ const char* pref_key, + STDQT_METHOD(WritePref) (THIS_ const char* pref_key, IHXBuffer* buffer); }; diff --git a/amarok/src/engine/helix/helix-sp/hsperror.h b/amarok/src/engine/helix/helix-sp/hsperror.h index f50e494d..d48827a5 100644 --- a/amarok/src/engine/helix/helix-sp/hsperror.h +++ b/amarok/src/engine/helix/helix-sp/hsperror.h @@ -29,7 +29,7 @@ public: /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); @@ -52,7 +52,7 @@ public: * The meaning of the arguments is exactly as described in * hxerror.h */ - STDMETHOD(ErrorOccurred) (THIS_ + STDQT_METHOD(ErrorOccurred) (THIS_ const UINT8 unSeverity, const ULONG32 ulHXCode, const ULONG32 ulUserCode, diff --git a/amarok/src/engine/helix/helix-sp/hsphook.h b/amarok/src/engine/helix/helix-sp/hsphook.h index 6983124f..3e6ab843 100644 --- a/amarok/src/engine/helix/helix-sp/hsphook.h +++ b/amarok/src/engine/helix/helix-sp/hsphook.h @@ -29,7 +29,7 @@ public: /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); STDMETHOD_(ULONG32,AddRef) (THIS); @@ -37,10 +37,10 @@ public: /* * IHXAudioHook methods */ - STDMETHOD(OnBuffer) (THIS_ + STDQT_METHOD(OnBuffer) (THIS_ HXAudioData *pAudioInData, HXAudioData *pAudioOutData); - STDMETHOD(OnInit) (THIS_ + STDQT_METHOD(OnInit) (THIS_ HXAudioFormat *pFormat); void setFadeout(bool fadeout); @@ -97,7 +97,7 @@ public: /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); STDMETHOD_(ULONG32,AddRef) (THIS); @@ -105,10 +105,10 @@ public: /* * IHXAudioHook methods */ - STDMETHOD(OnBuffer) (THIS_ + STDQT_METHOD(OnBuffer) (THIS_ HXAudioData *pAudioInData, HXAudioData *pAudioOutData); - STDMETHOD(OnInit) (THIS_ + STDQT_METHOD(OnInit) (THIS_ HXAudioFormat *pFormat); void updateEQgains(int preamp, vector<int> &equalizerGains); @@ -177,7 +177,7 @@ public: /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); STDMETHOD_(ULONG32,AddRef) (THIS); @@ -185,10 +185,10 @@ public: /* * IHXAudioHook methods */ - STDMETHOD(OnBuffer) (THIS_ + STDQT_METHOD(OnBuffer) (THIS_ HXAudioData *pAudioInData, HXAudioData *pAudioOutData); - STDMETHOD(OnInit) (THIS_ + STDQT_METHOD(OnInit) (THIS_ HXAudioFormat *pFormat); void updateEQgains(int preamp, vector<int> &equalizerGains); @@ -216,7 +216,7 @@ public: /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); STDMETHOD_(ULONG32,AddRef) (THIS); @@ -224,10 +224,10 @@ public: /* * IHXAudioHook methods */ - STDMETHOD(OnBuffer) (THIS_ + STDQT_METHOD(OnBuffer) (THIS_ HXAudioData *pAudioInData, HXAudioData *pAudioOutData); - STDMETHOD(OnInit) (THIS_ + STDQT_METHOD(OnInit) (THIS_ HXAudioFormat *pFormat); diff --git a/amarok/src/engine/helix/helix-sp/hspvoladvise.h b/amarok/src/engine/helix/helix-sp/hspvoladvise.h index 20b0572b..1c6e3033 100644 --- a/amarok/src/engine/helix/helix-sp/hspvoladvise.h +++ b/amarok/src/engine/helix/helix-sp/hspvoladvise.h @@ -23,7 +23,7 @@ public: /* * IUnknown methods */ - STDMETHOD(QueryInterface) (THIS_ + STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); @@ -34,10 +34,10 @@ public: /* * IHXVolumeAdviceSink methods */ - STDMETHOD(OnVolumeChange) (THIS_ + STDQT_METHOD(OnVolumeChange) (THIS_ const UINT16 uVolume ); - STDMETHOD(OnMuteChange) (THIS_ + STDQT_METHOD(OnMuteChange) (THIS_ const BOOL bMute ); |