imagehlp: forward duplicated exports
Marcus R. Brown
mrbrown at 0xd6.org
Fri Nov 21 10:35:10 CST 2003
Per Dmitry Timoshkov's suggestion. Please disregard the previous imagehlp
patch.
* dlls/imagehlp/Makefile.in, dlls/imagehlp/access.c,
dlls/imagehlp/imagehlp.spec, dlls/imagehlp/modify.c:
Marcus R. Brown <mrbrown at 0xd6.org>
Replace various routines with a forward to ntdll.
Index: dlls/imagehlp/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/imagehlp/Makefile.in,v
retrieving revision 1.17
diff -u -b -B -w -p -r1.17 Makefile.in
--- dlls/imagehlp/Makefile.in 11 Oct 2003 01:09:19 -0000 1.17
+++ dlls/imagehlp/Makefile.in 21 Nov 2003 16:27:43 -0000
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = imagehlp.dll
-IMPORTS = kernel32
+IMPORTS = ntdll kernel32
C_SRCS = \
access.c \
Index: dlls/imagehlp/access.c
===================================================================
RCS file: /home/wine/wine/dlls/imagehlp/access.c,v
retrieving revision 1.18
diff -u -b -B -w -p -r1.18 access.c
--- dlls/imagehlp/access.c 5 Sep 2003 23:08:37 -0000 1.18
+++ dlls/imagehlp/access.c 21 Nov 2003 16:27:43 -0000
@@ -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"
@@ -107,19 +109,6 @@ DWORD WINAPI GetImageUnusedHeaderBytes(
}
/***********************************************************************
- * 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.@)
*/
PLOADED_IMAGE WINAPI ImageLoad(LPSTR DllName, LPSTR DllPath)
@@ -136,41 +125,6 @@ PLOADED_IMAGE WINAPI ImageLoad(LPSTR Dll
}
/***********************************************************************
- * 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.@)
*/
BOOL WINAPI ImageUnload(PLOADED_IMAGE pLoadedImage)
@@ -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 );
Index: dlls/imagehlp/imagehlp.spec
===================================================================
RCS file: /home/wine/wine/dlls/imagehlp/imagehlp.spec,v
retrieving revision 1.10
diff -u -b -B -w -p -r1.10 imagehlp.spec
--- dlls/imagehlp/imagehlp.spec 20 Mar 2003 03:53:15 -0000 1.10
+++ dlls/imagehlp/imagehlp.spec 21 Nov 2003 16:27:43 -0000
@@ -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)
Index: dlls/imagehlp/modify.c
===================================================================
RCS file: /home/wine/wine/dlls/imagehlp/modify.c,v
retrieving revision 1.12
diff -u -b -B -w -p -r1.12 modify.c
--- dlls/imagehlp/modify.c 5 Sep 2003 23:08:37 -0000 1.12
+++ dlls/imagehlp/modify.c 21 Nov 2003 16:27:43 -0000
@@ -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 CheckSumMappedF
BaseAddress,
(FileLength + 1) / sizeof(WORD));
- Header = ImageNtHeader(BaseAddress);
+ Header = RtlImageNtHeader((HMODULE)BaseAddress);
HdrSum = Header->OptionalHeader.CheckSum;
/* Subtract image checksum from calculated checksum. */
More information about the wine-patches
mailing list