WebSVN – Kolibri OS – Diff – /programs/develop/libraries/fontslib/trunk/fonts_lib.asm

         mov     ebp, dword [buffer_read_d] ;point to structure
         mov     ecx, dword [ebp+4]         ;êîë-âî áëîêîâ ÁÄÂÊ
         mov     dword [save_ecx],ecx
         add     ebp, 32 ;ñìåùàåìñÿ äî ÁÄÂÊ
         mov     dword [save_ebp],ebp
-;        mov     dword [save_point_nt],ebp
         cld     ;óñòàíîâêà ôëàãà íàïðàâëåíèÿ
 align 4
 .start_loop:
         push    ecx
         lea     edi,[ebp+0x28] ;â edi óêàçàòåëü íà íà÷àëî èìåíè.
         xor     eax,eax
         mov     ecx,263
-align 4
-.again: mov     al,byte[edi]
-        test    al,al
-        jz      .next_a
-        dec     ecx
-        inc     edi
-        jnz     .again
-        jmp     @f
-;        repe    scasb   ;íàéäåì êîíåö ñòðîêè
+        repne    scasb   ;íàéäåì êîíåö ñòðîêè
-;        jnz     @f
-;;;; èìÿ ïðèñóòñòâóåò, ïðîâåðèì ÿâëÿòñÿ ëè èìÿ ôàéëà ñ ðàñøèðåíèåì fnt )
-;        sub     edi,6   ;.ksf,0
 ;;;;;;;;;;;;;;;;;;;;;;;
 .next_a:
-        sub     edi,4   ;.ksf,0
+        sub     edi,5   ;.ksf,0
         mov     esi,dword name_font
         mov     ecx,name_font_e-name_font
         repe    cmpsb
         jnz     @f
 ;;;;;;;; óðà ýòî íàø ôàéë ò.å. íàø øðèôò ìû íàøëè íóæíûé ôàéëèê ))
 ;;;;;;; îòëè÷íî ñåé÷àñ ïðîâåðèëè ÷òî çàãîëîâîê èìåííî òîò êîòîðûé íàì íóæåí
 ; ñåé÷àñ íóæíî ïåðåðàñïðåäåëèòü áëîêè ò.å. ïî ìåðå íàõîæäåíèÿ áóäåì ïåðåíîñèòü áëîêè
 ; â íà÷àëî áóôåðà
-        mov     dword [save_point_nt],ebp
-;        mov     esi, ebp
-;        mov     ecx,304/4
-;align 4
-;.transfer:
-;        lodsd
-;        stosd
-;        loop .transfer
-;        add     dword [save_point_nt],304       ;óêàçàòåëü íà ñëåäóþùèé áëîê
-;;; ñäåëàëè òàðíñôåð ïåðåìåùåíèå äàííûõ
+        mov     dword [save_point_nt],ebp
         pop     ecx
         mov     dword [esp+28],0
         popad
 align 4
 get_font:
 ; ïîèñê â ìàññèâå øðèôòà ïðè ñîâïàäåíèè ócëîâèé çàãðóçêà øðèôòà
 ; esp+4 = dd width font shl 16 +hight font
 ; esp+0 = dd back
-pop     eax
-        pop     dword [font_x_y]
-push    eax
-;       pop     eax
+;pop     eax
-;       mov     dword [font_x_y],eax
+;        pop     dword [font_x_y]
+;push    eax
 pushad
+        mov     eax,dword [esp+32+4]
+        mov     dword [font_x_y],eax
         xor     eax,eax
         mov     dword [number_function],eax
         mov     dword [index_start_block],eax   ;ïîçèöèÿ â ôàéëå äëÿ ÷òåíèÿ äàííûõ
         mov     dword [flags_],eax              ;ñòàðøàÿ ïîçèöèÿ äëÿ ÷òåíèÿ äàííûõ
         mov     dword [read_block],8            ;ñêîëüêî áàéò ÷èòàòü íàì íóæíî 8 áàéò
         mov     eax,dword [alloc_memory_point]
         lea     edi,dword [eax+4]
         mov     dword [offset_to_string],edi
-;        mov     ecx,dword [save_ecx]            ; êîë-âî èòåðàöèé ò.å. ïðîõîäîâ
-align 4
 ;.start_check:
 ;        push    ecx
         mov     eax,70
         mov     ebx,dword struct_f_info
         mcall
 ;;;;;;;;;;;;;;;; ïðîâåðèì ôîðìàò çàãîëîâêà
         mov     eax,ebx
         mov     eax,dword [file_buffer]
