- Make the NDK compatible with the MSDDK again.
[reactos.git] / reactos / ntoskrnl / ldr / rtl.c
index 9224dd7..02e9e5a 100644 (file)
@@ -1,97 +1,22 @@
-/* $Id: rtl.c,v 1.9 2000/08/05 18:01:53 dwelch Exp $
+/* $Id$
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
- * FILE:            ntoskrnl/ldr/loader.c
+ * FILE:            ntoskrnl/ldr/rtl.c
  * PURPOSE:         Loader utilities
+ *
  * PROGRAMMERS:     Jean Michault
  *                  Rex Jolliff (rex@lvcablemodem.com)
  */
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <internal/module.h>
-#include <internal/ntoskrnl.h>
-#include <internal/ob.h>
-#include <internal/ps.h>
-#include <string.h>
-#include <internal/string.h>
-#include <internal/ldr.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>
 
 /* FUNCTIONS ****************************************************************/
 
-
-PIMAGE_NT_HEADERS STDCALL RtlImageNtHeader (IN PVOID BaseAddress)
-{
-   PIMAGE_DOS_HEADER DosHeader;
-   PIMAGE_NT_HEADERS NTHeaders;
-   
-   DPRINT("BaseAddress %x\n", BaseAddress);
-   DosHeader = (PIMAGE_DOS_HEADER)BaseAddress;
-   DPRINT("DosHeader %x\n", DosHeader);
-   NTHeaders = (PIMAGE_NT_HEADERS)(BaseAddress + DosHeader->e_lfanew);
-   DPRINT("NTHeaders %x\n", NTHeaders);
-   DPRINT("DosHeader->e_magic %x DosHeader->e_lfanew %x\n",
-         DosHeader->e_magic, DosHeader->e_lfanew);
-   DPRINT("*NTHeaders %x\n", *(PULONG)NTHeaders);
-   if ((DosHeader->e_magic != IMAGE_DOS_MAGIC)
-       || (DosHeader->e_lfanew == 0L)
-       || (*(PULONG) NTHeaders != IMAGE_PE_MAGIC))
-     {
-       return(NULL);
-     }
-   return(NTHeaders);
-}
-
-
-PVOID STDCALL
-RtlImageDirectoryEntryToData (
-       IN PVOID        BaseAddress,
-       IN BOOLEAN      ImageLoaded,
-       IN ULONG        Directory,
-       OUT PULONG      Size
-       )
-{
-       PIMAGE_NT_HEADERS NtHeader;
-       PIMAGE_SECTION_HEADER SectionHeader;
-       ULONG Va;
-       ULONG Count;
-
-       NtHeader = RtlImageNtHeader (BaseAddress);
-       if (NtHeader == NULL)
-               return NULL;
-
-       if (Directory >= NtHeader->OptionalHeader.NumberOfRvaAndSizes)
-               return NULL;
-
-       Va = NtHeader->OptionalHeader.DataDirectory[Directory].VirtualAddress;
-       if (Va == 0)
-               return NULL;
-
-       if (Size)
-               *Size = NtHeader->OptionalHeader.DataDirectory[Directory].Size;
-
-       if (ImageLoaded)
-               return (PVOID)(BaseAddress + Va);
-
-       /* image mapped as ordinary file, we must find raw pointer */
-       SectionHeader = (PIMAGE_SECTION_HEADER)(NtHeader + 1);
-       Count = NtHeader->FileHeader.NumberOfSections;
-       while (Count--)
-       {
-               if (SectionHeader->VirtualAddress == Va)
-                       return (PVOID)(BaseAddress + SectionHeader->PointerToRawData);
-               SectionHeader++;
-       }
-
-       return NULL;
-}
-
-
 NTSTATUS STDCALL
 LdrGetProcedureAddress (IN PVOID BaseAddress,
                         IN PANSI_STRING Name,
@@ -99,47 +24,83 @@ LdrGetProcedureAddress (IN PVOID BaseAddress,
                         OUT PVOID *ProcedureAddress)
 {
    PIMAGE_EXPORT_DIRECTORY ExportDir;
+   ULONG ExportDirSize = 0;
    PUSHORT OrdinalPtr;
    PULONG NamePtr;
+   PCHAR CurrentNamePtr;
    PULONG AddressPtr;
-   ULONG i = 0;
+
+   if (ProcedureAddress == NULL)
+      return STATUS_INVALID_PARAMETER;
 
    /* get the pointer to the export directory */
-   ExportDir = (PIMAGE_EXPORT_DIRECTORY)
-       RtlImageDirectoryEntryToData (BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &i);
+   ExportDir = RtlImageDirectoryEntryToData(BaseAddress, TRUE,
+                                           IMAGE_DIRECTORY_ENTRY_EXPORT,
+                                           &ExportDirSize);
+
+   if (ExportDir == NULL || ExportDirSize == 0)
+      return STATUS_INVALID_PARAMETER;
 
-   if (!ExportDir || !i || !ProcedureAddress)
-     {
-       return STATUS_INVALID_PARAMETER;
-     }
+   AddressPtr = (PULONG)RVA(BaseAddress, ExportDir->AddressOfFunctions);
 
-   AddressPtr = (PULONG)((ULONG)BaseAddress + (ULONG)ExportDir->AddressOfFunctions);
    if (Name && Name->Length)
-     {
-       /* by name */
-       OrdinalPtr = (PUSHORT)((ULONG)BaseAddress + (ULONG)ExportDir->AddressOfNameOrdinals);
-       NamePtr = (PULONG)((ULONG)BaseAddress + (ULONG)ExportDir->AddressOfNames);
-       for (i = 0; i < ExportDir->NumberOfNames; i++, NamePtr++, OrdinalPtr++)
-         {
-            if (!_strnicmp(Name->Buffer, (char*)(BaseAddress + *NamePtr), Name->Length))
-              {
-                 *ProcedureAddress = (PVOID)((ULONG)BaseAddress + (ULONG)AddressPtr[*OrdinalPtr]);
-                 return STATUS_SUCCESS;
-              }
-         }
-       DbgPrint("LdrGetProcedureAddress: Can't resolve symbol '%Z'\n", Name);
-     }
+   {
+      LONG minn, maxn, mid, res;
+
+      /* Search for export by name */
+
+      /*
+       * NOTE: Exports are always sorted and so we can apply binary search.
+       * Also the function names are _case sensitive_, so respect that.
+       * -- Filip Navara, August 1st, 2005
+       */
+
+      OrdinalPtr = (PUSHORT)RVA(BaseAddress, ExportDir->AddressOfNameOrdinals);
+      NamePtr = (PULONG)RVA(BaseAddress, ExportDir->AddressOfNames);
+
+      minn = 0; maxn = ExportDir->NumberOfNames - 1;
+      while (minn <= maxn)
+      {
+         mid = (minn + maxn) / 2;
+         CurrentNamePtr = (PCHAR)RVA(BaseAddress, NamePtr[mid]);
+         res = strncmp(CurrentNamePtr, Name->Buffer, Name->Length);
+         if (res == 0)
+         {
+            /*
+             * Check if the beginning of the name matched, but it's still
+             * not the whole name.
+             */
+            if (CurrentNamePtr[Name->Length] != 0)
+            {
+               res = -1;
+            }
+            else
+            {
+               *ProcedureAddress = (PVOID)RVA(BaseAddress, AddressPtr[OrdinalPtr[mid]]);
+               return STATUS_SUCCESS;
+            }
+         }
+         if (res > 0)
+            maxn = mid - 1;
+         else
+            minn = mid + 1;
+      }
+
+      CPRINT("LdrGetProcedureAddress: Can't resolve symbol '%Z'\n", Name);
+   }
    else
-     {
-       /* by ordinal */
-       Ordinal &= 0x0000FFFF;
-       if (Ordinal - ExportDir->Base < ExportDir->NumberOfFunctions)
-         {
-            *ProcedureAddress = (PVOID)((ULONG)BaseAddress + (ULONG)AddressPtr[Ordinal - ExportDir->Base]);
-            return STATUS_SUCCESS;
-         }
-       DbgPrint("LdrGetProcedureAddress: Can't resolve symbol @%d\n", Ordinal);
-  }
+   {
+      /* Search for export by ordinal */
+
+      Ordinal &= 0x0000FFFF;
+      if (Ordinal - ExportDir->Base < ExportDir->NumberOfFunctions)
+      {
+         *ProcedureAddress = (PVOID)RVA(BaseAddress, AddressPtr[Ordinal - ExportDir->Base]);
+         return STATUS_SUCCESS;
+      }
+
+      CPRINT("LdrGetProcedureAddress: Can't resolve symbol @%d\n", Ordinal);
+   }
 
    return STATUS_PROCEDURE_NOT_FOUND;
 }