Delete dead code (#14703)

2 files changed, 0 insertions, 304 deletions

diff --git a/src/tools/metainfo/mdinfo.cpp b/src/tools/metainfo/mdinfo.cpp
index 753321fb5c..5458a76d28 100644
--- a/src/tools/metainfo/mdinfo.cpp
+++ b/src/tools/metainfo/mdinfo.cpp
@@ -38,7 +38,6 @@ extern HRESULT  _FillVariant(
 
 // Validator declarations.
 extern DWORD g_ValModuleType;
-#include <ivehandler.h>
 
 // Tables for mapping element type to text
 const char *g_szMapElementType[] = 
@@ -312,7 +311,6 @@ void MDInfo::Init(
     strPassBackFn inPBFn,               // Callback to write text.
     DUMP_FILTER DumpFilter)             // Flags to control the dump.
 {
-    m_VEHandlerReporterPtr = 0;
     m_pbFn = inPBFn;
     m_DumpFilter = DumpFilter;
     m_pTables = NULL;
@@ -335,228 +333,6 @@ MDInfo::~MDInfo()
 } // MDInfo::~MDInfo()
 
 //=====================================================================================================================
-//#define EXTERNAL_VE_HANDLER_FOR_MD_VALIDATION
-#ifndef EXTERNAL_VE_HANDLER_FOR_MD_VALIDATION
-
-HINSTANCE GetModuleInst()
-{
-    return NULL;
-} // HINSTANCE GetModuleInst()
-
-typedef HRESULT (*REPORTFCTN)(LPCWSTR, VEContext, HRESULT);
-HRESULT DefaultReporter( // Return status.
-    LPCWSTR     szMsg,                  // Error message.
-    VEContext   Context,                // Error context (offset,token)
-    HRESULT     hrRpt)                      // Original HRESULT
-{ 
-    if(szMsg)
-    {
-        printf("%S", szMsg);
-        // include token and offset from Context
-        if(Context.Token) printf(" [token:0x%08X]",Context.Token);
-        if(Context.uOffset) printf(" [at:0x%X]",Context.uOffset);
-        printf(" [hr:0x%08X]\n",hrRpt);
-        fflush(stdout);
-    }
-    return S_OK;
-} // HRESULT DefaultReporter()
-
-
-#ifdef FEATURE_METADATA_VALIDATOR
-class MDVEHandlerClass : public IVEHandler
-{
-public: 
-    LONG        m_refCount;
-    REPORTFCTN  m_fnReport;
-
-    MDVEHandlerClass() { m_refCount=0; m_fnReport=DefaultReporter; };
-    virtual ~MDVEHandlerClass() { };
-
-    //-----------------------------------------------------------
-    // IUnknown support
-    //-----------------------------------------------------------
-    HRESULT STDMETHODCALLTYPE    QueryInterface(REFIID id, void** pInterface) 
-    {
-        if (id == IID_IVEHandler)
-            *pInterface = (IVEHandler*)this;
-        /*
-        else if (id == IID_IUnknown)
-            *pInterface = (IUnknown*)(IVEHandler*)this;
-        */
-        else
-        {
-            *pInterface = NULL;
-            return E_NOINTERFACE;
-        }
-
-        AddRef();
-        return S_OK;
-    }
-    ULONG STDMETHODCALLTYPE AddRef() 
-    {
-        return InterlockedIncrement(&m_refCount);
-    }
-
-    ULONG STDMETHODCALLTYPE Release() 
-    {
-        LONG       refCount = InterlockedDecrement(&m_refCount);
-        if (refCount == 0) delete this;
-        return (refCount);
-    }
-    //-----------------------------------------------------------
-    // IVEHandler support
-    //-----------------------------------------------------------
-    HRESULT STDMETHODCALLTYPE   SetReporterFtn(__int64 lFnPtr)
-    {
-        m_fnReport = lFnPtr ? reinterpret_cast<REPORTFCTN>(lFnPtr) 
-                             : DefaultReporter;
-        return S_OK;
-    };
-
-//*****************************************************************************
-// The Verification Event Handler itself. Declared in VEHandler.h as virtual, may be overridden
-//*****************************************************************************
-    HRESULT STDMETHODCALLTYPE VEHandler(HRESULT hrRpt, VEContext Context, SAFEARRAY *psa)
-    {
-        WCHAR       rcBuf[1024];             // Resource string.
-        WCHAR       rcMsg[1024];             // Error message.
-        BYTE       *marker;                  // User text.
-        HRESULT     hr;
-        ULONG32     k;
-        WCHAR      *pWsz[1024]; // is more than 1024 string arguments likely?
-
-        // Return warnings without text.
-        if (!FAILED(hrRpt))
-            return (hrRpt);
-        memset(pWsz,0,sizeof(pWsz));
-
-        ULONG32      nVars;
-        // Convert safearray of variants into va_list
-        if(psa && (nVars = psa->rgsabound[0].cElements))
-        {
-            WCHAR       *pwsz;
-            VARIANT     *pVar;
-            ULONG32      i,l;
-            BYTE        *pval;
-
-            _ASSERTE(psa->fFeatures & FADF_VARIANT);
-            _ASSERTE(psa->cDims == 1);
-            marker = new BYTE[nVars*sizeof(double)]; // double being the largest variant element
-            for(i=0,pVar=(VARIANT *)(psa->pvData),pval=marker; i < nVars; pVar++,i++)
-            {
-                switch(V_VT(pVar))
-                {
-                    case VT_I1:
-                        *(int *)pval = V_I1(pVar);
-                        pval += sizeof(int);
-                        break;
-                        
-                    case VT_UI1:
-                        *(int *)pval = V_UI1(pVar);
-                        pval += sizeof(int);
-                        break;
-                        
-
-                    case VT_I2:
-                        *(int *)pval = V_I2(pVar);
-                        pval += sizeof(int);
-                        break;
-                        
-                    case VT_UI2:
-                        *(int *)pval = V_UI2(pVar);
-                        pval += sizeof(int);
-                        break;
-                    
-                    case VT_I8:
-                    case VT_UI8:
-                        *(INT64 *)pval = V_I8(pVar);
-                        pval += sizeof(INT64);
-                        break;
-                        
-
-                    case VT_BYREF|VT_I1:
-                    case VT_BYREF|VT_UI1: // it's ASCII string, convert it to UNICODE
-                        {
-                        PBYTE pb = V_UI1REF(pVar);
-                        l = (ULONG32)strlen((char *)pb)+1;
-                        pwsz = new WCHAR[l];
-                        WszMultiByteToWideChar(CP_ACP,0,(char*)pb,-1,pwsz,l);
-                        for(k=0; pWsz[k]; k++);
-                        pWsz[k] = pwsz;
-                        
-                        *(WCHAR **)pval = pwsz;
-                        pval += sizeof(WCHAR *);
-                        break;
-                        }
-
-                    default:
-                        *(int *)pval = V_I4(pVar);
-                        pval += sizeof(int);
-                        break;
-                }
-            }
-        }
-        else
-            marker = NULL;
-
-        // If this is one of our errors, then grab the error from the rc file.
-        if (HRESULT_FACILITY(hrRpt) == FACILITY_URT)
-        {
-            hr = UtilLoadStringRC(LOWORD(hrRpt), rcBuf, NumItems(rcBuf), true);
-            if (hr == S_OK)
-            {
-                // Format the error.
-                vswprintf_s(rcMsg, NumItems(rcMsg), rcBuf, (va_list) marker);
-                rcMsg[NumItems(rcMsg) - 1] = 0;
-            }
-        }
-        // Otherwise it isn't one of ours, so we need to see if the system can
-        // find the text for it.
-        else
-        {
-            if (WszFormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
-                    0, hrRpt, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                    rcMsg, NumItems(rcMsg), 0))
-            {
-                hr = S_OK;
-
-                // System messages contain a trailing \r\n, which we don't want normally.
-                int iLen = lstrlenW(rcMsg);
-                if (iLen > 3 && rcMsg[iLen - 2] == '\r' && rcMsg[iLen - 1] == '\n')
-                    rcMsg[iLen - 2] = '\0';
-            }
-            else
-                hr = HRESULT_FROM_WIN32(GetLastError());
-        }
-        if(marker) delete [] marker;
-
-        // If we failed to find the message anywhere, then issue a hard coded message.
-        if (FAILED(hr))
-        {
-            swprintf_s(rcMsg, NumItems(rcMsg), W("COM+ Runtime Internal error: 0x%08x"), hrRpt);
-            //DEBUG_STMT(DbgWriteEx(rcMsg));
-        }
-
-        // delete WCHAR buffers allocated above (if any)
-        for(k=0; pWsz[k]; k++) 
-        { 
-            if(pWsz[k]) 
-            {
-                delete [] pWsz[k];
-                pWsz[k] = NULL;
-            }
-        }
-
-        return (m_fnReport(rcMsg, Context,hrRpt) == S_OK ? S_OK : E_FAIL);
-    };
-
-    static HRESULT STDMETHODCALLTYPE CreateObject(REFIID id, void **object)
-    { return E_NOTIMPL; }
-};
-#endif // FEATURE_METADATA_VALIDATOR
-
-#endif
-//=====================================================================================================================
 // DisplayMD() function
 //
 // Displays the meta data content of a file
@@ -596,84 +372,6 @@ void MDInfo::DisplayMD()
     if (m_DumpFilter & dumpUnsat)
         DisplayUnsatInfo();
     WriteLine("===========================================================");
-#ifdef FEATURE_METADATA_VALIDATOR
-    if (m_DumpFilter & dumpValidate)
-    {
-        IMetaDataValidate *pValidate = 0;
-#ifndef EXTERNAL_VE_HANDLER_FOR_MD_VALIDATION
-        MDVEHandlerClass    *pVEHandler = 0;
-#else
-        IVEHandler  *pVEHandler = 0;
-#endif
-        const char *szErrStr = 0;
-        HRESULT     hr = S_OK;
-
-        // Get a pointer to the Validator interface.
-        hr = m_pImport->QueryInterface(IID_IMetaDataValidate, (void **) &pValidate);
-        if (FAILED(hr))
-        {
-            szErrStr = "QueryInterface failed for IMetaDataValidate.";
-            goto ErrExit;
-        }
-
-        // Get a pointer to the VEHandler interface.
-#ifndef EXTERNAL_VE_HANDLER_FOR_MD_VALIDATION
-        if((pVEHandler = new MDVEHandlerClass())) hr = S_OK;
-        else hr = E_FAIL;
-#else
-        hr = CoCreateInstance(CLSID_VEHandlerClass,
-                           NULL,
-                           CLSCTX_INPROC_SERVER,
-                           IID_IVEHandler,
-                           (void **)&pVEHandler);
-#endif
-        if (FAILED(hr))
-        {
-#ifndef EXTERNAL_VE_HANDLER_FOR_MD_VALIDATION
-            szErrStr = "Failed to create VEHandler.";
-#else
-            szErrStr = "CoCreateInstance(VEHandler) failed.";
-#endif
-            goto ErrExit;
-        }
-
-        if(m_VEHandlerReporterPtr) pVEHandler->SetReporterFtn((__int64)m_VEHandlerReporterPtr);
-
-        hr = pValidate->ValidatorInit(g_ValModuleType, pVEHandler);
-        if (FAILED(hr))
-        {
-            szErrStr = "ValidatorInit failed.";
-            goto ErrExit;
-        }
-
-        hr = pValidate->ValidateMetaData();
-        if (FAILED(hr))
-        {
-            szErrStr = "ValidateMetaData failed to run successfully.";
-            goto ErrExit;
-        }
-        if (hr == S_OK)
-            WriteLine("No warnings or errors found.");
-        else if (hr == VLDTR_S_WRN)
-            WriteLine("Warnings found.");
-        else if (hr == VLDTR_S_ERR)
-            WriteLine("Errors found.");
-        else if (hr == VLDTR_S_WRNERR)
-            WriteLine("Warnings and Errors found.");
-        else
-            VWriteLine("Validator returned unexpected success code, hr=0x%08x.", hr);
-ErrExit:
-        if (pValidate)
-            pValidate->Release();
-#ifdef EXTERNAL_VE_HANDLER_FOR_MD_VALIDATION
-        if (pVEHandler)
-            pVEHandler->Release();
-#endif
-        if (szErrStr)
-            Error(szErrStr, hr);
-    }
-#endif // FEATURE_METADATA_VALIDATOR
-    WriteLine("===========================================================");
 } // MDVEHandlerClass()
 
 int MDInfo::WriteLine(__in_z __in const char *str)
diff --git a/src/tools/metainfo/mdinfo.h b/src/tools/metainfo/mdinfo.h
index 06c0a76b63..acca606f32 100644
--- a/src/tools/metainfo/mdinfo.h
+++ b/src/tools/metainfo/mdinfo.h
@@ -164,7 +164,6 @@ public:
     void DumpRawCol(ULONG ixTbl, ULONG ixCol, ULONG rid, bool bStats);
     ULONG DumpRawColStats(ULONG ixTbl, ULONG ixCol, ULONG cRows);
     const char *DumpRawNameOfType(ULONG ulType);
-    void SetVEHandlerReporter(__int64 VEHandlerReporterPtr) { m_VEHandlerReporterPtr = VEHandlerReporterPtr; };
 
     static void Error(const char *szError, HRESULT hr = S_OK);
 private:
@@ -186,7 +185,6 @@ private:
     IMetaDataImport2 *m_pImport;
     IMetaDataAssemblyImport *m_pAssemblyImport;
     strPassBackFn m_pbFn;
-    __int64 m_VEHandlerReporterPtr;
     IMetaDataTables *m_pTables;
     IMetaDataTables2 *m_pTables2;