Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3900 → Rev 3915

/programs/develop/libraries/newlib/pe/crtloader.c
39,7 → 39,7
return (val & (val - 1)) == 0;
}
 
int validate_pe(void *raw, size_t raw_size, int is_exec)
int validate_pe(void *raw, size_t raw_size)
{
PIMAGE_DOS_HEADER dos;
PIMAGE_NT_HEADERS32 nt;
63,15 → 63,9
if(nt->FileHeader.Machine != IMAGE_FILE_MACHINE_I386)
return 0;
 
if(is_exec && (nt->FileHeader.Characteristics & IMAGE_FILE_DLL))
return 0;
 
if(nt->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC)
return 0;
 
if( is_exec && nt->OptionalHeader.ImageBase != 0)
return 0;
 
if(nt->OptionalHeader.SectionAlignment < 4096)
{
if(nt->OptionalHeader.FileAlignment != nt->OptionalHeader.SectionAlignment)
214,7 → 208,7
 
// printf("libc.dll raw %p, size %d\n", raw_img, raw_size);
 
if(validate_pe(raw_img, raw_size, 0) != 0)
if(validate_pe(raw_img, raw_size) != 0)
{
// printf("invalide libc.dll\n");
img_base = create_image(raw_img);
/programs/develop/libraries/newlib/pe/loader.c
686,7 → 686,7
memcpy(path+dllpath->path_len, libname, len);
path[len+dllpath->path_len]=0;
 
printf("%s\n", path);
// printf("%s\n", path);
 
img_base = load_lib_internal(path);