- Add "log2lines" tool by Jan Roeloffzen. Bug #4342.

- Fix indentation in rsym.h.

svn path=/trunk/; revision=40652

reactos/tools/log2lines.mak

@@ -0,0 +1,41 @@
+LOG2LINES_BASE = $(TOOLS_BASE)
+LOG2LINES_BASE_ = $(LOG2LINES_BASE)$(SEP)
+
+LOG2LINES_INT = $(INTERMEDIATE_)$(LOG2LINES_BASE)
+LOG2LINES_INT_ = $(LOG2LINES_INT)$(SEP)
+LOG2LINES_OUT = $(OUTPUT_)$(LOG2LINES_BASE)
+LOG2LINES_OUT_ = $(LOG2LINES_OUT)$(SEP)
+
+LOG2LINES_TARGET = \
+	$(LOG2LINES_OUT_)log2lines$(EXEPOSTFIX)
+
+LOG2LINES_SOURCES = \
+	$(LOG2LINES_BASE_)log2lines.c \
+	$(LOG2LINES_BASE_)rsym_common.c
+
+LOG2LINES_OBJECTS = \
+	$(addprefix $(INTERMEDIATE_), $(LOG2LINES_SOURCES:.c=.o))
+
+LOG2LINES_HOST_CFLAGS = $(TOOLS_CFLAGS)
+
+LOG2LINES_HOST_LFLAGS = $(TOOLS_LFLAGS)
+
+.PHONY: log2lines
+log2lines: $(LOG2LINES_TARGET)
+
+$(LOG2LINES_TARGET): $(LOG2LINES_OBJECTS) | $(LOG2LINES_OUT)
+	$(ECHO_HOSTLD)
+	${host_gcc} $(LOG2LINES_OBJECTS) $(LOG2LINES_HOST_LFLAGS) -o $@
+
+$(LOG2LINES_INT_)log2lines.o: $(LOG2LINES_BASE_)log2lines.c | $(LOG2LINES_INT)
+	$(ECHO_HOSTCC)
+	${host_gcc} $(LOG2LINES_HOST_CFLAGS) -c $< -o $@
+
+#$(LOG2LINES_INT_)rsym_common.o: $(LOG2LINES_BASE_)rsym_common.c | $(LOG2LINES_INT)
+#	$(ECHO_HOSTCC)
+#	${host_gcc} $(LOG2LINES_HOST_CFLAGS) -c $< -o $@
+
+.PHONY: log2lines_clean
+log2lines_clean:
+	-@$(rm) $(LOG2LINES_TARGET) $(LOG2LINES_OBJECTS) 2>$(NUL)
+clean: log2lines_clean

reactos/tools/rsym.h

@@ -6,6 +6,8 @@
 #define IMAGE_DOS_MAGIC 0x5a4d
 #define IMAGE_PE_MAGIC  0x00004550
 #define IMAGE_SIZEOF_SHORT_NAME 8
+#define IMAGE_NT_OPTIONAL_HDR32_MAGIC   0x10b
+#define IMAGE_NT_OPTIONAL_HDR64_MAGIC   0x20b
 
 #define IMAGE_FILE_LINE_NUMS_STRIPPED   0x0004
 #define IMAGE_FILE_LOCAL_SYMS_STRIPPED  0x0008
@@ -45,7 +47,6 @@ typedef  unsigned long ULONG_PTR;
 #endif
 
 #pragma pack(push,2)
-
 typedef struct _IMAGE_DOS_HEADER {
     WORD e_magic;
     WORD e_cblp;
@@ -153,7 +154,6 @@ typedef struct _IMAGE_OPTIONAL_HEADER64 {
     IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
 } IMAGE_OPTIONAL_HEADER64, *PIMAGE_OPTIONAL_HEADER64;
 
-
 #ifdef _TARGET_PE64
 typedef IMAGE_OPTIONAL_HEADER64 IMAGE_OPTIONAL_HEADER;
 typedef PIMAGE_OPTIONAL_HEADER64 PIMAGE_OPTIONAL_HEADER;
@@ -226,6 +226,7 @@ typedef struct _STAB_ENTRY {
 } STAB_ENTRY, *PSTAB_ENTRY;
 
 /* http://www.math.utah.edu/docs/info/stabs_12.html */
+
 #define N_GYSM      0x20
 #define N_FNAME     0x22
 #define N_FUN       0x24
@@ -274,6 +275,7 @@ typedef struct _STAB_ENTRY {
 #define N_TSHIFT    (2)
 
 /* derived types, in e_type */
+
 #define DT_NON      (0)         /* no derived type */
 #define DT_PTR      (1)         /* pointer         */
 #define DT_FCN      (2)         /* function        */
@@ -318,19 +320,14 @@ typedef struct _STAB_ENTRY {
 #define C_HIDDEN    106         /* ext symbol in dmert public lib          */
 
 #pragma pack(1)
-typedef struct _COFF_SYMENT
-{
-  union
-    {
+typedef struct _COFF_SYMENT {
+    union {
         char e_name[E_SYMNMLEN];
-      struct
-        {
+        struct {
             ULONG e_zeroes;
             ULONG e_offset;
-        }
-      e;
-    }
-  e;
+        } e;
+    } e;
     ULONG e_value;
     short e_scnum;
     USHORT e_type;

reactos/tools/tools.mak

@@ -43,10 +43,11 @@ $(TOOLS_INT_)xml.o: $(TOOLS_BASE_)xml.cpp $(XML_SSPRINTF_HEADERS) | $(TOOLS_INT)
 include tools/bin2c.mak
 include tools/buildno/buildno.mak
 include tools/gendib/gendib.mak
+include tools/log2lines.mak
+include tools/nci/nci.mak
 ifeq ($(ARCH),powerpc)
 include tools/ofw_interface/ofw_interface.mak
 endif
-include tools/nci/nci.mak
 include tools/pefixup.mak
 include tools/raddr2line.mak
 include tools/rbuild/rbuild.mak