Browse Source

convert tabs to spaces

David Rose 16 years ago
parent
commit
4fbae3c37f

+ 9 - 9
direct/src/plugin_activex/P3DActiveX.cpp

@@ -30,7 +30,7 @@
 CP3DActiveXApp NEAR theApp;
 
 const GUID CDECL BASED_CODE _tlid =
-		{ 0x22A8FC5F, 0xBC33, 0x479A, { 0x83, 0x17, 0x2B, 0xC8, 0x16, 0xB8, 0xAB, 0x8A } };
+        { 0x22A8FC5F, 0xBC33, 0x479A, { 0x83, 0x17, 0x2B, 0xC8, 0x16, 0xB8, 0xAB, 0x8A } };
 const WORD _wVerMajor = 1;
 const WORD _wVerMinor = 0;
 
@@ -162,14 +162,14 @@ HRESULT UnRegisterCLSIDInCategory(REFCLSID clsid, CATID catid)
 
 BOOL CP3DActiveXApp::InitInstance()
 {
-	BOOL bInit = COleControlModule::InitInstance();
+    BOOL bInit = COleControlModule::InitInstance();
 
-	if (bInit)
-	{
-		// TODO: Add your own module initialization code here.
-	}
+    if (bInit)
+    {
+        // TODO: Add your own module initialization code here.
+    }
 
-	return bInit;
+    return bInit;
 }
 
 
@@ -178,9 +178,9 @@ BOOL CP3DActiveXApp::InitInstance()
 
 int CP3DActiveXApp::ExitInstance()
 {
-	// TODO: Add your own module termination code here.
+    // TODO: Add your own module termination code here.
 
-	return COleControlModule::ExitInstance();
+    return COleControlModule::ExitInstance();
 }
 
 

+ 2 - 2
direct/src/plugin_activex/P3DActiveX.h

@@ -28,8 +28,8 @@
 class CP3DActiveXApp : public COleControlModule
 {
 public:
-	BOOL InitInstance();
-	int ExitInstance();
+    BOOL InitInstance();
+    int ExitInstance();
 };
 
 extern const GUID CDECL _tlid;

+ 68 - 68
direct/src/plugin_activex/P3DActiveXCtrl.cpp

@@ -30,24 +30,24 @@
 class CPropbagPropExchange : public CPropExchange
 {
 public:
-	CPropbagPropExchange(LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog,
-		BOOL bLoading, BOOL bSaveAllProperties=FALSE);
-	~CPropbagPropExchange();
+    CPropbagPropExchange(LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog,
+        BOOL bLoading, BOOL bSaveAllProperties=FALSE);
+    ~CPropbagPropExchange();
 
 // Operations
-	virtual BOOL ExchangeProp(LPCTSTR pszPropName, VARTYPE vtProp,
-				void* pvProp, const void* pvDefault = NULL);
-	virtual BOOL ExchangeBlobProp(LPCTSTR pszPropName, HGLOBAL* phBlob,
-				HGLOBAL hBlobDefault = NULL);
-	virtual BOOL ExchangeFontProp(LPCTSTR pszPropName, CFontHolder& font,
-				const FONTDESC* pFontDesc, LPFONTDISP pFontDispAmbient);
-	virtual BOOL ExchangePersistentProp(LPCTSTR pszPropName,
-				LPUNKNOWN* ppUnk, REFIID iid, LPUNKNOWN pUnkDefault);
+    virtual BOOL ExchangeProp(LPCTSTR pszPropName, VARTYPE vtProp,
+                void* pvProp, const void* pvDefault = NULL);
+    virtual BOOL ExchangeBlobProp(LPCTSTR pszPropName, HGLOBAL* phBlob,
+                HGLOBAL hBlobDefault = NULL);
+    virtual BOOL ExchangeFontProp(LPCTSTR pszPropName, CFontHolder& font,
+                const FONTDESC* pFontDesc, LPFONTDISP pFontDispAmbient);
+    virtual BOOL ExchangePersistentProp(LPCTSTR pszPropName,
+                LPUNKNOWN* ppUnk, REFIID iid, LPUNKNOWN pUnkDefault);
 
 // Implementation
-	LPPROPERTYBAG m_pPropBag;
-	LPERRORLOG m_pErrorLog;
-	BOOL m_bSaveAllProperties;
+    LPPROPERTYBAG m_pPropBag;
+    LPERRORLOG m_pErrorLog;
+    BOOL m_bSaveAllProperties;
 };
 
 #ifdef _DEBUG
@@ -62,8 +62,8 @@ IMPLEMENT_DYNCREATE(CP3DActiveXCtrl, COleControl)
 // Message map
 
 BEGIN_MESSAGE_MAP(CP3DActiveXCtrl, COleControl)
-	ON_MESSAGE(OCM_COMMAND, OnOcmCommand)
-	ON_OLEVERB(AFX_IDS_VERB_PROPERTIES, OnProperties)
+    ON_MESSAGE(OCM_COMMAND, OnOcmCommand)
+    ON_OLEVERB(AFX_IDS_VERB_PROPERTIES, OnProperties)
     ON_WM_CREATE()
     ON_MESSAGE(WM_PANDA_NOTIFICATION, OnPandaNotification)
 END_MESSAGE_MAP()
@@ -89,7 +89,7 @@ END_EVENT_MAP()
 
 // TODO: Add more property pages as needed.  Remember to increase the count!
 BEGIN_PROPPAGEIDS(CP3DActiveXCtrl, 1)
-	PROPPAGEID(CP3DActiveXPropPage::guid)
+    PROPPAGEID(CP3DActiveXPropPage::guid)
 END_PROPPAGEIDS(CP3DActiveXCtrl)
 
 
