merge upstream patch for wtl to compile on vs2012

third_party/wtl/include/atlapp.h

 // Windows Template Library - WTL version 8.0
 // Copyright (C) Microsoft Corporation. All rights reserved.
 //
 // This file is a part of the Windows Template Library.
 // The use and distribution terms for this software are covered by the
 // Microsoft Permissive License (Ms-PL) which can be found in the file
 // Ms-PL.txt at the root of this distribution.
 
 #ifndef __ATLAPP_H__
 #define __ATLAPP_H__
@@ skipping 439 matching lines @@
 #if (_ATL_VER < 0x0700)
   #ifndef ATLVERIFY
     #ifdef _DEBUG
       #define ATLVERIFY(expr) ATLASSERT(expr)
     #else
       #define ATLVERIFY(expr) (expr)
     #endif // DEBUG
   #endif // ATLVERIFY
 #endif // (_ATL_VER < 0x0700)
 
-// Forward declaration for ATL3 fix
-#if (_ATL_VER < 0x0700) && defined(_ATL_DLL) && !defined(_WIN32_WCE)
+// Forward declaration for ATL3 and ATL11 fix
+#if (((_ATL_VER < 0x0700) && defined(_ATL_DLL)) || (_ATL_VER >= 0x0B00)) && !defined(_WIN32_WCE)
   namespace ATL { HRESULT AtlGetCommCtrlVersion(LPDWORD pdwMajor, LPDWORD pdwMinor); };
 #endif
 
 
 namespace WTL
 {
 
 #if (_ATL_VER >= 0x0700)
   DECLARE_TRACE_CATEGORY(atlTraceUI);
   #ifdef _DEBUG
@@ skipping 1093 matching lines @@
     #define _WTYPES_NS
   #else
     #define _WTYPES_NS  WTL
   #endif
 #endif // _WTYPES_NS
 
 }; // namespace WTL
 
 
 ///////////////////////////////////////////////////////////////////////////////
-// General DLL version helpers (excluded from atlbase.h if _ATL_DLL is defined)
+// General DLL version helpers
+// (ATL3: excluded from atlbase.h if _ATL_DLL is defined; ATL11: removed)
 
-#if (_ATL_VER < 0x0700) && defined(_ATL_DLL) && !defined(_WIN32_WCE)
+#if (((_ATL_VER < 0x0700) && defined(_ATL_DLL)) || (_ATL_VER >= 0x0B00)) && !defined(_WIN32_WCE)
 
 namespace ATL
 {
 
 inline HRESULT AtlGetDllVersion(HINSTANCE hInstDLL, DLLVERSIONINFO* pDllVersionInfo)
 {
         ATLASSERT(pDllVersionInfo != NULL);
         if(pDllVersionInfo == NULL)
                 return E_INVALIDARG;
 
@@ skipping 88 matching lines @@
 // These are always included
 #include "atlwinx.h"
 #include "atluser.h"
 #include "atlgdi.h"
 
 #ifndef _WTL_NO_AUTOMATIC_NAMESPACE
 using namespace WTL;
 #endif // !_WTL_NO_AUTOMATIC_NAMESPACE
 
 #endif // __ATLAPP_H__