Remove more duplicates: doexe2.asm, network.ini, etc.

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

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/NETWORK.INI", "common/settings/network.ini"},
- {"SETTINGS/TASKBAR.INI", build_type .. "/settings/taskbar.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/<groupname>" and the file should be put in <groupname>.
 --]]
 extra_files = {
- {"/", build_type .. "/distr_data/autorun.inf"},
+ {"/", "common/distr_data/autorun.inf"},
- {"/", build_type .. "/distr_data/KolibriOS_icon.ico"},
+ {"/", "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"},

data/eng/distr_data/autorun.inf

@@ -1,3 +0,0 @@
-[AutoRun]
-icon=KolibriOS_icon.ico
-shellexecute=readme.txt

data/eng/doexe2.asm

@@ -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

data/eng/settings/network.ini

@@ -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  = <set your proxy IP-addr or domain name here>
-;port   = <set your proxy port here>
-; If proxy requires authentification, uncomment following lines too
-; (otherwise, leave them commented):
-;user    = <set username here>
-;password= <set password here>

data/eng/settings/taskbar.ini

@@ -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

data/et/distr_data/autorun.inf

@@ -1,3 +0,0 @@
-[AutoRun]
-icon=KolibriOS_icon.ico
-shellexecute=readme.txt

data/et/doexe2.asm

@@ -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

data/et/settings/network.ini

@@ -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  = <set your proxy IP-addr or domain name here>
-;port   = <set your proxy port here>
-; If proxy requires authentification, uncomment following lines too
-; (otherwise, leave them commented):
-;user    = <set username here>
-;password= <set password here>

data/et/settings/taskbar.ini

@@ -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

data/it/distr_data/autorun.inf

@@ -1,3 +0,0 @@
-[AutoRun]
-icon=KolibriOS_icon.ico
-shellexecute=readme.txt

data/it/doexe2.asm

@@ -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

data/it/settings/network.ini

@@ -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  = <set your proxy IP-addr or domain name here>
-;port   = <set your proxy port here>
-; If proxy requires authentification, uncomment following lines too
-; (otherwise, leave them commented):
-;user    = <set username here>
-;password= <set password here>

data/it/settings/taskbar.ini

@@ -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

data/rus/distr_data/autorun.inf

@@ -1,3 +0,0 @@
-[AutoRun]
-icon=KolibriOS_icon.ico
-shellexecute=readme.txt

data/rus/doexe2.asm

@@ -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

data/rus/settings/network.ini

@@ -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  = <set your proxy IP-addr or domain name here>
-;port   = <set your proxy port here>
-; If proxy requires authentification, uncomment following lines too
-; (otherwise, leave them commented):
-;user    = <set username here>
-;password= <set password here>

data/rus/settings/taskbar.ini

@@ -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

data/sp/distr_data/autorun.inf

@@ -1,3 +0,0 @@
-[AutoRun]
-icon=KolibriOS_icon.ico
-shellexecute=readme.txt

data/sp/doexe2.asm

@@ -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

data/sp/settings/network.ini

@@ -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  = <set your proxy IP-addr or domain name here>
-;port   = <set your proxy port here>
-; If proxy requires authentification, uncomment following lines too
-; (otherwise, leave them commented):
-;user    = <set username here>
-;password= <set password here>

data/sp/settings/taskbar.ini

@@ -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

programs/games/LaserTank/trunk/smalllibc/doexe2.asm

@@ -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

programs/games/kosilka/doexe2.asm

@@ -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

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