Looks good.

-->Henry 

> -----Original Message-----
> From: helix-client-dev-bounces at helixcommunity.org 
> [mailto:helix-client-dev-bounces at helixcommunity.org] On 
> Behalf Of Nicholas Hart
> Sent: Monday, June 20, 2005 10:15 AM
> To: helix-client-dev at helixcommunity.org
> Subject: [Helix-client-dev] CR-client: hxcleng.cpp
> 
> Modified by: nhart
> 
> date: 6/20/05
> 
> branches: 150cay
> 
> synopsis:
> This is for cay150--simply merging recent changes from the 
> HEAD so that the core can build with ABD turned off.  It 
> looks like a couple other bug fixes were picked up too (an 
> "HX_RESULT res" declaration hiding a prior declaration?).
> 
> files changed: client/core/hxcleng.cpp
> 
> image size and heap use impact: none
> 
> platforms and profiles affected: all platforms, all profiles w/o ABD
> 
> 
> Index: hxcleng.cpp
> ===================================================================
> RCS file: /cvsroot/client/core/hxcleng.cpp,v
> retrieving revision 1.69.2.15
> diff -u -w -r1.69.2.15 hxcleng.cpp
> --- hxcleng.cpp	25 May 2005 17:02:13 -0000	1.69.2.15
> +++ hxcleng.cpp	20 Jun 2005 17:09:54 -0000
> @@ -1,5 +1,5 @@
>   /* ***** BEGIN LICENSE BLOCK *****
> - * Source last modified: $Id: hxcleng.cpp,v 1.69.2.15 2005/05/25
> 17:02:13 gwright Exp $
> +* Source last modified: $Id: hxcleng.cpp,v 1.83 2005/06/16 18:03:33
> ehyche Exp $
>    *
>    * Portions Copyright (c) 1995-2004 RealNetworks, Inc. All 
> Rights Reserved.
>    *
> @@ -182,7 +182,9 @@
>   #include "viewsrc.h"
>   #include "hxovmgr.h"
>   #include "hxtlogutil.h"
> +#if defined(HELIX_FEATURE_AUTO_BANDWIDTH_DETECTION)
>   #include "hxabd.h"
> +#endif /* #if defined(HELIX_FEATURE_AUTO_BANDWIDTH_DETECTION) */
> 
>   #ifdef _TEST_REPLACED_AUDIO_DEVICE
>   #include "hxaudev.h"
> @@ -341,7 +343,6 @@
>       ,m_pAsyncIOSelection(NULL)
>       ,m_bNetworkThreading(TRUE)
>   #endif
> -
>       ,m_pCookies(NULL)
>       ,m_pCookiesHelper(NULL)
>       ,m_pNetInterfaces(NULL)
> @@ -441,7 +442,9 @@
>       m_pFWCtlMgr = HXFirewallControlManager::Create();
>   #endif /* HELIX_FEATURE_FW_CTLMGR */
> 
> +#if defined(HELIX_FEATURE_AUTO_BANDWIDTH_DETECTION)
>       m_pABDCalibrator = new
> CHXABDCalibrator((IUnknown*)(IHXClientEngine*)this);
> +#endif /* #if defined(HELIX_FEATURE_AUTO_BANDWIDTH_DETECTION) */
> 
>   #ifdef _MEDIUM_BLOCK
>       m_pAllocator->SetScheduler((IUnknown*)m_pScheduler);
> @@ -467,7 +470,9 @@
> 
>       if (!m_pCommonClassFactory
>           || !m_pScheduler
> +#if defined(HELIX_FEATURE_AUTO_BANDWIDTH_DETECTION)
>           || !m_pABDCalibrator
> +#endif /* #if defined(HELIX_FEATURE_AUTO_BANDWIDTH_DETECTION) */
>   #if defined(HELIX_FEATURE_PREFERENCES) && 
> !defined(HELIX_FEATURE_NO_INTERNAL_PREFS)
>           || !m_pOrigPreferences
>   #endif /* HELIX_FEATURE_PREFERENCES */
> @@ -544,7 +549,9 @@
>   #if defined(HELIX_FEATURE_FW_CTLMGR)
>           HX_ADDREF(m_pFWCtlMgr);
>   #endif /* HELIX_FEATURE_FW_CTLMGR */
> +#if defined(HELIX_FEATURE_AUTO_BANDWIDTH_DETECTION)
>           HX_ADDREF(m_pABDCalibrator);
> +#endif /* #if defined(HELIX_FEATURE_AUTO_BANDWIDTH_DETECTION) */
> 
>   #if defined(HELIX_FEATURE_HYPER_NAVIGATE)
>   #if !defined(_WINCE) || (_WIN32_WCE >= 400)
> @@ -570,6 +577,7 @@
>           char* pProductName = new 
> char[strlen(HXVER_SDK_PRODUCT) + 1];
>           strcpy(pProductName, HXVER_SDK_PRODUCT); /* 
> Flawfinder: ignore */
> 
> +
>           char * pComa = HXFindChar(pCompanyName, ',');
>           if(pComa)
>           {
> @@ -582,6 +590,8 @@
>               *pComa = 0;
>           }
> 
> +        HX_RESULT theErr = HXR_OK;
> +
>   #if defined(HELIX_FEATURE_PREFERENCES) && 
> !defined(HELIX_FEATURE_NO_INTERNAL_PREFS)
>           const ULONG32 nProdMajorVer = TARVER_MAJOR_VERSION;
>           const ULONG32 nProdMinorVer = TARVER_MINOR_VERSION;
> @@ -589,9 +599,9 @@
> 
>   #if defined(HELIX_FEATURE_PREFERENCES)
>   #if defined(HELIX_FEATURE_NO_INTERNAL_PREFS)
> -        HX_RESULT theErr = HXR_OK;
> +        theErr = HXR_OK;
>   #elif defined(HELIX_FEATURE_LITEPREFS)
> -        HX_RESULT theErr = m_pOrigPreferences->Open(
> +        theErr = m_pOrigPreferences->Open(
>               (const char*) pCompanyName, (const char*) pProductName, 
> nProdMajorVer, nProdMinorVer);
>           if( theErr != HXR_OUTOFMEMORY )
>           {
> @@ -600,7 +610,7 @@
>               theErr = HXR_OK;
>           }
>   #else
> -        HX_RESULT theErr = m_pOrigPreferences->OpenUserPref(
> +        theErr = m_pOrigPreferences->OpenUserPref(
>               (const char*) pCompanyName, (const char*) pProductName, 
> nProdMajorVer, nProdMinorVer);
>   #endif
> 
> @@ -772,7 +782,6 @@
>   #endif // _VXWORKS
>   }
> 
> -
>   void HXClientEngine::_Initialize(void)
>   {
> 
> @@ -805,7 +814,7 @@
>   #endif /* !defined(HELIX_FEATURE_NO_INTERNAL_PREFS) */
> 
>       // generate GUID if it doesn't exist
> -    BOOL bRegenerate = TRUE;
> +        HXBOOL bRegenerate = TRUE;
> 
>       if (m_pPreferences &&
>           m_pPreferences->ReadPref(CLIENT_GUID_REGNAME, 
> pValue) == HXR_OK)
> @@ -1110,11 +1119,13 @@
>       m_pOverlayManager->Initialize();
>   #endif /* HELIX_FEATURE_OVERLAYMGR */
> 
> +#if defined(HELIX_FEATURE_AUTO_BANDWIDTH_DETECTION)
>       if (m_pABDCalibrator)
>       {
>           // set engine up to receive all the ABD calibration results
>  
> m_pABDCalibrator->AddAutoBWCalibrationSink((IHXAutoBWCalibrati
> onAdviseSink*)this);
>       }
> +#endif /* #if defined(HELIX_FEATURE_AUTO_BANDWIDTH_DETECTION) */
> 
>       if (!m_LastError)
>       {
> @@ -1122,7 +1133,6 @@
>       }
>   }
> 
> -
>   void HXClientEngine::InitLogging()
>   {
>   #if !defined(HELIX_FEATURE_PLUGINHANDLER2) && 
> !defined(HELIX_FEATURE_LOGLEVEL_NONE)
> @@ -1498,11 +1508,13 @@
>           return HXR_OK;
>       }
>   #endif /* HELIX_FEATURE_PAC */
> +#if defined(HELIX_FEATURE_AUTO_BANDWIDTH_DETECTION)
>       else if (m_pABDCalibrator &&
>                m_pABDCalibrator->QueryInterface(riid, ppvObj) 
> == HXR_OK)
>       {
>           return HXR_OK;
>       }
> +#endif /* #if defined(HELIX_FEATURE_AUTO_BANDWIDTH_DETECTION) */
> 
>       *ppvObj = NULL;
>       return HXR_NOINTERFACE;
> @@ -1789,10 +1801,10 @@
>                       switch(msg.m_ulMessage)
>                       {
>                          case HXMSG_ASYNC_DNS:
> -                           pThat->OnAsyncDNS((BOOL)msg.m_pParam2);
> +                        pThat->OnAsyncDNS((HXBOOL)msg.m_pParam2);
>                              break;
>                          case HXMSG_ASYNC_CONNECT:
> -                           pThat->OnConnect((BOOL)msg.m_pParam2);
> +                        pThat->OnConnect((HXBOOL)msg.m_pParam2);
>                              break;
>                          case HXMSG_ASYNC_READ:
>                              pThat->OnReadNotification();
> @@ -2221,10 +2233,8 @@
>       REF(const char*)    /*OUT*/ pMimeType
>   )
>   {
> -
>   #if defined(HELIX_FEATURE_PLUGINHANDLER2)
>       HX_RESULT   hr = HXR_OK;
> -
>       if (!m_pPlugin2Handler)
>       {
>       hr = HXR_FAIL;
> @@ -2502,12 +2512,14 @@
>       }
>   #endif /* HELIX_FEATURE_PROXYMGR */
> 
> +#if defined(HELIX_FEATURE_AUTO_BANDWIDTH_DETECTION)
>       if (m_pABDCalibrator)
>       {
>  
> m_pABDCalibrator->RemoveAutoBWCalibrationSink((IHXAutoBWCalibr
> ationAdviseSink*)this);
>           m_pABDCalibrator->Close();
>           HX_RELEASE(m_pABDCalibrator);
>       }
> +#endif /* #if defined(HELIX_FEATURE_AUTO_BANDWIDTH_DETECTION) */
> 
>   #if defined(HELIX_FEATURE_SMARTERNETWORK)
>       if (m_pPreferredTransportManager)
> @@ -2661,7 +2673,6 @@
>       HX_DELETE(m_select_callbacks);
> 
>   #endif /* _UNIX */
> -
>       if (m_pCommonClassFactory)
>       {
>           m_pCommonClassFactory->Close();
> @@ -2693,7 +2704,7 @@
>   //      So, on Mac, since IsMacInCooperativeThread is equivalent to 
> being at system time,
>   //
>   //      AtInterruptTime = !IsMacInCooperativeThread().
> -STDMETHODIMP_(BOOL)
> +STDMETHODIMP_(HXBOOL)
>   HXClientEngine::AtInterruptTime()
>   {
>   #if defined(_MACINTOSH)
> @@ -2730,7 +2741,7 @@
>   }
> 
>   STDMETHODIMP
> -HXClientEngine::EnableInterrupt(BOOL   bEnable)
> +HXClientEngine::EnableInterrupt(HXBOOL   bEnable)
>   {
>       /* Make sure all the players are in a stopped state */
>       CHXSimpleList::Iterator ndx = m_PlayerList.Begin();
> @@ -2770,7 +2781,7 @@
>   #endif
>   }
> 
> -STDMETHODIMP_(BOOL)
> +STDMETHODIMP_(HXBOOL)
>   HXClientEngine::IsInterruptEnabled()
>   {
>   #ifdef _MACINTOSH
> @@ -3208,11 +3219,10 @@
>    *
>    */
>   STDMETHODIMP
> -HXClientEngine::StopAudioPlayback(THIS)
> +HXClientEngine::StopAudioPlayback()
>   {
>       HXLOGL3(HXLOG_CORE, 
> "HXClientEngine[%p]::StopAudioPlayback()", this);
> -
> -    BOOL bAudio = FALSE;
> +    HXBOOL bAudio = FALSE;
> 
>       // First look for audio
>       CHXSimpleList::Iterator ndxPlayer = m_PlayerList.Begin();
> @@ -3247,7 +3257,7 @@
>   }
> 
>   void
> -HXClientEngine::NotifyPlayState(BOOL bInPlayingState)
> +HXClientEngine::NotifyPlayState(HXBOOL bInPlayingState)
>   {
>       if (m_pScheduler)
>       {
> @@ -3260,7 +3270,7 @@
>   HXClientEngine::InitPaths()
>   {
>   #if !defined(__TCS__)
> -    BOOL bShouldUseDocsAndSettingsPath = FALSE;
> +    HXBOOL bShouldUseDocsAndSettingsPath = FALSE;
>   #ifdef _WIN32
>       HXVERSIONINFO pnvi;
> 
> @@ -3287,7 +3297,7 @@
>               m_pPreferences->ReadPref("UserSDKDataPath", pBuffer) != 
> HXR_OK)
>   #endif
>           {
> -            BOOL bCreated = FALSE;
> +        HXBOOL bCreated = FALSE;
>               // see if RealPlayer App Data Path is set and 
> derive SDK path
>               // from that
>               if (bShouldUseDocsAndSettingsPath && m_pPreferences &&
> 
> _______________________________________________
> Helix-client-dev mailing list
> Helix-client-dev at helixcommunity.org
> http://lists.helixcommunity.org/mailman/listinfo/helix-client-dev