diff --git a/data/Tupfile.lua b/data/Tupfile.lua index b17d31b05b..c36f27e113 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -69,8 +69,8 @@ img_files = { {"SETTINGS/KOLIBRI.LBL", build_type .. "/settings/kolibri.lbl"}, {"SETTINGS/LANG.INI", build_type .. "/settings/lang.ini"}, {"SETTINGS/MENU.DAT", build_type .. "/settings/menu.dat"}, - {"SETTINGS/NETWORK.INI", build_type .. "/settings/network.ini"}, - {"SETTINGS/TASKBAR.INI", build_type .. "/settings/taskbar.ini"}, + {"SETTINGS/NETWORK.INI", "common/settings/network.ini"}, + {"SETTINGS/TASKBAR.INI", "common/settings/taskbar.ini"}, {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"}, {"SETTINGS/SYSTEM.INI", "common/settings/system.ini"}, } @@ -135,8 +135,8 @@ in the directory with Tupfile.lua; for other files, the item should contain a named subitem "group=path/" and the file should be put in . --]] extra_files = { - {"/", build_type .. "/distr_data/autorun.inf"}, - {"/", build_type .. "/distr_data/KolibriOS_icon.ico"}, + {"/", "common/distr_data/autorun.inf"}, + {"/", "common/distr_data/KolibriOS_icon.ico"}, {"/", build_type .. "/settings/kolibri.lbl"}, {"Docs/stack.txt", build_type .. "/docs/STACK.TXT"}, {"HD_Load/9x2klbr/", "common/HD_load/9x2klbr/LDKLBR.VXD"}, diff --git a/data/common/RUN b/data/common/RUN deleted file mode 100644 index 192134eda9..0000000000 Binary files a/data/common/RUN and /dev/null differ diff --git a/data/ca/distr_data/KolibriOS_icon.ico b/data/common/distr_data/KolibriOS_icon.ico similarity index 100% rename from data/ca/distr_data/KolibriOS_icon.ico rename to data/common/distr_data/KolibriOS_icon.ico diff --git a/data/ca/distr_data/autorun.inf b/data/common/distr_data/autorun.inf similarity index 100% rename from data/ca/distr_data/autorun.inf rename to data/common/distr_data/autorun.inf diff --git a/data/ca/doexe2.asm b/data/common/doexe2.asm similarity index 100% rename from data/ca/doexe2.asm rename to data/common/doexe2.asm diff --git a/data/ca/settings/network.ini b/data/common/settings/network.ini similarity index 100% rename from data/ca/settings/network.ini rename to data/common/settings/network.ini diff --git a/data/ca/settings/taskbar.ini b/data/common/settings/taskbar.ini similarity index 100% rename from data/ca/settings/taskbar.ini rename to data/common/settings/taskbar.ini diff --git a/data/eng/RUN b/data/eng/RUN deleted file mode 100644 index 192134eda9..0000000000 Binary files a/data/eng/RUN and /dev/null differ diff --git a/data/eng/distr_data/KolibriOS_icon.ico b/data/eng/distr_data/KolibriOS_icon.ico deleted file mode 100644 index fcba0849d9..0000000000 Binary files a/data/eng/distr_data/KolibriOS_icon.ico and /dev/null differ diff --git a/data/eng/distr_data/autorun.inf b/data/eng/distr_data/autorun.inf deleted file mode 100644 index a3c071e7c4..0000000000 --- a/data/eng/distr_data/autorun.inf +++ /dev/null @@ -1,3 +0,0 @@ -[AutoRun] -icon=KolibriOS_icon.ico -shellexecute=readme.txt \ No newline at end of file diff --git a/data/eng/doexe2.asm b/data/eng/doexe2.asm deleted file mode 100644 index eaebd8aaf8..0000000000 --- a/data/eng/doexe2.asm +++ /dev/null @@ -1,68 +0,0 @@ -filename equ '%EXENAME%' - -virtual at 0 -file filename:3Ch,4 -load pehea dword from 0 -file filename:pehea,0F8h+28h*3 -load NumberOfSections word from 4+6 -load SizeOfOptionalHeader word from 4+14h -if NumberOfSections<>3 -error Expected three sections, .text, .bss and .reloc -end if -if SizeOfOptionalHeader<>0E0h -error Nonstandard PE header -end if -load RelocsRVA dword from 4+0A0h -load RelocsSize dword from 4+0A4h -load ImageBase dword from 4+34h -load TextRVA dword from 4+0F8h+0Ch -load TextSize dword from 4+0F8h+8 -load TextOffs dword from 4+0F8h+14h -load BSSSize dword from 4+0F8h+28h+10h -load RelocRVA dword from 4+0F8h+28h*2+0Ch -load RelocOffs dword from 4+0F8h+28h*2+14h -if BSSSize -error Second section expected to be .bss -end if -if RelocRVA<>RelocsRVA -error Third section expected to be .reloc -end if -;file 'test.exe':pehea+0F8h,28h -;load physofs dword from 4+14h -;load mem dword from 4+8 -;file 'test.exe':physofs+16,4 -;load sz dword from $-4 -end virtual - -file filename:TextOffs,TextSize - -while RelocsSize>8 -virtual at 0 -file filename:RelocOffs,8 -load CurRelocPage dword from 0 -load CurRelocChunkSize dword from 4 -end virtual -RelocsSize=RelocsSize-CurRelocChunkSize -CurRelocChunkSize = CurRelocChunkSize-8 -RelocOffs=RelocOffs+8 -while CurRelocChunkSize -virtual at 0 -file filename:RelocOffs,2 -RelocOffs=RelocOffs+2 -CurRelocChunkSize=CurRelocChunkSize-2 -load s word from 0 -end virtual -CurRelocType = s shr 12 -RelocItem = CurRelocPage + (s and 0xFFF) -if CurRelocType=0 -else if CurRelocType=3 -load z dword from RelocItem-TextRVA -store dword z-(TextRVA+ImageBase) at RelocItem-TextRVA -else -error Unexpected relocation type -end if -end while -end while - -store dword TextSize at 10h -store dword RelocRVA-TextRVA at 14h diff --git a/data/eng/settings/network.ini b/data/eng/settings/network.ini deleted file mode 100644 index 048f6848b6..0000000000 --- a/data/eng/settings/network.ini +++ /dev/null @@ -1,25 +0,0 @@ -; General configuration for otherwise unlisted devices. -[ip?] -; type should be dhcp, auto or disabled. -ip_type = auto -dns_type= auto - -; Specific configuration for network device 1. -[ip1] -; type can be dhcp, auto, static or disabled. -ip_type = auto -ip = 192.168.1.150 -subnet = 255.255.255.0 -gateway = 192.168.1.1 -dns_type= auto -dns = 192.168.1.1 - -[proxy] -; If Internet connection requires HTTP proxy, set it here -; and uncomment following lines: -;proxy = -;port = -; If proxy requires authentification, uncomment following lines too -; (otherwise, leave them commented): -;user = -;password= \ No newline at end of file diff --git a/data/eng/settings/taskbar.ini b/data/eng/settings/taskbar.ini deleted file mode 100644 index 2b6cb89017..0000000000 --- a/data/eng/settings/taskbar.ini +++ /dev/null @@ -1,40 +0,0 @@ -[Variables] -PanelHeight=28 -PanelWidth=0 -SoftenHeight=4 -ButtonTopOffset=3 -ButtonBottOffset=3 - -[Flags] -SoftenUp=1 -SoftenDown=1 -MinLeftButton=0 -MinRightButton=0 -MenuButton=1 -RunApplButtons=1 -ClnDesktButton=1 -Clock=1 -CpuUsage=1 -ChangeLang=1 -Attachment=1 -ButtonsStyle=0 - -[Colors] -MenuButton=0,100,0 -ClnDesktButton=0,128,255 -Clock=0,128,255 -CpuUsage=0,100,0 -CpuUsageBckgr=255,0,0 -ChangeLang=0,128,255 -PageList=255,255,255 -Text=255,255,255 -AltTab=255,128,0 - -[ApplicationsPaths] -End=/sys/END -Menu=/sys/@MENU -Run=/sys/RUN -PrnScr=/sys/SCRSHOOT -Clock=/sys/CALENDAR -CpuUsage=/sys/GMON -MouseEmul=/sys/MOUSEMUL diff --git a/data/et/distr_data/KolibriOS_icon.ico b/data/et/distr_data/KolibriOS_icon.ico deleted file mode 100644 index fcba0849d9..0000000000 Binary files a/data/et/distr_data/KolibriOS_icon.ico and /dev/null differ diff --git a/data/et/distr_data/autorun.inf b/data/et/distr_data/autorun.inf deleted file mode 100644 index a3c071e7c4..0000000000 --- a/data/et/distr_data/autorun.inf +++ /dev/null @@ -1,3 +0,0 @@ -[AutoRun] -icon=KolibriOS_icon.ico -shellexecute=readme.txt \ No newline at end of file diff --git a/data/et/doexe2.asm b/data/et/doexe2.asm deleted file mode 100644 index eaebd8aaf8..0000000000 --- a/data/et/doexe2.asm +++ /dev/null @@ -1,68 +0,0 @@ -filename equ '%EXENAME%' - -virtual at 0 -file filename:3Ch,4 -load pehea dword from 0 -file filename:pehea,0F8h+28h*3 -load NumberOfSections word from 4+6 -load SizeOfOptionalHeader word from 4+14h -if NumberOfSections<>3 -error Expected three sections, .text, .bss and .reloc -end if -if SizeOfOptionalHeader<>0E0h -error Nonstandard PE header -end if -load RelocsRVA dword from 4+0A0h -load RelocsSize dword from 4+0A4h -load ImageBase dword from 4+34h -load TextRVA dword from 4+0F8h+0Ch -load TextSize dword from 4+0F8h+8 -load TextOffs dword from 4+0F8h+14h -load BSSSize dword from 4+0F8h+28h+10h -load RelocRVA dword from 4+0F8h+28h*2+0Ch -load RelocOffs dword from 4+0F8h+28h*2+14h -if BSSSize -error Second section expected to be .bss -end if -if RelocRVA<>RelocsRVA -error Third section expected to be .reloc -end if -;file 'test.exe':pehea+0F8h,28h -;load physofs dword from 4+14h -;load mem dword from 4+8 -;file 'test.exe':physofs+16,4 -;load sz dword from $-4 -end virtual - -file filename:TextOffs,TextSize - -while RelocsSize>8 -virtual at 0 -file filename:RelocOffs,8 -load CurRelocPage dword from 0 -load CurRelocChunkSize dword from 4 -end virtual -RelocsSize=RelocsSize-CurRelocChunkSize -CurRelocChunkSize = CurRelocChunkSize-8 -RelocOffs=RelocOffs+8 -while CurRelocChunkSize -virtual at 0 -file filename:RelocOffs,2 -RelocOffs=RelocOffs+2 -CurRelocChunkSize=CurRelocChunkSize-2 -load s word from 0 -end virtual -CurRelocType = s shr 12 -RelocItem = CurRelocPage + (s and 0xFFF) -if CurRelocType=0 -else if CurRelocType=3 -load z dword from RelocItem-TextRVA -store dword z-(TextRVA+ImageBase) at RelocItem-TextRVA -else -error Unexpected relocation type -end if -end while -end while - -store dword TextSize at 10h -store dword RelocRVA-TextRVA at 14h diff --git a/data/et/settings/network.ini b/data/et/settings/network.ini deleted file mode 100644 index 048f6848b6..0000000000 --- a/data/et/settings/network.ini +++ /dev/null @@ -1,25 +0,0 @@ -; General configuration for otherwise unlisted devices. -[ip?] -; type should be dhcp, auto or disabled. -ip_type = auto -dns_type= auto - -; Specific configuration for network device 1. -[ip1] -; type can be dhcp, auto, static or disabled. -ip_type = auto -ip = 192.168.1.150 -subnet = 255.255.255.0 -gateway = 192.168.1.1 -dns_type= auto -dns = 192.168.1.1 - -[proxy] -; If Internet connection requires HTTP proxy, set it here -; and uncomment following lines: -;proxy = -;port = -; If proxy requires authentification, uncomment following lines too -; (otherwise, leave them commented): -;user = -;password= \ No newline at end of file diff --git a/data/et/settings/taskbar.ini b/data/et/settings/taskbar.ini deleted file mode 100644 index 2b6cb89017..0000000000 --- a/data/et/settings/taskbar.ini +++ /dev/null @@ -1,40 +0,0 @@ -[Variables] -PanelHeight=28 -PanelWidth=0 -SoftenHeight=4 -ButtonTopOffset=3 -ButtonBottOffset=3 - -[Flags] -SoftenUp=1 -SoftenDown=1 -MinLeftButton=0 -MinRightButton=0 -MenuButton=1 -RunApplButtons=1 -ClnDesktButton=1 -Clock=1 -CpuUsage=1 -ChangeLang=1 -Attachment=1 -ButtonsStyle=0 - -[Colors] -MenuButton=0,100,0 -ClnDesktButton=0,128,255 -Clock=0,128,255 -CpuUsage=0,100,0 -CpuUsageBckgr=255,0,0 -ChangeLang=0,128,255 -PageList=255,255,255 -Text=255,255,255 -AltTab=255,128,0 - -[ApplicationsPaths] -End=/sys/END -Menu=/sys/@MENU -Run=/sys/RUN -PrnScr=/sys/SCRSHOOT -Clock=/sys/CALENDAR -CpuUsage=/sys/GMON -MouseEmul=/sys/MOUSEMUL diff --git a/data/it/RUN b/data/it/RUN deleted file mode 100644 index 14af9a654d..0000000000 Binary files a/data/it/RUN and /dev/null differ diff --git a/data/it/distr_data/KolibriOS_icon.ico b/data/it/distr_data/KolibriOS_icon.ico deleted file mode 100644 index fcba0849d9..0000000000 Binary files a/data/it/distr_data/KolibriOS_icon.ico and /dev/null differ diff --git a/data/it/distr_data/autorun.inf b/data/it/distr_data/autorun.inf deleted file mode 100644 index a3c071e7c4..0000000000 --- a/data/it/distr_data/autorun.inf +++ /dev/null @@ -1,3 +0,0 @@ -[AutoRun] -icon=KolibriOS_icon.ico -shellexecute=readme.txt \ No newline at end of file diff --git a/data/it/doexe2.asm b/data/it/doexe2.asm deleted file mode 100644 index eaebd8aaf8..0000000000 --- a/data/it/doexe2.asm +++ /dev/null @@ -1,68 +0,0 @@ -filename equ '%EXENAME%' - -virtual at 0 -file filename:3Ch,4 -load pehea dword from 0 -file filename:pehea,0F8h+28h*3 -load NumberOfSections word from 4+6 -load SizeOfOptionalHeader word from 4+14h -if NumberOfSections<>3 -error Expected three sections, .text, .bss and .reloc -end if -if SizeOfOptionalHeader<>0E0h -error Nonstandard PE header -end if -load RelocsRVA dword from 4+0A0h -load RelocsSize dword from 4+0A4h -load ImageBase dword from 4+34h -load TextRVA dword from 4+0F8h+0Ch -load TextSize dword from 4+0F8h+8 -load TextOffs dword from 4+0F8h+14h -load BSSSize dword from 4+0F8h+28h+10h -load RelocRVA dword from 4+0F8h+28h*2+0Ch -load RelocOffs dword from 4+0F8h+28h*2+14h -if BSSSize -error Second section expected to be .bss -end if -if RelocRVA<>RelocsRVA -error Third section expected to be .reloc -end if -;file 'test.exe':pehea+0F8h,28h -;load physofs dword from 4+14h -;load mem dword from 4+8 -;file 'test.exe':physofs+16,4 -;load sz dword from $-4 -end virtual - -file filename:TextOffs,TextSize - -while RelocsSize>8 -virtual at 0 -file filename:RelocOffs,8 -load CurRelocPage dword from 0 -load CurRelocChunkSize dword from 4 -end virtual -RelocsSize=RelocsSize-CurRelocChunkSize -CurRelocChunkSize = CurRelocChunkSize-8 -RelocOffs=RelocOffs+8 -while CurRelocChunkSize -virtual at 0 -file filename:RelocOffs,2 -RelocOffs=RelocOffs+2 -CurRelocChunkSize=CurRelocChunkSize-2 -load s word from 0 -end virtual -CurRelocType = s shr 12 -RelocItem = CurRelocPage + (s and 0xFFF) -if CurRelocType=0 -else if CurRelocType=3 -load z dword from RelocItem-TextRVA -store dword z-(TextRVA+ImageBase) at RelocItem-TextRVA -else -error Unexpected relocation type -end if -end while -end while - -store dword TextSize at 10h -store dword RelocRVA-TextRVA at 14h diff --git a/data/it/settings/network.ini b/data/it/settings/network.ini deleted file mode 100644 index 048f6848b6..0000000000 --- a/data/it/settings/network.ini +++ /dev/null @@ -1,25 +0,0 @@ -; General configuration for otherwise unlisted devices. -[ip?] -; type should be dhcp, auto or disabled. -ip_type = auto -dns_type= auto - -; Specific configuration for network device 1. -[ip1] -; type can be dhcp, auto, static or disabled. -ip_type = auto -ip = 192.168.1.150 -subnet = 255.255.255.0 -gateway = 192.168.1.1 -dns_type= auto -dns = 192.168.1.1 - -[proxy] -; If Internet connection requires HTTP proxy, set it here -; and uncomment following lines: -;proxy = -;port = -; If proxy requires authentification, uncomment following lines too -; (otherwise, leave them commented): -;user = -;password= \ No newline at end of file diff --git a/data/it/settings/taskbar.ini b/data/it/settings/taskbar.ini deleted file mode 100644 index 2b6cb89017..0000000000 --- a/data/it/settings/taskbar.ini +++ /dev/null @@ -1,40 +0,0 @@ -[Variables] -PanelHeight=28 -PanelWidth=0 -SoftenHeight=4 -ButtonTopOffset=3 -ButtonBottOffset=3 - -[Flags] -SoftenUp=1 -SoftenDown=1 -MinLeftButton=0 -MinRightButton=0 -MenuButton=1 -RunApplButtons=1 -ClnDesktButton=1 -Clock=1 -CpuUsage=1 -ChangeLang=1 -Attachment=1 -ButtonsStyle=0 - -[Colors] -MenuButton=0,100,0 -ClnDesktButton=0,128,255 -Clock=0,128,255 -CpuUsage=0,100,0 -CpuUsageBckgr=255,0,0 -ChangeLang=0,128,255 -PageList=255,255,255 -Text=255,255,255 -AltTab=255,128,0 - -[ApplicationsPaths] -End=/sys/END -Menu=/sys/@MENU -Run=/sys/RUN -PrnScr=/sys/SCRSHOOT -Clock=/sys/CALENDAR -CpuUsage=/sys/GMON -MouseEmul=/sys/MOUSEMUL diff --git a/data/rus/RUN b/data/rus/RUN deleted file mode 100644 index 9c45d0e8fc..0000000000 Binary files a/data/rus/RUN and /dev/null differ diff --git a/data/rus/distr_data/KolibriOS_icon.ico b/data/rus/distr_data/KolibriOS_icon.ico deleted file mode 100644 index fcba0849d9..0000000000 Binary files a/data/rus/distr_data/KolibriOS_icon.ico and /dev/null differ diff --git a/data/rus/distr_data/autorun.inf b/data/rus/distr_data/autorun.inf deleted file mode 100644 index a3c071e7c4..0000000000 --- a/data/rus/distr_data/autorun.inf +++ /dev/null @@ -1,3 +0,0 @@ -[AutoRun] -icon=KolibriOS_icon.ico -shellexecute=readme.txt \ No newline at end of file diff --git a/data/rus/doexe2.asm b/data/rus/doexe2.asm deleted file mode 100644 index eaebd8aaf8..0000000000 --- a/data/rus/doexe2.asm +++ /dev/null @@ -1,68 +0,0 @@ -filename equ '%EXENAME%' - -virtual at 0 -file filename:3Ch,4 -load pehea dword from 0 -file filename:pehea,0F8h+28h*3 -load NumberOfSections word from 4+6 -load SizeOfOptionalHeader word from 4+14h -if NumberOfSections<>3 -error Expected three sections, .text, .bss and .reloc -end if -if SizeOfOptionalHeader<>0E0h -error Nonstandard PE header -end if -load RelocsRVA dword from 4+0A0h -load RelocsSize dword from 4+0A4h -load ImageBase dword from 4+34h -load TextRVA dword from 4+0F8h+0Ch -load TextSize dword from 4+0F8h+8 -load TextOffs dword from 4+0F8h+14h -load BSSSize dword from 4+0F8h+28h+10h -load RelocRVA dword from 4+0F8h+28h*2+0Ch -load RelocOffs dword from 4+0F8h+28h*2+14h -if BSSSize -error Second section expected to be .bss -end if -if RelocRVA<>RelocsRVA -error Third section expected to be .reloc -end if -;file 'test.exe':pehea+0F8h,28h -;load physofs dword from 4+14h -;load mem dword from 4+8 -;file 'test.exe':physofs+16,4 -;load sz dword from $-4 -end virtual - -file filename:TextOffs,TextSize - -while RelocsSize>8 -virtual at 0 -file filename:RelocOffs,8 -load CurRelocPage dword from 0 -load CurRelocChunkSize dword from 4 -end virtual -RelocsSize=RelocsSize-CurRelocChunkSize -CurRelocChunkSize = CurRelocChunkSize-8 -RelocOffs=RelocOffs+8 -while CurRelocChunkSize -virtual at 0 -file filename:RelocOffs,2 -RelocOffs=RelocOffs+2 -CurRelocChunkSize=CurRelocChunkSize-2 -load s word from 0 -end virtual -CurRelocType = s shr 12 -RelocItem = CurRelocPage + (s and 0xFFF) -if CurRelocType=0 -else if CurRelocType=3 -load z dword from RelocItem-TextRVA -store dword z-(TextRVA+ImageBase) at RelocItem-TextRVA -else -error Unexpected relocation type -end if -end while -end while - -store dword TextSize at 10h -store dword RelocRVA-TextRVA at 14h diff --git a/data/rus/settings/network.ini b/data/rus/settings/network.ini deleted file mode 100644 index 048f6848b6..0000000000 --- a/data/rus/settings/network.ini +++ /dev/null @@ -1,25 +0,0 @@ -; General configuration for otherwise unlisted devices. -[ip?] -; type should be dhcp, auto or disabled. -ip_type = auto -dns_type= auto - -; Specific configuration for network device 1. -[ip1] -; type can be dhcp, auto, static or disabled. -ip_type = auto -ip = 192.168.1.150 -subnet = 255.255.255.0 -gateway = 192.168.1.1 -dns_type= auto -dns = 192.168.1.1 - -[proxy] -; If Internet connection requires HTTP proxy, set it here -; and uncomment following lines: -;proxy = -;port = -; If proxy requires authentification, uncomment following lines too -; (otherwise, leave them commented): -;user = -;password= \ No newline at end of file diff --git a/data/rus/settings/taskbar.ini b/data/rus/settings/taskbar.ini deleted file mode 100644 index 2b6cb89017..0000000000 --- a/data/rus/settings/taskbar.ini +++ /dev/null @@ -1,40 +0,0 @@ -[Variables] -PanelHeight=28 -PanelWidth=0 -SoftenHeight=4 -ButtonTopOffset=3 -ButtonBottOffset=3 - -[Flags] -SoftenUp=1 -SoftenDown=1 -MinLeftButton=0 -MinRightButton=0 -MenuButton=1 -RunApplButtons=1 -ClnDesktButton=1 -Clock=1 -CpuUsage=1 -ChangeLang=1 -Attachment=1 -ButtonsStyle=0 - -[Colors] -MenuButton=0,100,0 -ClnDesktButton=0,128,255 -Clock=0,128,255 -CpuUsage=0,100,0 -CpuUsageBckgr=255,0,0 -ChangeLang=0,128,255 -PageList=255,255,255 -Text=255,255,255 -AltTab=255,128,0 - -[ApplicationsPaths] -End=/sys/END -Menu=/sys/@MENU -Run=/sys/RUN -PrnScr=/sys/SCRSHOOT -Clock=/sys/CALENDAR -CpuUsage=/sys/GMON -MouseEmul=/sys/MOUSEMUL diff --git a/data/sp/RUN b/data/sp/RUN deleted file mode 100644 index 6eeaeaf335..0000000000 Binary files a/data/sp/RUN and /dev/null differ diff --git a/data/sp/distr_data/KolibriOS_icon.ico b/data/sp/distr_data/KolibriOS_icon.ico deleted file mode 100644 index fcba0849d9..0000000000 Binary files a/data/sp/distr_data/KolibriOS_icon.ico and /dev/null differ diff --git a/data/sp/distr_data/autorun.inf b/data/sp/distr_data/autorun.inf deleted file mode 100644 index a3c071e7c4..0000000000 --- a/data/sp/distr_data/autorun.inf +++ /dev/null @@ -1,3 +0,0 @@ -[AutoRun] -icon=KolibriOS_icon.ico -shellexecute=readme.txt \ No newline at end of file diff --git a/data/sp/doexe2.asm b/data/sp/doexe2.asm deleted file mode 100644 index eaebd8aaf8..0000000000 --- a/data/sp/doexe2.asm +++ /dev/null @@ -1,68 +0,0 @@ -filename equ '%EXENAME%' - -virtual at 0 -file filename:3Ch,4 -load pehea dword from 0 -file filename:pehea,0F8h+28h*3 -load NumberOfSections word from 4+6 -load SizeOfOptionalHeader word from 4+14h -if NumberOfSections<>3 -error Expected three sections, .text, .bss and .reloc -end if -if SizeOfOptionalHeader<>0E0h -error Nonstandard PE header -end if -load RelocsRVA dword from 4+0A0h -load RelocsSize dword from 4+0A4h -load ImageBase dword from 4+34h -load TextRVA dword from 4+0F8h+0Ch -load TextSize dword from 4+0F8h+8 -load TextOffs dword from 4+0F8h+14h -load BSSSize dword from 4+0F8h+28h+10h -load RelocRVA dword from 4+0F8h+28h*2+0Ch -load RelocOffs dword from 4+0F8h+28h*2+14h -if BSSSize -error Second section expected to be .bss -end if -if RelocRVA<>RelocsRVA -error Third section expected to be .reloc -end if -;file 'test.exe':pehea+0F8h,28h -;load physofs dword from 4+14h -;load mem dword from 4+8 -;file 'test.exe':physofs+16,4 -;load sz dword from $-4 -end virtual - -file filename:TextOffs,TextSize - -while RelocsSize>8 -virtual at 0 -file filename:RelocOffs,8 -load CurRelocPage dword from 0 -load CurRelocChunkSize dword from 4 -end virtual -RelocsSize=RelocsSize-CurRelocChunkSize -CurRelocChunkSize = CurRelocChunkSize-8 -RelocOffs=RelocOffs+8 -while CurRelocChunkSize -virtual at 0 -file filename:RelocOffs,2 -RelocOffs=RelocOffs+2 -CurRelocChunkSize=CurRelocChunkSize-2 -load s word from 0 -end virtual -CurRelocType = s shr 12 -RelocItem = CurRelocPage + (s and 0xFFF) -if CurRelocType=0 -else if CurRelocType=3 -load z dword from RelocItem-TextRVA -store dword z-(TextRVA+ImageBase) at RelocItem-TextRVA -else -error Unexpected relocation type -end if -end while -end while - -store dword TextSize at 10h -store dword RelocRVA-TextRVA at 14h diff --git a/data/sp/settings/network.ini b/data/sp/settings/network.ini deleted file mode 100644 index 048f6848b6..0000000000 --- a/data/sp/settings/network.ini +++ /dev/null @@ -1,25 +0,0 @@ -; General configuration for otherwise unlisted devices. -[ip?] -; type should be dhcp, auto or disabled. -ip_type = auto -dns_type= auto - -; Specific configuration for network device 1. -[ip1] -; type can be dhcp, auto, static or disabled. -ip_type = auto -ip = 192.168.1.150 -subnet = 255.255.255.0 -gateway = 192.168.1.1 -dns_type= auto -dns = 192.168.1.1 - -[proxy] -; If Internet connection requires HTTP proxy, set it here -; and uncomment following lines: -;proxy = -;port = -; If proxy requires authentification, uncomment following lines too -; (otherwise, leave them commented): -;user = -;password= \ No newline at end of file diff --git a/data/sp/settings/taskbar.ini b/data/sp/settings/taskbar.ini deleted file mode 100644 index 2b6cb89017..0000000000 --- a/data/sp/settings/taskbar.ini +++ /dev/null @@ -1,40 +0,0 @@ -[Variables] -PanelHeight=28 -PanelWidth=0 -SoftenHeight=4 -ButtonTopOffset=3 -ButtonBottOffset=3 - -[Flags] -SoftenUp=1 -SoftenDown=1 -MinLeftButton=0 -MinRightButton=0 -MenuButton=1 -RunApplButtons=1 -ClnDesktButton=1 -Clock=1 -CpuUsage=1 -ChangeLang=1 -Attachment=1 -ButtonsStyle=0 - -[Colors] -MenuButton=0,100,0 -ClnDesktButton=0,128,255 -Clock=0,128,255 -CpuUsage=0,100,0 -CpuUsageBckgr=255,0,0 -ChangeLang=0,128,255 -PageList=255,255,255 -Text=255,255,255 -AltTab=255,128,0 - -[ApplicationsPaths] -End=/sys/END -Menu=/sys/@MENU -Run=/sys/RUN -PrnScr=/sys/SCRSHOOT -Clock=/sys/CALENDAR -CpuUsage=/sys/GMON -MouseEmul=/sys/MOUSEMUL diff --git a/programs/games/LaserTank/trunk/smalllibc/doexe2.asm b/programs/games/LaserTank/trunk/smalllibc/doexe2.asm deleted file mode 100644 index eaebd8aaf8..0000000000 --- a/programs/games/LaserTank/trunk/smalllibc/doexe2.asm +++ /dev/null @@ -1,68 +0,0 @@ -filename equ '%EXENAME%' - -virtual at 0 -file filename:3Ch,4 -load pehea dword from 0 -file filename:pehea,0F8h+28h*3 -load NumberOfSections word from 4+6 -load SizeOfOptionalHeader word from 4+14h -if NumberOfSections<>3 -error Expected three sections, .text, .bss and .reloc -end if -if SizeOfOptionalHeader<>0E0h -error Nonstandard PE header -end if -load RelocsRVA dword from 4+0A0h -load RelocsSize dword from 4+0A4h -load ImageBase dword from 4+34h -load TextRVA dword from 4+0F8h+0Ch -load TextSize dword from 4+0F8h+8 -load TextOffs dword from 4+0F8h+14h -load BSSSize dword from 4+0F8h+28h+10h -load RelocRVA dword from 4+0F8h+28h*2+0Ch -load RelocOffs dword from 4+0F8h+28h*2+14h -if BSSSize -error Second section expected to be .bss -end if -if RelocRVA<>RelocsRVA -error Third section expected to be .reloc -end if -;file 'test.exe':pehea+0F8h,28h -;load physofs dword from 4+14h -;load mem dword from 4+8 -;file 'test.exe':physofs+16,4 -;load sz dword from $-4 -end virtual - -file filename:TextOffs,TextSize - -while RelocsSize>8 -virtual at 0 -file filename:RelocOffs,8 -load CurRelocPage dword from 0 -load CurRelocChunkSize dword from 4 -end virtual -RelocsSize=RelocsSize-CurRelocChunkSize -CurRelocChunkSize = CurRelocChunkSize-8 -RelocOffs=RelocOffs+8 -while CurRelocChunkSize -virtual at 0 -file filename:RelocOffs,2 -RelocOffs=RelocOffs+2 -CurRelocChunkSize=CurRelocChunkSize-2 -load s word from 0 -end virtual -CurRelocType = s shr 12 -RelocItem = CurRelocPage + (s and 0xFFF) -if CurRelocType=0 -else if CurRelocType=3 -load z dword from RelocItem-TextRVA -store dword z-(TextRVA+ImageBase) at RelocItem-TextRVA -else -error Unexpected relocation type -end if -end while -end while - -store dword TextSize at 10h -store dword RelocRVA-TextRVA at 14h diff --git a/programs/games/kosilka/doexe2.asm b/programs/games/kosilka/doexe2.asm deleted file mode 100644 index fb23830629..0000000000 --- a/programs/games/kosilka/doexe2.asm +++ /dev/null @@ -1,68 +0,0 @@ -filename equ 'kosilka.exe' - -virtual at 0 -file filename:3Ch,4 -load pehea dword from 0 -file filename:pehea,0F8h+28h*3 -load NumberOfSections word from 4+6 -load SizeOfOptionalHeader word from 4+14h -if NumberOfSections<>3 -error Expected three sections, .text, .bss and .reloc -end if -if SizeOfOptionalHeader<>0E0h -error Nonstandard PE header -end if -load RelocsRVA dword from 4+0A0h -load RelocsSize dword from 4+0A4h -load ImageBase dword from 4+34h -load TextRVA dword from 4+0F8h+0Ch -load TextSize dword from 4+0F8h+8 -load TextOffs dword from 4+0F8h+14h -load BSSSize dword from 4+0F8h+28h+10h -load RelocRVA dword from 4+0F8h+28h*2+0Ch -load RelocOffs dword from 4+0F8h+28h*2+14h -if BSSSize -error Second section expected to be .bss -end if -if RelocRVA<>RelocsRVA -error Third section expected to be .reloc -end if -;file 'test.exe':pehea+0F8h,28h -;load physofs dword from 4+14h -;load mem dword from 4+8 -;file 'test.exe':physofs+16,4 -;load sz dword from $-4 -end virtual - -file filename:TextOffs,TextSize - -while RelocsSize>8 -virtual at 0 -file filename:RelocOffs,8 -load CurRelocPage dword from 0 -load CurRelocChunkSize dword from 4 -end virtual -RelocsSize=RelocsSize-CurRelocChunkSize -CurRelocChunkSize = CurRelocChunkSize-8 -RelocOffs=RelocOffs+8 -while CurRelocChunkSize -virtual at 0 -file filename:RelocOffs,2 -RelocOffs=RelocOffs+2 -CurRelocChunkSize=CurRelocChunkSize-2 -load s word from 0 -end virtual -CurRelocType = s shr 12 -RelocItem = CurRelocPage + (s and 0xFFF) -if CurRelocType=0 -else if CurRelocType=3 -load z dword from RelocItem-TextRVA -store dword z-(TextRVA+ImageBase) at RelocItem-TextRVA -else -error Unexpected relocation type -end if -end while -end while - -store dword TextSize at 10h -store dword RelocRVA-TextRVA at 14h diff --git a/programs/use_msvc.lua b/programs/use_msvc.lua index 96f5c7bbae..b07f75c99b 100644 --- a/programs/use_msvc.lua +++ b/programs/use_msvc.lua @@ -24,5 +24,5 @@ function link_msvc(input, output) local mapname = output .. ".map" tup.rule(input, "link.exe " .. LDFLAGS .. " /out:%o /Map:" .. mapname .. " %f", {exename, extra_outputs = {mapname}}) - tup.rule(exename, env_prefix .. "fasm " .. THISDIR .. "/../data/eng/doexe2.asm %o " .. tup.getconfig("KPACK_CMD"), output) + tup.rule(exename, env_prefix .. "fasm " .. THISDIR .. "/../data/common/doexe2.asm %o " .. tup.getconfig("KPACK_CMD"), output) end