Issue #1484 - Use the currently distributed version of PassthroughAPP unaltered

src/plugin/passthroughapp/ProtocolCF.inl

-// Copyright 2007 Igor Tandetnik
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 #ifndef PASSTHROUGHAPP_PROTOCOLCF_INL
 #define PASSTHROUGHAPP_PROTOCOLCF_INL
 
 #if _MSC_VER > 1000
- #pragma once
+#pragma once
 #endif // _MSC_VER > 1000
 
 #ifndef PASSTHROUGHAPP_PROTOCOLCF_H
- #error ProtocolCF.inl requires ProtocolCF.h to be included first
+        #error ProtocolCF.inl requires ProtocolCF.h to be included first
 #endif
 
 #include "PassthroughObject.h"
 
-
 namespace PassthroughAPP
 {
 
 // ===== CComClassFactoryProtocol =====
 
 inline STDMETHODIMP CComClassFactoryProtocol::CreateInstance(
         IUnknown* punkOuter, REFIID riid, void** ppvObj)
 {
         ATLASSERT(ppvObj != 0);
         if (!ppvObj)
@@ skipping 124 matching lines @@
         }
 
         HRESULT hr = E_OUTOFMEMORY;
         void* pv = static_cast<void*>(CreatorClass::CreateInstance);
         FactoryComObject* p = 0;
         ATLTRY(p = new FactoryComObject(pv))
         if (p != NULL)
         {
                 p->SetVoid(pv);
                 p->InternalFinalConstructAddRef();
-#if _ATL_VER >= 0x800
+                // MG: Updated to conform to more recent ATL version.
                 hr = p->_AtlInitialConstruct();
                 if (SUCCEEDED(hr))
-#endif
                         hr = p->FinalConstruct();
-#if _ATL_VER >= 0x800
                 if (SUCCEEDED(hr))
                         hr = p->_AtlFinalConstruct();
-#endif
                 p->InternalFinalConstructRelease();
                 if (FAILED(hr))
                 {
                         delete p;
                         p = 0;
                 }
         }
         *ppObj = p;
         return hr;
 }
 
 template <class Factory, class Protocol, class FactoryComObject>
 inline HRESULT CMetaFactory<Factory, Protocol, FactoryComObject>::
         CreateInstance(IClassFactory* pTargetCF, IClassFactory** ppCF)
 {
         if (!ppCF)
         {
                 return E_POINTER;
         }
         *ppCF = 0;
 
         Factory* pObj = 0;
         HRESULT hr = CreateInstance(&pObj);
         ATLASSERT(SUCCEEDED(hr) && pObj != 0);
         if (SUCCEEDED(hr))
         {
-                pObj->_AtlInitialConstruct();
                 pObj->AddRef();
 
                 hr = pObj->SetTargetClassFactory(pTargetCF);
                 ATLASSERT(SUCCEEDED(hr));
 
                 if (SUCCEEDED(hr))
                 {
                         hr = pObj->QueryInterface(IID_IClassFactory,
                                 reinterpret_cast<void**>(ppCF));
                         ATLASSERT(SUCCEEDED(hr) && *ppCF != 0);
@@ skipping 12 matching lines @@
         {
                 return E_POINTER;
         }
         *ppCF = 0;
 
         Factory* pObj = 0;
         HRESULT hr = CreateInstance(&pObj);
         ATLASSERT(SUCCEEDED(hr) && pObj != 0);
         if (SUCCEEDED(hr))
         {
-                //pObj->_AtlInitialConstruct();
                 pObj->AddRef();
 
                 hr = pObj->SetTargetCLSID(clsidTarget);
                 ATLASSERT(SUCCEEDED(hr));
 
                 if (SUCCEEDED(hr))
                 {
                         hr = pObj->QueryInterface(IID_IClassFactory,
                                 reinterpret_cast<void**>(ppCF));
                         ATLASSERT(SUCCEEDED(hr) && *ppCF != 0);
                 }
 
                 pObj->Release();
         }
         return hr;
 }
 
 } // end namespace PassthroughAPP
 
 #endif // PASSTHROUGHAPP_PROTOCOLCF_INL