WebSVN – Kolibri OS – Path Comparison – / – /programs Rev 3013 and /programs Rev 3014

Regard whitespace Rev 3013 → Rev 3014

 /programs/develop/info3ds/info3ds.asm
 ,8 → 13,7
 include '../../proc32.inc'
 include '../../develop/libraries/box_lib/load_lib.mac'
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
-include 'mem.inc'
-include 'dll.inc'
+include '../../dll.inc'
 include 'lang.inc'
 include 'info_fun_float.inc'

 /programs/develop/kol_f_edit/kol_f_edit.asm
 ,8 → 13,7
 include '../../proc32.inc'
 include '../../develop/libraries/box_lib/load_lib.mac'
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
-include 'mem.inc'
-include 'dll.inc'
+include '../../dll.inc'
 include 'strlen.inc'
 include 'obj_codes.inc'

 /programs/develop/libraries/buf2d/trunk/examples/e2_images.asm
 ,8 → 10,7
 include '../../../../../macros.inc'
 include '../../../../../proc32.inc'
 include '../../../../../develop/libraries/box_lib/load_lib.mac'
-include 'mem.inc'
-include 'dll.inc'
+include '../../../../../dll.inc'
 @use_library_mem mem.Alloc,mem.Free,mem.ReAlloc, dll.Load

 /programs/develop/libraries/buf2d/trunk/examples/e3_text.asm
 ,8 → 10,7
 include '../../../../../macros.inc'
 include '../../../../../proc32.inc'
 include '../../../../../develop/libraries/box_lib/load_lib.mac'
-include 'mem.inc'
-include 'dll.inc'
+include '../../../../../dll.inc'
 @use_library_mem mem.Alloc,mem.Free,mem.ReAlloc, dll.Load

 /programs/develop/libraries/libs-dev/.test/001/test001.asm
 ,7 → 17,7
 include '../../../../../proc32.inc'
 include '../../../../../macros.inc'
 include '../../libio/libio.inc'
-include '../dll.inc'
+include '../../../../../dll.inc'
 yy dd 20
 ,70 → 275,6
 _f_path db '/rd/1/lib',0
 _f_mask db '*ini*',0
-;-----------------------------------------------------------------------------
-proc mem.Alloc size ;/////////////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-        push    ebx ecx
-        mov     eax,[size]
-        lea     ecx,[eax+4+4095]
-        and     ecx,not 4095
-        mcall   68,12
-        add     ecx,-4
-        mov     [eax],ecx
-        add     eax,4
-        pop     ecx ebx
-        ret
-endp
-;-----------------------------------------------------------------------------
-proc mem.ReAlloc mptr,size;///////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-        push    ebx ecx esi edi eax
-        mov     eax,[mptr]
-        mov     ebx,[size]
-        or      eax,eax
-        jz      @f
-        lea     ecx,[ebx+4+4095]
-        and     ecx,not 4095
-        add     ecx,-4
-        cmp     ecx,[eax-4]
-        je      .exit
-    @@: mov     eax,ebx
-        call    mem.Alloc
-        xchg    eax,[esp]
-        or      eax,eax
-        jz      .exit
-        mov     esi,eax
-        xchg    eax,[esp]
-        mov     edi,eax
-        mov     ecx,[esi-4]
-        cmp     ecx,[edi-4]
-        jbe     @f
-        mov     ecx,[edi-4]
-    @@: add     ecx,3
-        shr     ecx,2
-        cld
-        rep     movsd
-        xchg    eax,[esp]
-        call    mem.Free
-  .exit:
-        pop     eax edi esi ecx ebx
-        ret
-endp
-;-----------------------------------------------------------------------------
-proc mem.Free mptr ;//////////////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-        mov     eax,[mptr]
-        or      eax,eax
-        jz      @f
-        push    ebx ecx
-        lea     ecx,[eax-4]
-        mcall   68,13
-        pop     ecx ebx
-    @@: ret
-endp
 ;---------------------------------------------------------------------
 ;---  ÄÀÍÍÛÅ ÏÐÎÃÐÀÌÌÛ  ----------------------------------------------
 ;---------------------------------------------------------------------

 /programs/develop/libraries/libs-dev/.test/002/test002.asm
 ,7 → 11,7
 include '../../../../../proc32.inc'
 include '../../../../../macros.inc'
-include '../dll.inc'
+include '../../../../../dll.inc'
 include '../../libio/libio.inc'
 include '../../libimg/libimg.inc'
 ,56 → 138,7
         ret
 ;-----------------------------------------------------------------------------
