resolve menu conflict

removed unused functions from debug.inc during compilation

data/Tupfile.lua

@@ -166,6 +166,7 @@ extra_files = {
  {"kolibrios/demos/rpento.lif", "common/demos/rpento.lif"},
  {"kolibrios/develop/fpc/", "common/develop/fpc/*"},
  {"kolibrios/develop/fpc/examples/", "../programs/develop/fp/examples/src/*"},
+ {"kolibrios/develop/fasm/fasm.txt", SRC_PROGS .. "/develop/fasm/1.73/fasm.txt"},
  {"kolibrios/develop/oberon07/compiler.kex", SRC_PROGS .. "/develop/oberon07/Compiler.kex"},
  {"kolibrios/develop/oberon07/LICENSE", SRC_PROGS .. "/develop/oberon07/LICENSE"},
  {"kolibrios/develop/oberon07/doc/CC.txt", SRC_PROGS .. "/develop/oberon07/doc/CC.txt"},

data/ru_RU/docs/guide/guide.htm

@@ -20,13 +20,13 @@
 <a href="hardware_support.htm">Поддержка оборудования</a>
 
 <strong>Разработка</strong>
-<a href="/sys/docpack|f">Справочник по системным функциям Колибри</a>
-<a href="/sys/docpack|e">Использование отладчика</a>
-<a href="/sys/docpack|d">Руководство FASM</a>
+<a href="/sys/docpack|d">Справочник по системным функциям Колибри</a>
+<a href="/sys/docpack|c">Использование отладчика</a>
+<a href="/kolibrios/develop/fasm/fasm.txt">Руководство FASM</a>
 
 <strong>Использование библиотек</strong>
-<a href="/sys/docpack|i">Ini</a>
-<a href="/sys/docpack|j">Диалог открытия файла OpenDial</a>
+<a href="/sys/docpack|g">Ini</a>
+<a href="/sys/docpack|h">Диалог открытия файла OpenDial</a>
 
 <strong>Смотрите также</strong>
 Вики проекта <a href="http://wiki.kolibrios.org/">wiki.kolibrios.org</a>

kernel/trunk/network/socket.inc

@@ -226,7 +226,6 @@ macro   socket_init {
         mov     ecx, 5
         rep stosd
 
-        rdtsc                           ; seed, differs from boot to boot
        @@:
         pseudo_random eax
         cmp     ax, EPHEMERAL_PORT_MIN

kernel/trunk/network/tcp.inc

@@ -208,7 +208,6 @@ macro   tcp_init {
         mov     ecx, (6*NET_DEVICES_MAX)
         rep stosd
 
-        rdtsc                           ; seed, differs from boot to boot
         pseudo_random   eax
         mov     [TCP_sequence_num], eax
 

programs/debug.inc

@@ -31,6 +31,7 @@ macro debug_print_dec arg
 dpd fix debug_print_dec
 
 ;---------------------------------
+if used debug_outdec
 debug_outdec:           ;(eax - num, edi-str)
         push 10         ;2
         pop ecx         ;1
@@ -59,7 +60,9 @@ debug_outchar:          ; al - char
    popad
    popf
 ret
+end if
 
+if used debug_outstr
 debug_outstr:
    mov  eax,63
    mov  ebx,1
@@ -72,7 +75,7 @@ debug_outstr:
    jmp  @b
  @@:
    ret
-
+end if
 
 macro newline
 {
@@ -112,6 +115,7 @@ macro debug_print_hex arg
 }
 dph fix debug_print_hex
 
+if used debug_outhex
 debug_outhex:
     ;  eax - number
     mov   edx, 8
@@ -130,4 +134,5 @@ debug_outhex:
 ret
 
 __hexdigits:
-  db '0123456789ABCDEF'
+  db '0123456789ABCDEF'
+end if

programs/media/animage/animage.asm

@@ -104,8 +104,12 @@ START:
 
 load_libraries l_libs_start,end_l_libs
 
-        cmp     eax,-1
-        jz      close
+        cmp   [lib1.status_lib],0
+        jnz   close
+        cmp   [lib2.status_lib],0
+        jnz   close
+        cmp   [lib4.status_lib],0
+        jnz   close
 
         mcall SF_SET_EVENTS_MASK,0x80000067 ; 1100111b
 ;---------------------------------------------------------
@@ -222,9 +226,14 @@ include 'menu.inc'
 ;-----------------------------------------------------------
 ;------------variables and data of program------------------
 ;-----------------------------------------------------------
+name_of_program db 'ANIMAGE graphics editor v1.54',0
+mouse_pos_x     db 'X='
+mouse_pos_y     db 'Y='
+new_text1       db 'Picture size X'
+new_text2       db 'Picture size Y'
+ok_text         db 'OK'
 
 include 'lib_data.inc'
-include 'panel_data.inc'
 include 'brushes.inc'
 include 'spray.inc'
 include 'width_lines.inc'

programs/media/animage/events_of_mouse.inc

@@ -3,8 +3,23 @@
 ;---------------------------------------------
 align 4
 mouse:
+	cmp  [lib3.status_lib],0 ; test load library
+	jnz  .m_end
+	cld
 	stdcall [kmainmenu_dispatch_cursorevent], [main_menu]
 
+	mov  eax,[main_menu]
+	cmp  dword[eax+16],-1
+	je   @f
+	mov  [m_lost],1
+	jmp  still
+@@:
+	cmp  [m_lost],0
+	je   .m_end
+	dec  [m_lost]
+	jmp  still
+.m_end:
+
 	or ecx,-1
 	mcall SF_THREAD_INFO,procinfo
 	

programs/media/animage/icons_instruments.inc

@@ -1,15 +1,13 @@
-macro square_width_put
-{
-local .no_put_to_screen
-local .next_color_put
-local .vertical_width_put
-local .horizontal_width_put
-
+align 4
+square_width_put:
 	mov ebx,[ReserveArray]
 	mov eax,[ebx]
 	test eax,eax
 	jz .no_put_to_screen
 	mov ecx,[ebx]
+
+	cmp ecx,[Picture_SizeX]
+	jg .no_put_to_screen ;if ecx > screen size return
 	add ebx,4
 	xor ebp,ebp
 
@@ -48,13 +46,10 @@ local .horizontal_width_put
 	jnz .next_color_put
 
 	.no_put_to_screen:
-}
+	ret
 
-macro square_width_save
-{
-local .next_color_save
-local .vertical_width_save
-local .horizontal_width_save
+align 4
+square_width_save:
 	mov ebx,[ReserveArray]
 	mov [ebx],eax
 	mov ecx,eax
@@ -93,7 +88,7 @@ local .horizontal_width_save
 	add ebx,4
 	dec ecx
 	jnz .next_color_save
-}
+	ret
 
 macro draw_calc_pixels brush
 {
@@ -680,7 +675,7 @@ TakeButtonInstruments:
 	no_new_line_xy:
 
 	;put saved pixels
-	square_width_put
+	call square_width_put
 
 	;calculate line
 	mov ebx,[ReserveArray]
@@ -712,7 +707,7 @@ TakeButtonInstruments:
 	call calculate_line
 
 	;save color pixels in ReserveArray
-	square_width_save
+	call square_width_save
 
 	;draw calculated pixels on work arrea
 	draw_calc_pixels width_pixels
@@ -746,7 +741,7 @@ TakeButtonInstruments:
 	no_new_rectangle_xy:
 
 	;put saved pixels
-	square_width_put
+	call square_width_put
 
 	;calculate line
 	mov ebx,[ReserveArray]
@@ -778,7 +773,7 @@ TakeButtonInstruments:
 	call calculate_rectangle
 
 	;save color pixels in ReserveArray
-	square_width_save
+	call square_width_save
 
 	;draw calculated pixels on work arrea
 	draw_calc_pixels width_pixels_rectangle
@@ -812,7 +807,7 @@ TakeButtonInstruments:
 	no_new_circle_xy:
 
 	;put saved pixels
-	square_width_put
+	call square_width_put
 
 	mov esi,[ScreenX]
 	mov edi,[ScreenY]
@@ -931,7 +926,7 @@ TakeButtonInstruments:
 	call calculate_circle
 
 	;save color pixels in ReserveArray
-	square_width_save
+	call square_width_save
 
 	;draw calculated pixels on work arrea
 	draw_calc_pixels width_pixels
@@ -1311,7 +1306,7 @@ end if
 	no_new_konture_xy:
 
 	;put saved pixels
-	square_width_put
+	call square_width_put
 
 	;calculate line
 	mov ebx,[ReserveArray]
@@ -1343,7 +1338,7 @@ end if
 	call calculate_line
 
 	;save color pixels in ReserveArray
-	square_width_save
+	call square_width_save
 
 	;draw calculated pixels on work arrea
 	draw_calc_pixels width_pixels
@@ -1384,7 +1379,7 @@ end if
 	no_new_ellips_xy:
 
 	;put saved pixels
-	square_width_put
+	call square_width_put
 
 
 	mov esi,[ScreenX]
@@ -1495,7 +1490,7 @@ end if
 	call calculate_ellips
 
 	;save color pixels in ReserveArray
-	square_width_save
+	call square_width_save
 
 	;draw calculated pixels on work arrea
 	draw_calc_pixels width_pixels

programs/media/animage/menu.inc

@@ -15,6 +15,8 @@ no_set:
 }
 
 init_main_menu:
+	cmp  [lib3.status_lib],0 ; test load library
+	jnz  @f
 	stdcall [kmenu_init], syscolors
 	
 	stdcall [ksubmenu_new]
@@ -110,10 +112,14 @@ init_main_menu:
 	; add 'Reflection' menu to main
 	stdcall [kmenuitem_new], KMENUITEM_SUBMENU, sz_main_menu_Filters, [main_menu_filters]
 	stdcall [ksubmenu_add], [main_menu], eax
+@@:
 	ret
 
 put_main_menu:
+	cmp  [lib3.status_lib],0 ; test load library
+	jnz  @f
 	stdcall [kmainmenu_draw], [main_menu]
+@@:
 ret
 
 button_handler_main_menu:
@@ -145,11 +151,13 @@ button_handler_main_menu:
 .end_handler:
 ret
 
+align 4
 main_menu dd 0
 main_menu_file  dd 0
 main_menu_edit dd 0
 main_menu_instr dd 0
 main_menu_filters dd 0
+m_lost db 0
 
 sz_main_menu_File        db 'File', 0
 sz_main_menu_File_New    db 'New', 0

programs/media/animage/panel_data.inc

@@ -1,9 +0,0 @@
-;**********************************************************
-;------------------TEXT DATA-------------------------------
-;**********************************************************
-name_of_program      db 'ANIMAGE graphics editor v1.53',0
-mouse_pos_x	     db 'X='
-mouse_pos_y	     db 'Y='
-new_text1	     db 'PICTURE SIZE X'
-new_text2	     db 'PICTURE SIZE Y'
-ok_text 	     db 'OK'

programs/system/docpack/Tupfile.lua

@@ -15,9 +15,6 @@ then tup.append_table(deps,
 else tup.append_table(deps,
   tup.rule("../../../kernel/trunk/docs/sysfuncs.txt", cp_cmd, "SysFuncs.txt"))
 end
-tup.append_table(deps,
-  tup.rule("../../develop/fasm/1.73/fasm.txt", cp_cmd, "Fasm.txt")
-)
 tup.append_table(deps,
   tup.rule("../../../kernel/trunk/docs/stack.txt", cp_cmd, "Stack.txt")
 )

programs/system/docpack/docpack.asm

@@ -9,7 +9,7 @@
 ;---------------------------------------------------------------------
 
 FILE_COUNT=0
-DEF_FILE equ 'g'
+DEF_FILE equ 'f'
 
 macro embed_docdir_file fn
 {
@@ -197,18 +197,17 @@ embedded:
 
   embed_docdir_file 'Copying.txt'      ;a
   embed_docdir_file 'Hot_Keys.txt'     ;b
-  embed_local_file 'Fasm.txt'          ;c
-  embed_docdir_file 'Mtdbg.txt'        ;d
+  embed_docdir_file 'Mtdbg.txt'        ;c
 if lang eq ru_RU
-  embed_local_file 'SysFuncr.txt'      ;e
+  embed_local_file  'SysFuncr.txt'     ;d
 else ; Default to en_US
-  embed_local_file 'SysFuncs.txt'      ;e
+  embed_local_file  'SysFuncs.txt'     ;d
 end if
-  embed_local_file 'Stack.txt'         ;f
-  embed_docdir_file 'KFAR_Keys.txt'    ;g
-  embed_docdir_file 'INI.txt'          ;h
-  embed_docdir_file 'OpenDial.txt'     ;i
-  embed_docdir_file 'Credits.txt'      ;j
+  embed_local_file  'Stack.txt'        ;e
+  embed_docdir_file 'KFAR_Keys.txt'    ;f
+  embed_docdir_file 'INI.txt'          ;g
+  embed_docdir_file 'OpenDial.txt'     ;h
+  embed_docdir_file 'Credits.txt'      ;i
 ; -- End of embedding area  -------
 
   dd 0