[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-803-g0406436

[Bill Hoffman]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0406436e8a1ad973afc64fbab779b616f6c896d5 (commit)
       via  0317aa7488a8dc26e0dcc3370f1b32847ca9a78c (commit)
      from  62426472d6b2126c0c615dececef351754d2cc4b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0406436e8a1ad973afc64fbab779b616f6c896d5
commit 0406436e8a1ad973afc64fbab779b616f6c896d5
Merge: 6242647 0317aa7
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jul 2 21:04:17 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 2 21:04:17 2015 -0400

    Merge topic 'auto_export_dll_symbols' into next
    
    0317aa74 Define ANON_OBJECT_HEADER_BIGOBJ as it is not found on all systems.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0317aa7488a8dc26e0dcc3370f1b32847ca9a78c
commit 0317aa7488a8dc26e0dcc3370f1b32847ca9a78c
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jul 2 21:03:22 2015 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Thu Jul 2 21:03:22 2015 -0400

    Define ANON_OBJECT_HEADER_BIGOBJ as it is not found on all systems.

diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx
index 48d7b7e..b2a6c17 100644
--- a/Source/bindexplib.cxx
+++ b/Source/bindexplib.cxx
@@ -78,6 +78,26 @@
 #include <fstream>
 #include <iostream>
 
+typedef struct cmANON_OBJECT_HEADER_BIGOBJ {
+   /* same as ANON_OBJECT_HEADER_V2 */
+    WORD    Sig1;            // Must be IMAGE_FILE_MACHINE_UNKNOWN
+    WORD    Sig2;            // Must be 0xffff
+    WORD    Version;         // >= 2 (implies the Flags field is present)
+    WORD    Machine;         // Actual machine - IMAGE_FILE_MACHINE_xxx
+    DWORD   TimeDateStamp;
+    CLSID   ClassID;         // {D1BAA1C7-BAEE-4ba9-AF20-FAF66AA4DCB8}
+    DWORD   SizeOfData;      // Size of data that follows the header
+    DWORD   Flags;           // 0x1 -> contains metadata
+    DWORD   MetaDataSize;    // Size of CLR metadata
+    DWORD   MetaDataOffset;  // Offset of CLR metadata
+
+    /* bigobj specifics */
+    DWORD   NumberOfSections; // extended from WORD
+    DWORD   PointerToSymbolTable;
+    DWORD   NumberOfSymbols;
+} cmANON_OBJECT_HEADER_BIGOBJ;
+
+
 PIMAGE_SECTION_HEADER GetSectionHeaderOffset(PIMAGE_FILE_HEADER
                                              pImageFileHeader)
 {
@@ -87,12 +107,12 @@ PIMAGE_SECTION_HEADER GetSectionHeaderOffset(PIMAGE_FILE_HEADER
      pImageFileHeader->SizeOfOptionalHeader);
 }
 
-PIMAGE_SECTION_HEADER GetSectionHeaderOffset(ANON_OBJECT_HEADER_BIGOBJ*
+PIMAGE_SECTION_HEADER GetSectionHeaderOffset(cmANON_OBJECT_HEADER_BIGOBJ*
                                              pImageFileHeader)
 {
   return (PIMAGE_SECTION_HEADER)
       ((DWORD_PTR)pImageFileHeader          +
-       sizeof(ANON_OBJECT_HEADER_BIGOBJ));
+       sizeof(cmANON_OBJECT_HEADER_BIGOBJ));
 }
 
 /*
@@ -120,7 +140,7 @@ const char* StrNStr(const char* start, const char* find, size_t &size) {
 }
 
 template <
-  // ANON_OBJECT_HEADER_BIGOBJ or IMAGE_FILE_HEADER
+  // cmANON_OBJECT_HEADER_BIGOBJ or IMAGE_FILE_HEADER
   class ObjectHeaderType,
   // PIMAGE_SYMBOL_EX or PIMAGE_SYMBOL
   class SymbolTableType>
@@ -380,11 +400,12 @@ DumpFile(const char* filename, FILE *fout)
       symbolDumper.DumpObjFile();
    } else {
    // check for /bigobj format
-     ANON_OBJECT_HEADER_BIGOBJ* h = (ANON_OBJECT_HEADER_BIGOBJ*) lpFileBase;
+     cmANON_OBJECT_HEADER_BIGOBJ* h =
+       (cmANON_OBJECT_HEADER_BIGOBJ*) lpFileBase;
      if(h->Sig1 == 0x0 && h->Sig2 == 0xffff)
        {
-       DumpSymbols<ANON_OBJECT_HEADER_BIGOBJ, IMAGE_SYMBOL_EX>
-         symbolDumper((ANON_OBJECT_HEADER_BIGOBJ*) lpFileBase, fout);
+       DumpSymbols<cmANON_OBJECT_HEADER_BIGOBJ, IMAGE_SYMBOL_EX>
+         symbolDumper((cmANON_OBJECT_HEADER_BIGOBJ*) lpFileBase, fout);
        symbolDumper.DumpObjFile();
        }
      // if we don't know what it is die so the build will stop

-----------------------------------------------------------------------

Summary of changes:
 Source/bindexplib.cxx |   33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake