Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 08:53:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[APPHELP] Remove imagehlp.dll dependency. CORE-10367

Browse source 
svn path=/trunk/; revision=71312
This commit is contained in:
Mark Jansen 2016-05-10 20:42:37 +00:00
parent 67c8423d4f
commit 4a7af46cee
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/dll/appcompat/apphelp/CMakeLists.txt
View file

@ -16,7 +16,6 @@ add_library(apphelp SHARED
set_module_type(apphelp win32dll) set_module_type(apphelp win32dll)
target_link_libraries(apphelp wine) target_link_libraries(apphelp wine)
# When binutils is fixed, we should move imagehlp to delay! CORE-6504
add_delay_importlibs(apphelp version) 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) add_cd_file(TARGET apphelp DESTINATION reactos/system32 FOR all)

6
reactos/dll/appcompat/apphelp/sdbfileattr.c
View file

@ -18,11 +18,13 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "apphelp.h" #include "apphelp.h"
#include "imagehlp.h" #include "imagehlp.h"
#include "winver.h" #include "winver.h"
#include "rtlfuncs.h"
#include "wine/unicode.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[23], TAG_LINK_DATE, headers->FileHeader.TimeDateStamp);
SdbpSetDWORDAttr(&attr_info[24], TAG_UPTO_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)) if (export_dir && ((PBYTE)(export_dir+1) <= mapping_end))
{ {
PIMAGE_SECTION_HEADER section = NULL; 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) if (export_name)
SdbpSetStringAttrFromAnsiString(&attr_info[25], TAG_EXPORT_NAME, export_name, strlen((char*)export_name)); SdbpSetStringAttrFromAnsiString(&attr_info[25], TAG_EXPORT_NAME, export_name, strlen((char*)export_name));
else else