WebSVN – Kolibri OS – Diff – /programs/develop/cedit/SRC/KOSAPI.ob07

 VAR
-    DLL_INIT: PROCEDURE [stdcall] (entry: INTEGER);
-    imp_error*: RECORD
-        proc*, lib*: STRING;
-        error*: INTEGER
-    END;
+    DLL_INIT: PROCEDURE [stdcall] (entry: INTEGER);
 PROCEDURE mem_commit (adr, size: INTEGER);
-VAR
-    tmp: INTEGER;
+VAR
     tmp: INTEGER;
 BEGIN
     FOR tmp := adr TO adr + size - 1 BY 4096 DO
         SYSTEM.PUT(tmp, 0)
     END
 END mem_commit;
 PROCEDURE [stdcall] malloc* (size: INTEGER): INTEGER;
-VAR
+PROCEDURE [stdcall] malloc* (size: INTEGER): INTEGER;
-    ptr: INTEGER;
+VAR
     ptr: INTEGER;
 BEGIN
 PROCEDURE AppAdr (): INTEGER;
 VAR
     buf: ARRAY 1024 OF CHAR;
-    a: INTEGER;
     a: INTEGER;
 BEGIN
     a := sysfunc3(9, SYSTEM.ADR(buf), -1);
     SYSTEM.GET(SYSTEM.ADR(buf) + 22, a)
     RETURN a
 END AppAdr;
-PROCEDURE GetCommandLine* (): INTEGER;
-VAR
+PROCEDURE GetCommandLine* (): INTEGER;
-    param: INTEGER;
+VAR
     param: INTEGER;
 BEGIN
     SYSTEM.GET(28 + AppAdr(), param)
     RETURN param
 END GetCommandLine;
 PROCEDURE GetName* (): INTEGER;
-VAR
+PROCEDURE GetName* (): INTEGER;
-    name: INTEGER;
+VAR
 PROCEDURE GetProcAdr* (name: ARRAY OF CHAR; lib: INTEGER): INTEGER;
 VAR
-    cur, procname, adr: INTEGER;
     cur, procname, adr: INTEGER;
     PROCEDURE streq (str1, str2: INTEGER): BOOLEAN;
