From 76fc4175889da8d63d8a8b8e5ad67f73727e3306 Mon Sep 17 00:00:00 2001
From: "Marcus R. Brown" <mrbrown@0xd6.org>
Date: Fri, 21 Nov 2003 21:31:35 +0000
Subject: [PATCH] Replace various routines with a forward to ntdll.

---
 dlls/imagehlp/Makefile.in   |  2 +-
 dlls/imagehlp/access.c      | 52 +++----------------------------------
 dlls/imagehlp/imagehlp.spec |  8 +++---
 dlls/imagehlp/modify.c      |  4 ++-
 4 files changed, 11 insertions(+), 55 deletions(-)

diff --git a/dlls/imagehlp/Makefile.in b/dlls/imagehlp/Makefile.in
index 0e5f9b7f511..21646ef961e 100644
--- a/dlls/imagehlp/Makefile.in
+++ b/dlls/imagehlp/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imagehlp.dll
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	access.c \
diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c
index 558788b5160..5c94deb4aa4 100644
--- a/dlls/imagehlp/access.c
+++ b/dlls/imagehlp/access.c
@@ -23,6 +23,8 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winnt.h"
+#include "winreg.h"
+#include "winternl.h"
 #include "winerror.h"
 #include "wine/debug.h"
 #include "imagehlp.h"
@@ -106,19 +108,6 @@ DWORD WINAPI GetImageUnusedHeaderBytes(
   return 0;
 }
 
-/***********************************************************************
- *		ImageDirectoryEntryToData (IMAGEHLP.@)
- */
-PVOID WINAPI ImageDirectoryEntryToData(
-  PVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size)
-{
-  FIXME("(%p, %d, %hd, %p): stub\n",
-    Base, MappedAsImage, DirectoryEntry, Size
-  );
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return NULL;
-}
-
 /***********************************************************************
  *		ImageLoad (IMAGEHLP.@)
  */
@@ -135,41 +124,6 @@ PLOADED_IMAGE WINAPI ImageLoad(LPSTR DllName, LPSTR DllPath)
   return pLoadedImage;
 }
 
-/***********************************************************************
- *		ImageNtHeader (IMAGEHLP.@)
- */
-PIMAGE_NT_HEADERS WINAPI ImageNtHeader(PVOID Base)
-{
-  TRACE("(%p)\n", Base);
-  return (PIMAGE_NT_HEADERS)
-    ((LPBYTE) Base + ((PIMAGE_DOS_HEADER) Base)->e_lfanew);
-}
-
-/***********************************************************************
- *		ImageRvaToSection (IMAGEHLP.@)
- */
-PIMAGE_SECTION_HEADER WINAPI ImageRvaToSection(
-  PIMAGE_NT_HEADERS NtHeaders, PVOID Base, ULONG Rva)
-{
-  FIXME("(%p, %p, %ld): stub\n", NtHeaders, Base, Rva);
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return NULL;
-}
-
-/***********************************************************************
- *		ImageRvaToVa (IMAGEHLP.@)
- */
-PVOID WINAPI ImageRvaToVa(
-  PIMAGE_NT_HEADERS NtHeaders, PVOID Base, ULONG Rva,
-  PIMAGE_SECTION_HEADER *LastRvaSection)
-{
-  FIXME("(%p, %p, %ld, %p): stub\n",
-    NtHeaders, Base, Rva, LastRvaSection
-  );
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return NULL;
-}
-
 /***********************************************************************
  *		ImageUnload (IMAGEHLP.@)
  */
@@ -268,7 +222,7 @@ BOOL WINAPI MapAndLoad(
     IMAGEHLP_hHeap, 0, sizeof(LOADED_IMAGE)
   );
 
-  pNtHeader = ImageNtHeader((PVOID) hModule);
+  pNtHeader = RtlImageNtHeader(hModule);
 
   pLoadedImage->ModuleName = HeapAlloc(IMAGEHLP_hHeap, 0, strlen(pszDllPath)+1); /* FIXME: Correct? */
   strcpy( pLoadedImage->ModuleName, pszDllPath );
diff --git a/dlls/imagehlp/imagehlp.spec b/dlls/imagehlp/imagehlp.spec
index 24dd73473fb..ebe4fe86a4d 100644
--- a/dlls/imagehlp/imagehlp.spec
+++ b/dlls/imagehlp/imagehlp.spec
@@ -8,16 +8,16 @@
 @ stdcall GetImageUnusedHeaderBytes(ptr ptr)
 @ stdcall GetTimestampForLoadedLibrary(long)
 @ stdcall ImageAddCertificate(long ptr ptr)
-@ stdcall ImageDirectoryEntryToData(ptr long long ptr)
+@ stdcall ImageDirectoryEntryToData(ptr long long ptr) ntdll.RtlImageDirectoryEntryToData
 @ stdcall ImageEnumerateCertificates(long long ptr ptr long)
 @ stdcall ImageGetCertificateData(long long ptr ptr)
 @ stdcall ImageGetCertificateHeader(long long ptr)
 @ stdcall ImageGetDigestStream(long long ptr long)
 @ stdcall ImageLoad(str str)
-@ stdcall ImageNtHeader(ptr)
+@ stdcall ImageNtHeader(ptr) ntdll.RtlImageNtHeader
 @ stdcall ImageRemoveCertificate(long long)
-@ stdcall ImageRvaToSection(ptr ptr long)
-@ stdcall ImageRvaToVa(ptr ptr long ptr)
+@ stdcall ImageRvaToSection(ptr ptr long) ntdll.RtlImageRvaToSection
+@ stdcall ImageRvaToVa(ptr ptr long ptr) ntdll.RtlImageRvaToVa
 @ stdcall ImageUnload(ptr)
 @ stdcall ImagehlpApiVersion()
 @ stdcall ImagehlpApiVersionEx(ptr)
diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c
index d4f2370ef08..f7df8de81d8 100644
--- a/dlls/imagehlp/modify.c
+++ b/dlls/imagehlp/modify.c
@@ -22,6 +22,8 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "winreg.h"
+#include "winternl.h"
 #include "winerror.h"
 #include "wine/debug.h"
 #include "imagehlp.h"
@@ -101,7 +103,7 @@ PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile(
 				BaseAddress,
 				(FileLength + 1) / sizeof(WORD));
 
-  Header = ImageNtHeader(BaseAddress);
+  Header = RtlImageNtHeader(BaseAddress);
   HdrSum = Header->OptionalHeader.CheckSum;
 
   /* Subtract image checksum from calculated checksum. */