From 4a7af46ceef5b4e5369dd6630180041c3b73a212 Mon Sep 17 00:00:00 2001 From: Mark Jansen Date: Tue, 10 May 2016 20:42:37 +0000 Subject: [PATCH] [APPHELP] Remove imagehlp.dll dependency. CORE-10367 svn path=/trunk/; revision=71312 --- reactos/dll/appcompat/apphelp/CMakeLists.txt | 3 +-- reactos/dll/appcompat/apphelp/sdbfileattr.c | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/reactos/dll/appcompat/apphelp/CMakeLists.txt b/reactos/dll/appcompat/apphelp/CMakeLists.txt index 58642ffb3d0..6f40d1cf17c 100644 --- a/reactos/dll/appcompat/apphelp/CMakeLists.txt +++ b/reactos/dll/appcompat/apphelp/CMakeLists.txt @@ -16,7 +16,6 @@ add_library(apphelp SHARED set_module_type(apphelp win32dll) target_link_libraries(apphelp wine) -# When binutils is fixed, we should move imagehlp to delay! CORE-6504 add_delay_importlibs(apphelp version) -add_importlibs(apphelp msvcrt imagehlp kernel32 ntdll) +add_importlibs(apphelp msvcrt kernel32 ntdll) add_cd_file(TARGET apphelp DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/appcompat/apphelp/sdbfileattr.c b/reactos/dll/appcompat/apphelp/sdbfileattr.c index 2fab304c369..349501cc96f 100644 --- a/reactos/dll/appcompat/apphelp/sdbfileattr.c +++ b/reactos/dll/appcompat/apphelp/sdbfileattr.c @@ -18,11 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "apphelp.h" #include "imagehlp.h" #include "winver.h" +#include "rtlfuncs.h" #include "wine/unicode.h" @@ -334,11 +336,11 @@ BOOL WINAPI SdbGetFileAttributes(LPCWSTR path, PATTRINFO *attr_info_ret, LPDWORD SdbpSetDWORDAttr(&attr_info[23], TAG_LINK_DATE, headers->FileHeader.TimeDateStamp); SdbpSetDWORDAttr(&attr_info[24], TAG_UPTO_LINK_DATE, headers->FileHeader.TimeDateStamp); - export_dir = (PIMAGE_EXPORT_DIRECTORY)ImageDirectoryEntryToData(mapped.view, FALSE, IMAGE_DIRECTORY_ENTRY_EXPORT, &export_dir_size); + export_dir = (PIMAGE_EXPORT_DIRECTORY)RtlImageDirectoryEntryToData(mapped.view, FALSE, IMAGE_DIRECTORY_ENTRY_EXPORT, &export_dir_size); if (export_dir && ((PBYTE)(export_dir+1) <= mapping_end)) { PIMAGE_SECTION_HEADER section = NULL; - PBYTE export_name = ImageRvaToVa(headers, mapped.view, export_dir->Name, §ion); + PBYTE export_name = RtlImageRvaToVa(headers, mapped.view, export_dir->Name, §ion); if (export_name) SdbpSetStringAttrFromAnsiString(&attr_info[25], TAG_EXPORT_NAME, export_name, strlen((char*)export_name)); else