[ros-diffs] [rharabien] 54619: - Partially revert r54613 to fix test bot

[rharabien]

Author: rharabien
Date: Thu Dec  8 20:28:06 2011
New Revision: 54619

URL: http://svn.reactos.org/svn/reactos?rev=54619&view=rev
Log:
- Partially revert r54613 to fix test bot

Modified:
    trunk/reactos/tools/rsym/rsym.c

Modified: trunk/reactos/tools/rsym/rsym.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym.c?rev=54619&r1=54618&r2=54619&view=diff
==============================================================================
--- trunk/reactos/tools/rsym/rsym.c [iso-8859-1] (original)
+++ trunk/reactos/tools/rsym/rsym.c [iso-8859-1] Thu Dec  8 20:28:06 2011
@@ -432,6 +432,34 @@
 }
 
 static int
+IncludeRelocationsForSection(PIMAGE_SECTION_HEADER SectionHeader)
+{
+  static char *BlacklistedSections[] =
+    {
+      ".edata",
+      ".reloc"
+    };
+  char SectionName[IMAGE_SIZEOF_SHORT_NAME];
+  unsigned i;
+
+  if (0 != (SectionHeader->Characteristics & IMAGE_SCN_LNK_REMOVE))
+    {
+      return 0;
+    }
+
+  for (i = 0; i < sizeof(BlacklistedSections) / 
sizeof(BlacklistedSections[0]); i++)
+    {
+      strncpy(SectionName, BlacklistedSections[i], IMAGE_SIZEOF_SHORT_NAME);
+      if (0 == memcmp(SectionName, SectionHeader->Name, 
IMAGE_SIZEOF_SHORT_NAME))
+        {
+          return 0;
+        }
+    }
+
+  return 1;
+}
+
+static int
 ProcessRelocations(ULONG *ProcessedRelocsLength, void **ProcessedRelocs,
                    void *RawData, PIMAGE_OPTIONAL_HEADER OptHeader,
                    unsigned NumberOfSections, PIMAGE_SECTION_HEADER 
SectionHeaders)
@@ -476,7 +504,7 @@
     {
       TargetSectionHeader = FindSectionForRVA(BaseReloc->VirtualAddress, 
NumberOfSections,
                                               SectionHeaders);
-      if (NULL != TargetSectionHeader)
+      if (NULL != TargetSectionHeader && 
IncludeRelocationsForSection(TargetSectionHeader))
         {
           AcceptedRelocs = *ProcessedRelocs;
           Found = 0;