WebSVN – Kolibri OS – Diff – /contrib/sdk/sources/newlib/libc/pe/loader.c

     char       *img_path;
     uint32_t    refcount;
-    void       *start;
+    char       *start;
-    uint32_t    end;
+    char       *end;
     void       *entry;
     char *path;
     int   path_len;
 }dll_path_t;
-module_t* load_library(const char *name);
 LIST_HEAD(path_list);
     exp =  MakePtr(PIMAGE_EXPORT_DIRECTORY, libc_image,
                    nt->OptionalHeader.DataDirectory[0].VirtualAddress);
     libc_dll.start = libc_image;
-    libc_dll.end   = MakePtr(uint32_t,libc_image, nt->OptionalHeader.SizeOfImage);
+    libc_dll.end   = MakePtr(char*,libc_image, nt->OptionalHeader.SizeOfImage);
     libc_dll.img_hdr  = nt;
     libc_dll.img_sec  = MakePtr(PIMAGE_SECTION_HEADER,nt, sizeof(IMAGE_NT_HEADERS32));
     libc_dll.img_exp  = MakePtr(PIMAGE_EXPORT_DIRECTORY,libc_image,
     };
     return img_base;
 };
-//static jmp_buf loader_env;
-//static loader_recursion;
 int link_image(void *img_base, PIMAGE_IMPORT_DESCRIPTOR imp)
+{
     static jmp_buf loader_env;
                         continue;
                     };
                 };
                 minn = 0;
                 maxn = exp->NumberOfNames - 1;
                 while (minn <= maxn)
+                {
                     int mid;
     return  MakePtr(void*, raw, nt->OptionalHeader.AddressOfEntryPoint);
 };
+void *get_proc_address(void *handle, const char *proc_name)
 void *get_proc_address(module_t *module, char *proc_name)
     module_t *module = handle;
     PIMAGE_DOS_HEADER        expdos;
     return img_base;
+}
-module_t* load_library(const char *name)
+void* load_library(const char *name)
+{
     PIMAGE_DOS_HEADER        dos;
     PIMAGE_NT_HEADERS32      nt;
     if( unlikely(img_base == NULL) )
+    {
         printf("unable to load %s\n", name);
-        return NULL;
+        return 0;
     };
-    module = (module_t*)malloc(sizeof(module_t));
+    module = malloc(sizeof(module_t));
     if(unlikely(module == NULL))
+    {
     nt  =  MakePtr( PIMAGE_NT_HEADERS32, dos, dos->e_lfanew);
     exp =  MakePtr(PIMAGE_EXPORT_DIRECTORY, img_base,
                nt->OptionalHeader.DataDirectory[0].VirtualAddress);
-    module->end   = MakePtr(uint32_t,img_base, nt->OptionalHeader.SizeOfImage);
+    module->end   = MakePtr(char*,img_base, nt->OptionalHeader.SizeOfImage);
     module->img_hdr  = nt;
     module->img_sec  = MakePtr(PIMAGE_SECTION_HEADER,nt, sizeof(IMAGE_NT_HEADERS32));
     module->img_exp  = MakePtr(PIMAGE_EXPORT_DIRECTORY, img_base,
     free(module);
 err1:
     user_free(img_base);
     return NULL;
 };
-};
+void enumerate_libraries(int (*callback)(void *handle, const char* name,
+                                         uint32_t base, uint32_t size, void *user_data),
+                         void *user_data)
+{
+    module_t *mod = &libc_dll;
+    do
+    {
+        if(0 == callback(mod, mod->img_name, (uint32_t)mod->start,
+                         mod->end - mod->start, user_data))
+            break;
+        mod = (module_t*)mod->list.next;
+    }while(mod != &libc_dll);

Subversion Repositories Kolibri OS

(root)/contrib/sdk/sources/newlib/libc/pe/loader.c – Rev 5022 → 5190