programs/system: Post-SVN tidy (part 2) (#410)

- Move source code from `trunk` into root directory for each program.
- Update build files and ASM include paths. Add SPDX license header where appropriate.
- Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden.

(Work towards #75, point 3)

Reviewed-on: KolibriOS/kolibrios#410
Reviewed-by: Ivan B <dunkaist@gmail.com>
Reviewed-by: Burer <burer@kolibrios.org>
Co-authored-by: Andrew <dent.ace@gmail.com>
Co-committed-by: Andrew <dent.ace@gmail.com>

data/Tupfile.lua

@@ -79,7 +79,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
  {"GAMES/DESCENT", build_type .. "/games/descent"},
  {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/rus/.shell"},
  {"SETTINGS/GAMES.INI", "ru_RU/settings/games.ini"},
- {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"},
+ {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/mykey.ini"},
  {"SETTINGS/SYSPANEL.INI", "ru_RU/settings/syspanel.ini"},
 }) elseif build_type == "en_US" then tup.append_table(img_files, {
  {"WELCOME.HTM", VAR_DATA .. "/" .. build_type .. "/welcome.htm.kpack"},
@@ -89,7 +89,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
  {"GAMES/DESCENT", "common/games/descent"},
  {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/eng/.shell"},
  {"SETTINGS/GAMES.INI", "common/settings/games.ini"},
- {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"},
+ {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/mykey.ini"},
  {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"},
 }) elseif build_type == "es_ES" then tup.append_table(img_files, {
  {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/example.asm"},
@@ -98,7 +98,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
  {"GAMES/DESCENT", "common/games/descent"},
  {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/eng/.shell"},
  {"SETTINGS/GAMES.INI", "common/settings/games.ini"},
- {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"},
+ {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/mykey.ini"},
  {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"},
 }) elseif build_type == "it_IT" then tup.append_table(img_files, {
  {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/example.asm"},
@@ -106,7 +106,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
  {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"},
  {"GAMES/DESCENT", "common/games/descent"},
  {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/eng/.shell"},
- {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey_it.ini"},
+ {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/mykey_it.ini"},
  {"SETTINGS/GAMES.INI", "common/settings/games.ini"},
  {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"},
 }) else tup.append_table(img_files, {
@@ -116,7 +116,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
  {"GAMES/DESCENT", "common/games/descent"},
  {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/eng/.shell"},
  {"SETTINGS/GAMES.INI", "common/settings/games.ini"},
- {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"},
+ {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/mykey.ini"},
  {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"},
 }) end
 
@@ -402,7 +402,7 @@ tup.append_table(img_files, {
  {"@DOCKY", VAR_PROGS .. "/system/docky/docky"},
  {"@HA", VAR_PROGS .. "/other/ha/HA"},
  {"@ICON", VAR_PROGS .. "/system/icon_new/icon"},
- {"@MENU", VAR_PROGS .. "/system/menu/trunk/menu"},
+ {"@MENU", VAR_PROGS .. "/system/menu/menu"},
  {"@NOTIFY", VAR_PROGS .. "/system/notify3/notify"},
  {"@OPEN", VAR_PROGS .. "/system/open/open"},
  {"@RESHARE", VAR_PROGS .. "/system/reshare/reshare"},
@@ -426,18 +426,18 @@ tup.append_table(img_files, {
  {"ESKIN", VAR_PROGS .. "/system/eskin/trunk/eskin"},
  {"FSPEED", VAR_PROGS .. "/testing/fspeed/fspeed"},
  {"GMON", VAR_PROGS .. "/system/gmon/gmon"},
- {"HDD_INFO", VAR_PROGS .. "/system/hdd_info/trunk/hdd_info"},
+ {"HDD_INFO", VAR_PROGS .. "/system/hdd_info/hdd_info"},
  {"KBD", VAR_PROGS .. "/testing/kbd/trunk/kbd"},
  {"KPACK", VAR_PROGS .. "/other/kpack/trunk/kpack"},
- {"LAUNCHER", VAR_PROGS .. "/system/launcher/trunk/launcher"},
+ {"LAUNCHER", VAR_PROGS .. "/system/launcher/launcher"},
  {"LOADDRV", VAR_PROGS .. "/system/loaddrv/loaddrv"},
  {"MAGNIFY", VAR_PROGS .. "/system/magnify/magnify"},
  {"MGB", VAR_PROGS .. "/testing/mgb/trunk/mgb"},
- {"MOUSEMUL", VAR_PROGS .. "/system/mousemul/trunk/mousemul"},
+ {"MOUSEMUL", VAR_PROGS .. "/system/mousemul/mousemul"},
  {"MADMOUSE", VAR_PROGS .. "/other/madmouse/madmouse"},
- {"MYKEY", VAR_PROGS .. "/system/MyKey/trunk/MyKey"},
+ {"MYKEY", VAR_PROGS .. "/system/MyKey/MyKey"},
  {"PCIDEV", VAR_PROGS .. "/testing/pcidev/trunk/PCIDEV"},
- {"RDSAVE", VAR_PROGS .. "/system/rdsave/trunk/rdsave"},
+ {"RDSAVE", VAR_PROGS .. "/system/rdsave/rdsave"},
  {"RTFREAD", VAR_PROGS .. "/other/rtfread/rtfread"},
  {"SEARCHAP", VAR_PROGS .. "/system/searchap/searchap"},
  {"SCRSHOOT", VAR_PROGS .. "/media/scrshoot/scrshoot"},

programs/build_all.bat

@@ -65,16 +65,16 @@ fasm system\skincfg\trunk\skincfg.asm %BIN%\skincfg
 fasm system\docpack\docpack.asm %BIN%\docpack
 fasm system\end\trunk\end.asm %BIN%\end
 fasm system\gmon\gmon.asm %BIN%\gmon
-fasm system\icon\trunk\icon.asm %BIN%\icon
+fasm system\icon\icon.asm %BIN%\icon
 fasm system\kbd\trunk\kbd.ASM %BIN%\kbd
-fasm system\launcher\trunk\launcher.asm %BIN%\launcher
+fasm system\launcher\launcher.asm %BIN%\launcher
-fasm system\menu\trunk\menu.asm %BIN%\@menu
+fasm system\menu\menu.asm %BIN%\@menu
 fasm system\mgb\trunk\mgb.asm %BIN%\mgb
-fasm system\mousemul\trunk\mousemul.asm %BIN%\mousemul
+fasm system\mousemul\mousemul.asm %BIN%\mousemul
 fasm system\PANEL\trunk\@TASKBAR.ASM %BIN%\@TASKBAR
 fasm system\pcidev\trunk\pcidev.asm %BIN%\pcidev
 fasm system\RB\trunk\@RB.ASM %BIN%\@RB
-fasm system\rdsave\trunk\rdsave.asm %BIN%\rdsave
+fasm system\rdsave\rdsave.asm %BIN%\rdsave
 fasm system\run\trunk\run.asm %BIN%\run
 fasm system\setup\trunk\setup.asm %BIN%\setup
 fasm system\skinsel\skinsel.asm %BIN%\skinsel
@@ -238,9 +238,9 @@ fasm media\midamp\trunk\midamp.asm %BIN%\nightbuild\midamp
 fasm develop\heed\trunk\heed.asm %BIN%\nightbuild\heed
 fasm develop\tinypad\trunk\tinypad.asm %BIN%\nightbuild\tinypad
 fasm system\skincfg\trunk\skincfg.asm %BIN%\nightbuild\skincfg
-fasm system\hdd_info\trunk\hdd_info.asm %BIN%\nightbuild\hdd_info
+fasm system\hdd_info\hdd_info.asm %BIN%\nightbuild\hdd_info
 fasm system\mgb\trunk\mgb.asm %BIN%\nightbuild\mgb
-fasm system\rdsave\trunk\rdsave.asm %BIN%\nightbuild\rdsave
+fasm system\rdsave\rdsave.asm %BIN%\nightbuild\rdsave
 fasm other\kpack\trunk\kpack.asm %BIN%\nightbuild\kpack
 fasm other\rtfread\rtfread.asm %BIN%\nightbuild\rtfread
 ;restore

programs/system/MyKey/ASPAPI.INC

@@ -1,163 +1,165 @@
-include '../../../proc32.inc'
+; SPDX-License-Identifier: NOASSERTION
-
+;
-macro start_draw_window x,y,xsize,ysize,areacolor,caption,capsize
+
-{
+include '../../proc32.inc'
-	;pusha
+
-	mov	eax, 12 		; function 12:tell os about windowdraw
+macro start_draw_window x,y,xsize,ysize,areacolor,caption,capsize
-	mov	ebx, 1			; 1, start of draw
+{
-	int	0x40
+	;pusha
-	; DRAW WINDOW
+	mov	eax, 12 		; function 12:tell os about windowdraw
-	mov	eax, 0			; function 0 : define and draw window
+	mov	ebx, 1			; 1, start of draw
-	mov	ebx, x*65536+xsize	; [x start] *65536 + [x size]
+	int	0x40
-	mov	ecx, y*65536+ysize	; [y start] *65536 + [y size]
+	; DRAW WINDOW
-	mov	edx, areacolor		 ; color of work area RRGGBB
+	mov	eax, 0			; function 0 : define and draw window
-	mov	esi, 0x00334455 	 ; color of grab bar  RRGGBB
+	mov	ebx, x*65536+xsize	; [x start] *65536 + [x size]
-	mov	edi, 0x00ddeeff 	 ; color of frames    RRGGBB
+	mov	ecx, y*65536+ysize	; [y start] *65536 + [y size]
-	int	0x40
+	mov	edx, areacolor		 ; color of work area RRGGBB
-	; WINDOW LABEL
+	mov	esi, 0x00334455 	 ; color of grab bar  RRGGBB
-	mov	eax, 4			; function 4 : write text to window
+	mov	edi, 0x00ddeeff 	 ; color of frames    RRGGBB
-	mov	ebx, 8*65536+8		; [x start] *65536 + [y start]
+	int	0x40
-	mov	ecx, 0x0;0ffffff         ; color of text RRGGBB
+	; WINDOW LABEL
-	mov	edx, caption		; pointer to text beginning
+	mov	eax, 4			; function 4 : write text to window
-	mov	esi, capsize	; text length
+	mov	ebx, 8*65536+8		; [x start] *65536 + [y start]
-	int	0x40
+	mov	ecx, 0x0;0ffffff         ; color of text RRGGBB
-	;popa
+	mov	edx, caption		; pointer to text beginning
-}
+	mov	esi, capsize	; text length
-
+	int	0x40
-macro end_draw_window
+	;popa
-{
+}
-	mov	eax, 12 		; end of redraw
+
-	mov	ebx, 2
+macro end_draw_window
-	int	0x40
+{
-}
+	mov	eax, 12 		; end of redraw
-
+	mov	ebx, 2
-macro change_window_place_size x,y,xsize,ysize
+	int	0x40
-{
+}
-	mov	eax, 67 		 ; function 67 : replace and/or resize window
+
-	mov	ebx, x
+macro change_window_place_size x,y,xsize,ysize
-	mov	ecx, y
+{
-	mov	edx, xsize
+	mov	eax, 67 		 ; function 67 : replace and/or resize window
-	mov	esi, ysize
+	mov	ebx, x
-	int	0x40
+	mov	ecx, y
-}
+	mov	edx, xsize
-
+	mov	esi, ysize
-proc draw_button stdcall, x:dword, y:dword, xsize:dword, ysize:dword, \
+	int	0x40
-	id:dword, butcolor:dword, text:dword, textlen:byte, textcolor:dword
+}
-
+
-	pusha
+proc draw_button stdcall, x:dword, y:dword, xsize:dword, ysize:dword, \
-	mov	ebx, dword [x]
+	id:dword, butcolor:dword, text:dword, textlen:byte, textcolor:dword
-	shl	ebx, 16
+
-	add	ebx, dword [xsize]	  ; [x start] *65536 + [x size]
+	pusha
-
+	mov	ebx, dword [x]
-	mov	ecx, dword [y]
+	shl	ebx, 16
-	shl	ecx, 16
+	add	ebx, dword [xsize]	  ; [x start] *65536 + [x size]
-	add	ecx, dword [ysize]	  ; [y start] *65536 + [y size]
+
-
+	mov	ecx, dword [y]
-	mov	edx, dword [id] 		; button id
+	shl	ecx, 16
-	mov	esi, dword [butcolor]		; button color RRGGBB
+	add	ecx, dword [ysize]	  ; [y start] *65536 + [y size]
-	mov	eax, 8			; function 8 : define and draw button
+
-	int	0x40
+	mov	edx, dword [id] 		; button id
-
+	mov	esi, dword [butcolor]		; button color RRGGBB
-	mov	ebx, dword [x]
+	mov	eax, 8			; function 8 : define and draw button
-	add	ebx, 5
+	int	0x40
-	shl	ebx, 16
+
-	mov	eax, dword [ysize]
+	mov	ebx, dword [x]
-	sub	eax, 5
+	add	ebx, 5
-	shr	eax, 1
+	shl	ebx, 16
-	add	ebx, eax
+	mov	eax, dword [ysize]
-	add	ebx, dword [y]	;mov    ebx, (x+5)*65536+y+(ysize-5)/2  ; Draw button text
+	sub	eax, 5
-
+	shr	eax, 1
-	mov	ecx, dword [textcolor]
+	add	ebx, eax
-	mov	edx, dword [text]
+	add	ebx, dword [y]	;mov    ebx, (x+5)*65536+y+(ysize-5)/2  ; Draw button text
-	xor	eax, eax
+
-	mov	al,  byte [textlen]
+	mov	ecx, dword [textcolor]
-	mov	esi, eax
+	mov	edx, dword [text]
-	mov	eax, 4
+	xor	eax, eax
-	int	0x40
+	mov	al,  byte [textlen]
-	popa
+	mov	esi, eax
-ret
+	mov	eax, 4
-endp
+	int	0x40
-
+	popa
-;macro outtextxy x,y,prompt,prompt_len,color
+ret
-;{
+endp
-proc outtextxy stdcall, x:dword, y:dword, prompt:dword, prompt_len:dword, color:dword
+
-	pusha
+;macro outtextxy x,y,prompt,prompt_len,color
-	mov	eax, 4
+;{
-	mov	ebx, dword [x]	       ; draw info text with function 4
+proc outtextxy stdcall, x:dword, y:dword, prompt:dword, prompt_len:dword, color:dword
-	shl	ebx, 16
+	pusha
-	or	ebx, dword [y]
+	mov	eax, 4
-	mov	ecx, dword [color]
+	mov	ebx, dword [x]	       ; draw info text with function 4
-	mov	edx, dword [prompt]
+	shl	ebx, 16
-	mov	esi, dword [prompt_len]
+	or	ebx, dword [y]
-	test	esi, esi
+	mov	ecx, dword [color]
-	jnz	@f
+	mov	edx, dword [prompt]
-	or	ecx, 0x80000000
+	mov	esi, dword [prompt_len]
-      @@:
+	test	esi, esi
-	int	0x40
+	jnz	@f
-	popa
+	or	ecx, 0x80000000
-ret
+      @@:
-endp
+	int	0x40
-;}
+	popa
-
+ret
-;proc bar x:dword, y:dword, xsize:dword, ysize:dword, color:dword
+endp
-macro bar x, y, xsize, ysize, color
+;}
-{
+
-	pusha
+;proc bar x:dword, y:dword, xsize:dword, ysize:dword, color:dword
-	mov eax, 13
+macro bar x, y, xsize, ysize, color
-	;mov ebx, [x]
+{
-	;shl ebx, 16
+	pusha
-	;add ebx, [xsize]
+	mov eax, 13
-	;mov ecx, [y]
+	;mov ebx, [x]
-	;shl ecx, 16
+	;shl ebx, 16
-	;add ecx, [ysize]
+	;add ebx, [xsize]
-	;mov edx, [color]
+	;mov ecx, [y]
-	mov	ebx, x*65536+xsize
+	;shl ecx, 16
-	mov	ecx, y*65536+ysize
+	;add ecx, [ysize]
-	mov edx, color
+	;mov edx, [color]
-
+	mov	ebx, x*65536+xsize
-	int 0x40
+	mov	ecx, y*65536+ysize
-	popa
+	mov edx, color
-;ret
+
-;endp
+	int 0x40
-}
+	popa
-
+;ret
-macro line x1,y1,x2,y2,color
+;endp
-{
+}
-  pusha
+
-  mov eax, 38
+macro line x1,y1,x2,y2,color
-  mov ebx, x1*65536+x2
+{
-  mov ecx, y1*65536+y2
+  pusha
-  mov edx, color
+  mov eax, 38
-  int 0x40
+  mov ebx, x1*65536+x2
-  popa
+  mov ecx, y1*65536+y2
-}
+  mov edx, color
-
+  int 0x40
-macro rectangle x,y,xsize,ysize,color
+  popa
-{
+}
-  x2=x+xsize
+
-  y2=y+ysize
+macro rectangle x,y,xsize,ysize,color
-  line x,y,x2,y,color
+{
-  line x,y,x,y2,color
+  x2=x+xsize
-  line x,y2,x2,y2,color
+  y2=y+ysize
-  line x2,y,x2,y2,color
+  line x,y,x2,y,color
-}
+  line x,y,x,y2,color
-
+  line x,y2,x2,y2,color
-macro rectangle2 x,y,xsize,ysize,color1,color2
+  line x2,y,x2,y2,color
-{
+}
-  x2=x+xsize
+
-  y2=y+ysize
+macro rectangle2 x,y,xsize,ysize,color1,color2
-  line x,y,x2,y,color1
+{
-  line x,y,x,y2,color1
+  x2=x+xsize
-  line x,y2,x2,y2,color2
+  y2=y+ysize
-  line x2,y,x2,y2,color2
+  line x,y,x2,y,color1
-}
+  line x,y,x,y2,color1
-
+  line x,y2,x2,y2,color2
-macro putpixel x,y,color
+  line x2,y,x2,y2,color2
-{
+}
-  mov eax, 1
+
-  mov ebx, x
+macro putpixel x,y,color
-  mov ecx, y
+{
-  mov edx, color
+  mov eax, 1
-  int 0x40
+  mov ebx, x
-}
+  mov ecx, y
-
+  mov edx, color
+  int 0x40
+}

programs/system/MyKey/MyKey.asm

@@ -1,4 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
 ;
+
 ;   MyKey. Version 0.2.
 ;
 ;   Author:         Asper
@@ -23,13 +25,13 @@ include 'lang.inc' ; Language support for locales: it_IT, en_US.
 
 include 'string.inc'
 ;include 'macros.inc'
-include '../../../macros.inc'
+include '../../macros.inc'
 include 'ASPAPI.INC'
 ;include 'editbox_ex.mac'
-include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
+include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 ;include 'load_lib.mac'
-include '../../../develop/libraries/box_lib/load_lib.mac'
+include '../../develop/libraries/box_lib/load_lib.mac'
-include '../../../dll.inc'
+include '../../dll.inc'
 
 include 'debug.inc'
 DEBUG	 equ 0;1

programs/system/MyKey/Tupfile.lua

@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 

programs/system/hdd_info/Tupfile.lua

@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 

programs/system/icon/Tupfile.lua

@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 

programs/system/kobra/Makefile

@@ -1,12 +1,12 @@
-ROOT=../../../develop/libraries/framework/trunk
+ROOT=../../develop/libraries/framework/trunk
 
-include ../../../develop/libraries/framework/trunk/config.mk
+include ../../develop/libraries/framework/trunk/config.mk
 
 # Note that kobra_st.o MUST be first and kobra.o last.
 OBJECTS=kobra_st.o $(ROOT)/stdlib/heap.o $(ROOT)/stdlib/malloc.o $(ROOT)/stdlib/stdlib.o $(ROOT)/kolibri/kolibri.o $(ROOT)/libIPC/ipc.o kobra.o
 
 # Set real path to kolibri.img if you want to use install option
-KOLIBRI_IMG=../../../../../../0.7.x-night/kolibri.img
+KOLIBRI_IMG=../../../../../0.7.x-night/kolibri.img
 
 # Path to kobra.kex on floppy (directory should be created before installing)
 DESTDIR=kobra/

programs/system/launch/Tupfile.lua

@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 
 add_include(HELPERDIR .. "/develop/libraries/libs-dev/libio")

programs/system/launcher/launcher.asm

@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;-----------------------------------------------------------------------------
 ;
 ;   LAUNCHER - startup of programs
@@ -28,11 +31,11 @@
 	dd 0x0		; I_Param
 	dd 0x0		; I_Icon
 ;-----------------------------------------------------------------------------
-include "../../../macros.inc"
+include "../../macros.inc"
 
 define __DEBUG__ 1
 define __DEBUG_LEVEL__ 1
-include "../../../debug-fdo.inc"
+include "../../debug-fdo.inc"
 ;-----------------------------------------------------------------------------
 START:                           ; start of execution
 	mcall	68,11
@@ -43,7 +46,7 @@ START:                           ; start of execution
 	mov	ecx,[processinfo+32]
 	test	ecx,ecx
 	jnz	@f
-	
+
 	inc	ecx	; if file size zero
 ;--------------------------------------
 @@:

programs/system/menu/Tupfile.lua

@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 

programs/system/menu/menu.asm

@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;******************************************************************************
 ;   MAIN MENU
 ;******************************************************************************
@@ -41,11 +44,11 @@
 	dd bootparam   ; boot parameters
 	dd 0x0         ; path
 ;------------------------------------------------------------------------------
-include "..\..\..\macros.inc"
+include "..\..\macros.inc"
-include "..\..\..\struct.inc"
+include "..\..\struct.inc"
-include "..\..\..\gui_patterns.inc"
+include "..\..\gui_patterns.inc"
 ; Formatted debug output:
-include "..\..\..\debug-fdo.inc"
+include "..\..\debug-fdo.inc"
 __DEBUG__       = 1             ; 0 - disable debug output / 1 - enable debug output
 __DEBUG_LEVEL__ = DBG_ERR      ; set the debug level
 DBG_ALL       = 0  ; all messages

programs/system/mousemul/Tupfile.lua

@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 

programs/system/mousemul/mousemul.asm

@@ -1,306 +1,312 @@
-; <--- description --->
+; SPDX-License-Identifier: NOASSERTION
-; compiler:     FASM 1.67.23
+;
-; name:         Mouse Emulation For KolibriOS
+
-;-----------------------------------------------------------------------------
+; Text encoded with Code Page 866 - Cyrillic
-; version:      1.2
+
-; last update:  01/06/2012
+
-; written by:   Marat Zakiyanov aka Mario79, aka Mario
+; <--- description --->
-; changes:      using new functions 66.6 and 66.7
+; compiler:     FASM 1.67.23
-;-----------------------------------------------------------------------------
+; name:         Mouse Emulation For KolibriOS
-; version:      1.1
+;-----------------------------------------------------------------------------
-; last update:  26/05/2012
+; version:      1.2
-; written by:   Lipatov Kirill aka Leency
+; last update:  01/06/2012
-; changes:      shows notify with instructions, while opening program
+; written by:   Marat Zakiyanov aka Mario79, aka Mario
-;-----------------------------------------------------------------------------
+; changes:      using new functions 66.6 and 66.7
-; version:      1.0
+;-----------------------------------------------------------------------------
-; last update:  04/09/2010
+; version:      1.1
-; written by:   Marat Zakiyanov aka Mario79, aka Mario
+; last update:  26/05/2012
-; changes:      total optimization of code,
+; written by:   Lipatov Kirill aka Leency
-;               different events for Up and Down of key Num 5
+; changes:      shows notify with instructions, while opening program
-;               advansed acceleration mode
+;-----------------------------------------------------------------------------
-;-----------------------------------------------------------------------------
+; version:      1.0
-; version:      0.8
+; last update:  04/09/2010
-; last update:  03/10/2007
+; written by:   Marat Zakiyanov aka Mario79, aka Mario
-; written by:   Zlobny_Gluk
+; changes:      total optimization of code,
-; e-mail:       umbrosia@land.ru
+;               different events for Up and Down of key Num 5
-;-----------------------------------------------------------------------------
+;               advansed acceleration mode
-; <--- include all KolibriOS stuff --->
+;-----------------------------------------------------------------------------
-include "lang.inc"
+; version:      0.8
-include '../../../macros.inc'
+; last update:  03/10/2007
-
+; written by:   Zlobny_Gluk
-; <--- start of KolibriOS application --->
+; e-mail:       umbrosia@land.ru
-MEOS_APP_START
+;-----------------------------------------------------------------------------
-
+; <--- include all KolibriOS stuff --->
-; <--- start of code --->
+include "lang.inc"
-CODE
+include '../../macros.inc'
-;-----------------------------------------------------------------------------
+
-start:
+; <--- start of KolibriOS application --->
-	mcall	70,notifyapp
+MEOS_APP_START
-
+
-start1:
+; <--- start of code --->
-	xor	ebx,ebx
+CODE
-	mcall	40
+;-----------------------------------------------------------------------------
-@@:
+start:
-	mcall	23,10
+	mcall	70,notifyapp
-
+
-	mcall	66,3
+start1:
-	test	eax,0x80	;NumLock status
+	xor	ebx,ebx
-	jz	@r
+	mcall	40
-
+@@:
-	mov	ebx,4
+	mcall	23,10
-	call	hotkeys_common
+
-
+	mcall	66,3
-	mcall	40,10b
+	test	eax,0x80	;NumLock status
-still:
+	jz	@r
-	mcall	10
+
-
+	mov	ebx,4
-	cmp	eax,2		; if event == 2
+	call	hotkeys_common
-	jne	still
+
-;-----------------------------------------------------------------------------
+	mcall	40,10b
-key:				   ; key event handler
+still:
-	call	mouse_acceleration
+	mcall	10
-
+
-	mcall	2		   ; get key code
+	cmp	eax,2		; if event == 2
-
+	jne	still
-	push	eax
+;-----------------------------------------------------------------------------
-	mcall	66,3
+key:				   ; key event handler
-	test	eax,0x80	;NumLock status
+	call	mouse_acceleration
-	pop	eax
+
-	jnz	@f
+	mcall	2		   ; get key code
-	mov	ebx,5
+
-	call	hotkeys_common
+	push	eax
-	jmp	start1
+	mcall	66,3
-@@:
+	test	eax,0x80	;NumLock status
-	cmp	al,2
+	pop	eax
-	jne	still
+	jnz	@f
-
+	mov	ebx,5
-	xor	edx,edx
+	call	hotkeys_common
-
+	jmp	start1
-	cmp	ah,80	; Down Num 2
+@@:
-	je	keytwo
+	cmp	al,2
-	cmp	ah,81	; Down Num 3
+	jne	still
-	je	keythree
+
-	cmp	ah,75	; Down Num 4
+	xor	edx,edx
-	je	keyfour
+
-	cmp	ah,77	; Down Num 6
+	cmp	ah,80	; Down Num 2
-	je	keysix
+	je	keytwo
-	cmp	ah,71	; Down Num 7
+	cmp	ah,81	; Down Num 3
-	je	keyseven
+	je	keythree
-	cmp	ah,72	; Down Num 8
+	cmp	ah,75	; Down Num 4
-	je	keyeight
+	je	keyfour
-	cmp	ah,73	; Down Num 9
+	cmp	ah,77	; Down Num 6
-	je	keynine
+	je	keysix
-	cmp	ah,76	; Down Num 5
+	cmp	ah,71	; Down Num 7
-	je	keyfive
+	je	keyseven
-	cmp	ah,204	; Up Num 5
+	cmp	ah,72	; Down Num 8
-	je	keyfive_1
+	je	keyeight
-	cmp	ah,79	; Down Num 1
+	cmp	ah,73	; Down Num 9
-	jne	still
+	je	keynine
-;-----------------------------------------------------------------------------
+	cmp	ah,76	; Down Num 5
-keyone:
+	je	keyfive
-	call	down
+	cmp	ah,204	; Up Num 5
-keyfour:
+	je	keyfive_1
-	call	left
+	cmp	ah,79	; Down Num 1
-	jmp	mouseread
+	jne	still
-;-----------------------------------------------------------------------------
+;-----------------------------------------------------------------------------
-keythree:
+keyone:
-	call	right
+	call	down
-keytwo:
+keyfour:
-	call	down
+	call	left
-	jmp	mouseread
+	jmp	mouseread
-;-----------------------------------------------------------------------------
+;-----------------------------------------------------------------------------
-keyseven:
+keythree:
-	call	left
+	call	right
-keyeight:
+keytwo:
-	call	up
+	call	down
-	jmp	mouseread
+	jmp	mouseread
-;-----------------------------------------------------------------------------
+;-----------------------------------------------------------------------------
-keynine:
+keyseven:
-	call	up
+	call	left
-keysix:
+keyeight:
-	call	right
+	call	up
-	jmp	mouseread
+	jmp	mouseread
-;-----------------------------------------------------------------------------
+;-----------------------------------------------------------------------------
-keyfive:
+keynine:
-	inc	edx
+	call	up
-keyfive_1:
+keysix:
-	mcall	18,19,5
+	call	right
-	jmp	still
+	jmp	mouseread
-;-----------------------------------------------------------------------------
+;-----------------------------------------------------------------------------
-left:
+keyfive:
-	mov	eax,esi
+	inc	edx
-	shl	eax,16
+keyfive_1:
-	sub	edx,eax
+	mcall	18,19,5
-	ret
+	jmp	still
-;-----------------------------------------------------------------------------
+;-----------------------------------------------------------------------------
-right:
+left:
-	mov	eax,esi
+	mov	eax,esi
-	shl	eax,16
+	shl	eax,16
-	add	edx,eax
+	sub	edx,eax
-	ret
+	ret
-;-----------------------------------------------------------------------------
+;-----------------------------------------------------------------------------
-down:
+right:
-	add	edx,esi
+	mov	eax,esi
-	ret
+	shl	eax,16
-;-----------------------------------------------------------------------------
+	add	edx,eax
-up:
+	ret
-	sub	edx,esi
+;-----------------------------------------------------------------------------
-	ret
+down:
-;-----------------------------------------------------------------------------
+	add	edx,esi
-mouseread:
+	ret
-	xor	ebx,ebx
+;-----------------------------------------------------------------------------
-	mcall	37
+up:
-	add	edx,eax
+	sub	edx,esi
-
+	ret
-sravn:
+;-----------------------------------------------------------------------------
-	xor	ebx,ebx
+mouseread:
-	xor	edi,edi
+	xor	ebx,ebx
-
+	mcall	37
-real:
+	add	edx,eax
-	mov	ebx,edx
+
-	mov	edi,ebx
+sravn:
-	shr	ebx,16 ; get x1
+	xor	ebx,ebx
-;       shl     edi,16 ; get y1
+	xor	edi,edi
-;       shr     edi,16
+
-	and	edi,0xffff
+real:
-
+	mov	ebx,edx
-nullli:
+	mov	edi,ebx
-	add	ebx,16
+	shr	ebx,16 ; get x1
-	cmp	ebx,65535
+;       shl     edi,16 ; get y1
-	jg	xmin
+;       shr     edi,16
-	sub	ebx,15
+	and	edi,0xffff
-
+
-	add	edi,16
+nullli:
-	cmp	edi,65535
+	add	ebx,16
-	jg	ymin
+	cmp	ebx,65535
-	sub	edi,15
+	jg	xmin
-
+	sub	ebx,15
-razr:
+
-	mcall	14
+	add	edi,16
-
+	cmp	edi,65535
-	mov	ecx,eax
+	jg	ymin
-	shr	eax,16 ; get x2
+	sub	edi,15
-;       shl     ecx,16 ; get y2
+
-;       shr     ecx,16
+razr:
-	and	ecx,0xffff
+	mcall	14
-
+
-rightdownli:
+	mov	ecx,eax
-	cmp	eax,ebx
+	shr	eax,16 ; get x2
-	jl	xmax
+;       shl     ecx,16 ; get y2
-	cmp	ecx,edi
+;       shr     ecx,16
-	jl	ymax
+	and	ecx,0xffff
-
+
-mousewrite:
+rightdownli:
-	mcall	18,19,4
+	cmp	eax,ebx
-	mcall	26,9
+	jl	xmax
-	mov	[mouse_timer_ticks],eax
+	cmp	ecx,edi
-	jmp	still
+	jl	ymax
-;-----------------------------------------------------------------------------
+
-mouse_acceleration:
+mousewrite:
-	xor	esi,esi
+	mcall	18,19,4
-	inc	esi
+	mcall	26,9
-	mcall	18,19,2
+	mov	[mouse_timer_ticks],eax
-	mov	ecx,eax
+	jmp	still
-	mcall	26,9
+;-----------------------------------------------------------------------------
-	sub	eax,[mouse_timer_ticks]
+mouse_acceleration:
-	cmp	eax,ecx  ; mouse_delay
+	xor	esi,esi
-	ja	@f
+	inc	esi
-	xor	ecx,ecx
+	mcall	18,19,2
-	mcall	18,19	; checkspeed
+	mov	ecx,eax
-	mov	esi,eax
+	mcall	26,9
-	shl	esi,2
+	sub	eax,[mouse_timer_ticks]
-@@:
+	cmp	eax,ecx  ; mouse_delay
-	ret
+	ja	@f
-;-----------------------------------------------------------------------------
+	xor	ecx,ecx
-xmax:
+	mcall	18,19	; checkspeed
-	dec	eax
+	mov	esi,eax
-	dec	ebx
+	shl	esi,2
-	dec	edi
+@@:
-	shl	eax,16
+	ret
-	add	edi,eax
+;-----------------------------------------------------------------------------
-	mov	edx,edi
+xmax:
-	jmp	sravn
+	dec	eax
-;-----------------------------------------------------------------------------
+	dec	ebx
-xmin:
+	dec	edi
-	mov	edx,edi
+	shl	eax,16
-	jmp	sravn
+	add	edi,eax
-;-----------------------------------------------------------------------------
+	mov	edx,edi
-ymax:
+	jmp	sravn
-	dec	ecx
+;-----------------------------------------------------------------------------
-	dec	ebx
+xmin:
-
+	mov	edx,edi
-	shl	ebx,16
+	jmp	sravn
-	mov	edi,ebx
+;-----------------------------------------------------------------------------
-	add	edi,ecx
+ymax:
-	mov	edx,edi
+	dec	ecx
-	jmp	sravn
+	dec	ebx
-;-----------------------------------------------------------------------------
+
-ymin:
+	shl	ebx,16
-	shl	ebx,16
+	mov	edi,ebx
-	mov	edx,ebx
+	add	edi,ecx
-	shr	ebx,16
+	mov	edx,edi
-	jmp	sravn
+	jmp	sravn
-;-----------------------------------------------------------------------------
+;-----------------------------------------------------------------------------
-hotkeys_common:
+ymin:
-	xor	ecx,ecx
+	shl	ebx,16
-	xor	edx,edx
+	mov	edx,ebx
-	mov	cl,79	; Down Num 1
+	shr	ebx,16
-	mcall	66
+	jmp	sravn
-
+;-----------------------------------------------------------------------------
-	mov	cl,80	; Down Num 2
+hotkeys_common:
-	mcall	66
+	xor	ecx,ecx
-
+	xor	edx,edx
-	mov	cl,81	; Down Num 3
+	mov	cl,79	; Down Num 1
-	mcall	66
+	mcall	66
-
+
-	mov	cl,75	; Down Num 4
+	mov	cl,80	; Down Num 2
-	mcall	66
+	mcall	66
-
+
-	mov	cl,76	; Down Num 5
+	mov	cl,81	; Down Num 3
-	mcall	66
+	mcall	66
-
+
-	mov	cl,204 ; Up Num 5
+	mov	cl,75	; Down Num 4
-	mcall	66
+	mcall	66
-
+
-	mov	cl,77	; Down Num 6
+	mov	cl,76	; Down Num 5
-	mcall	66
+	mcall	66
-
+
-	mov	cl,71	; Down Num 7
+	mov	cl,204 ; Up Num 5
-	mcall	66
+	mcall	66
-
+
-	mov	cl,72	; Down Num 8
+	mov	cl,77	; Down Num 6
-	mcall	66
+	mcall	66
-
+
-	mov	cl,73	; Down Num 9
+	mov	cl,71	; Down Num 7
-	mcall	66
+	mcall	66
-; disable/enable input, work only hotkeys (f.66.6,66.7)
+
-	add	ebx,2
+	mov	cl,72	; Down Num 8
-	mcall	66
+	mcall	66
-	ret
+
-;-----------------------------------------------------------------------------
+	mov	cl,73	; Down Num 9
-; <--- initialised data --->
+	mcall	66
-DATA
+; disable/enable input, work only hotkeys (f.66.6,66.7)
-;-----------------------------------------------------------------------------
+	add	ebx,2
-; <--- uninitialised data --->
+	mcall	66
-UDATA
+	ret
-mouse_timer_ticks	dd 0
+;-----------------------------------------------------------------------------
-;-----------------------------------------------------------------------------
+; <--- initialised data --->
-if lang eq ru_RU
+DATA
-	ud_user_message db '"NumLock включает и выключает эмулятор мыши.\nУправление через Numpad." -I',0
+;-----------------------------------------------------------------------------
-else if lang eq it_IT
+; <--- uninitialised data --->
-	ud_user_message db '"NumLock - on/off - usa Numpad per muovere il cursore." -I',0
+UDATA
-else
+mouse_timer_ticks	dd 0
-	ud_user_message db '"NumLock - on/off mouse emul. Numpad - move cursor." -I',0
+;-----------------------------------------------------------------------------
-end if
+if lang eq ru_RU
-
+	ud_user_message db '"NumLock включает и выключает эмулятор мыши.\nУправление через Numpad." -I',0
-notifyapp:
+else if lang eq it_IT
-	dd 7
+	ud_user_message db '"NumLock - on/off - usa Numpad per muovere il cursore." -I',0
-	dd 0
+else
-	dd ud_user_message
+	ud_user_message db '"NumLock - on/off mouse emul. Numpad - move cursor." -I',0
-	dd 0
+end if
-	dd 0
+
-	db '@notify',0
+notifyapp:
-;-----------------------------------------------------------------------------
+	dd 7
-MEOS_APP_END
+	dd 0
-; <--- end of KolibriOS application --->
+	dd ud_user_message
-; ZG
+	dd 0
+	dd 0
+	db '@notify',0
+;-----------------------------------------------------------------------------
+MEOS_APP_END
+; <--- end of KolibriOS application --->
+; ZG

programs/system/rdsave/Tupfile.lua

@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 

programs/system/rdsave/rdsave.asm

@@ -1,3 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 ;   RDsave для Kolibri (0.6.5.0 и старше)
 ;   Save RAM-disk to hard or floppy drive
 ;---------------------------------------------------------------------
@@ -25,15 +31,15 @@ dd cur_dir_path
 
 
 include 'lang.inc' ; Language support for locales: ru_RU (CP866), et_EE, it_IT, en_US.
-include '../../../macros.inc'
+include '../../macros.inc'
 if debug eq yes
-include '../../../debug.inc'
+include '../../debug.inc'
 end if
-include '../../../proc32.inc'
+include '../../proc32.inc'
-include '../../../dll.inc'
+include '../../dll.inc'
-include '../../../KOSfuncs.inc'
+include '../../KOSfuncs.inc'
-include '../../../load_lib.mac'
+include '../../load_lib.mac'
-include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
+include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 include 'str.inc'
 
 	@use_library