Changeset 5650 for trunk/src

Timestamp:

May 3, 2001, 8:18:53 PM (24 years ago)

Author:

sandervl

Message:

YD: Fail for typelib TLBMAGIC2 type

Location:

trunk/src/oleaut32

Files:

• oleaut32.cpp (modified) (3 diffs)
• typelib.cpp (modified) (3 diffs)

trunk/src/oleaut32/oleaut32.cpp

@@ -1 @@
-/* $Id: oleaut32.cpp,v 1.6 2000-12-24 14:39:54 sandervl Exp $ */
+/* $Id: oleaut32.cpp,v 1.7 2001-05-03 18:18:53 sandervl Exp $ */
 /* 
  * OLEAUT32 
@@ -29 +29 @@
 void OpenPrivateLogFiles()
 {
-//    OpenPrivateLogFileTypelib();
+#ifdef DEBUG
+    OpenPrivateLogFileTypelib();
+#endif
 }
 //******************************************************************************
@@ -36 +38 @@
 void ClosePrivateLogFiles()
 {
-//    ClosePrivateLogFileTypelib();
+#ifdef DEBUG
+    ClosePrivateLogFileTypelib();
+#endif
 }
 

trunk/src/oleaut32/typelib.cpp

@@ -1 @@
-/* $Id: typelib.cpp,v 1.18 2001-04-26 19:24:56 sandervl Exp $ */
+/* $Id: typelib.cpp,v 1.19 2001-05-03 18:18:53 sandervl Exp $ */
 /* 
  * ITypelib interface
@@ -667 +667 @@
     m_pHeader = (TLB2Header *)m_pTypeLib;
 
+    dprintf((LOG, "header:"));
+    dprintf((LOG, "magic1=0x%08x ,magic2=0x%08x\n", m_pHeader->magic1, m_pHeader->magic2));
+
+    if (memcmp(&m_pHeader->magic1,TLBMAGIC2,4)) {
+        dprintf((LOG, "Header type magic 0x%08x not supported.",m_pHeader->magic1));
+        return E_FAIL;
+    }
+
     if (m_pHeader->varflags & HELPDLLFLAG)
     {
@@ -682 +690 @@
     if (m_pSegDir->pTypeInfoTab.res0c != 0x0F || m_pSegDir->pImpInfo.res0c != 0x0F)
     {
-        dprintf((LOG, "  Segment directory sanity check failed!"));
+        dprintf((LOG, "  Segment directory sanity check failed! pTypeInfo %x, pImpInfo %x", m_pSegDir->pTypeInfoTab.res0c, m_pSegDir->pImpInfo.res0c));
         return E_FAIL;
     }