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

src/plugin/passthroughapp/ProtocolCF.inl

Index: src/plugin/passthroughapp/ProtocolCF.inl
===================================================================
--- a/src/plugin/passthroughapp/ProtocolCF.inl
+++ b/src/plugin/passthroughapp/ProtocolCF.inl
@@ -1,31 +1,16 @@
-// 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
 {
 
@@ -170,15 +155,12 @@
 	{
 		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))
 		{
@@ -205,7 +187,6 @@
 	ATLASSERT(SUCCEEDED(hr) && pObj != 0);
 	if (SUCCEEDED(hr))
 	{
-		pObj->_AtlInitialConstruct();
 		pObj->AddRef();
 
 		hr = pObj->SetTargetClassFactory(pTargetCF);
@@ -238,7 +219,6 @@
 	ATLASSERT(SUCCEEDED(hr) && pObj != 0);
 	if (SUCCEEDED(hr))
 	{
-		//pObj->_AtlInitialConstruct();
 		pObj->AddRef();
 
 		hr = pObj->SetTargetCLSID(clsidTarget);