-    VAR
-        c1, c2: CHAR;
+    VAR
         c1, c2: CHAR;
     BEGIN
         REPEAT
             SYSTEM.GET(str1, c1);
         UNTIL (c1 # c2) OR (c1 = 0X)
         RETURN c1 = c2
-    END streq;
     END streq;
 BEGIN
     adr := 0;
     IF (lib # 0) & (name # "") THEN
 PROCEDURE init (dll: INTEGER);
-VAR
-    lib_init: INTEGER;
+VAR
     lib_init: INTEGER;
 BEGIN
     lib_init := GetProcAdr("lib_init", dll);
     IF lib_init # 0 THEN
         DLL_INIT(lib_init)
     END
 END init;
+PROCEDURE OutChar* (c: CHAR);
+BEGIN
+    sysfunc3(63, 1, ORD(c))
+END OutChar;
+PROCEDURE OutLn*;
+BEGIN
+    OutChar(0DX);
+    OutChar(0AX)
+END OutLn;
+PROCEDURE OutString (s: ARRAY OF CHAR);
+VAR
+    i: INTEGER;
+BEGIN
+    i := 0;
+    WHILE (i < LEN(s)) & (s[i] # 0X) DO
+        OutChar(s[i]);
+        INC(i)
+    END
+END OutString;
+PROCEDURE imp_error (lib, proc: STRING);
+BEGIN
+    OutString("import error: ");
+    IF proc = "" THEN
+        OutString("can't load '")
+    ELSE
+        OutString("not found '"); OutString(proc); OutString("' in '")
+    END;
+    OutString(lib);
+    OutString("'" + 0DX + 0AX)
+END imp_error;
 PROCEDURE GetStr (adr, i: INTEGER; VAR str: STRING);
 VAR
     c: CHAR;
         str[i] := c; INC(i)
     UNTIL c = 0X
 END GetStr;
-PROCEDURE [stdcall] dll_Load* (import_table: INTEGER): INTEGER;
+PROCEDURE [stdcall-] dll_Load* (import_table: INTEGER): INTEGER;
 CONST
 	path = "/sys/lib/";
-VAR
-    imp, lib, exp, proc, res, pathLen: INTEGER;
+VAR
-    fail, done: BOOLEAN;
-    procname, libname: STRING;
+    imp, lib, exp, proc, pathLen: INTEGER;
     procname, libname: STRING;
-BEGIN
-    SYSTEM.CODE(060H); (* pusha *)
-    fail := FALSE;
-    done := FALSE;
+BEGIN
-    res := 0;
+    SYSTEM.CODE(060H); (* pusha *)
     libname := path;
     pathLen := LENGTH(libname);
-    REPEAT
-        SYSTEM.GET(import_table, imp);
+    SYSTEM.GET(import_table, imp);
-        IF imp # 0 THEN
+    WHILE imp # 0 DO
-            SYSTEM.GET(import_table + 4, lib);
+        SYSTEM.GET(import_table + 4, lib);
-            GetStr(lib, pathLen, libname);
+        GetStr(lib, pathLen, libname);
+        exp := sysfunc3(68, 19, SYSTEM.ADR(libname[0]));
-            exp := sysfunc3(68, 19, SYSTEM.ADR(libname[0]));
+        IF exp = 0 THEN
-            fail := exp = 0;
-        ELSE
-            done := TRUE
-        END;
-        IF fail THEN
-            done := TRUE;
-            imp_error.proc := "";
-            imp_error.lib  := libname;
-            imp_error.error := 1
-        END;
+            imp_error(libname, "")
-        IF (imp # 0) & ~fail THEN
+        ELSE
             REPEAT
                 SYSTEM.GET(imp, proc);
                 IF proc # 0 THEN
                     GetStr(proc, 0, procname);
                     proc := GetProcAdr(procname, exp);
-                    IF proc # 0 THEN
-                        SYSTEM.PUT(imp, proc);
+                    IF proc # 0 THEN
-                        INC(imp, 4)
+                        SYSTEM.PUT(imp, proc)
                     ELSE
-                        imp_error.proc  := procname;
+                    	proc := 1;
-                        imp_error.lib   := libname;
+                        imp_error(libname, procname)
-                        imp_error.error := 2
+                    END;
-                    END
+                    INC(imp, 4)
                 END
-            UNTIL proc = 0;
-            init(exp);
-            INC(import_table, 8)
-        END
-    UNTIL done;
-    IF fail THEN
+            UNTIL proc = 0;
-        res := 1
+            init(exp)
+        END;
+        INC(import_table, 8);
+        SYSTEM.GET(import_table, imp);
     END;
-    import_table := res;
     SYSTEM.CODE(061H) (* popa *)
-    RETURN import_table
+    RETURN 0
 END dll_Load;
 PROCEDURE LoadLib* (name: ARRAY OF CHAR): INTEGER;
-VAR
-    Lib: INTEGER;
+VAR
     Lib: INTEGER;
 BEGIN
     DLL_INIT := dll_Init;
     Lib := sysfunc3(68, 19, SYSTEM.ADR(name[0]));
     IF Lib # 0 THEN
         init(Lib)
     END
     RETURN Lib
 END LoadLib;
-PROCEDURE _init*;
-BEGIN
-    DLL_INIT := dll_Init;
+PROCEDURE _init* (import_table: INTEGER);
-    imp_error.lib   := "";
+BEGIN
-    imp_error.proc  := "";
+    DLL_INIT := dll_Init;

Subversion Repositories Kolibri OS

(root)/programs/develop/cedit/SRC/KOSAPI.ob07 @ 9194 – Rev 9577 → 9645