FASM: fix whole system hung if source was "dd %t" (by Prohor Nikiforov)

KFM: buildin buttons.bmp
CMM: update libs

git-svn-id: svn://kolibrios.org@7863 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/fs/kfm/trunk/data.inc

@@ -271,4 +271,6 @@ align 4
 sysopen:
         dd  7,0,start_parameter,0,0
         db  '/sys/@open',0
-;---------------------------------------------------------------------
+;---------------------------------------------------------------------
+buttons_file_data file 'images/buttons.raw'
+;icons_file_data	file 'icons.bmp'

programs/fs/kfm/trunk/draw.inc

@@ -8,72 +8,32 @@ draw_buttons_panel:
 	sub	ebx,9
 	add	ebx,5 shl 16
 	mcall	13,,,0xffffff
+	
 	mov	edx,15 shl 16+20
 	add	edx,[skin_high]
-	pusha
-	call	.calculate_button
-	mcall	,,,150
-	popa
-	mcall	7,[buttons_img_start],<16,16>
-	add	edx,26 shl 16
-	add	ebx,16*16*3
-	pusha
-	call	.calculate_button
-	mcall	,,,151
-	popa
-	mcall
-	add	edx,26 shl 16
-	add	ebx,16*16*3
-	pusha
-	call	.calculate_button
-	mcall	,,,152
-	popa
-	mcall
-	add	edx,26 shl 16
-	add	ebx,16*16*3
-	pusha
-	call	.calculate_button
-	mcall	,,,153
-	popa
-	mcall
-	add	edx,26 shl 16
-	add	ebx,16*16*3
-	pusha
-	call	.calculate_button
-	mcall	,,,154
-	popa
-	mcall
-	add	edx,26 shl 16
-	add	ebx,16*16*3
-	pusha
-	call	.calculate_button
-	mcall	,,,155
-	popa
-	mcall
-	add	edx,26 shl 16
-	add	ebx,16*16*3
-	pusha
-	call	.calculate_button
-	mcall	,,,156
-	popa
-	mcall
-	add	edx,26 shl 16
-	add	ebx,16*16*3
-	pusha
-	call	.calculate_button
-	mcall	,,,157
-	popa
+	mcall	7,buttons_file_data,<198,16>
+	
+	mov ecx, 20
+	add ecx, [skin_high]
+	shl ecx, 16
+	add ecx, 16
+	mcall	8,<15,16>,,150+0x40000000
+	
+_new_but:
+	add	ebx,26 shl 16
+	inc edx
 	mcall
+	cmp edx, 157+0x40000000
+	jl  _new_but
+	
 	ret
 ;--------------------------------------
 .calculate_button:
-	mov	esi,0xffffff
 	mov	ebx,edx
 	mov	bx,15
 	mov	ecx,edx
 	shl	ecx,16
 	mov	cx,bx
-	mov	eax,8
 	ret
 ;------------------------------------------------------------------------------
 draw_left_sort_button:

programs/fs/kfm/trunk/err_wind.inc

@@ -7,9 +7,6 @@ read_folder_1_error:
 initiation_error:
     mov   [error_pointer],ini_file_name
     jmp   error_window
-buttons_error:
-    mov   [error_pointer],buttons_file_name
-    jmp   error_window
 icon_error:
     mov   [error_pointer],icons_file_name
 error_window:

programs/fs/kfm/trunk/kfm.asm

@@ -69,7 +69,6 @@ START:
     mov   [read_folder_name],ax
     mov   [read_folder_1_name],ax
     call  load_icon_and_convert_to_img
-    call  load_buttons_and_convert_to_img
     call  load_initiation_file
     call  add_memory_for_folders
     call  device_detect_f70
@@ -258,20 +257,6 @@ load_icon_and_convert_to_img:
     call  sub_application_memory
     ret
 ;---------------------------------------------------------------------
-load_buttons_and_convert_to_img:
-    mov   ebx,buttons_file_name
-    call  prepare_load_data
-    jnz   buttons_error
-    mov   eax,[appl_memory]
-    mov   [buttons_img_start],eax
-    call  prepare_load_data_2
-    add   eax,[buttons_img_start]
-    call  prepare_load_data_1
-    jnz   buttons_error
-    call  convert_bmp_to_img
-    call  sub_application_memory
-    ret
-;---------------------------------------------------------------------
 load_initiation_file:
     mov   ebx,ini_file_name
     call  prepare_load_data

programs/fs/kfm/trunk/text.inc

@@ -85,9 +85,6 @@ ini_file_name:
 icons_file_name:
      db 'icons.bmp',0
 ;---------------------------------------------------------------------
-buttons_file_name:
-     db 'buttons.bmp',0
-;---------------------------------------------------------------------
 error_type:
      db 'File system error',0
 ;---------------------------------------------------------------------