@@ -97,7 +97,7 @@ END_PROPPAGEIDS(CP3DActiveXCtrl)
 // Initialize class factory and guid
 
 IMPLEMENT_OLECREATE_EX(CP3DActiveXCtrl, "P3DACTIVEX.P3DActiveXCtrl.1",
-	0x924b4927, 0xd3ba, 0x41ea, 0x9f, 0x7e, 0x8a, 0x89, 0x19, 0x4a, 0xb3, 0xac)
+    0x924b4927, 0xd3ba, 0x41ea, 0x9f, 0x7e, 0x8a, 0x89, 0x19, 0x4a, 0xb3, 0xac)
 
 
 
@@ -110,20 +110,20 @@ IMPLEMENT_OLETYPELIB(CP3DActiveXCtrl, _tlid, _wVerMajor, _wVerMinor)
 // Interface IDs
 
 const IID BASED_CODE IID_DP3DActiveX =
-		{ 0x76904D54, 0xCC5, 0x4DBB, { 0xB0, 0x22, 0xF4, 0x8B, 0x1E, 0x95, 0x18, 0x3B } };
+        { 0x76904D54, 0xCC5, 0x4DBB, { 0xB0, 0x22, 0xF4, 0x8B, 0x1E, 0x95, 0x18, 0x3B } };
 const IID BASED_CODE IID_DP3DActiveXEvents =
-		{ 0x1B2413ED, 0x51C8, 0x495E, { 0xB9, 0x17, 0x98, 0x3C, 0x45, 0x9B, 0x8F, 0xC7 } };
+        { 0x1B2413ED, 0x51C8, 0x495E, { 0xB9, 0x17, 0x98, 0x3C, 0x45, 0x9B, 0x8F, 0xC7 } };
 
 
 
 // Control type information
 
 static const DWORD BASED_CODE _dwP3DActiveXOleMisc =
-	OLEMISC_ACTIVATEWHENVISIBLE |
-	OLEMISC_SETCLIENTSITEFIRST |
-	OLEMISC_INSIDEOUT |
-	OLEMISC_CANTLINKINSIDE |
-	OLEMISC_RECOMPOSEONRESIZE;
+    OLEMISC_ACTIVATEWHENVISIBLE |
+    OLEMISC_SETCLIENTSITEFIRST |
+    OLEMISC_INSIDEOUT |
+    OLEMISC_CANTLINKINSIDE |
+    OLEMISC_RECOMPOSEONRESIZE;
 
 IMPLEMENT_OLECTLTYPE(CP3DActiveXCtrl, IDS_P3DACTIVEX, _dwP3DActiveXOleMisc)
 
@@ -134,26 +134,26 @@ IMPLEMENT_OLECTLTYPE(CP3DActiveXCtrl, IDS_P3DACTIVEX, _dwP3DActiveXOleMisc)
 
 BOOL CP3DActiveXCtrl::CP3DActiveXCtrlFactory::UpdateRegistry(BOOL bRegister)
 {
-	// TODO: Verify that your control follows apartment-model threading rules.
-	// Refer to MFC TechNote 64 for more information.
-	// If your control does not conform to the apartment-model rules, then
-	// you must modify the code below, changing the 6th parameter from
-	// afxRegApartmentThreading to 0.
-
-	if (bRegister)
-		return AfxOleRegisterControlClass(
-			AfxGetInstanceHandle(),
-			m_clsid,
-			m_lpszProgID,
-			IDS_P3DACTIVEX,
+    // TODO: Verify that your control follows apartment-model threading rules.
+    // Refer to MFC TechNote 64 for more information.
+    // If your control does not conform to the apartment-model rules, then
+    // you must modify the code below, changing the 6th parameter from
+    // afxRegApartmentThreading to 0.
+
+    if (bRegister)
+        return AfxOleRegisterControlClass(
+            AfxGetInstanceHandle(),
+            m_clsid,
+            m_lpszProgID,
+            IDS_P3DACTIVEX,
             IDB_P3DACTIVEX,
-			afxRegApartmentThreading,
-			_dwP3DActiveXOleMisc,
-			_tlid,
-			_wVerMajor,
-			_wVerMinor);
-	else
-		return AfxOleUnregisterClass(m_clsid, m_lpszProgID);
+            afxRegApartmentThreading,
+            _dwP3DActiveXOleMisc,
+            _tlid,
+            _wVerMajor,
+            _wVerMinor);
+    else
+        return AfxOleUnregisterClass(m_clsid, m_lpszProgID);
 }
 
 
@@ -162,8 +162,8 @@ BOOL CP3DActiveXCtrl::CP3DActiveXCtrlFactory::UpdateRegistry(BOOL bRegister)
 
 CP3DActiveXCtrl::CP3DActiveXCtrl() : m_pPandaObject( NULL ), m_instance( *this )
 {
-	InitializeIIDs(&IID_DP3DActiveX, &IID_DP3DActiveXEvents);
-	// TODO: Initialize your control's instance data here.
+    InitializeIIDs(&IID_DP3DActiveX, &IID_DP3DActiveXEvents);
+    // TODO: Initialize your control's instance data here.
 
 }
 
@@ -171,7 +171,7 @@ CP3DActiveXCtrl::CP3DActiveXCtrl() : m_pPandaObject( NULL ), m_instance( *this )
 
 CP3DActiveXCtrl::~CP3DActiveXCtrl()
 {
-	// TODO: Cleanup your control's instance data here.
+    // TODO: Cleanup your control's instance data here.
     if ( m_pPandaObject )
     {
         delete m_pPandaObject;
@@ -184,8 +184,8 @@ CP3DActiveXCtrl::~CP3DActiveXCtrl()
 
 void CP3DActiveXCtrl::OnDraw(CDC* pdc, const CRect& rcBounds, const CRect& rcInvalid)
 {
-	if (!pdc)
-		return;
+    if (!pdc)
+        return;
 
     if ( !m_instance.IsInit( ) )
     {
@@ -195,7 +195,7 @@ void CP3DActiveXCtrl::OnDraw(CDC* pdc, const CRect& rcBounds, const CRect& rcInv
     CBrush brBackGnd(TranslateColor(AmbientBackColor()));
     pdc->FillRect(rcBounds, &brBackGnd);
 
-	DoSuperclassPaint(pdc, rcBounds);
+    DoSuperclassPaint(pdc, rcBounds);
 }
 
 
@@ -204,10 +204,10 @@ void CP3DActiveXCtrl::OnDraw(CDC* pdc, const CRect& rcBounds, const CRect& rcInv
 
 void CP3DActiveXCtrl::DoPropExchange(CPropExchange* pPX)
 {
-	ExchangeVersion(pPX, MAKELONG(_wVerMinor, _wVerMajor));
-	COleControl::DoPropExchange(pPX);
+    ExchangeVersion(pPX, MAKELONG(_wVerMinor, _wVerMajor));
+    COleControl::DoPropExchange(pPX);
 
-	// TODO: Call PX_ functions for each persistent custom property.
+    // TODO: Call PX_ functions for each persistent custom property.
     
     ExchangeProperties( pPX );
 }
@@ -219,13 +219,13 @@ void CP3DActiveXCtrl::DoPropExchange(CPropExchange* pPX)
 //
 DWORD CP3DActiveXCtrl::GetControlFlags()
 {
-	DWORD dwFlags = COleControl::GetControlFlags();
+    DWORD dwFlags = COleControl::GetControlFlags();
 
 
-	// The control will not be redrawn when making the transition
-	// between the active and inactivate state.
-	dwFlags |= noFlickerActivate;
-	return dwFlags;
+    // The control will not be redrawn when making the transition
+    // between the active and inactivate state.
+    dwFlags |= noFlickerActivate;
+    return dwFlags;
 }
 
 
@@ -234,9 +234,9 @@ DWORD CP3DActiveXCtrl::GetControlFlags()
 
 void CP3DActiveXCtrl::OnResetState()
 {
-	COleControl::OnResetState();  // Resets defaults found in DoPropExchange
+    COleControl::OnResetState();  // Resets defaults found in DoPropExchange
 
-	// TODO: Reset any other control state here.
+    // TODO: Reset any other control state here.
 }
 
 
@@ -245,8 +245,8 @@ void CP3DActiveXCtrl::OnResetState()
 
 BOOL CP3DActiveXCtrl::PreCreateWindow(CREATESTRUCT& cs)
 {
-	cs.lpszClass = _T("STATIC");
-	return COleControl::PreCreateWindow(cs);
+    cs.lpszClass = _T("STATIC");
+    return COleControl::PreCreateWindow(cs);
 }
 
 
@@ -255,7 +255,7 @@ BOOL CP3DActiveXCtrl::PreCreateWindow(CREATESTRUCT& cs)
 
 BOOL CP3DActiveXCtrl::IsSubclassedControl()
 {
-	return TRUE;
+    return TRUE;
 }
 
 
@@ -265,14 +265,14 @@ BOOL CP3DActiveXCtrl::IsSubclassedControl()
 LRESULT CP3DActiveXCtrl::OnOcmCommand(WPARAM wParam, LPARAM lParam)
 {
 #ifdef _WIN32
-	WORD wNotifyCode = HIWORD(wParam);
+    WORD wNotifyCode = HIWORD(wParam);
 #else
-	WORD wNotifyCode = HIWORD(lParam);
+    WORD wNotifyCode = HIWORD(lParam);
 #endif
 
-	// TODO: Switch on wNotifyCode here.
+    // TODO: Switch on wNotifyCode here.
 
-	return 0;
+    return 0;
 }
 
 // CP3DActiveXCtrl message handlers
@@ -384,7 +384,7 @@ int CP3DActiveXCtrl::Init( )
 
 HRESULT CP3DActiveXCtrl::ExchangeProperties( CPropExchange*  pPX )
 {
-	USES_CONVERSION;
+    USES_CONVERSION;
     HRESULT hr = E_FAIL;
 
     if ( !pPX )

+ 18 - 18
direct/src/plugin_activex/P3DActiveXCtrl.h

@@ -27,7 +27,7 @@
 class CP3DActiveXCtrl : public COleControl,
                         public PPInterface
 {
-	DECLARE_DYNCREATE(CP3DActiveXCtrl)
+    DECLARE_DYNCREATE(CP3DActiveXCtrl)
 
 // Constructor
 public:
@@ -35,11 +35,11 @@ public:
 
 // Overrides
 public:
-	virtual void OnDraw(CDC* pdc, const CRect& rcBounds, const CRect& rcInvalid);
-	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
-	virtual void DoPropExchange(CPropExchange* pPX);
-	virtual void OnResetState();
-	virtual DWORD GetControlFlags();
+    virtual void OnDraw(CDC* pdc, const CRect& rcBounds, const CRect& rcInvalid);
+    virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
+    virtual void DoPropExchange(CPropExchange* pPX);
+    virtual void OnResetState();
+    virtual DWORD GetControlFlags();
 
     int BeginDownload(CString& url);
 
@@ -47,29 +47,29 @@ public:
 
 // Implementation
 protected:
-	~CP3DActiveXCtrl();
+    ~CP3DActiveXCtrl();
 
-	DECLARE_OLECREATE_EX(CP3DActiveXCtrl)    // Class factory and guid
-	DECLARE_OLETYPELIB(CP3DActiveXCtrl)      // GetTypeInfo
-	DECLARE_PROPPAGEIDS(CP3DActiveXCtrl)     // Property page IDs
-	DECLARE_OLECTLTYPE(CP3DActiveXCtrl)		// Type name and misc status
+    DECLARE_OLECREATE_EX(CP3DActiveXCtrl)    // Class factory and guid
+    DECLARE_OLETYPELIB(CP3DActiveXCtrl)      // GetTypeInfo
+    DECLARE_PROPPAGEIDS(CP3DActiveXCtrl)     // Property page IDs
+    DECLARE_OLECTLTYPE(CP3DActiveXCtrl)     // Type name and misc status
 
-	// Subclassed control support
-	BOOL IsSubclassedControl();
-	LRESULT OnOcmCommand(WPARAM wParam, LPARAM lParam);
+    // Subclassed control support
+    BOOL IsSubclassedControl();
+    LRESULT OnOcmCommand(WPARAM wParam, LPARAM lParam);
 
 // Message maps
-	DECLARE_MESSAGE_MAP()
+    DECLARE_MESSAGE_MAP()
 
 // Dispatch maps
-	DECLARE_DISPATCH_MAP()
+    DECLARE_DISPATCH_MAP()
 
 // Event maps
-	DECLARE_EVENT_MAP()
+    DECLARE_EVENT_MAP()
 
 // Dispatch and event IDs
 public:
-	enum {
+    enum {
         dispidmain = 1
     };
     afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);

+ 8 - 8
direct/src/plugin_activex/P3DActiveXPropPage.cpp

@@ -37,7 +37,7 @@ END_MESSAGE_MAP()
 // Initialize class factory and guid
 
 IMPLEMENT_OLECREATE_EX(CP3DActiveXPropPage, "P3DACTIVEX.P3DActiveXPropPage.1",
-	0xd0111370, 0xe705, 0x485e, 0x96, 0xfd, 0xa2, 0xef, 0xb1, 0x71, 0x26, 0x9a)
+    0xd0111370, 0xe705, 0x485e, 0x96, 0xfd, 0xa2, 0xef, 0xb1, 0x71, 0x26, 0x9a)
 
 
 
@@ -46,11 +46,11 @@ IMPLEMENT_OLECREATE_EX(CP3DActiveXPropPage, "P3DACTIVEX.P3DActiveXPropPage.1",
 
 BOOL CP3DActiveXPropPage::CP3DActiveXPropPageFactory::UpdateRegistry(BOOL bRegister)
 {
-	if (bRegister)
-		return AfxOleRegisterPropertyPageClass(AfxGetInstanceHandle(),
-			m_clsid, IDS_P3DACTIVEX_PPG);
-	else
-		return AfxOleUnregisterClass(m_clsid, NULL);
+    if (bRegister)
+        return AfxOleRegisterPropertyPageClass(AfxGetInstanceHandle(),
+            m_clsid, IDS_P3DACTIVEX_PPG);
+    else
+        return AfxOleUnregisterClass(m_clsid, NULL);
 }
 
 
@@ -58,7 +58,7 @@ BOOL CP3DActiveXPropPage::CP3DActiveXPropPageFactory::UpdateRegistry(BOOL bRegis
 // CP3DActiveXPropPage::CP3DActiveXPropPage - Constructor
 
 CP3DActiveXPropPage::CP3DActiveXPropPage() :
-	COlePropertyPage(IDD, IDS_P3DACTIVEX_PPG_CAPTION)
+    COlePropertyPage(IDD, IDS_P3DACTIVEX_PPG_CAPTION)
 {
 }
 
@@ -68,7 +68,7 @@ CP3DActiveXPropPage::CP3DActiveXPropPage() :
 
 void CP3DActiveXPropPage::DoDataExchange(CDataExchange* pDX)
 {
-	DDP_PostProcessing(pDX);
+    DDP_PostProcessing(pDX);
 }
 
 

+ 6 - 6
direct/src/plugin_activex/P3DActiveXPropPage.h

@@ -21,22 +21,22 @@
 
 class CP3DActiveXPropPage : public COlePropertyPage
 {
-	DECLARE_DYNCREATE(CP3DActiveXPropPage)
-	DECLARE_OLECREATE_EX(CP3DActiveXPropPage)
+    DECLARE_DYNCREATE(CP3DActiveXPropPage)
+    DECLARE_OLECREATE_EX(CP3DActiveXPropPage)
 
 // Constructor
 public:
-	CP3DActiveXPropPage();
+    CP3DActiveXPropPage();
 
 // Dialog Data
-	enum { IDD = IDD_PROPPAGE_P3DACTIVEX };
+    enum { IDD = IDD_PROPPAGE_P3DACTIVEX };
 
 // Implementation
 protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+    virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 
 // Message maps
 protected:
-	DECLARE_MESSAGE_MAP()
+    DECLARE_MESSAGE_MAP()
 };
 

+ 135 - 135
direct/src/plugin_activex/PPDownloadCallback.cpp

@@ -24,214 +24,214 @@ PPDownloadCallback::PPDownloadCallback( PPDownloadCallbackSync& downloadSync )
 
 STDMETHODIMP PPDownloadCallback::QueryInterface(REFIID riid, void **ppvObject)
 {
-	TRACE(_T("IUnknown::QueryInterface\n"));
-
-	*ppvObject = NULL;
-	
-	// IUnknown
-	if (::IsEqualIID(riid, __uuidof(IUnknown)))
-	{
-		TRACE(_T("IUnknown::QueryInterface(IUnknown)\n"));
-
-		*ppvObject = this;
-	}
-	// IBindStatusCallback
-	else if (::IsEqualIID(riid, __uuidof(IBindStatusCallback)))
-	{
-		TRACE(_T("IUnknown::QueryInterface(IBindStatusCallback)\n"));
-
-		*ppvObject = static_cast<IBindStatusCallback *>(this);
-	}
-
-	if (*ppvObject)
-	{
-		(*reinterpret_cast<LPUNKNOWN *>(ppvObject))->AddRef();
-
-		return S_OK;
-	}
-	
-	return E_NOINTERFACE;
+    TRACE(_T("IUnknown::QueryInterface\n"));
+
+    *ppvObject = NULL;
+
+    // IUnknown
+    if (::IsEqualIID(riid, __uuidof(IUnknown)))
+    {
+        TRACE(_T("IUnknown::QueryInterface(IUnknown)\n"));
+
+        *ppvObject = this;
+    }
+    // IBindStatusCallback
+    else if (::IsEqualIID(riid, __uuidof(IBindStatusCallback)))
+    {
+        TRACE(_T("IUnknown::QueryInterface(IBindStatusCallback)\n"));
+
+        *ppvObject = static_cast<IBindStatusCallback *>(this);
+    }
+
+    if (*ppvObject)
+    {
+        (*reinterpret_cast<LPUNKNOWN *>(ppvObject))->AddRef();
+
+        return S_OK;
+    }
+
+    return E_NOINTERFACE;
 }                                             
 
 STDMETHODIMP_(ULONG) PPDownloadCallback::AddRef()
 {
-	TRACE(_T("IUnknown::AddRef\n"));
+    TRACE(_T("IUnknown::AddRef\n"));
 
-	return ++m_ulObjRefCount;
+    return ++m_ulObjRefCount;
 }
 
 STDMETHODIMP_(ULONG) PPDownloadCallback::Release()
 {
-	TRACE(_T("IUnknown::Release\n"));
+    TRACE(_T("IUnknown::Release\n"));
 
-	return --m_ulObjRefCount;
+    return --m_ulObjRefCount;
 }
 
 STDMETHODIMP PPDownloadCallback::OnStartBinding(DWORD, IBinding *)
 {
-	TRACE(_T("IBindStatusCallback::OnStartBinding\n"));
+    TRACE(_T("IBindStatusCallback::OnStartBinding\n"));
 
     m_downloadSync.Begin();
 
-	return S_OK;
+    return S_OK;
 }
 
 STDMETHODIMP PPDownloadCallback::GetPriority(LONG *)
 {
-	TRACE(_T("IBindStatusCallback::GetPriority\n"));
+    TRACE(_T("IBindStatusCallback::GetPriority\n"));
 
-	return E_NOTIMPL;
+    return E_NOTIMPL;
 }
 
 STDMETHODIMP PPDownloadCallback::OnLowResource(DWORD)
 {
-	TRACE(_T("IBindStatusCallback::OnLowResource\n"));
+    TRACE(_T("IBindStatusCallback::OnLowResource\n"));
 
-	return S_OK;
+    return S_OK;
 }
 
 STDMETHODIMP PPDownloadCallback::OnProgress(ULONG ulProgress,
-										 ULONG ulProgressMax,
-										 ULONG ulStatusCode,
-										 LPCWSTR szStatusText)
+                                         ULONG ulProgressMax,
+                                         ULONG ulStatusCode,
+                                         LPCWSTR szStatusText)
 {
 #ifdef _DEBUG
-	static const LPCTSTR plpszStatus[] = 
-	{
-		_T("BINDSTATUS_FINDINGRESOURCE"),  // 1
-		_T("BINDSTATUS_CONNECTING"),
-		_T("BINDSTATUS_REDIRECTING"),
-		_T("BINDSTATUS_BEGINDOWNLOADDATA"),
-		_T("BINDSTATUS_DOWNLOADINGDATA"),
-		_T("BINDSTATUS_ENDDOWNLOADDATA"),
-		_T("BINDSTATUS_BEGINDOWNLOADCOMPONENTS"),
-		_T("BINDSTATUS_INSTALLINGCOMPONENTS"),
-		_T("BINDSTATUS_ENDDOWNLOADCOMPONENTS"),
-		_T("BINDSTATUS_USINGCACHEDCOPY"),
-		_T("BINDSTATUS_SENDINGREQUEST"),
-		_T("BINDSTATUS_CLASSIDAVAILABLE"),
-		_T("BINDSTATUS_MIMETYPEAVAILABLE"),
-		_T("BINDSTATUS_CACHEFILENAMEAVAILABLE"),
-		_T("BINDSTATUS_BEGINSYNCOPERATION"),
-		_T("BINDSTATUS_ENDSYNCOPERATION"),
-		_T("BINDSTATUS_BEGINUPLOADDATA"),
-		_T("BINDSTATUS_UPLOADINGDATA"),
-		_T("BINDSTATUS_ENDUPLOADINGDATA"),
-		_T("BINDSTATUS_PROTOCOLCLASSID"),
-		_T("BINDSTATUS_ENCODING"),
-		_T("BINDSTATUS_VERFIEDMIMETYPEAVAILABLE"),
-		_T("BINDSTATUS_CLASSINSTALLLOCATION"),
-		_T("BINDSTATUS_DECODING"),
-		_T("BINDSTATUS_LOADINGMIMEHANDLER"),
-		_T("BINDSTATUS_CONTENTDISPOSITIONATTACH"),
-		_T("BINDSTATUS_FILTERREPORTMIMETYPE"),
-		_T("BINDSTATUS_CLSIDCANINSTANTIATE"),
-		_T("BINDSTATUS_IUNKNOWNAVAILABLE"),
-		_T("BINDSTATUS_DIRECTBIND"),
-		_T("BINDSTATUS_RAWMIMETYPE"),
-		_T("BINDSTATUS_PROXYDETECTING"),
-		_T("BINDSTATUS_ACCEPTRANGES"),
-		_T("???")  // unknown
-	};
+    static const LPCTSTR plpszStatus[] = 
+    {
+        _T("BINDSTATUS_FINDINGRESOURCE"),  // 1
+        _T("BINDSTATUS_CONNECTING"),
+        _T("BINDSTATUS_REDIRECTING"),
+        _T("BINDSTATUS_BEGINDOWNLOADDATA"),
+        _T("BINDSTATUS_DOWNLOADINGDATA"),
+        _T("BINDSTATUS_ENDDOWNLOADDATA"),
+        _T("BINDSTATUS_BEGINDOWNLOADCOMPONENTS"),
+        _T("BINDSTATUS_INSTALLINGCOMPONENTS"),
+        _T("BINDSTATUS_ENDDOWNLOADCOMPONENTS"),
+        _T("BINDSTATUS_USINGCACHEDCOPY"),
+        _T("BINDSTATUS_SENDINGREQUEST"),
+        _T("BINDSTATUS_CLASSIDAVAILABLE"),
+        _T("BINDSTATUS_MIMETYPEAVAILABLE"),
+        _T("BINDSTATUS_CACHEFILENAMEAVAILABLE"),
+        _T("BINDSTATUS_BEGINSYNCOPERATION"),
+        _T("BINDSTATUS_ENDSYNCOPERATION"),
+        _T("BINDSTATUS_BEGINUPLOADDATA"),
+        _T("BINDSTATUS_UPLOADINGDATA"),
+        _T("BINDSTATUS_ENDUPLOADINGDATA"),
+        _T("BINDSTATUS_PROTOCOLCLASSID"),
+        _T("BINDSTATUS_ENCODING"),
+        _T("BINDSTATUS_VERFIEDMIMETYPEAVAILABLE"),
+        _T("BINDSTATUS_CLASSINSTALLLOCATION"),
+        _T("BINDSTATUS_DECODING"),
+        _T("BINDSTATUS_LOADINGMIMEHANDLER"),
+        _T("BINDSTATUS_CONTENTDISPOSITIONATTACH"),
+        _T("BINDSTATUS_FILTERREPORTMIMETYPE"),
+        _T("BINDSTATUS_CLSIDCANINSTANTIATE"),
+        _T("BINDSTATUS_IUNKNOWNAVAILABLE"),
+        _T("BINDSTATUS_DIRECTBIND"),
+        _T("BINDSTATUS_RAWMIMETYPE"),
+        _T("BINDSTATUS_PROXYDETECTING"),
+        _T("BINDSTATUS_ACCEPTRANGES"),
+        _T("???")  // unknown
+    };
 #endif
 
-	TRACE(_T("IBindStatusCallback::OnProgress\n"));
+    TRACE(_T("IBindStatusCallback::OnProgress\n"));
+
+    TRACE(_T("ulProgress: %lu, ulProgressMax: %lu\n"),
+          ulProgress, ulProgressMax);
 
-	TRACE(_T("ulProgress: %lu, ulProgressMax: %lu\n"),
-		  ulProgress, ulProgressMax);
-	
-	TRACE(_T("ulStatusCode: %lu "), ulStatusCode);
+    TRACE(_T("ulStatusCode: %lu "), ulStatusCode);
+
+    if (ulStatusCode < UF_BINDSTATUS_FIRST ||
+        ulStatusCode > UF_BINDSTATUS_LAST)
+    {
+        ulStatusCode = UF_BINDSTATUS_LAST + 1;
+    }
 
-	if (ulStatusCode < UF_BINDSTATUS_FIRST ||
-		ulStatusCode > UF_BINDSTATUS_LAST)
-	{
-		ulStatusCode = UF_BINDSTATUS_LAST + 1;
-	}
-	
     m_downloadSync.ProgressNotify( ulProgress, ulProgressMax );
 
 #ifdef _DEBUG
-	TRACE(_T("(%s), szStatusText: %ls\n"),
-		  plpszStatus[ulStatusCode - UF_BINDSTATUS_FIRST],
-		  szStatusText);
+    TRACE(_T("(%s), szStatusText: %ls\n"),
+          plpszStatus[ulStatusCode - UF_BINDSTATUS_FIRST],
+          szStatusText);
 #endif
 
-	return S_OK;
+    return S_OK;
 }
 
 STDMETHODIMP PPDownloadCallback::OnStopBinding(HRESULT, LPCWSTR)
 {
-	TRACE(_T("IBindStatusCallback::OnStopBinding\n"));
+    TRACE(_T("IBindStatusCallback::OnStopBinding\n"));
 
     m_downloadSync.End( );
 
-	return S_OK;
+    return S_OK;
 }
 
 STDMETHODIMP PPDownloadCallback::GetBindInfo(DWORD *, BINDINFO *)
 {
-	TRACE(_T("IBindStatusCallback::GetBindInfo\n"));
+    TRACE(_T("IBindStatusCallback::GetBindInfo\n"));
 
-	return S_OK;
+    return S_OK;
 }
 
 STDMETHODIMP PPDownloadCallback::OnDataAvailable(DWORD grfBSCF, DWORD dwSize,
-											  FORMATETC *, STGMEDIUM *pstgmed)
+                                              FORMATETC *, STGMEDIUM *pstgmed)
 {
-	TRACE(_T("IBindStatusCallback::OnDataAvailable\n"));
+    TRACE(_T("IBindStatusCallback::OnDataAvailable\n"));
 
-	HRESULT hr = S_OK;
+    HRESULT hr = S_OK;
 
-	// Get the Stream passed
-	if (BSCF_FIRSTDATANOTIFICATION & grfBSCF)
-	{
-		if (!m_spStream && pstgmed->tymed == TYMED_ISTREAM)
+    // Get the Stream passed
+    if (BSCF_FIRSTDATANOTIFICATION & grfBSCF)
+    {
+        if (!m_spStream && pstgmed->tymed == TYMED_ISTREAM)
         {
-			m_spStream = pstgmed->pstm;
+            m_spStream = pstgmed->pstm;
         }
-	}
-
-	DWORD dwRead = dwSize - m_dwTotalRead; // Minimum amount available that hasn't been read
-	DWORD dwActuallyRead = 0;            // Placeholder for amount read during this pull
-
-	// If there is some data to be read then go ahead and read them
-	if (m_spStream)
-	{
-		if (dwRead > 0)
-		{
-			BYTE* pBytes = NULL;
-			ATLTRY(pBytes = new BYTE[dwRead + 1]);
-			if (pBytes == NULL)
-				return E_OUTOFMEMORY;
-			hr = m_spStream->Read(pBytes, dwRead, &dwActuallyRead);
-			if (SUCCEEDED(hr))
-			{
-				pBytes[dwActuallyRead] = 0;
-				if (dwActuallyRead>0)
-				{
+    }
+
+    DWORD dwRead = dwSize - m_dwTotalRead; // Minimum amount available that hasn't been read
+    DWORD dwActuallyRead = 0;            // Placeholder for amount read during this pull
+
+    // If there is some data to be read then go ahead and read them
+    if (m_spStream)
+    {
+        if (dwRead > 0)
+        {
+            BYTE* pBytes = NULL;
+            ATLTRY(pBytes = new BYTE[dwRead + 1]);
+            if (pBytes == NULL)
+                return E_OUTOFMEMORY;
+            hr = m_spStream->Read(pBytes, dwRead, &dwActuallyRead);
+            if (SUCCEEDED(hr))
+            {
+                pBytes[dwActuallyRead] = 0;
+                if (dwActuallyRead>0)
+                {
                     bool ret = m_downloadSync.DataNotify( dwSize, (const void*)pBytes, dwActuallyRead );
                     if (!ret)
                     {
                         hr = E_ABORT;
                     }
 
-					m_dwTotalRead += dwActuallyRead;
-				}
-			}
-			delete[] pBytes;
-		}
-	}
+                    m_dwTotalRead += dwActuallyRead;
+                }
+            }
+            delete[] pBytes;
+        }
+    }
 
-	if (BSCF_LASTDATANOTIFICATION & grfBSCF)
+    if (BSCF_LASTDATANOTIFICATION & grfBSCF)
     {
-		m_spStream.Release();
+        m_spStream.Release();
     }
-	return hr;
+    return hr;
 }
 
 STDMETHODIMP PPDownloadCallback::OnObjectAvailable(REFIID, IUnknown *)
 {
-	TRACE(_T("IBindStatusCallback::OnObjectAvailable\n"));
+    TRACE(_T("IBindStatusCallback::OnObjectAvailable\n"));
 
-	return S_OK;
+    return S_OK;
 }

+ 21 - 21
direct/src/plugin_activex/PPDownloadCallback.h

@@ -16,8 +16,8 @@
 
 enum
 {
-	UF_BINDSTATUS_FIRST = BINDSTATUS_FINDINGRESOURCE,
-	UF_BINDSTATUS_LAST = BINDSTATUS_ACCEPTRANGES
+    UF_BINDSTATUS_FIRST = BINDSTATUS_FINDINGRESOURCE,
+    UF_BINDSTATUS_LAST = BINDSTATUS_ACCEPTRANGES
 };
 
 class PPDownloadCallbackSync
@@ -32,29 +32,29 @@ public:
 class PPDownloadCallback : public IBindStatusCallback
 {
 public:
-	PPDownloadCallback( PPDownloadCallbackSync& downloadSync );
+    PPDownloadCallback( PPDownloadCallbackSync& downloadSync );
 
-	// IUnknown methods
-	STDMETHOD(QueryInterface)(REFIID riid, void **ppvObject);
-	STDMETHOD_(ULONG, AddRef)();
-	STDMETHOD_(ULONG, Release)();
+    // IUnknown methods
+    STDMETHOD(QueryInterface)(REFIID riid, void **ppvObject);
+    STDMETHOD_(ULONG, AddRef)();
+    STDMETHOD_(ULONG, Release)();
 
-	// IBindStatusCallback methods
-	STDMETHOD(OnStartBinding)(DWORD, IBinding *);
-	STDMETHOD(GetPriority)(LONG *);
-	STDMETHOD(OnLowResource)(DWORD);
-	STDMETHOD(OnProgress)(ULONG ulProgress,
-						  ULONG ulProgressMax,
-						  ULONG ulStatusCode,
-						  LPCWSTR szStatusText);
-	STDMETHOD(OnStopBinding)(HRESULT, LPCWSTR);
-	STDMETHOD(GetBindInfo)(DWORD *, BINDINFO *);
-	STDMETHOD(OnDataAvailable)(DWORD, DWORD, FORMATETC *, STGMEDIUM *);
-	STDMETHOD(OnObjectAvailable)(REFIID, IUnknown *);
+    // IBindStatusCallback methods
+    STDMETHOD(OnStartBinding)(DWORD, IBinding *);
+    STDMETHOD(GetPriority)(LONG *);
+    STDMETHOD(OnLowResource)(DWORD);
+    STDMETHOD(OnProgress)(ULONG ulProgress,
+                          ULONG ulProgressMax,
+                          ULONG ulStatusCode,
+                          LPCWSTR szStatusText);
+    STDMETHOD(OnStopBinding)(HRESULT, LPCWSTR);
+    STDMETHOD(GetBindInfo)(DWORD *, BINDINFO *);
+    STDMETHOD(OnDataAvailable)(DWORD, DWORD, FORMATETC *, STGMEDIUM *);
+    STDMETHOD(OnObjectAvailable)(REFIID, IUnknown *);
 
 protected:
-	ULONG m_ulObjRefCount;
-	CComPtr<IStream> m_spStream;
+    ULONG m_ulObjRefCount;
+    CComPtr<IStream> m_spStream;
 
 private:
     PPDownloadCallbackSync& m_downloadSync;

+ 7 - 7
direct/src/plugin_activex/PPDownloadRequest.cpp

@@ -25,13 +25,13 @@ bool PPDownloadRequest::Begin( )
 bool PPDownloadRequest::DataNotify( size_t expectedDataSize, const void* data, size_t dataSize )
 {
     bool ret = false;
-	if ( m_instance.m_eventStop.m_hObject != NULL )
-	{
-		if ( ::WaitForSingleObject( m_instance.m_eventStop.m_hObject, 0 ) == WAIT_OBJECT_0 )
-		{
-			return ret;  // canceled by the user
-		}
-	}
+    if ( m_instance.m_eventStop.m_hObject != NULL )
+    {
+        if ( ::WaitForSingleObject( m_instance.m_eventStop.m_hObject, 0 ) == WAIT_OBJECT_0 )
+        {
+            return ret;  // canceled by the user
+        }
+    }
     switch ( this->m_requestType )
     {
     case ( RequestType::P3DObject ):

+ 1 - 1
direct/src/plugin_activex/PPInstance.h

@@ -58,7 +58,7 @@ public:
     inline bool IsInit() { return m_isInit; }
 
     HWND m_parentWnd;
-  	CEvent m_eventStop;
+    CEvent m_eventStop;
 
     P3D_object* m_p3dObject;
 

+ 1 - 1
direct/src/plugin_activex/PPInterface.h

@@ -45,4 +45,4 @@ private:
     HRESULT Invoke( int nType, IDispatch* pDisp, CString& ptName, VARIANT* pvResult, int cArgs, VARIANT* params );
     HRESULT GetHtmlDocDispatch( CComPtr<IDispatch>& pHTMLDocDispatch );
 
-};
+};

+ 6 - 6
direct/src/plugin_activex/PPPandaObject.h

@@ -24,9 +24,9 @@ class PPandaObject  : public IDispatch
 {
 public:
 
-	// Methods
-	PPandaObject( PPInterface* interfac, P3D_object* p3dObject );
-	virtual ~PPandaObject();
+    // Methods
+    PPandaObject( PPInterface* interfac, P3D_object* p3dObject );
+    virtual ~PPandaObject();
 
     // IUnknown methods 
     STDMETHOD(QueryInterface)(REFIID riid, void FAR* FAR* ppvObj);
@@ -61,9 +61,9 @@ public:
 private:
      PPandaObject();
     
-	// Props - Dispatch related
-	unsigned long m_refs;
-	ITypeInfo FAR* m_ptinfo;
+    // Props - Dispatch related
+    unsigned long m_refs;
+    ITypeInfo FAR* m_ptinfo;
     std::vector<CString> m_idsOfNames;
     PPInterface* m_interface;
     P3D_object *m_p3dObject;

+ 14 - 14
direct/src/plugin_activex/stdafx.h

@@ -5,39 +5,39 @@
 #pragma once
 
 #ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#define VC_EXTRALEAN        // Exclude rarely-used stuff from Windows headers
 #endif
 
 // Modify the following defines if you have to target a platform prior to the ones specified below.
 // Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER				// Allow use of features specific to Windows 95 and Windows NT 4 or later.
-#define WINVER 0x0400		// Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
+#ifndef WINVER              // Allow use of features specific to Windows 95 and Windows NT 4 or later.
+#define WINVER 0x0400       // Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
 #endif
 
-#ifndef _WIN32_WINNT		// Allow use of features specific to Windows NT 4 or later.
-#define _WIN32_WINNT 0x0400	// Change this to the appropriate value to target Windows 2000 or later.
-#endif						
+#ifndef _WIN32_WINNT        // Allow use of features specific to Windows NT 4 or later.
+#define _WIN32_WINNT 0x0400 // Change this to the appropriate value to target Windows 2000 or later.
+#endif
 
-#ifndef _WIN32_WINDOWS		// Allow use of features specific to Windows 98 or later.
+#ifndef _WIN32_WINDOWS      // Allow use of features specific to Windows 98 or later.
 #define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
 #endif
 
-#ifndef _WIN32_IE			// Allow use of features specific to IE 4.0 or later.
-#define _WIN32_IE 0x0400	// Change this to the appropriate value to target IE 5.0 or later.
+#ifndef _WIN32_IE           // Allow use of features specific to IE 4.0 or later.
+#define _WIN32_IE 0x0400    // Change this to the appropriate value to target IE 5.0 or later.
 #endif
 
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
+#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS  // some CString constructors will be explicit
 
 #include <afxctl.h>         // MFC support for ActiveX Controls
 #include <afxext.h>         // MFC extensions
-#include <afxdtctl.h>		// MFC support for Internet Explorer 4 Comon Controls
+#include <afxdtctl.h>       // MFC support for Internet Explorer 4 Comon Controls
 #ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h>			// MFC support for Windows Common Controls
+#include <afxcmn.h>         // MFC support for Windows Common Controls
 #endif // _AFX_NO_AFXCMN_SUPPORT
 
 // Delete the two includes below if you do not wish to use the MFC
 //  database classes
-#include <afxdb.h>			// MFC database classes
-#include <afxdao.h>			// MFC DAO database classes
+#include <afxdb.h>          // MFC database classes
+#include <afxdao.h>         // MFC DAO database classes
 #include <afxwin.h>