-proc mem.Alloc, size ;////////////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-        push    ebx ecx
-        mov     ecx, [size]
-        add     ecx, 4
-        mcall   68, 12
-        add     ecx, -4
-        mov     [eax], ecx
-        add     eax, 4
-        pop     ecx ebx
-        ret
-endp
-;-----------------------------------------------------------------------------
-proc mem.ReAlloc, mptr, size ;////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-        push    ebx ecx edx
-        mov     ecx, [size]
-        or      ecx, ecx
-        jz      @f
-        add     ecx, 4
-    @@: mov     edx, [mptr]
-        or      edx, edx
-        jz      @f
-        add     edx, -4
-    @@: mcall   68, 20
-        or      eax, eax
-        jz      @f
-        add     ecx, -4
-        mov     [eax], ecx
-        add     eax, 4
-    @@: pop     edx ecx ebx
-        ret
-endp
-;-----------------------------------------------------------------------------
-proc mem.Free, mptr ;/////////////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-        push    ebx ecx
-        mov     ecx, [mptr]
-        or      ecx, ecx
-        jz      @f
-        add     ecx, -4
-    @@: mcall   68, 13
-        pop     ecx ebx
-        ret
-endp
-;-----------------------------------------------------------------------------
 s_header db 'Image Viewer (test app)', 0
 ;-----------------------------------------------------------------------------

 /programs/develop/libraries/libs-dev/.test/003/test003.asm
 ,7 → 8,7
 include '../../../../../proc32.inc'
 include '../../../../../macros.inc'
-include '../dll.inc'
+include '../../../../../dll.inc'
 include '../../libio/libio.inc'
 include '../../libimg/libimg.inc'
 ,56 → 148,7
         ret
 ;-----------------------------------------------------------------------------
-proc mem.Alloc, size ;////////////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-        push    ebx ecx
-        mov     ecx, [size]
-        add     ecx, 4
-        mcall   68, 12
-        add     ecx, -4
-        mov     [eax], ecx
-        add     eax, 4
-        pop     ecx ebx
-        ret
-endp
-;-----------------------------------------------------------------------------
-proc mem.ReAlloc, mptr, size ;////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-        push    ebx ecx edx
-        mov     ecx, [size]
-        or      ecx, ecx
-        jz      @f
-        add     ecx, 4
-    @@: mov     edx, [mptr]
-        or      edx, edx
-        jz      @f
-        add     edx, -4
-    @@: mcall   68, 20
-        or      eax, eax
-        jz      @f
-        add     ecx, -4
-        mov     [eax], ecx
-        add     eax, 4
-    @@: pop     edx ecx ebx
-        ret
-endp
-;-----------------------------------------------------------------------------
-proc mem.Free, mptr ;/////////////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-        push    ebx ecx
-        mov     ecx, [mptr]
-        or      ecx, ecx
-        jz      @f
-        add     ecx, -4
-    @@: mcall   68, 13
-        pop     ecx ebx
-        ret
-endp
-;-----------------------------------------------------------------------------
 window_title    db 'libimg to_rgb2 & encode demo',0
 ;input_file     db '/hd0/1/in_1bpp.wbmp',0

 /programs/develop/libraries/network/examples/nslookup.asm
 ,7 → 13,7
 include '../../../../macros.inc'
 purge mov,add,sub
 include '../../../../proc32.inc'
-include 'dll.inc'
+include '../../../../dll.inc'
 include '../network.inc'

 /programs/develop/tinypad/trunk/tinypad.asm
 ,7 → 607,7
 include 'tp-editor.asm'
 include 'tp-recode.asm'
-include 'external/dll.inc'
+include '../../../dll.inc'
 ;-----------------------------------------------------------------------------
 section @DATA ;:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

 /programs/develop/tinypad/trunk/tp-common.asm
 ,51 → 584,3
         ret
 endp