-        mov     ebx,dword [type_fnt]
-        cmp     eax,ebx
-;        jnz     @f
-;        xor     eax,eax
-;        mov     dword [number_function],eax
-;        add     eax,8
-;        mov     dword [read_block],eax
-;        mov     dword [buffer_read_d],file_buffer
-;        mov     ebx,dword struct_f_info
-;        mov     eax,70
-;align 4
-;.start_check:
-;çàãðóçèì çàãîëîâîê ôàéëà è óçíàåì åãî ðàçìåð ãëèôà.
-;        lea     edi, [ebp+0x28] ;â edi óêàçàòåëü íà íà÷àëî èìåíè.
-;        mov     dword [offset_to_string],edi
-;get in buffer info above own file
-;        mcall
-;;;;;;;;;;;;;;;; ïðîâåðèì ôîðìàò çàãîëîâêà
-;        mov     ecx,dword [file_buffer.type_fnt]
-;        mov     edx,dword [type_fnt]
-;        cmp     ecx,edx
+        mov     ebx,dword [type_fnt]
-;        jnz     @f
+        cmp     eax,ebx
-        mov     ecx,dword [file_buffer.font_size]
-        mov     edx,dword [font_x_y]
-        cmp     ecx,edx
-;        jnz     @f      ;óïñ íåóäà÷à âûøëà
+        mov     ecx,dword [file_buffer.font_size]
-;øðèôò ñîâïàë ò.å. ýòî íàø,íóæíûé íàì øðèôò, ìû åãî äîëæíû çàãðóçèòü â ÎÇÓ
+        mov     edx,dword [font_x_y]
         cmp     ecx,edx
 ;        mov     ebp,dword [save_point_nt]
 ;        add     eax,dword [buffer_read_d]
         mov     dword [font_array_data],eax
         mov     dword [esp+28],0
 ;        pop     ecx
 popad
-ret
+ret 4
 ;here error file system
 align 4
-@@:
-;        pop     ecx
-;        add     ebp,304
-;        dec     ecx
- ;       jnz      .start_check
 @@:
         or      dword [esp+28],-1       ;âåðíåì îøèáêó
         popad
-        ret
+        ret 4
         mov     esi,dword [esp+4+32] ;ASCIIZ
         mov     edx,dword [esp+12+32]  ; x shl 16 +y
         mov     ecx,dword [font_x_y]  ;ðàçìåð ãëèôà x shl 16 +y
         mov     edi,dword [esp+8+32]     ;óêàçàòåëü íà ïàëèòðó èç öâåòà è ôîíà
         xor     ebp,ebp         ;ñì 65 ôóíêöèþ ))
-        ;;;;;;;;;;;;;;;;;;;;;
-;        pushad
-;        mov     ebp, dword [esp+4+32+32]
-;         mov     ebp, dword [save_point_nt]
-;        lea     edi, [ebp+0x28] ;â edi óêàçàòåëü íà íà÷àëî èìåíè.
-;        sub     edi,4   ;.ksf,0
-;        mov eax,4
-;        mov ebx,dword [show_dir]
-;        add     dword [show_dir],10
-;        mov ecx,0x80000000;DDBBCC
-;        mov edx,ebp;[ebp+0x28];eax;edi
-;        xor     esi,esi
-      ;mov esi,8
-;        mcall
-;        popad
-;;;;;;;;;;;;;;;;;;;;;;;;
         cld
 align 4
 @@:     ;pushad
         xor     eax,eax
         lodsb
         test    al,al
-        jz      .exit
+        jz      .return
-;        movzx   eax,al
         shl     eax,4         ;óìíîæàåì íà 16 ò.ê. ýòî âûñîòà ãëèôà
-;        imul    eax,16
-        mov     ebx,dword [font_array_data]    ; òóò ðàñïîëîãàþòñÿ ãëèôû ñèìâîëîâ
-;        add     eax,ebx
-;        mov     ebx,dword [ebx+8] ; ñìåùåíèå
-;        add     eax,ebx
+        mov     ebx,dword [font_array_data]    ; òóò ðàñïîëîãàþòñÿ ãëèôû ñèìâîëîâ
         add     ebx,eax
         push    esi
         mov     esi,1
         mov     eax,65
         mcall
         pop     esi
         add     edx,8 shl 16    ;ñëåäóþùèé ñèìâîë øèðèíà ñèìâîëà = 8 òî÷êàì
-        jmp     @b
-align 4
-.exit:  ;popad
-;        add     edx,16
-;        loop    .next
+        jmp     @b
 align 4
 .return:
 @@:
         mov     ebx,dword [font_array_data]    ; òóò ðàñïîëîãàþòñÿ ãëèôû ñèìâîëîâ
         mov     esi,1
         mov     eax,65
         mcall
 popad
 ret 4
 fulder_array_point dd 0x0
 font_array_point  dd 0x0
 font_array_data   dd 0x0        ; ðåàëüíûå äàííûå ò.å. ìàòðèöà øðèôòà
 save_ebp          dd 0x0
 save_point_nt     dd 0x0
-;name_of_file     db 263 dup(0x0)
-;name_of_file      db '/sys/FONTS/font01.ksf',0
 name_fulder       db '/sys/FONTS',0
 name_fuld_end=     ($-name_fulder) -1
 name_font         db '.ksf'
 name_font_e:
 type_fnt          db 'kf01'

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/fontslib/trunk/fonts_lib.asm – Rev 1158 → 1167