[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-805-g5d3276f

Bill Hoffman bill.hoffman at kitware.com
Thu Jul 2 23:21:02 EDT 2015


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  5d3276f7d3a1b99fc985d0fa587987c1271fc407 (commit)
       via  f15c3b309c34b0a700cf9312ca50357f386feedb (commit)
      from  0406436e8a1ad973afc64fbab779b616f6c896d5 (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=5d3276f7d3a1b99fc985d0fa587987c1271fc407
commit 5d3276f7d3a1b99fc985d0fa587987c1271fc407
Merge: 0406436 f15c3b3
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jul 2 23:21:00 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 2 23:21:00 2015 -0400

    Merge topic 'auto_export_dll_symbols' into next
    
    f15c3b30 Devine IMAGE_SYMBOL_EX in this file because it is not in all WinNT.h files.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f15c3b309c34b0a700cf9312ca50357f386feedb
commit f15c3b309c34b0a700cf9312ca50357f386feedb
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jul 2 23:19:59 2015 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Thu Jul 2 23:19:59 2015 -0400

    Devine IMAGE_SYMBOL_EX in this file because it is not in all WinNT.h files.

diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx
index b2a6c17..861436f 100644
--- a/Source/bindexplib.cxx
+++ b/Source/bindexplib.cxx
@@ -97,6 +97,22 @@ typedef struct cmANON_OBJECT_HEADER_BIGOBJ {
     DWORD   NumberOfSymbols;
 } cmANON_OBJECT_HEADER_BIGOBJ;
 
+typedef struct _cmIMAGE_SYMBOL_EX {
+    union {
+        BYTE     ShortName[8];
+        struct {
+            DWORD   Short;     // if 0, use LongName
+            DWORD   Long;      // offset into string table
+        } Name;
+        DWORD   LongName[2];    // PBYTE  [2]
+    } N;
+    DWORD   Value;
+    LONG    SectionNumber;
+    WORD    Type;
+    BYTE    StorageClass;
+    BYTE    NumberOfAuxSymbols;
+} cmIMAGE_SYMBOL_EX;
+typedef cmIMAGE_SYMBOL_EX UNALIGNED *PcmIMAGE_SYMBOL_EX;
 
 PIMAGE_SECTION_HEADER GetSectionHeaderOffset(PIMAGE_FILE_HEADER
                                              pImageFileHeader)
@@ -142,7 +158,7 @@ const char* StrNStr(const char* start, const char* find, size_t &size) {
 template <
   // cmANON_OBJECT_HEADER_BIGOBJ or IMAGE_FILE_HEADER
   class ObjectHeaderType,
-  // PIMAGE_SYMBOL_EX or PIMAGE_SYMBOL
+  // PcmIMAGE_SYMBOL_EX or PIMAGE_SYMBOL
   class SymbolTableType>
 class DumpSymbols
 {
@@ -404,7 +420,7 @@ DumpFile(const char* filename, FILE *fout)
        (cmANON_OBJECT_HEADER_BIGOBJ*) lpFileBase;
      if(h->Sig1 == 0x0 && h->Sig2 == 0xffff)
        {
-       DumpSymbols<cmANON_OBJECT_HEADER_BIGOBJ, IMAGE_SYMBOL_EX>
+       DumpSymbols<cmANON_OBJECT_HEADER_BIGOBJ, cmIMAGE_SYMBOL_EX>
          symbolDumper((cmANON_OBJECT_HEADER_BIGOBJ*) lpFileBase, fout);
        symbolDumper.DumpObjFile();
        }

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

Summary of changes:
 Source/bindexplib.cxx |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list