-;-----------------------------------------------------------------------------
-proc mem.Alloc,size ;/////////////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-        push    ebx ecx
-        mov     ecx,[size]
-        ;*** add ecx,4
-        mcall   68,12
-        ;*** add ecx,-4
-        ;*** mov [eax],ecx
-        ;*** add eax,4
-        pop     ecx ebx
-        ret
-endp
-;-----------------------------------------------------------------------------
-proc mem.ReAlloc,mptr,size ;//////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-        push    ebx ecx edx
-        mov     ecx,[size]
-        or      ecx,ecx
-        jz      @f
-        ;*** add ecx,4
-    @@: mov     edx,[mptr]
-        or      edx,edx
-        jz      @f
-        ;*** add edx,-4
-    @@: mcall   68,20
-        or      eax,eax
-        jz      @f
-        ;*** add ecx,-4
-        ;*** mov [eax],ecx
-        ;*** add eax,4
-    @@: pop     edx ecx ebx
-        ret
-endp
-;-----------------------------------------------------------------------------
-proc mem.Free,mptr ;//////////////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-        push    ebx ecx
-        mov     ecx,[mptr]
-        or      ecx,ecx
-        jz      @f
-        ;*** add ecx,-4
-    @@: mcall   68,13
-        pop     ecx ebx
-        ret
-endp

 /programs/dll.inc
 ,0 → 1,144
+;-----------------------------------------------------------------------------
+proc dll.Load, import_table:dword
+        mov     esi, [import_table]
+  .next_lib:
+        mov     edx, [esi]
+        or      edx, edx
+        jz      .exit
+        push    esi
+        mov     esi, [esi + 4]
+        mov     edi, s_libdir.fname
+    @@:
+        lodsb
+        stosb
+        or      al, al
+        jnz     @b
+        mcall   68, 19, s_libdir
+        or      eax, eax
+        jz      .fail
+        stdcall dll.Link, eax, edx
+        stdcall dll.Init, [eax + 4]
+        pop     esi
+        add     esi, 8
+        jmp     .next_lib
+  .exit:
+        xor     eax, eax
+        ret
+  .fail:
+        add     esp, 4
+        xor     eax, eax
+        inc     eax
+        ret
+endp
+;-----------------------------------------------------------------------------
+proc dll.Link, exp:dword, imp:dword
+        push    eax
+        mov     esi, [imp]
+        test    esi, esi
+        jz      .done
+  .next:
+        lodsd
+        test    eax, eax
+        jz      .done
+        stdcall dll.GetProcAddress, [exp], eax
+        or      eax, eax
+        jz      @f
+        mov     [esi - 4], eax
+        jmp     .next
+    @@:
+        mov     dword[esp], 0
+  .done:
+        pop     eax
+        ret
+endp
+;-----------------------------------------------------------------------------
+proc dll.Init, dllentry:dword
+        pushad
+        mov     eax, mem.Alloc
+        mov     ebx, mem.Free
+        mov     ecx, mem.ReAlloc
+        mov     edx, dll.Load
+        stdcall [dllentry]
+        popad
+        ret
+endp
+;-----------------------------------------------------------------------------
+proc dll.GetProcAddress, exp:dword, sz_name:dword
+        mov     edx, [exp]
+        xor     eax, eax
+  .next:
+        or      edx, edx
+        jz      .end
+        cmp     dword[edx], 0
+        jz      .end
+        stdcall strcmp, [edx], [sz_name]
+        test    eax, eax
+        jz      .ok
+        add     edx, 8
+        jmp     .next
+  .ok:
+        mov     eax, [edx + 4]
+  .end:
+        ret
+endp
+;-----------------------------------------------------------------------------
+proc strcmp, str1:dword, str2:dword
+        push    esi edi
+        mov     esi, [str1]
+        mov     edi, [str2]
+        xor     eax, eax
+    @@:
+        lodsb
+        scasb
+        jne     .fail
+        or      al, al
+        jnz     @b
+        jmp     .ok
+  .fail:
+        or      eax, -1
+  .ok:
+        pop     edi esi
+        ret
+endp
+;-----------------------------------------------------------------------------
+s_libdir:
+  db '/sys/lib/'
+  .fname rb 32
+;-----------------------------------------------------------------------------
+proc mem.Alloc, size
+        push    ebx ecx
+        mov     ecx, [size]
+        mcall   68, 12
+        pop     ecx ebx
+        ret
+endp
+;-----------------------------------------------------------------------------
+proc mem.ReAlloc, mptr, size
+        push    ebx ecx edx
+        mov     ecx, [size]
+        or      ecx, ecx
+        jz      @f
+    @@:
+        mov     edx, [mptr]
+        or      edx, edx
+        jz      @f
+    @@:
+        mcall   68, 20
+        or      eax, eax
+        jz      @f
+    @@:
+        pop     edx ecx ebx
+        ret
+endp
+;-----------------------------------------------------------------------------
+proc mem.Free, mptr
+        push    ebx ecx
+        mov     ecx,[mptr]
+        or      ecx,ecx
+        jz      @f
+    @@:
+        mcall   68, 13
+        pop     ecx ebx
+        ret
+endp
+;-----------------------------------------------------------------------------

 /programs/games/nu_pogodi/trunk/nu_pogod.asm
 ,8 → 13,7
 include '../../../proc32.inc'
 include '../../../develop/libraries/box_lib/load_lib.mac'
 include '../../../develop/libraries/box_lib/trunk/box_lib.mac' ;¬ ªà®áë ¤«ï § ¤ ¨ï í«¥¬¥â®¢ box_lib
