[mjansen] 71312: [APPHELP] Remove imagehlp.dll dependency. CORE-10367

Author: mjansen
Date: Tue May 10 20:42:37 2016
New Revision: 71312

URL: http://svn.reactos.org/svn/reactos?rev=71312&view=rev
Log:
[APPHELP] Remove imagehlp.dll dependency. CORE-10367

Modified:
    trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt
    trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c

Modified: trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/CMak…
==============================================================================
--- trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt	[iso-8859-1] Tue May 10 20:42:37
2016
@@ -16,7 +16,6 @@
 
 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)

Modified: trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbf…
==============================================================================
--- trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c	[iso-8859-1] Tue May 10 20:42:37
2016
@@ -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 @@
         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,
&section);
+            PBYTE export_name = RtlImageRvaToVa(headers, mapped.view,
export_dir->Name, &section);
             if (export_name)
                 SdbpSetStringAttrFromAnsiString(&attr_info[25], TAG_EXPORT_NAME,
export_name, strlen((char*)export_name));
             else