BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /programs/ @ 6801

  → /programs @ 6799

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Regard whitespace Rev 6801 → Rev 6799

/programs/fs/kfar/trunk/zlib/deflate.asm
2912,7 → 2912,7
mov esi,[edx+deflate_state.window]
add esi,[edx+deflate_state.strstart]
dec esi
lodsb ;prev = *scan; ++scan
lodsb
mov edi,esi
scasb
jnz .end2
2925,7 → 2925,6
;ecx = strend-scan
mov ecx,MAX_MATCH-2
repz scasb
dec edi
sub edi,[edx+deflate_state.window]
sub edi,[edx+deflate_state.strstart]
mov [edx+deflate_state.match_length],edi

/programs/fs/kfar/trunk/zlib/example1.asm
112,7 → 112,7
align 4
draw_window:
mcall SF_REDRAW, SSF_BEGIN_DRAW
mcall SF_REDRAW, SSF_BEGIN_DRAW ; äã­ªæ¨ï 12: á®®¡é¨âì Ž‘ ® ­ ç «¥ ®âà¨á®¢ª¨
mcall SF_STYLE_SETTINGS, SSF_GET_COLORS, sc,sizeof.system_colors
mov edx, [sc.work] ; 梥â ä®­
or edx, 0x33000000 ; ¨ ⨯ ®ª­  3
127,12 → 127,8
cStr edx,'Outp. size:'
mcall , <10,120>,,,11
mov edx,[strategy]
imul edx,12
add edx,capt_strateg
mcall , <90,10>,0,,12
mcall SF_DRAW_NUMBER, (5 shl 16)+1, m0size, <90,20>
mcall SF_DRAW_NUMBER, (1 shl 16)+1, strategy, <90,10>, 0
mcall , (5 shl 16)+1, m0size, <90,20>
mcall , (5 shl 16)+1, m1size, <90,30>
mcall , (5 shl 16)+1, m2size, <90,120>
;mov ecx,(1 shl 31)
153,7 → 149,7
dec esi
jnz .cycle1
mcall SF_REDRAW, SSF_END_DRAW
mcall SF_REDRAW, SSF_END_DRAW ; äã­ªæ¨ï 12.2, § ª®­ç¨«¨ à¨á®¢ âì
ret
align 4
242,19 → 238,11
ret
endp
align 4
sc system_colors
align 4
title db 'Zlib test, press on [Up], [Down], [Left], [Right]',0
align 4
capt_strateg db '0) Default ',0
db '1) Filtered',0
db '2) Huffman ',0
db '3) Rle ',0
db '4) Fixed ',0
align 4
import_archiver:
deflate_unpack dd sz_deflate_unpack
deflateInit dd sz_deflateInit

/programs/media/kiv/trunk/kiv.asm
12,7 → 12,6
include '../../../proc32.inc'
include '../../../macros.inc'
include '../../../dll.inc'
include '../../../KOSfuncs.inc'
;include '../../../debug.inc'
include '../../../develop/libraries/libs-dev/libio/libio.inc'
23,7 → 22,7
;-----------------------------------------------------------------------------
START:
mcall SF_SYS_MISC, SSF_HEAP_INIT
mcall 68, 11
stdcall dll.Load, @IMPORT
or eax, eax
59,7 → 58,7
mov [slide_key], eax
invoke ini_get_shortcut, inifilename, aShortcuts, aTglbar, -1, tglbar_mod
mov [tglbar_key], eax
mcall SF_KEYBOARD, SSF_SET_INPUT_MODE, 1 ; set kbd mode to scancodes
mcall 66, 1, 1 ; set kbd mode to scancodes
cmp byte [@PARAMS], 0
jnz params_given
83,7 → 82,7
jmp params_given
set_bgr:
mcall SF_BACKGROUND_SET, SSF_MODE_BG
mcall 15, 4
mov eax, @PARAMS + 4
call load_image
jc exit
113,7 → 112,7
push 10
pop eax
jz @f
mcall SF_SYSTEM_GET, SSF_TIME_COUNT
mcall 26, 9
mov edx, [cur_frame]
mov ebx, [cur_frame_time]
add ebx, [edx + Image.Delay]
135,12 → 134,12
key:
xor esi, esi
keyloop:
mcall SF_GET_KEY
mcall 2
test al, al
jnz keyloopdone
shr eax, 8
mov ecx, eax
mcall SF_KEYBOARD, SSF_GET_CONTROL_KEYS
mcall 66, 3
mov edx, next_mod
call check_shortcut
jz .next
196,14 → 195,14
mov eax, [image]
@@:
mov [cur_frame], eax
mcall SF_SYSTEM_GET, SSF_TIME_COUNT
mcall 26, 9
mov [cur_frame_time], eax
mcall SF_THREAD_INFO, procinfo, -1
mcall 9, procinfo, -1
call draw_cur_frame
jmp still
button:
mcall SF_GET_BUTTON
mcall 17
shr eax, 8
; flip horizontally
311,7 → 310,7
jne still
exit:
mcall SF_TERMINATE_PROCESS
mcall -1
redraw_image = red
418,9 → 417,9
jz .no_resize
test [wnd_style], 1 SHL 25
jz .no_resize
mcall SF_STYLE_SETTINGS, SSF_GET_SKIN_HEIGHT
mcall 48, 4
add esi, eax
mcall SF_CHANGE_WINDOW,-1,-1
mcall 67,-1,-1
.no_resize:
ret
428,9 → 427,9
mov esi, [image]
mov ecx, [esi + Image.Width]
mov edx, [esi + Image.Height]
mcall SF_BACKGROUND_SET, SSF_SIZE_BG
mcall 15, 1
mcall SF_BACKGROUND_SET, SSF_MAP_BG
mcall 15, 6
test eax, eax
jz @f
437,10 → 436,10
push eax
invoke img.to_rgb2, esi, eax
pop ecx
mcall SF_BACKGROUND_SET, SSF_UNMAP_BG
mcall 15, 7
@@:
mcall SF_BACKGROUND_SET, SSF_REDRAW_BG
mcall 15, 3
ret
slide_show:
574,13 → 573,13
rep movsb
@@:
mov byte [edi], 0
mcall SF_SYS_MISC, SSF_MEM_ALLOC, 0x1000
mcall 68, 12, 0x1000
test eax, eax
jz .ret
mov ebx, readdir_fileinfo
mov dword [ebx+12], (0x1000 - 32) / 304
mov dword [ebx+16], eax
mcall SF_FILE
mcall 70
cmp eax, 6
jz .dirok
test eax, eax
590,11 → 589,11
mov [readblocks], ecx
imul ecx, 304
add ecx, 32
mcall SF_SYS_MISC, SSF_MEM_REALLOC
mcall 68, 20
test eax, eax
jz free_directory
mov [directory_ptr], eax
mcall SF_FILE, readdir_fileinfo
mcall 70, readdir_fileinfo
.dirok:
cmp ebx, 0
jle free_directory
705,7 → 704,7
ret
free_directory:
mcall SF_SYS_MISC, SSF_MEM_FREE, [directory_ptr]
mcall 68, 13, [directory_ptr]
and [directory_ptr], 0
ret
735,7 → 734,7
test byte [eax + Image.Flags], Image.IsAnimated
jz @f
push ebx
mcall SF_SYSTEM_GET, SSF_TIME_COUNT
mcall 26, 9
pop ebx
mov [cur_frame_time], eax
@@:
754,15 → 753,15
mov eax, [image]
cmp eax, eax
call update_image_sizes
mcall SF_STYLE_SETTINGS, SSF_GET_SKIN_HEIGHT
mcall 48, 4
mov esi, [wnd_height]
add esi, eax
test byte [bTglbar], 1
jz @f
mcall SF_CHANGE_WINDOW, -1, -1, [wnd_width],
mcall 67, -1, -1, [wnd_width],
jmp .mode_not_changed
@@:
mcall SF_CHANGE_WINDOW, [wnd_x], [wnd_y], [wnd_width],
mcall 67, [wnd_x], [wnd_y], [wnd_width],
jmp .mode_not_changed
.mode_slide:
mov [bg_color], 0x00000000
770,12 → 769,12
mov [wnd_x], eax
mov eax, [procinfo.box.top]
mov [wnd_y], eax
mcall SF_GET_SCREEN_SIZE
mcall 14
mov edx, eax
shr edx, 16
movzx eax, ax
mov esi, eax
mcall SF_CHANGE_WINDOW, 0, 0, ,
mcall 67, 0, 0, ,
jmp .posok.slide_show
.mode_not_changed:
782,7 → 781,7
cmp [bFirstDraw], 0
jz .posok
or ecx, -1
mcall SF_THREAD_INFO, procinfo
mcall 9, procinfo
test byte [procinfo.wnd_state], 0x04
jnz .posok
802,14 → 801,14
cmp eax, -1
jz @f
mov ebx, ecx
mcall SF_CHANGE_WINDOW
mcall 67
@@:
.posok:
test [wnd_style], 1 SHL 25
jz .posok.slide_show
mcall SF_REDRAW, SSF_BEGIN_DRAW
mcall SF_STYLE_SETTINGS, SSF_GET_SKIN_HEIGHT
mcall 12, 1
mcall 48, 4
mov ebp, eax ; save skin height
add eax, [wnd_height]
mov ebx, [wnd_x]
818,18 → 817,18
mov ecx, [wnd_y]
shl ecx, 16
add ecx, eax
mcall SF_CREATE_WINDOW, , , [wnd_style], 0, real_header
mcall 0, , , [wnd_style], 0, real_header
jmp .posok.common
.posok.slide_show:
mcall SF_REDRAW, SSF_BEGIN_DRAW
mcall SF_GET_SCREEN_SIZE
mcall 12, 1
mcall 14
mov ebx, eax
shr ebx, 16
movzx eax, ax
mov ecx, eax
mcall SF_CREATE_WINDOW, , , [wnd_style], 0, real_header
mcall 0, , , [wnd_style], 0, real_header
.posok.common:
mcall SF_THREAD_INFO, procinfo, -1
mcall 9, procinfo, -1
mov eax, [procinfo.client_box.width]
sub eax, [image_padding]
sub eax, [image_padding]
860,7 → 859,7
mov ebx, [procinfo.client_box.width]
inc ebx
mov ecx, [draw_y]
mcall SF_DRAW_RECT, , , [bg_color]
mcall 13, , , [bg_color]
mov ecx, [procinfo.client_box.height]
inc ecx
mov esi, [cur_frame]
901,7 → 900,7
je .decorations_done
mov ebx, [procinfo.client_box.width]
push ebx
mcall SF_DRAW_LINE, , <30, 30>, 0x007F7F7F
mcall 38, , <30, 30>, 0x007F7F7F
mcall , <5 + 25 * 1, 5 + 25 * 1>, <0, 30>
mcall , <10 + 25 * 3, 10 + 25 * 3>
mcall , <15 + 25 * 5, 15 + 25 * 5>
911,7 → 910,7
imul ebx, 10001h
mcall
mcall SF_DEFINE_BUTTON, <5 + 25 * 0, 20>, <5, 20>, 'opn'+40000000h
mcall 8, <5 + 25 * 0, 20>, <5, 20>, 'opn'+40000000h
mcall , <10 + 25 * 1, 20>, , 'bck'+40000000h
mcall , <10 + 25 * 2, 20>, , 'fwd'+40000000h
mcall , <15 + 25 * 3, 20>, , 'bgr'+40000000h
932,7 → 931,7
mov ebp, (numimages-1)*20
mcall SF_PUT_IMAGE_EXT, buttons+openbtn*20, <20, 20>, <5 + 25 * 0, 5>, 8, palette
mcall 65, buttons+openbtn*20, <20, 20>, <5 + 25 * 0, 5>, 8, palette
mcall , buttons+backbtn*20, , <10 + 25 * 1, 5>
mcall , buttons+forwardbtn*20, , <10 + 25 * 2, 5>
mcall , buttons+bgrbtn*20, , <15 + 25 * 3, 5>
958,7 → 957,7
call draw_cur_frame
.nodraw:
mcall SF_REDRAW, SSF_END_DRAW
mcall 12, 2
ret