-include 'mem.inc'
-include 'dll.inc'
+include '../../../dll.inc'
 @use_library_mem mem.Alloc,mem.Free,mem.ReAlloc, dll.Load

 /programs/media/log_el/trunk/log_el.asm
 ,8 → 48,7
 include '../../../proc32.inc'
 include '../../../develop/libraries/box_lib/load_lib.mac'
 include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
-include 'mem.inc'
-include 'dll.inc'
+include '../../../dll.inc'
 include 'le_pole.inc'
 include 'le_signal.inc'

 /programs/media/voxel_editor/trunk/voxel_editor.asm
 ,8 → 12,7
 include '../../../../programs/macros.inc'
 include '../../../../programs/proc32.inc'
 include '../../../../programs/develop/libraries/box_lib/load_lib.mac'
-include 'mem.inc'
-include 'dll.inc'
+include '../../../dll.inc'
 include 'vox_draw.inc'
 @use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load

 /programs/media/zsea/zSea.asm
 ,7 → 473,7
 include 'win_sort.inc'
 include 'win_opti.inc'
 include 'libini.inc'
-include 'dll.inc'
+include '../../../dll.inc'
 include 'data.inc'
 ;---------------------------------------------------------------------
 IM_END:

 /programs/network/airc/trunk/airc.asm
 ,7 → 31,7
 include "../../../macros.inc"
 include "../../../proc32.inc"
 include "../../../develop/libraries/network/network.inc"
-include "dll.inc"
+include "../../../dll.inc"
 ;include "fdo.inc"
 include "eth.inc"
 include "lang.inc"

 /programs/network/downloader/trunk/downloader.asm
 ,7 → 48,7
 include '../../../proc32.inc'
 include '../../../develop/libraries/box_lib/load_lib.mac'
 include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
-include 'dll.inc'
+include '../../../dll.inc'
 include '../../../debug.inc'
 URLMAXLEN       equ 256 ; maximum length of url string

 /programs/network/zeroconf/trunk/zeroconf.asm
 ,7 → 46,7
 include 'ETH.INC'
 include 'debug-fdo.inc'
 include 'dhcp.inc'
-include 'dll.inc'
+include '../../../dll.inc'
 START:                                      ; start of execution

 /programs/other/planet_v/planet_v.asm
 ,8 → 14,7
 include '../../proc32.inc'
 include '../../macros.inc'
-include 'mem.inc'
-include 'dll.inc'
+include '../../dll.inc'
 include '../../develop/libraries/box_lib/load_lib.mac'
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'

 /programs/other/t_edit/t_edit.asm
 ,8 → 22,7
 include '../../proc32.inc'
 ;include '../../config.inc'
 include '../../macros.inc'
-include 'mem.inc'
-include 'dll.inc'
+include '../../dll.inc'
 include '../../develop/libraries/box_lib/load_lib.mac'
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 include '../../system/desktop/trunk/kglobals.inc'

 /programs/system/MyKey/trunk/MyKey.asm
 ,7 → 24,7
 include 'macros.inc'
 include 'editbox_ex.mac'
 include 'load_lib.mac'
-include 'dll.inc'
+include '../../../dll.inc'
 include 'debug.inc'
 DEBUG    equ 0;1

/programs/system/launch/trunk/dll.inc
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/system/launch/trunk/mem.inc
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

 /programs/system/launch/trunk/launch.asm
 ,8 → 46,7
 include 'proc32.inc'
 include 'macros.inc'
 include 'libio.inc'
-include 'mem.inc'
-include 'dll.inc'
+include '../../../dll.inc'
 purge mov

 /programs/system/panel/trunk/@PANEL.ASM
 ,7 → 1237,7
 ;------------------------------------------------------------------------------
 include 'libini.inc'
 ;------------------------------------------------------------------------------
-include 'dll.inc'
+include '../../../dll.inc'
 ;------------------------------------------------------------------------------
 include 'drawappl.inc'
 ;------------------------------------------------------------------------------

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3013 → Rev 3014