compiles on modified jwasm

2025-04-21 08:34:40 +00:00 · 2025-04-02 07:52:59 +09:00 · 2025-04-02 07:52:59 +09:00 · 207c82c19f
commit 207c82c19f
parent 5746ab4feb
49 changed files with 1793 additions and 1964 deletions
--- a/SRC/GNUmakefile
+++ b/SRC/GNUmakefile
@ -0,0 +1,118 @@
 .SUFFIXES: .asm .obj
 .PHONY: vz default clean
 OBJS =	main.obj alias.obj char.obj core.obj disp.obj dos.obj expr.obj\
 	filer.obj gets.obj harderr.obj inst.obj key.obj ledit.obj macro.obj\
 	memo.obj menu.obj misc.obj open.obj printf.obj scrn.obj smooth.obj\
 	string.obj text.obj view.obj wind.obj swap.obj ems.obj xscr.obj msg.obj
 HARD =
 FLAG = -DPC98
 default:
 	@echo "Available paltforms: 98 J31 IBM IBMJ AX 55 US"
 	@echo "Run $(MAKE) vz PLATFORM=<platform> to build"
 ifeq ($(PLATFORM),98)
 HARD=
 FLAG=-DPC98
 endif
 ifeq ($(PLATFORM),J31)
 HARD=J31
 FLAG=-DJ31
 endif
 ifeq ($(PLATFORM),IBM)
 HARD=IBM
 FLAG=-DIBMV
 endif
 ifeq ($(PLATFORM),IBMJ)
 HARD=IBMJ
 FLAG=-DIBMJ
 endif
 ifeq ($(PLATFORM),AX)
 HARD=AX
 FLAG=-DIBMAX
 endif
 ifeq ($(PLATFORM),55)
 HARD=55
 FLAG=-DJBM
 endif
 ifeq ($(PLATFORM),US)
 HARD=US
 FLAG=-DUS
 endif
 vz: vz$(HARD).com
 .asm.obj:
 	jwasm -Zm -Zg -ml -Zne -Zg -fpc -nologo -Cu -zcw -c $(FLAG) -Fo$@ $< || (rm -f $@ ; exit 1)
 vz$(HARD).com: $(OBJS)
 	wlink format dos com name $@ file `echo $^ | sed "s/ /,/g"`
 main.obj: vz.inc main.asm
 alias.obj: vz.inc alias.asm
 char.obj: vz.inc char.asm
 core.obj: vz.inc core.asm
 disp.obj: vz.inc disp.asm
 dos.obj: vz.inc dos.asm
 expr.obj: vz.inc expr.asm
 filer.obj: vz.inc filer.asm
 gets.obj: vz.inc gets.asm
 harderr.obj: vz.inc harderr.asm
 inst.obj: vz.inc inst.asm
 key.obj: vz.inc key.asm key98.asm keyibm.asm
 ledit.obj: vz.inc ledit.asm
 macro.obj: vz.inc macro.asm
 memo.obj: vz.inc memo.asm
 menu.obj: vz.inc menu.asm
 misc.obj: vz.inc misc.asm
 open.obj: vz.inc open.asm
 printf.obj: sprintf.inc printf.asm
 scrn.obj: vz.inc scrn.asm scrn98.asm scrnibm.asm
 smooth.obj: vz.inc smooth.asm
 string.obj: vz.inc string.asm
 text.obj: vz.inc text.asm
 view.obj: vz.inc view.asm
 wind.obj: vz.inc wind.asm
 xscr.obj: vz.inc xscr.asm
 swap.obj: vz.inc swap.asm
 ems.obj: vz.inc ems.asm
 msg.obj: vz.inc msg.asm
 clean:
 	rm -f vz*.com *.obj *.err
--- a/SRC/ac.bat
+++ b/SRC/ac.bat
@ -1,29 +0,0 @@
 echo off
 rem	-------	Assemble a source -------
 rem		... called by cmos.def [f¥10],[SHIFT]+[f¥10]
 rem
 rem	%ASM%	:assembler name cap (opt,t,m) ex. set asm=opt
 rem	%MASM%	:assemble option (/ml) ex. set masm=/ml
 echo ===== %ASM%asm %1 =====
 if not "%2"=="" goto asm2
 if not "%HARD%"=="" goto asm1d
 %ASM%asm %MASM% %1;
 goto end
 :asm1d
 %ASM%asm %MASM% /d%HARD% %1;
 goto end
 :asm2
 if not "%HARD%"=="" goto asm2d
 %ASM%asm %MASM% /%2 %1;
 goto end
 :asm2d
 %ASM%asm %MASM% /d%HARD% /%2 %1;
 goto end
 :end
 if errorlevel 1 echo 
--- a/SRC/alias.asm
+++ b/SRC/alias.asm
@ -99,7 +99,7 @@ isatm3:
 	mov	di,si
 	stc
 isatm8:	pop	si
-	ret
+	VZ_RET
 isatom	endp
 ;--- Word length ---
@ -118,7 +118,7 @@ wlen1:	lodsb
 wlen2:	dec	si
 	sub	cx,si
 	neg	cx
-	ret
+	VZ_RET
 wordlen	endp
 ;--- Statement length ---
@ -141,7 +141,7 @@ slen2:	tst	al
 slen3:	dec	si
 	sub	cx,si
 	neg	cx
-wlen9:	ret
+wlen9:	VZ_RET
 statelen endp
 ;--- Insert string ---
@ -179,7 +179,7 @@ insstr1:
 	pop	ds
 	popm	<di,si,dx,cx>
 	call	memmove
-	ret
+	VZ_RET
 insertstr endp
 ;--- Spread %n variables ---
@ -205,7 +205,7 @@ _if z
 	clr	dl
 	jmps	spvar_all
 _endif
-spvar9:	ret
+spvar9:	VZ_RET
 spvar2:
 	inc	cx
@ -313,7 +313,7 @@ _repeat
 	dec	dl
 _until
 skpar0:	clr	si
-skpar9:	ret
+skpar9:	VZ_RET
 seekparm endp
 ;--- Parse parmeter ---
@ -329,32 +329,32 @@ parseparm proc
 	mov	di,si
 	call	parsepath
 	dec	si
-	test	dl,PRS_DRV
+	test	dl,VZ_PRS_DRV
 _ifn z
-	or	dl,PRS_DIR
+	or	dl,VZ_PRS_DIR
 _endif
-	and	dl,PRS_DIR+PRS_NAME+PRS_EXT
+	and	dl,VZ_PRS_DIR+VZ_PRS_NAME+VZ_PRS_EXT
 	shl	dh,1
 	mov	al,dl
 	and	al,dh
 	jz	papar0
-	test	al,PRS_DIR
+	test	al,VZ_PRS_DIR
 	jnz	papar2
 	mov	di,bx
-	test	al,PRS_NAME
+	test	al,VZ_PRS_NAME
 	jnz	papar2
 	mov	di,cx
 	inc	di
 papar2:	xchg	si,di
 	mov	ax,bx
-	test	dl,PRS_NAME
+	test	dl,VZ_PRS_NAME
 	jz	papar3
-	test	dh,PRS_NAME+PRS_EXT
+	test	dh,VZ_PRS_NAME+VZ_PRS_EXT
 	jz	papar4
 papar3:	mov	ax,cx
-	test	dl,PRS_EXT
+	test	dl,VZ_PRS_EXT
 	jz	papar5
-	test	dh,PRS_EXT
+	test	dh,VZ_PRS_EXT
 	jnz	papar5
 papar4:	mov	di,ax
 papar5:	mov	cx,di
@ -362,7 +362,7 @@ papar5:	mov	cx,di
 	jmps	papar9
 papar0:	clr	cx
 papar9:	pop	di
-	ret
+	VZ_RET
 parseparm endp
 ;--- Dump alias ---
@ -382,14 +382,14 @@ aliasmenu proc
 	mov	si,bx
 	add	si,type _menu
 	call	popupmenu
-almnu9:	ret
+almnu9:	VZ_RET
 aliasmenu endp
 drawalias proc
 	tst	ah
 _ifn z
 	stc
-	ret
+	VZ_RET
 _endif
 	mov	cl,al
 	clr	ch
@ -399,7 +399,7 @@ _endif
 	call	fillspc
 	call	skipspc
 	call	puts
-	ret
+	VZ_RET
 drawalias endp
 ;--- Count alias ---
@ -417,7 +417,7 @@ _repeat
 _loop
 cntal8:	mov	si,di
 	pop	di
-	ret
+	VZ_RET
 cntalias endp
 ;--- Parse command line ---
@ -515,7 +515,7 @@ pacmd5:
 	mov	si,tmpbuf
 	call	ems_loadmap
 pacmd9:	tstb	poolf
-	ret
+	VZ_RET
 parseline endp
 ;--- Next statement ---
@ -548,7 +548,7 @@ _endif
 	call	skipspc
 	mov	ax,si
 	pop	si
-next9:	ret
+next9:	VZ_RET
 nextstate endp
 ;--- Parse statement (%%,%env%) ---
@ -616,7 +616,7 @@ _endif
 	add	si,cx
 	jmp	pastat1
 pastat9:dec	si
-	ret
+	VZ_RET
 parsestate endp
 	endes
@ -627,4 +627,3 @@ ENDIF
 ;	End of 'alias.asm'
 ; Copyright (C) 1989 by c.mos
 ;****************************
--- a/SRC/char.asm
+++ b/SRC/char.asm
@ -16,9 +16,9 @@ isupper	proc
 	cmp	al,'Z'
 	ja	notup
 	stc
-isupr9:	ret
+isupr9:	VZ_RET
 notup:	clc
-	ret
+	VZ_RET
 isupper	endp
 ;--- Is lower/alpha? ---
@ -34,9 +34,9 @@ islower:
 	cmp	al,'z'
 	ja	notalp
 	stc
-	ret
+	VZ_RET
 notalp:	clc
-isal9:	ret
+isal9:	VZ_RET
 isalpha	endp
 	endbs
@ -53,9 +53,9 @@ isdigit proc
 	cmp	al,'9'
 	ja	notdig
 	stc
-	ret
+	VZ_RET
 notdig:	clc
-	ret
+	VZ_RET
 isdigit endp
 ;--- Is kanji ? ---
@ -65,9 +65,9 @@ isdigit endp
 iskanji	proc
 	ifkanji kjyes
 	clc
-	ret
+	VZ_RET
 kjyes:	stc
-	ret
+	VZ_RET
 iskanji	endp
 ;--- Char to upper/lower case ---
@ -81,7 +81,7 @@ _if c
 	sub	al,'a'-'A'
 	stc
 _endif
-	ret
+	VZ_RET
 toupper	endp
 tolower	proc
@ -90,7 +90,7 @@ _if c
 	add	al,'a'-'A'
 	stc
 _endif
-	ret
+	VZ_RET
 tolower	endp
 ;--- String to upper/lower case ---
@ -110,7 +110,7 @@ _repeat
  _cont
 strup2:	lodsb
 _until
-	ret
+	VZ_RET
 strupr	endp
 strlwr	proc
@ -126,7 +126,7 @@ _repeat
  _cont
 strlw2:	lodsb
 _until
-	ret
+	VZ_RET
 strlwr	endp
 ;--- Copy string ---
@ -142,7 +142,7 @@ _repeat
 	tst	al
 _until z
 	dec	di
-	ret
+	VZ_RET
 strcpy	endp
 ;--- Copy string (max) ---
@ -163,7 +163,7 @@ _loop
 sncpy2:	clr	al
 	stosb
 sncpy3:	dec	di
-	ret
+	VZ_RET
 strncpy endp
 ;--- Copy word ---
@ -181,7 +181,7 @@ _until be
 	dec	si
 	dec	di
 	mov	byte ptr es:[di],0
-	ret
+	VZ_RET
 wrdcpy	endp
 ;--- Compare two strings ---
@ -193,7 +193,7 @@ strcmp	proc
 	pushm	<si,di>
 	call	strcmp1
 	popm	<di,si>
-	ret
+	VZ_RET
 strcmp	endp
 strcmp1	proc
@ -207,7 +207,7 @@ strcmp1	proc
    rep cmpsb
 	mov	al,es:[di-1]
 	pop	cx
-	ret
+	VZ_RET
 strcmp1	endp
 ;----- Ignore case compare -----
@ -229,7 +229,7 @@ _repeat
 	tst	al
 _until z
 	popm	<di,si>
-	ret
+	VZ_RET
 stricmp	endp
 ;--- Ignore case word compare ---
@ -258,7 +258,7 @@ wcmp1:	cmp	ah,SPC
 	stc
 wcmp9:	mov	ax,si			; AX=next si
 	pop	si
-	ret
+	VZ_RET
 wrdicmp	endp
 ;--- String length ---
@ -274,7 +274,7 @@ strlen	proc
 	not	ax
 	dec	ax
 	popm	<es,di,cx>
-	ret
+	VZ_RET
 strlen	endp
 	public	skipstr
@ -285,7 +285,7 @@ skipstr	proc
  repnz	scasb
 	mov	ax,cx
 	pop	cx
-	ret
+	VZ_RET
 skipstr	endp
 	public	strskip
@ -296,7 +296,7 @@ strskip	proc
 	call	skipstr
 	mov	si,di
 	popm	<es,di>
-	ret
+	VZ_RET
 strskip	endp
 ;--- Skip SPC,TAB ---
@ -313,7 +313,7 @@ skipspc1:
 	cmp	al,SPC
 	je	skipspc
 skpspc8:dec	si
-	ret
+	VZ_RET
 skipspc	endp
 ;--- Skip to next char ---
@ -328,7 +328,7 @@ _repeat
 	cmp	al,SPC
 _until be
 	call	skipspc1
-	ret
+	VZ_RET
 skipchar endp
 ;--- Change LF to NULL ---
@ -347,7 +347,7 @@ lftonull proc
 	dec	ax
 	mov	byte ptr [di],0
 	pop	cx
-	ret
+	VZ_RET
 lftonull endp
 ;--- Scan CS:table ---
@ -358,9 +358,9 @@ scantbl	proc
 	movseg	es,cs
  repne	scasb
 	pop	es
-	ret
+	VZ_RET
 scantbl	endp
-	ret
+	VZ_RET
 ;----- strchr(s,c) -----
 ;<-- CY :found(SI:ptr, CX:index)
@ -407,7 +407,7 @@ _until e
 	_endif
 		stc
 strchr_x:	pop	bx
-		ret
+		VZ_RET
 strchr		endp
 ;----- strstr(si,di) -----
@ -448,7 +448,7 @@ _repeat
 _loop
 strstr8:	clc
 strstr9:	pop	bx
-		ret
+		VZ_RET
 strstr		endp
 	endes
--- a/SRC/chktsr.asm
+++ b/SRC/chktsr.asm
@ -112,7 +112,7 @@ _if z
 schex_x:stc
 _endif
 	dec	si
-	ret
+	VZ_RET
 scanhexa endp
 ;--- Scan substring2 in string1 (ignore case) ---
@ -144,7 +144,7 @@ stri2:	lodsb
 	inc	di
 	jmp	stri1
 stri_o:	stc
-stri_x:	ret	
+stri_x:	VZ_RET	
 stristr	endp
 ;--- Is upper? ---
@ -156,9 +156,9 @@ isupper	proc
 	cmp	al,'Z'
 	ja	notup
 	stc
-isupr9:	ret
+isupr9:	VZ_RET
 notup:	clc
-	ret
+	VZ_RET
 isupper	endp
 ;--- Is lower/alpha? ---
@ -173,9 +173,9 @@ islower:
 	cmp	al,'z'
 	ja	notalp
 	stc
-	ret
+	VZ_RET
 notalp:	clc
-isal9:	ret
+isal9:	VZ_RET
 isalpha	endp
 ;--- Is digit ? ---
@ -187,9 +187,9 @@ isdigit proc
 	cmp	al,'9'
 	ja	notdig
 	stc
-	ret
+	VZ_RET
 notdig:	clc
-	ret
+	VZ_RET
 isdigit endp
 ;--- Char to upper/lower case ---
@ -202,7 +202,7 @@ _if c
 	sub	al,'a'-'A'
 	stc
 _endif
-	ret
+	VZ_RET
 toupper	endp
 ;--- Skip SPC,TAB ---
@ -218,7 +218,7 @@ skipspc1:
 	cmp	al,SPC
 	je	skipspc
 skpspc8:dec	si
-	ret
+	VZ_RET
 skipspc	endp
 ;--- Messages ---
--- a/SRC/core.asm
+++ b/SRC/core.asm
@ -19,7 +19,7 @@
 	extrn	w_back		:word
 	endws
-	extrn	chkdosheight	:near
+;	extrn	chkdosheight	:near
 	extrn	chkline1	:near
 	extrn	clrbtm		:near
 	extrn	cls		:near
@ -65,7 +65,7 @@ _if c
 	sub	al,cl
 	mov	cl,255
 _endif
-	ret
+	VZ_RET
 do_tab	endp
 	endes
@ -131,7 +131,7 @@ blod5:	mov	[bp].lbseg,ss		; ##1.5
 	mov	[bp].wnxt,0
 	clc
 blod9:	pop	es
-	ret
+	VZ_RET
 bload	endp
 ;--- Save from Line buffer ---
@ -229,7 +229,7 @@ _endif
 	call	offlbuf
 	clc
 bsav9:	pop	es
-	ret
+	VZ_RET
 bsave	endp
 ;--- Close Line buffer ---
@ -246,7 +246,7 @@ offlbuf	proc
 	pop	si
 	mov	[bp].bmax,0FFFFh
 	mov	[bp].inbuf,FALSE
-	ret
+	VZ_RET
 offlbuf	endp
 ;--- Scan line start ptr  ---
@ -265,7 +265,7 @@ topl1:	dec	si
 	cld
 	inc	si
 	inc	si
-topl9:	ret
+topl9:	VZ_RET
 toplin	endp
 endlin	proc
@ -277,7 +277,7 @@ endlin	proc
  repne	scasb
 	mov	si,di
 	popm	<es,di,cx>
-	ret
+	VZ_RET
 endlin	endp
 ;--- Scan field start ptr ---
@ -294,7 +294,7 @@ _if c
 	inc	[bp].lnumb
 _endif
 	inc	[bp].dnumb
-	ret
+	VZ_RET
 prefldl:
 	cmp	byte ptr [si-1],LF
 _if e
@ -380,7 +380,7 @@ fild4:
 	jne	fild1
 	clc
 fild8:	mov	si,bx
-fild9:	ret
+fild9:	VZ_RET
 prefld	endp
 nxtfld	endp
@ -402,7 +402,7 @@ _repeat
 	cmp	si,di
 _until a
 	mov	si,ax
-tfld9:	ret
+tfld9:	VZ_RET
 topfld	endp
 ;****************************
@ -460,7 +460,7 @@ _endif
 	call	scrout_cp
 	call	dispstat
 dspscr9:clc
-	ret
+	VZ_RET
 dspscr	endp
@ -519,7 +519,7 @@ tout1:
 	call	isdnumb
 	jz	tout9
 tout8:	inc	dx
-tout9:	ret
+tout9:	VZ_RET
 tout	endp
 ;--- Check block ---
@ -585,10 +585,10 @@ _ifn z
 	mov	cx,-1
  _endif
 _endif
-	ret
+	VZ_RET
 noblk:	
 	clr	ah
-	ret
+	VZ_RET
 chktblk	endp
 chkbblk	proc
@ -689,7 +689,7 @@ sout41:	clr	ax
 	jz	sout9
 sout5:	call	cls
 sout9:	clc
-	ret
+	VZ_RET
 scrout	endp
 ;--- Display lower screen ---
@ -737,7 +737,7 @@ bout2:
 	jmp	bout1
 bout8:	pop	ds
 	clc
-	ret
+	VZ_RET
 bufout	endp
 ;--- Set home line number ---
@ -757,7 +757,7 @@ sethomdnumb:
 	sub	dl,[bp].wy
 	sbb	dh,0
 _endif
-	ret
+	VZ_RET
 sethomnumb endp
 ;--- Set bottom line number ---
@ -777,7 +777,7 @@ _else
 	clr	dh
 	add	dx,[bp].dnumb
 _endif
-	ret
+	VZ_RET
 setbtmnumb endp
 ;--- Clear message line ---
@ -802,7 +802,7 @@ _endif
 	mov	ds,[bp].ttops
 	call	clrmsg1
 	popm	<ds,bp>
-	ret
+	VZ_RET
 clrmsg1:
 	mov	dx,[bp].lnumb
@ -832,7 +832,7 @@ _else
 	call	cls
  _endif
 _endif
-	ret
+	VZ_RET
 clrmsg	endp
 	endcs
@ -962,7 +962,7 @@ cpxeq:
 	mov	[bp].lx,cl
 	mov	[bp].lxs,cl
 	pop	ds
-	ret
+	VZ_RET
 cptoxy	endp
 	endes
@ -1102,7 +1102,7 @@ xyc_lf:	dec	cl
 xyc8:
 	mov	[bp].tcp,si
 	mov	[bp].lx,cl
-	ret
+	VZ_RET
 xytocp	endp
 ;--- Adjust by cp ---
@ -1146,7 +1146,7 @@ setlendp:
 	mov	[bp].tnxt,si
 	call	setbend
 	pop	si
-	ret
+	VZ_RET
 setlinep endp
 ;--- Set bend ---
@ -1159,7 +1159,7 @@ _if e
 	dec	si
 _endif
 	mov	[bp].bend,si
-	ret
+	VZ_RET
 setbend endp
 ;--- Set home ptr ---
@ -1202,7 +1202,7 @@ home4:
 	mov	[bp].wy,al		;set wy
 home5:	mov	[bp].thom,si		;set thom
 _endif
-	ret
+	VZ_RET
 sethome endp
 	endcs
@ -1230,7 +1230,7 @@ _endif
 	sub	al,ah
 _if b
 hadj9:	clc
-	ret
+	VZ_RET
 _endif
 	inc	al
 	tstb	[bp].ckanj
@ -1241,7 +1241,7 @@ _endif
 hadj4:	mov	[bp].fofs,al
 	mov	[bp].wnxt,0		; ##100.04
 	stc
-	ret
+	VZ_RET
 hadjust	endp
 	endes
@ -1286,11 +1286,11 @@ vadjm:
 vadjb:
 	call	sethome
 vadjs:	stc
-	ret
+	VZ_RET
 vadj0:
 	mov	[bp].wy,al
 vadjc:	clc
-	ret
+	VZ_RET
 vadjust	endp
@ -1332,7 +1332,7 @@ vscr2:	push	dx
 vscr3:	popf
 	call	scrout1
 vscr8:	pop	dx
-	ret
+	VZ_RET
 vscr5:
 	mov	al,dh
 vscr6:
@ -1381,7 +1381,7 @@ _else
 	pop	si
 	call	tout
 _endif
-	ret
+	VZ_RET
 vscroll	endp
 	public	vscroll2
@ -1426,4 +1426,3 @@ vscroll2 endp
 ;	End of 'core.asm'
 ; Copyright (C) 1989 by c.mos
 ;****************************
--- a/SRC/ctype.inc
+++ b/SRC/ctype.inc
@ -21,23 +21,23 @@ _FN		equ	10000000b		; file name char
 isupper:	cmp	al,'A'
 		jb	isnot
 		cmp	al,'Z'+1
-		ret
+		VZ_RET
 isalpha:	call	isupper
 		jc	isal9
 islower:	cmp	al,'a'
 		jb	isnot
 		cmp	al,'z'+1
-isal9:		ret
+isal9:		VZ_RET
 isdigit:	cmp	al,'0'
 		jb	isnot
 		cmp	al,'9'+1
-		ret
+		VZ_RET
 iskanji:	ifkanji yes
 isnot:		clc
-		ret
+		VZ_RET
 ;----- Is file name? -----
 ;--> AL :char (20h<=AL<80h)
@ -58,7 +58,7 @@ isfilename	proc
 		popm	<cx,bx>
 		jz	isfl9
 yes:		stc
-isfl9:		ret
+isfl9:		VZ_RET
 isfilename	endp
 fnbittbl	db	01011111b,11000100b,11111111b,11000000b
--- a/SRC/disp.asm
+++ b/SRC/disp.asm
@ -135,7 +135,7 @@ newline	proc
 	mov	msgon,-1
 	popm	<dx,cx,ax>
 	popf
-	ret
+	VZ_RET
 newline	endp
 	endes
@ -183,7 +183,7 @@ _endif
 	call	getloc		; ##156.139
 	call	locate
 	popm	<ds,di,si,dx>
-	ret
+	VZ_RET
 dispmsg	endp
 messagep proc
@ -195,7 +195,7 @@ _repeat
 	dec	dl
 _until z
 	mov	si,di
-	ret
+	VZ_RET
 messagep endp
 	assume	ds:cgroup
@ -213,7 +213,7 @@ dispstr	proc
 	mov	si,sbuf
 	call	puts
 	pop	ds
-	ret
+	VZ_RET
 dispstr	endp
 	assume	ds:nothing
@ -264,7 +264,7 @@ ask8:	pushf
 	call	csroff
 	pop	ax
 	popf
-	ret
+	VZ_RET
 dispaskn:
 	mov	al,dl
@ -289,7 +289,7 @@ disppole proc
 	mov	dl,vsplit
 	call	locate
 	call	vlinec
-	ret
+	VZ_RET
 disppole endp
 ;****************************
@ -368,14 +368,14 @@ _endif
 	mov	al,ATR_TXT
 	call	setatr
 	pop	ds
-	ret
+	VZ_RET
 setatr_r:
 	mov	al,[bp].atrstt1
 	tst	al
 _ifn z
 	call	set_attr
-	ret
+	VZ_RET
 _endif
 	mov	al,ATR_STT
 	tstb	[bp].tchf
@ -387,7 +387,7 @@ _if z
 	mov	al,ATR_STT2
 _endif
 	call	setatr
-	ret
+	VZ_RET
 fillright proc
 _ifn cxz
@ -395,7 +395,7 @@ _ifn cxz
 	call	putspc
  _loop
 _endif
-	ret
+	VZ_RET
 fillright endp
 ;--- Edit mode ---
@ -444,7 +444,7 @@ _endif
 	mov	bx,sp
 	call	printf
 	add	sp,4
-	ret
+	VZ_RET
 ;--- Indicator bar ---
@ -511,7 +511,7 @@ _endif
 	mov	dl,33
 	call	fillspc
 	mov	al,GRC_VL
-	ret
+	VZ_RET
 ;--- System parameter ---
@ -572,7 +572,7 @@ sys_cp:	push	ax		; %
 	mov	si,offset cgroup:pf_sysparm
 	call	printf
 	add	sp,10
-	ret
+	VZ_RET
 dispstat endp
 	assume	ds:nothing
@ -605,7 +605,7 @@ _if z
 	sub	ax,1
 	sbb	dx,0
 _endif
-tsize9:	ret
+tsize9:	VZ_RET
 textsize endp
 ;--- Get current ptr ---
@ -626,7 +626,7 @@ _if a
 	mov	dx,cx
 	mov	ax,bx
 _endif
-	ret
+	VZ_RET
 getcurptr endp
 gettcp	proc
@ -640,7 +640,7 @@ _ifn z
 	mov	ax,[bp].tnxt
  _endif
 _endif
-	ret
+	VZ_RET
 gettcp	endp
 ;--- Display text label ---
@ -659,7 +659,7 @@ _else
  _endif
 _endif
 	pop	ax
-	ret
+	VZ_RET
 setatr_p endp
 displabel1 proc
@ -667,7 +667,7 @@ displabel1 proc
 	call	displabel
 	call	putspc
 	call	setatr_r
-	ret
+	VZ_RET
 displabel1 endp
 	public	displabel
@ -704,7 +704,7 @@ _endif
 	pop	ds
 	mov	dl,28
 	call	fillspc
-	ret
+	VZ_RET
 displabel endp
 ;--- Display Line header ---
@ -761,7 +761,7 @@ _ifn z
 	pop	si
 _endif
 	pop	dx
-	ret
+	VZ_RET
 disphead endp
 	endcs
@ -804,7 +804,7 @@ dispframe proc
 	call	locate
 	call	vlinec
 	popm	<dx,cx>
-	ret
+	VZ_RET
 dispframe endp
 ;--- Repeat put char ---
@ -821,7 +821,7 @@ _repeat
 	pop	ax
 _loop
 	pop	cx
-	ret
+	VZ_RET
 repputc endp
 	assume	ds:cgroup
@ -838,7 +838,7 @@ dispprmpt proc
 	mov	si,prompt
 	call	puts_t
 	pop	ds
-	ret
+	VZ_RET
 dispprmpt endp
 ;--- Display key mode ---
@ -887,7 +887,7 @@ dspk2:	clr	ah
 	call	abputc
 _loop
 dspk8:	pop	ax
-dspk9:	ret
+dspk9:	VZ_RET
 dispkeymode endp
 ;--- Display macro message ---
@ -943,7 +943,7 @@ _ifn z
 _endif
 	call	loadwloc
 	pop	silent
-macmsg9:ret
+macmsg9:VZ_RET
 dispmacmsg endp
 ;--- Put message ---
@ -954,7 +954,7 @@ putmg	proc
 	movseg	ds,cs
 	call	puts
 	pop	ds
-	ret
+	VZ_RET
 putmg	endp
 	endes
--- a/SRC/dos.asm
+++ b/SRC/dos.asm
@ -64,7 +64,7 @@ _pblk		ends
 	extrn	stopintnum	:word
 	extrn	stops		:word
 	extrn	syssw		:word
-	extrn	texts		:word
+	;extrn	texts		:word
 	extrn	tmpbuf		:word
 ;	extrn	tmpbuf2		:word
 	extrn	parbuf		:near	; ##156.96
@ -90,7 +90,7 @@ _pblk		ends
 	extrn	xmem_close	:near
 	extrn	xmem_extend	:near
 	extrn	tmp_close	:near
-	extrn	ems_free	:near
+;	extrn	ems_free	:near
 	extrn	ems_resetmap	:near
 	extrn	ems_restore	:near
 	extrn	ems_save	:near
@ -146,7 +146,7 @@ ENDIF
 	extrn	cs_stack	:near
 	extrn	windgets1	:near
-	extrn	dos_go		:near
+;	extrn	dos_go		:near
 ;--- Local work ---
@ -241,7 +241,7 @@ isfreeme proc
 	mov	es,ax
 	tstw	es:[mcb_psp]
 _ifn z
-	ret
+	VZ_RET
 _endif
 	pop	ax
 	mov	dx,loseg
@ -275,7 +275,7 @@ exec1:
 	call	setfnckey
 	call	setdosloc
 	mov	si,xbuf
-	mov	buflen,DOSLEN-2
+	mov	buflen,VZ_DOSLEN-2
 	call	dosgets
 	mov	flret,0
 	jnc	exec2
@ -338,7 +338,7 @@ _endif
 	call	resetint24
 	call	swapout
 ;	call	resetgbank
-	jmp	lo_exec
+	jmp	near ptr lo_exec
 cs_exec:
 	pop	bp
@ -507,7 +507,7 @@ isvz3:	cmp	al,'.'
 	ja	isvz2
 isvz_o:	clc
 isvz8:	popm	<di,es>
-	ret
+	VZ_RET
 ENDIF
 intdos:
@ -725,7 +725,7 @@ dosget_i:
 dosget1:
 	mov	flcmdp,0		; ##153.43
 	mov	cl,buflen
-	test	dossw,DOS_RETURN
+	test	dossw,VZ_DOS_RETURN
 _ifn z
 	tstb	flret
  _if z
@ -774,7 +774,7 @@ dos_esc:
 	mov	execcmd,0
 dosesc1:mov	frompool,ah
 	stc
-	ret
+	VZ_RET
 IFNDEF NOFILER
 dos_filer:
 	mov	pathp,0
@ -794,7 +794,7 @@ dosfl0:
 	tstb	doslen			; by DOSBOX
 _ifn z
 doscr1:
-	and	dossw,not DOS_GO
+	and	dossw,not VZ_DOS_GO
 	clr	cx
 	xchg	cx,word ptr doslen
 	jmps	dos_cr
@ -874,7 +874,7 @@ dosget8:
 ;ENDIF
 	popm	<si,cx>
 	clc
-	ret
+	VZ_RET
 dosgets	endp
 ;--- Skip command ---			; ##1.5
@ -893,7 +893,7 @@ _until be
 	mov	flcmdp,si
 	jmp	skcmd1
 skcmd7:	mov	si,bx
-skcmd8:	ret
+skcmd8:	VZ_RET
 skipcmd	endp
 ENDIF
@ -920,7 +920,7 @@ _until
 	call	strcpy
 	mov	al,LF
 	stosb
-	ret
+	VZ_RET
 dosspread endp
 ENDIF
@ -963,7 +963,7 @@ _endif
 ;	mov	ax,cs
 ;	mov	ss,ax
 ;	sti
-	ret
+	VZ_RET
 quit_tsr endp
 	endcs
@ -986,7 +986,7 @@ _if e
 ;  _endif
 _endif
 ENDIF
-	ret	
+	VZ_RET	
 install_vz endp
 	endis	; endws
@ -1019,7 +1019,7 @@ ENDIF
 	stc
 _endif
 	pop	ds
-	ret	
+	VZ_RET	
 remove_vz endp
 	endis
@ -1047,7 +1047,7 @@ _ifn z
 	mov	gends,ax
 	pop	es
 _endif
-	ret
+	VZ_RET
 expandfar endp
 ;--- Init far area ---
@ -1086,10 +1086,10 @@ _if ae
 _endif
 	mov	gends,bx
 	clr	ax
-	ret
+	VZ_RET
 inifar_x:
 	stc
-	ret
+	VZ_RET
 initfar endp
 ;--- Allocate TPA ---
@ -1145,9 +1145,9 @@ _until e
 	mov	cs:tpafreep,bx
 alloc8:	pop	es
 	mov	es:[bx],dx
-alloc9:	ret
+alloc9:	VZ_RET
 alloc_x:pop	ax
-	ret
+	VZ_RET
 allocTPA endp
 	endes
@ -1172,7 +1172,7 @@ _endif
 	jz	chkmcb9
 	cmp	es:[mcb_psp],ax
 chkmcb9:pop	es
-	ret
+	VZ_RET
 checkmcb endp
 ;--- Free TPA ---
@ -1188,7 +1188,7 @@ _ifn z
 	msdos	F_FREE
  _endif
 _endif
-	ret
+	VZ_RET
 freeTPA endp
 ;--- Get TPA top seg ptr ---
@ -1207,7 +1207,7 @@ _if ae
 _endif
 	inc	bx
 	inc	bx
-	ret
+	VZ_RET
 TPAptr	endp
 ;--- Set/reset INT06h ---
@ -1235,7 +1235,7 @@ setintstop proc
 	mov	ax,offset cgroup:int06in
 	call	setint
 	mov	cs:stopf,FALSE
-	ret
+	VZ_RET
 setintstop endp
 	public	resetintstop
@ -1243,7 +1243,7 @@ resetintstop proc
 	mov	bx,offset cgroup:vct06
 	mov	di,cs:stopintnum
 	call	resetint
-	ret
+	VZ_RET
 resetintstop endp
 	endes
@ -1261,7 +1261,7 @@ setint21 proc
 	mov	di,21h*4
 	mov	ax,offset cgroup:int21in
 	call	setint
-	ret
+	VZ_RET
 setint21 endp
@ -1269,7 +1269,7 @@ resetint21 proc
 	mov	bx,offset cgroup:vct21
 	mov	di,21h*4
 	call	resetint1
-	ret
+	VZ_RET
 resetint21 endp
 ;--- Set/reset INT vector ---
@ -1305,7 +1305,7 @@ _endif
 	pop	es
 	pop	ds
 	sti
-	ret
+	VZ_RET
 setint	endp
 	public	resetint,resetint1
@ -1330,7 +1330,7 @@ _ifn z
 _endif
 	pop	ds
 	sti
-	ret
+	VZ_RET
 resetint endp
 IFDEF DEBUG21
@ -1345,4 +1345,3 @@ ENDIF
 ;	End of 'dos.asm'
 ; Copyright (C) 1989 by c.mos
 ;****************************
--- a/SRC/ems.asm
+++ b/SRC/ems.asm
@ -160,7 +160,7 @@ eopen1:		mov	ax,PAGEMAX
 		jmps	eopen9
 eopen_x:	stc
 eopen9:		pop	es
-		ret
+		VZ_RET
 ems_open	endp
 ;----- Open XMS -----
@ -220,7 +220,7 @@ xopen1:		mov	dx,cx
 		jmps	xopen9
 xopen_x:	stc
 xopen9:		pop	es
-		ret
+		VZ_RET
 xms_open	endp
 		endis
@ -248,7 +248,7 @@ xmem_close	proc
 		mov	dx,offset cgroup:tmppath
 		msdos	F_DELETE
 	_endif
-		ret
+		VZ_RET
 xmem_close	endp
 ;----- Allocate EMS pages -----
@ -270,7 +270,7 @@ ems_alloc:
 		clr	ch
 		call	ems_alloc1
 		popm	<ds,si,cx>
-ealc9:		ret	
+ealc9:		VZ_RET	
 ems_alloc1	proc
 		call	ems_check
@ -284,7 +284,7 @@ ems_alloc1	proc
 		clc
 	  _endif
 	_endif
-		ret
+		VZ_RET
 ems_alloc1	endp
 ems_salloc	endp
@ -294,13 +294,13 @@ size2pc		proc
 	_if z
 		inc	sp
 		inc	sp
-		ret
+		VZ_RET
 	_endif
 		dec	ax
 		rolm	ax,2
 		and	ax,3
 		inc	ax
-		ret
+		VZ_RET
 size2pc		endp
 ;----- Allocate XMEM pages -----
@ -331,7 +331,7 @@ xmem_alloc	proc
 		call	bmp_alloc
 	_endif
 xmalc8:		popm	<ds,di,si,dx,cx,bx>
-		ret
+		VZ_RET
 xmem_alloc	endp
 ;----- Free XMEM pages -----
@ -352,7 +352,7 @@ xmem_free	proc
 	  _endif
 		popm	<ds,si,dx,cx,ax>
 	_endif
-		ret
+		VZ_RET
 xmem_free	endp
@ -373,7 +373,7 @@ ex_emsmap	proc
 		call	ems_map2
 	_endif
 exmap9:		mov	retval,ax
-		ret
+		VZ_RET
 ex_emsmap	endp
 		endes
@ -391,7 +391,7 @@ ems_save	proc
 		emm	EM_SAVE
 	  _endif
 	_endif
-		ret
+		VZ_RET
 ems_save	 endp
 ems_restore	proc
@ -402,7 +402,7 @@ ems_restore	proc
 		emm	EM_RESTORE
 	  _endif
 	_endif
-		ret
+		VZ_RET
 ems_restore	endp
 ;----- Get handle -----
@ -410,13 +410,13 @@ ems_restore	endp
 get_h_ems	proc
 		mov	dx,cs:h_ems
 		tst	dx
-		ret
+		VZ_RET
 get_h_ems	endp
 get_h_tmp	proc
 		mov	bx,cs:h_tmp
 		tst	bx
-		ret
+		VZ_RET
 get_h_tmp	endp
 ;----- Map EMS pages -----
@ -482,7 +482,7 @@ _loop
 		tst	cx
 		popm	<ds,di,cx,bx>
 emap9:		pop	dx
-		ret
+		VZ_RET
 ems_map		endp
 ;----- Reset EMS page map  -----
@ -496,7 +496,7 @@ ems_resetmap	proc
 		clr	ax
 	rep	stosw
 		popm	<es,di,cx>
-		ret
+		VZ_RET
 ems_resetmap	endp
 ;----- Check EMS/XMS -----
@ -505,13 +505,13 @@ ems_resetmap	endp
 		public	ems_check
 ems_check	proc
 		tstw	cs:h_ems
-		ret
+		VZ_RET
 ems_check	endp
 		public	xms_check
 xms_check	proc
 		tstw	cs:h_xms
-		ret
+		VZ_RET
 xms_check	endp
 ;----- Save map -----
@ -527,7 +527,7 @@ _repeat
 		mov	[si+MAX_PAGE*2-2],ax
 _loop
 		popm	<ds,si,cx,ax>
-		ret
+		VZ_RET
 ems_savemap	endp
 ;----- Load map -----
@ -559,7 +559,7 @@ ems_loadmap	proc
 	  _until e	
 	_endif
 		popm	<ds,si,dx,bx,ax>
-		ret
+		VZ_RET
 ems_loadmap	endp
 		endbs
@ -630,7 +630,7 @@ _endif
 	_endif
 trunc8:		call	tmp_close
 		pop	ds
-		ret
+		VZ_RET
 xmem_trunc	endp
 ;------------------------------------------------
@ -689,7 +689,7 @@ scanbmp:
 		mov	ah,1
 	_endif
 		test	al,ah
-scbmp9:		ret
+scbmp9:		VZ_RET
 scanend:
 		tst	di
 		jnz	scbmp9
@ -698,7 +698,7 @@ scanend:
 		stc
 bmaloc9:
 		popm	<di,dx,cx,bx>
-		ret
+		VZ_RET
 bmp_alloc	endp
 ;----- Truncate BMP -----
@ -738,7 +738,7 @@ _repeat
 bmptr7:		tst	dx
 _until z		
 bmptr8:		mov	ax,dx
-bmptr9:		ret
+bmptr9:		VZ_RET
 bmp_trunc	endp
 		endes
@ -786,7 +786,7 @@ _repeat
 _loop		
 		pop	cx
 		popm	<bx,ax>
-		ret		
+		VZ_RET		
 bmp_free	endp
 ;----- Unpack BMP handle -----
@ -802,7 +802,7 @@ bmp_unpack	proc
 		and	cx,3
 		inc	cx
 		and	ah,00000011b
-		ret
+		VZ_RET
 bmp_unpack	endp
 		endbs
@ -838,7 +838,7 @@ init_bmp	proc
 		mov	ax,PAGEMAX
 		sub	ax,dx
 		mov	[si].bm_max,ax
-		ret
+		VZ_RET
 initbmp1	proc
 		mov	[si].bm_max,ax
@ -851,7 +851,7 @@ initbmp1	proc
 		add	dx,ax
 		shrm	ax,3
 		add	bx,ax
-		ret
+		VZ_RET
 initbmp1	endp
 init_bmp	endp
@ -885,7 +885,7 @@ ishandle	proc
 		mov	si,offset cgroup:r_tmp
 ishdl8:		pop	ax
 		sub	ax,[si].bm_base
-		ret
+		VZ_RET
 ishandle	endp
 ;----- XMEM block read/write -----
@ -974,7 +974,7 @@ xms_rw1:
 		mov	es:[di+bx],dl
 	_endif
 xmemrw9:	popm	<es,ds,si,dx,cx,bx>
-		ret
+		VZ_RET
 xmem_read	endp
 ;----- TMPfile read/write -----
@ -997,7 +997,7 @@ tmp_write	proc
 		jmps	tmp_rw
 tmpw_x:		pop	ax
 		stc
-		ret
+		VZ_RET
 tmp_write	endp
 tmp_read	proc
@ -1029,7 +1029,7 @@ tmp_rw:
 	_endif
 		pop	ds
 tmpr9:
-		ret
+		VZ_RET
 tmp_read	endp
 tmp_open	proc
@ -1040,7 +1040,7 @@ tmp_open	proc
 		jc	tmpop9
 		mov	bx,ax
 	_endif
-tmpop9:		ret
+tmpop9:		VZ_RET
 tmp_open	endp
 		public	tmp_close
@ -1050,7 +1050,7 @@ tmp_close	proc
 		msdos	F_CLOSE
 		mov	cs:h_tmp,INVALID
 	_endif
-		ret
+		VZ_RET
 tmp_close	endp
 		endbs
--- a/SRC/expr.asm
+++ b/SRC/expr.asm
@ -180,10 +180,10 @@ _endif
 	call	readexpr
 	jc	setopt_x
 	mov	optptr,NULL
-	ret
+	VZ_RET
 setopt_x:
 	stc
-	ret
+	VZ_RET
 setoption endp
 ;----- Set open option -----
@ -207,9 +207,9 @@ set_opnopt	proc
 	_endif
 		mov	dl,OPE_SET
 		call	readexpr
-		ret
+		VZ_RET
 setopop_x:	stc
-		ret
+		VZ_RET
 set_opnopt	endp
 ;--- Read expression ---
@ -457,7 +457,7 @@ _endif
 	clc
 rexp9:	mov	sp,sp_save
 	pop	di
-	ret
+	VZ_RET
 readexpr endp
 ;--- Set option No. ---
@ -489,7 +489,7 @@ _if z
 	neg	cx
 	clc
 _endif
-	ret
+	VZ_RET
 setoptnum endp
 ;--- Set option value ---
@ -638,7 +638,7 @@ IFNDEF NEWEXPR
 	clr	cx
 ENDIF
 stval9:	popm	<es,bx>
-	ret
+	VZ_RET
 ;--- Operate ---
 ;-->
@ -738,7 +738,7 @@ ELSE
 ENDIF
 op_get:
 op_nop:
-	ret
+	VZ_RET
 op_push:
 	mov	bx,macsp
 	dec	bx
@ -751,46 +751,46 @@ op_pop:
 	inc	bx
 	inc	bx
 oppop1:	mov	macsp,bx
-	ret	
+	VZ_RET	
 op_inc:
 	inc	ax
-	ret
+	VZ_RET
 op_dec:
 	dec	ax
-	ret
+	VZ_RET
 op_com:
 	not	ax
-	ret
+	VZ_RET
 op_swap:
 	xchg	al,ah
-	ret
+	VZ_RET
 IFDEF NEWEXPR
 op_wptr:
 	movhl	cx,VARPTR+WORDPTR,0
 	add	ax,dx
 	add	ax,dx
-	ret
+	VZ_RET
 op_ptr:
 	movhl	cx,VARPTR,0
 ENDIF
 op_add:
 	add	ax,dx
-	ret
+	VZ_RET
 op_sub:
 	sub	ax,dx
-	ret
+	VZ_RET
 op_shl:
 	mov	cl,dl
 	shl	ax,cl
-	ret
+	VZ_RET
 op_shr:
 	mov	cl,dl
 	sar	ax,cl
-	ret
+	VZ_RET
 op_mul:
 	imul	dx
-	ret
+	VZ_RET
 op_div:
 	tst	dx
 _ifn z
@ -798,12 +798,12 @@ _ifn z
 	cwd
 	idiv	cx
 _endif
-	ret
+	VZ_RET
 op_mod:
 	call	op_div
 op_equ:
 	mov	ax,dx
-	ret
+	VZ_RET
 op_pushequ:
 	call	op_push
 	jmps	op_equ
@ -811,17 +811,17 @@ op_andc:
 	call	tobool
 op_and:
 	and	ax,dx
-	ret
+	VZ_RET
 op_orc:
 	call	tobool
 op_or:
 	or	ax,dx
-	ret
+	VZ_RET
 op_xorc:
 	call	tobool
 op_xor:
 	xor	ax,dx
-	ret
+	VZ_RET
 tobool:
 	tst	ax
 	mov	ax,FALSE
@ -833,7 +833,7 @@ _endif
 _ifn z
 	inc	dx
 _endif
-	ret
+	VZ_RET
 op_lt:
 	jl	op_set
@ -854,13 +854,13 @@ op_ne:
 	jne	op_set
 op_clr:
 	mov	ax,FALSE
-	ret
+	VZ_RET
 op_not:
 	tst	ax
 	jnz	op_clr
 op_set:
 	mov	ax,TRUE
-	ret
+	VZ_RET
 setoptval endp
@ -933,7 +933,7 @@ _if z
  _endif
 _endif
 	popm	<cx,bx>
-	ret
+	VZ_RET
 	public	scan_chr,scan_str
 scan_chr:
@ -950,7 +950,7 @@ scan_str:
 	call	strskip
 scstr8:	lodsb
 	clc
-	ret
+	VZ_RET
 scannum	endp
 ;--- Scan decimal word ---
@ -975,9 +975,9 @@ deciw1:
 	aad
 	mov	dx,ax
 	clc	
-	ret
+	VZ_RET
 deciw_x:stc
-	ret
+	VZ_RET
 scandeciw endp
 ;--- Scan decimal word or alpha ---
@ -995,9 +995,9 @@ scandecial proc
 	xchg	al,ah
 	call	deciw1
 	mov	al,0
-	ret
+	VZ_RET
 scand9:	clc
-	ret
+	VZ_RET
 scandecial endp
 ;--- Option in 'puts' ---
@ -1034,7 +1034,7 @@ _else
 	call	putval
 _endif
 oputs8:	pop	ds
-oputs9:	ret
+oputs9:	VZ_RET
 optputs endp
@ -1057,7 +1057,7 @@ get_optkwd	proc
 		add	di,offset cgroup:tb_opt_b
 		mov	ax,es:[di]
 		popm	<es,di,cx>
-		ret
+		VZ_RET
 get_optkwd	endp
 ;----- Scan Long hexa -----
@ -1093,7 +1093,7 @@ _until
 sclh8:		mov	ax,bx
 		popm	<cx,bx>
 		dec	si
-		ret
+		VZ_RET
 scan_lhexa	endp
 	endes
--- a/SRC/ezkey.asm
+++ b/SRC/ezkey.asm
@ -390,7 +390,7 @@ int9in	endp
 ishireso proc
 	tstb	hireso
-	ret
+	VZ_RET
 ishireso endp
 ;--- INT18h entry ---
@ -438,33 +438,33 @@ isrv1:
 	je	set_stt
 	cmp	ah,4			; AH=4 :Set ext function ptr
 	je	set_ext
-	ret
+	VZ_RET
 srvfunc:
 	pushm	<bx,cx,dx,si,di,es>
 	mov	bx,offset opttbl
 	call	do_function
 	popm	<es,di,si,dx,cx,bx>
-	ret
+	VZ_RET
 get_stt:
 	mov	al,status
-	ret
+	VZ_RET
 set_stt:
 	mov	status,al
-	ret
+	VZ_RET
 set_ext:
 	xchg	bx,vcthook.@off		; ES:BX :function ptr
 	push	vcthook.@seg
 	mov	vcthook.@seg,es
 	pop	es
-	ret
+	VZ_RET
 intsrvin endp
 dummy	proc	far
-	ret
+	VZ_RET
 dummy	endp
 ;--- Function ---
@ -532,7 +532,7 @@ func2:	push	ax
 	shl	di,1
 	call	cs:[di+offset funcjmptbl]
 	pop	ax
-func9:	ret	
+func9:	VZ_RET	
 do_function endp
 ;--- Function jump table ---
@ -562,7 +562,7 @@ scrnsize proc
 	mov	di,ax
 	shl	di,1
 	tstb	es:dosfkey
-	ret
+	VZ_RET
 scrnsize endp
 ;--- Clear graphic screen ---
@ -600,7 +600,7 @@ _ifn z
 	clr	di
 	mov	es:[di],dx
 _endif
-	ret
+	VZ_RET
 gclsplane:
 	mov	es,ax
 	clr	ax
@ -609,12 +609,12 @@ gclsplane:
    rep	stosw	
 	mov	ax,es
 	add	ax,0800h
-	ret
+	VZ_RET
 do_grafcls endp
 gvdraw0 proc
 	outi	0A6h,0
-	ret
+	VZ_RET
 gvdraw0 endp
 ;--- Clear text screen ---
@ -634,7 +634,7 @@ do_textcls proc
 	mov	di,2000h
 	pop	ax
    rep	stosw
-	ret
+	VZ_RET
 do_textcls endp
 ;--- Save text screen ---
@ -650,7 +650,7 @@ scrnsize30 proc
 _if b
 	mov	ax,800h
 _endif
-	ret
+	VZ_RET
 scrnsize30 endp
 do_textsave proc
@ -678,7 +678,7 @@ _repeat
 	inc	di
 _loop
 _endif
-	ret
+	VZ_RET
 do_textsave endp
 ;--- Swap text VRAM ---
@ -688,14 +688,14 @@ do_textswap proc
 _if z
 	clr	dx
 	bios	0Eh
-	ret
+	VZ_RET
 _endif
 	call	scrnsize30
 	cmp	ax,800h
 _if e
 	mov	dx,1000h
 	bios	0Eh
-	ret
+	VZ_RET
 _endif
 	shl	ax,1
 	mov	bx,offset splittbl
@ -713,7 +713,7 @@ _endif
 	mov	bx,cs
 	mov	dx,2
 	bios	0Fh
-	ret
+	VZ_RET
 IF 0
 	mov	bx,offset splittbl
 	mov	[bx],ax
@ -730,7 +730,7 @@ IF 0
 	mov	bx,cs
 	mov	dx,2
 	bios	0Fh
-	ret
+	VZ_RET
 ENDIF
 do_textswap endp
@ -740,14 +740,14 @@ do_keylock proc
 	not	locked
 	mov	ch,WAIT_LOCK
 	call	beep
-	ret
+	VZ_RET
 do_keylock endp
 ;--- Reset CRTV interrupt ---
 do_resetcrtv proc
 	out	64h,al
-	ret
+	VZ_RET
 do_resetcrtv endp
 ;--- Reset CPU ---
@ -788,7 +788,7 @@ _ifn z
 	mov	ah,41h
 _endif
 	int	18h
-	ret
+	VZ_RET
 do_grafon endp
 ;--- Analog/Digital mode ---
@ -800,7 +800,7 @@ _if le
 _endif
 	and	al,1
 	out	6Ah,al
-	ret
+	VZ_RET
 do_analog endp
 ;--- Display blue back ---
@ -844,7 +844,7 @@ _ifn z
 _endif
 ;	out	6Ah,al
 	mov	opttbl.analog,al
-	ret
+	VZ_RET
 do_blueback endp
 ;--- Click sound ---
@ -858,7 +858,7 @@ beep	proc
 	loop	$
 	outi	37h,7
 	popf
-	ret
+	VZ_RET
 beep	endp
 ;--- Convert [GRPH]+[A] ---
@ -883,7 +883,7 @@ cvtgr1:	sub	al,80h
 	xlat
 	mov	es:[di],al
 	pop	bx
-cvtgr9:	ret
+cvtgr9:	VZ_RET
 do_cvtgrph endp
 do_cvtgrph_hi proc
@ -898,7 +898,7 @@ do_cvtgrph_hi proc
 cvtgh1:	and	al,not K_GRPH
 	or	al,K_CTRL
 	mov	es:[di],al
-cvtgh9:	ret
+cvtgh9:	VZ_RET
 do_cvtgrph_hi endp
 ;--- Display [CAPS],[¶Å] mode ---
@ -938,7 +938,7 @@ _else
  _endif
 _endif
 	call	putcn
-dspcap9:ret
+dspcap9:VZ_RET
 do_keycaps endp
 ;--- Display [SHIFT]+[f¥n] ---
@ -966,7 +966,7 @@ _endif
 	call	dspfkey5
 	call	dspfkey5
 dspfky8:pop	ds
-dspfky9:ret
+dspfky9:VZ_RET
 dspfkey5:
 	add	di,6
@ -980,7 +980,7 @@ _repeat
 	popm	<si,cx>
 	add	si,16
 _loop
-	ret	
+	VZ_RET	
 dispfkey endp
 ;--- Is f-key white ? ---
@ -994,7 +994,7 @@ _ifn z
 	and	al,11100000b
 	cmp	al,11100000b
 _endif
-	ret
+	VZ_RET
 is_white endp
 ;--- Put char to VRAM ---
@ -1016,7 +1016,7 @@ kanj1:	mov	ah,al
 normal:	stosw	
 	jcxz	putcn9
 _loop
-putcn9:	ret
+putcn9:	VZ_RET
 putcn	endp
 		assume	ds:cgroup
@ -1042,7 +1042,7 @@ _if ae
  _endif
 _endif
 	pop	ax
-sfunc9:	ret
+sfunc9:	VZ_RET
 do_subfunction endp
 ;--- Snapshot ---
@ -1062,7 +1062,7 @@ do_snapshot proc
 	mov	ax,es
 	add	ax,TVSIZE/16
 snap8:	mov	snapseg,ax
-	ret
+	VZ_RET
 do_snapshot endp
 do_snapnext proc
@ -1088,7 +1088,7 @@ _ifn e
 	sub	ax,TVSIZE/16
 _endif
 	call	dispsnap
-	ret
+	VZ_RET
 do_snapprev endp
 dispsnap proc
@ -1103,7 +1103,7 @@ snap1:	push	ds
 	mov	cx,TVSIZE/4
    rep movsw
 	pop	ds
-	ret
+	VZ_RET
 dispsnap endp
 ;--- Startup ---
@ -1249,7 +1249,7 @@ free_env proc
    rep movsb
 	mov	es,envseg
 	msdos	F_FREE
-	ret
+	VZ_RET
 free_env endp
 ;--- Read option ---
@ -1267,7 +1267,7 @@ ropt1:	lodsb
 	cmp	al,SPC
 	jbe	ropt1
 ropt_x:	stc
-ropt9:	ret
+ropt9:	VZ_RET
 ropt2:
 	lodsb
--- a/SRC/filer.asm
+++ b/SRC/filer.asm
--- a/SRC/froll.asm
+++ b/SRC/froll.asm
@ -156,7 +156,7 @@ _ifn e
 	mov	dh,al
 _endif
 	call	fill_vram
-	ret
+	VZ_RET
 ;--- Move video ram ---
@ -215,7 +215,7 @@ _endif
 	dec	dh
 _until z	
 movvr9:	popm	<ds,ax>
-	ret
+	VZ_RET
 vramend_si:
 	mov	cx,2000h
@ -283,7 +283,7 @@ _repeat
 	dec	dh
 _until z
 	pop	ax
-	ret
+	VZ_RET
 ;--- Move code buffer ---
@ -312,7 +312,7 @@ _repeat
 	dec	dh
 _until z
 movcb9:	popm	<es,ds,ax>
-	ret
+	VZ_RET
 ;--- Fill code buffer ---
@ -334,7 +334,7 @@ _repeat
 	dec	dh
 _until z
 	popm	<es,ax>
-	ret
+	VZ_RET
 ;--- Hardware scroll ---
@ -437,7 +437,7 @@ _endif
 	mov	bx,ax
 	mov	al,14
 	call	outcrtc
-	ret
+	VZ_RET
 ;--- Sub routine ---
@ -460,7 +460,7 @@ outcrtc:
 	mov	al,bl
 	out	dx,al
 	sti
-	ret
+	VZ_RET
 ;--- Set parameter ---
 ;<--
@ -499,7 +499,7 @@ _endif
 	inc	dh
 	inc	dl
 	pop	ax
-	ret
+	VZ_RET
 ;--- Make video ram ptr ---
 ;--> CX
@ -523,7 +523,7 @@ _endif
 	add	cx,vrhome
 	and	cx,1FFFh
 	pop	ax
-	ret
+	VZ_RET
 ;--- Make code buffer ptr ---
 ;--> CX
@ -543,7 +543,7 @@ mkcbufp:
 	mov	cx,ax
 	shl	bx,1
 	pop	ax
-	ret
+	VZ_RET
 ;--- Flick Cursor ---
@ -579,7 +579,7 @@ flcsr1:
 	and	bx,1FFFh
 	jmp	flcsr1
 flcsr8:	popm	<es,cx,bx,ax>
-	ret
+	VZ_RET
 flickcsr endp
 fret	dd	0
@ -597,7 +597,7 @@ _if e
 	push	fret.@seg
 	push	fret.@off
 _endif
-	ret
+	VZ_RET
 flickcsr1 endp
 ;--- Startup ---
@ -687,7 +687,7 @@ free_env proc
    rep movsb
 	mov	es,envseg
 	msdos	F_FREE
-	ret
+	VZ_RET
 free_env endp
 ;--- Replace display cursor proc. ---
@ -732,9 +732,9 @@ srch2:	cmpsb
    rep	movsb
 	sti
 	clc
-	ret
+	VZ_RET
 srch_x:	stc
-	ret
+	VZ_RET
 resetcsrproc:
 	mov	di,es:csrprocp
@ -749,7 +749,7 @@ _ifn z
    rep	movsb
 	sti
 _endif
-	ret
+	VZ_RET
 ;--- Messages ---
--- a/SRC/gets.asm
+++ b/SRC/gets.asm
@ -159,7 +159,7 @@ gets_esc:
 	stc
 gets8:
 	popm	<ds,bp,si>
-	ret
+	VZ_RET
 ;--- Init gets ---
@ -202,7 +202,7 @@ igets5:	call	loadstr
 igets6:	call	getwindow
 	mov	word ptr [bp].tw_px,dx
 	mov	word ptr [bp].tw_sx,cx
-	ret
+	VZ_RET
 ;--- Scan history buffer ---
@ -220,9 +220,9 @@ _repeat
 stup1:	call	nextstr
 	tstb	[si]
 _until z
-	ret
+	VZ_RET
 stup2:	call	loadstr
-stup9:	ret
+stup9:	VZ_RET
 histdwn:
 	mov	si,[bp].hbptr
@ -246,7 +246,7 @@ stdn2:	call	prestr
 	jc	newstr
 	call	prestr
 stdn3:	call	loadstr
-stdn9:	ret
+stdn9:	VZ_RET
 newstr:	
 	mov	[bp].hbptr,si
@ -254,7 +254,7 @@ newstr:
 	mov	byte ptr [di],LF
 	mov	[bp].bend,di
 	mov	[bp].bword,0
-	ret
+	VZ_RET
 curstr:
 	mov	di,[bp].btop
@ -265,7 +265,7 @@ curstr:
 	dec	di
 	mov	[di],al
 	mov	[bp].bend,di
-	ret
+	VZ_RET
 ;
 loadstr:
@ -295,7 +295,7 @@ _ifn z
 _endif
 	mov	[bp].hbptr,si
 	mov	[bp].bend,di
-	ret
+	VZ_RET
 nextstr:
 	tstw	[bp].bword
@ -304,7 +304,7 @@ _repeat
 	lodsb
 	tst	al
 _until	z
-	ret
+	VZ_RET
 nextword:
 _repeat
 	lodsb
@ -318,7 +318,7 @@ _repeat
 	or	al,[si]
 _until z
 	dec	si
-	ret
+	VZ_RET
 prestr:
 	cmp	si,[bp].hbtop
@ -331,7 +331,7 @@ _repeat
 	je	prest_c
 	tstb	[si-1]
 _until z
-	ret
+	VZ_RET
 preword:
 _repeat
 	dec	si
@ -343,9 +343,9 @@ _repeat
 	cmp	al,SPC
 _until be
 	clc
-	ret
+	VZ_RET
 prest_c:stc
-	ret
+	VZ_RET
 ;
 skipword proc
@ -369,7 +369,7 @@ _until be
 	ja	skword8
 	clr	al			; stz
 skword8:pop	si
-skword9:ret
+skword9:VZ_RET
 skipword endp
 ;
@ -405,7 +405,7 @@ iscmp2:	mov	si,[bp].hbtop
  _endif
 	mov	[bp].bword,di
 _endif
-	ret
+	VZ_RET
 histcmp:
 	push	si
@ -420,7 +420,7 @@ _repeat
 	cmpsb
 _while e
 	pop	si
-	ret
+	VZ_RET
 gets	endp
@ -495,7 +495,7 @@ _endif
    rep	movsb
 	pop	cx
 	dec	cx
-stst9:	ret
+stst9:	VZ_RET
 stcut:
 	mov	si,[bp].hbend
@ -517,7 +517,7 @@ stct3:	mov	byte ptr [si],0
 	inc	si
 	mov	di,si
 	add	di,cx
-	ret
+	VZ_RET
 storestr endp
@ -565,7 +565,7 @@ _ifn cxz
 _endif
 	add	sp,type _getswk-bufwk_top
 	popm	<ds,bp>
-	ret
+	VZ_RET
 histcpy	endp
 	endes
--- a/SRC/harderr.asm
+++ b/SRC/harderr.asm
@ -51,7 +51,7 @@ setint24 proc
 	mov	ax,offset cgroup:int24in
 	mov	dx,cs
 	call	setint1
-	ret
+	VZ_RET
 setint24 endp
 	public	resetint24
@ -60,7 +60,7 @@ resetint24 proc
 	mov	di,24h*4
 	mov	dx,cs
 	call	resetint1
-	ret
+	VZ_RET
 resetint24 endp
 ;--- INT24h handler ---
--- a/SRC/inst.asm
+++ b/SRC/inst.asm
@ -18,12 +18,12 @@ PKEYCNT		equ	6
 ELSECNT		equ	13
 HISTCNT		equ	7
-DF_IF		equ	2
+VZ_DF_IF	equ	2
-DF_IFN		equ	3
+VZ_DF_IFN	equ	3
-DF_ELSE		equ	4
+VZ_DF_ELSE	equ	4
-DF_ENDIF	equ	5
+VZ_DF_ENDIF	equ	5
-DF_ELSEIF	equ	6
+VZ_DF_ELSEIF	equ	6
-DF_ELSEIFN	equ	7
+VZ_DF_ELSEIFN	equ	7
 ;--- External symbols ---
@ -175,7 +175,7 @@ _endif
 	mov	di,temptop
 	call	readclass
 	tstb	errcnt
-	ret
+	VZ_RET
 customize endp
 ;--- Syntax error ---
@ -216,7 +216,7 @@ _repeat
 _until
 	mov	si,bx
 opte8:	call	cputcrlf
-	ret
+	VZ_RET
 synerr	endp
 ;--- Insert converted data ---
@ -246,7 +246,7 @@ _endif
 	pop	cx
 	call	memmove
 	popm	<di,si,cx>
-	ret	
+	VZ_RET	
 insertcvt endp
 ;--- Move customize area ---
@ -281,7 +281,7 @@ _repeat
 	cmp	bx,offset cgroup:custm_end - 2	; ##155.70
 _while b
 	pop	bx
-	ret	
+	VZ_RET	
 movearea endp
 ;--- Is next class ? ---
@ -298,7 +298,7 @@ _ifn z
 	pop	si
  _endif
 _endif
-	ret
+	VZ_RET
 nextclass1 endp
 ;--- Command key ---
@ -340,7 +340,7 @@ pkey1:
 	mov	[bx],ah
 	jmp	ckey2
 ckey_x:	stc
-	ret
+	VZ_RET
 ckeymsg1:
 	mov	al,dl
 ckmsg1:	stosb
@ -373,7 +373,7 @@ _until c
 tbox_x:
 fkey_x:	pop	di
 	stc
-	ret
+	VZ_RET
 df_fnckey endp
 ;--- Text box ---
@ -457,7 +457,7 @@ _until be
 opt_x:
 hist_x:
 else_x:	stc
-	ret
+	VZ_RET
 df_history endp
 	public	get_histsym
@ -474,10 +474,10 @@ get_histsym proc
 	shl	bx,1
 	add	bx,offset cgroup:hist_top
 	clc
-	ret
+	VZ_RET
 histsym_x:
 	stc
-	ret
+	VZ_RET
 get_histsym endp
 ;--- Else ---
@ -576,7 +576,7 @@ _else
 stkey3:	mov	es:[bx+1],al
 _endif
 	clc
-stkey9:	ret
+stkey9:	VZ_RET
 storekey endp
 ;--- Macro key ---
@ -655,7 +655,7 @@ _ifn z
 mac_x:
 	pop	di
 	stc
-	ret
+	VZ_RET
  _endif
 _endif
 	cmp	si,enddefp
@ -854,7 +854,7 @@ menu_x1:pop	di
 	dec	di
 	dec	di
 menu_x:	stc
-	ret
+	VZ_RET
 df_menu endp
 ;--- Alias ---
@ -884,7 +884,7 @@ cpeol2:	lodsb
 	jne	cpeol1
 	clr	al
 	stosb
-	ret
+	VZ_RET
 copytoeol endp
 ;--- Skip space,tab ---
@ -896,7 +896,7 @@ skpsp1:	cmp	al,SPC
 	ja	skps9
 	cmp	al,LF
 	jne	skpsp
-skps9:	ret
+skps9:	VZ_RET
 skpsp	endp
 ;--- Skip to next line ---
@ -912,7 +912,7 @@ skipline proc
  repne	scasb
 	mov	si,di
 	popm	<es,di,cx>
-	ret
+	VZ_RET
 skipline endp
 ;--- Scan connma & numerics ---
@ -926,7 +926,7 @@ scannumc proc
 _if e
 	call	skipline
 	stc
-	ret
+	VZ_RET
 _endif
 	cmp	al,','
 _if e
@ -935,11 +935,11 @@ _if e
 	mov	ax,dx
 	dec	si
 	clc
-	ret
+	VZ_RET
 _endif
 	dec	si
 	stc
-	ret
+	VZ_RET
 scannumc endp
 ;--- Scan string ---
@ -959,7 +959,7 @@ scanstr proc
 	cmp	al,'"'
 	je	scanstr1
 scstr_x:stc	
-	ret
+	VZ_RET
 scans1:
 	stosb
 scanstr1:
@ -987,7 +987,7 @@ scans2:	cmp	al,'"'
 	jmp	scanstr1
 scans8:	clr	al
 	stosb
-	ret
+	VZ_RET
 scancode:
 	mov	al,'$'
 	call	scannum
@ -1126,7 +1126,7 @@ scank_o:
 scank_x:
 	stc
 scank9:	popm	<di,dx,bx>
-	ret
+	VZ_RET
 scankey	endp
 ;--- Check prefix key ---
@ -1147,7 +1147,7 @@ _if e
 	stc
 _endif
 	popm	<es,di,cx>
-	ret	
+	VZ_RET	
 isprekey endp
 ;--- Scan follow key ---
@ -1173,11 +1173,11 @@ scanpkey proc
 	add	al,ah
 	clr	ah
 	clc
-	ret
+	VZ_RET
 pkey_x:	stc
-	ret
+	VZ_RET
 pkeyn:	mov	al,INVALID
-	ret
+	VZ_RET
 scanpkey endp
 ;--- Re-customize ---
@ -1205,7 +1205,7 @@ _endif
 	pushf
 	call	dspscr	
 	popf
-	ret
+	VZ_RET
 se_recust endp
 	public	re_cust,re_cust1
@ -1235,7 +1235,7 @@ _ifn c
 	call	set_readmac
 	clc
 _endif
-	ret
+	VZ_RET
 re_cust endp
 ;--- Check next class ---
@ -1271,7 +1271,7 @@ _endif
 	inc	sp
 	inc	sp
 	clc
-nclas9:	ret
+nclas9:	VZ_RET
 nextclass endp
 ;--- Copy to buffer ---
@ -1319,13 +1319,13 @@ _endif
 	jc	re_ovflow
 	mov	storep,ax
 recust8:pop	di
-recust9:ret
+recust9:VZ_RET
 re_ovflow:
 	popm	<ax,ax,si,ax,ax,ax,ax>	; !!!
 	mov	dl,E_NOBUFFER
 	stc
-	ret
+	VZ_RET
 recust	endp
 rec_alias proc
@ -1340,9 +1340,9 @@ _endif
 	call	memmove
 	dec	ax
 	clc
-	ret
+	VZ_RET
 reals_x:stc
-	ret
+	VZ_RET
 rec_alias endp
 ;--- Read class symbol ---
@ -1390,7 +1390,7 @@ class2:
 	tstb	inedit
 	jnz	class0
 	stc
-	ret
+	VZ_RET
 class3:
 	push	bx
 	call	cs:[bx+1]
@ -1412,9 +1412,9 @@ _ifn z
 	mov	dl,E_NOLINE
 _endif
 	stc
-	ret
+	VZ_RET
 class8:	clc
-class9:	ret
+class9:	VZ_RET
 readclass endp
 ;----- Read Module Header -----
@ -1485,7 +1485,7 @@ readh1:		call	skipline
 	_else
 		mov	headerp,di
 	_endif
-rmdlh9:		ret
+rmdlh9:		VZ_RET
 read_mdlhead	endp
 read_mdlopt	proc
@ -1509,7 +1509,7 @@ _repeat
 	_endif
 		call	skipchar
 _until
-mdlopt9:	ret
+mdlopt9:	VZ_RET
 read_mdlopt	endp
 read_mdlttl	proc
@ -1543,7 +1543,7 @@ _until e
 	_endif
 	rep	movsb
 		pop	cx
-		ret
+		VZ_RET
 read_mdlttl	endp
 		endcs
@ -1558,7 +1558,7 @@ set_mhttllen	proc
 		mov	al,[si].mn_wd
 		mov	byte ptr mhttllen,al
 	_endif
-		ret
+		VZ_RET
 set_mhttllen	endp
 ;----- #if .. #else .. #endif -----
@ -1570,7 +1570,7 @@ if_state	proc
 		call	if_state1
 		popm	<di,dx,cx,bx>
 	_endif
-		ret
+		VZ_RET
 if_state	endp
@ -1600,7 +1600,7 @@ cond_x2:	inc	sp
 cond_x:		pop	si
 		pop	ax
 		stc
-		ret
+		VZ_RET
 if_state1	endp
 tb_cond:
@ -1623,7 +1623,7 @@ condif8:	mov	ifbit,dx
 		pop	ax
 		lodsb
 		clc
-		ret
+		VZ_RET
 cond_ifn:
 		shl	dx,1
 cond_elseifn:
@ -1645,7 +1645,7 @@ cond_comp:
 		movseg	es,cs
 		call	strstr
 		movseg	es,ss
-		ret
+		VZ_RET
 cond_else:
 		call	skipline
@ -1680,4 +1680,3 @@ _until e
 ;	End of 'inst.asm'
 ; Copyright (C) 1989 by c.mos
 ;****************************
--- a/SRC/key.asm
+++ b/SRC/key.asm
@ -180,7 +180,7 @@ inifp8:	mov	fptype,cl
 	mov	fpmode,al
 	popm	<es,ds>
 ENDIF
-	ret	
+	VZ_RET	
 initfp	endp
 ;--- Check MS-KANJI API ---		; ##156.90
@ -203,7 +203,7 @@ _ifn c
 	movseg	ds,cs
 	clc
 _endif
-	ret
+	VZ_RET
 ismskanji endp
 ENDIF
@ -226,7 +226,7 @@ _if s
 	mov	dx,dosktbl
 	call	getkeytbl
 _endif
-	ret
+	VZ_RET
 getdoskey endp
 	public	setdoskey
@ -238,7 +238,7 @@ setdoskey proc
 	mov	dx,dosktbl
 	mov	al,KEY_DOS
 	call	setkey
-	ret
+	VZ_RET
 setdoskey endp
 	public	setvzkey
@ -254,7 +254,7 @@ _ifn e
 	stc
 _endif
 	pop	ds
-	ret
+	VZ_RET
 setvzkey endp
 ;--- Control EZKEY ---
@ -281,7 +281,7 @@ _if z
  _endif
 	pop	es
 _endif
-	ret
+	VZ_RET
 on_ezkey endp
 vwx_call proc
@ -459,7 +459,7 @@ gkey81:
 	pop	bx
 	popm	<ds,di,si,cx,bx>
 	tst	al
-	ret
+	VZ_RET
 getkey	endp
 ;----- Auto saver -----
@ -469,7 +469,7 @@ pre_delay	proc
 		mov	as_waitc,ax
 		call	get_ringp
 		mov	as_ringp,ax
-		ret
+		VZ_RET
 pre_delay	endp
 check_delay	proc
@ -498,7 +498,7 @@ check_delay	proc
 		mov	sp,gkey_sp
 		jmp	gkey0
 	_endif
-chkdly9:	ret
+chkdly9:	VZ_RET
 check_delay	endp
 get_time	proc
@ -509,7 +509,7 @@ get_time	proc
 		add	al,dh
 		adc	ah,0
 		popm	<dx,cx>
-		ret
+		VZ_RET
 get_time	endp
 ;----- Event key -----
@ -522,7 +522,7 @@ event_key	proc
 		call	do_evmac
 	_endif
 		pop	dx
-		ret
+		VZ_RET
 event_key	endp
 ;----- Scan Command -----
@ -542,7 +542,7 @@ scancmkey	proc
 		add	bx,offset cgroup:tb_scancmd
 		call	cs:[bx]
 		pop	bx
-		ret
+		VZ_RET
 scc_sedit:
 		mov	cx,CM_FILER - CM_ESC
@ -576,7 +576,7 @@ scfl7:		call	scankey
 	_if c
 scfl8:		mov	lastkey,ax
 	_endif
-scfl9:		ret
+scfl9:		VZ_RET
 scc_getc:
 		mov	cx,CM_FILER-CM_ESC
@ -613,10 +613,10 @@ _endif
 	inc	di
 	and	di,not 1
 	stc
-	ret
+	VZ_RET
 sckey_x:
 	clc
-	ret
+	VZ_RET
 scankey endp
 ;--- Check STOP key ---
@ -632,7 +632,7 @@ _ifn z
 	msdos	F_CONIO
 	stc
 _endif
-	ret
+	VZ_RET
 chkstopkey endp
 ;--- Convert prefix key ---
@ -668,16 +668,16 @@ _if c
 	clr	ah			; stz
 	mov	retval,ax
 	mov	ax,cx
-	ret
+	VZ_RET
 _endif
 	add	dl,2
 	rorm	dl,3
 	or	al,dl
 	clr	ah
 cvpf9:	or	dl,1			; clz
-	ret
+	VZ_RET
 cvpf_x:	stc
-	ret
+	VZ_RET
 cvtpfix endp
 ;--- Get A,^A key ---
@ -707,9 +707,9 @@ _endif
 	ja	cvpf_x
 	and	al,1Fh
 getal8:	clc
-	ret
+	VZ_RET
 getal_x:stc
-	ret
+	VZ_RET
 getalpha endp
 ;--- KANA to aplha ---
@ -737,7 +737,7 @@ _if a
 	popm	<di,cx>
 _endif
 ENDIF
-	ret
+	VZ_RET
 cvtkanakey endp
 ;--- Store decimal word ---
@ -749,7 +749,7 @@ storedeciw proc
 	xchg	al,ah
 	add	ax,3030h
 	stosw
-	ret
+	VZ_RET
 storedeciw endp
 ;--- Display key symbol ---
@ -764,7 +764,7 @@ dispkeysym proc
 	pop	si
 	call	puts
 	popm	<di,si,cx>
-	ret
+	VZ_RET
 dispkeysym endp
 ;--- Set key symbol ---
@ -792,7 +792,7 @@ _ifn e
 	cbw
 	call	setkeysym1
 _endif
-	ret
+	VZ_RET
 setkeysym1:
 	cmp	ax,0040h
@ -810,7 +810,7 @@ setkeysym1:
 	stosb
 	clr	al
 	stosb
-	ret
+	VZ_RET
 setkeysym endp
 ;--- Set prefix key symbol ---
@ -877,7 +877,7 @@ dsppk7:	tst	dh
 	stosb
 dsppk8:	clr	al
 	stosb
-	ret
+	VZ_RET
 setpkeysym endp
 ;--- Get one char ---
@ -898,15 +898,15 @@ getc1:	mov	dl,SYS_GETC
 	cmp	al,CM_ESC
 	jne	getc8
 	stc
-	ret
+	VZ_RET
 getc2:	mov	al,dl
 	call	toupper
 getc8:	clc
-	ret
+	VZ_RET
 getc_x:
 	mov	ah,al
 	clr	al
-	ret
+	VZ_RET
 getc	endp
 ;--- Check FEP ---
@ -917,7 +917,7 @@ resetfp:
 IFDEF US
 checkfp:
 ctrlfp:
-	ret
+	VZ_RET
 ELSE
 	mov	ah,SYS_DOS
 checkfp	proc
@ -943,7 +943,7 @@ _else
 _endif
 chkfp9:	pop	ax
 	mov	sysmode0,ah
-	ret
+	VZ_RET
 checkfp	endp
 ;--- Control FEP ---
@ -976,7 +976,7 @@ _ifn z
  _endif
 _endif
 	popm	<es,ds,dx,cx,bx>
-	ret
+	VZ_RET
 ctrlfp	endp
 ENDIF
--- a/SRC/key98.asm
+++ b/SRC/key98.asm
@ -104,7 +104,7 @@ ENDIF
 vje_on:
 	mov	ah,1
 	int	INT_VJEB
-	ret
+	VZ_RET
 vje_off:
 	mov	ah,0
 	int	INT_VJEB
@ -114,12 +114,12 @@ vje_off:
 	pop	ax
 vje_act:
 vje_mask:
-	ret
+	VZ_RET
 mttk_on:
 	mov	ah,0
 	int	INT_MTTK
-	ret
+	VZ_RET
 mttk_off:
 	push	es
 	mov	ah,21
@ -132,7 +132,7 @@ mttk_off:
 	pop	es
 mttk_act:
 mttk_mask:
-	ret
+	VZ_RET
 atok_on:
 	tst	al
@ -141,7 +141,7 @@ _if z
 _endif
 	mov	ah,al
 	int	INT_ATOK
-	ret
+	VZ_RET
 atok_off:
 	mov	ah,66h
 	int	INT_ATOK
@ -151,12 +151,12 @@ atok_off:
 	pop	ax
 atok_act:
 atok_mask:
-	ret
+	VZ_RET
 wxp_on:					; ##155.78
 	mov	ah,0
 	int	INT_WXP
-	ret
+	VZ_RET
 wxp_off:
 	mov	ah,4Ch
 	int	INT_WXP
@ -166,7 +166,7 @@ wxp_off:
 	pop	ax
 wxp_act:
 wxp_mask:
-	ret
+	VZ_RET
 ;--- Control ATOK7 by junk.35 ---
@ -184,21 +184,21 @@ _ifn z
 _else
 	call	atok7_force_off
 _endif
-	ret
+	VZ_RET
 atok7_off:
 	call	init_a7
 	call	atok7_getmode
 	call	atok7_force_off
 atok7_act:
 atok7_mask:
-	ret
+	VZ_RET
 atok7_getmode:
 	mov	ax,3
 	mov	cs:packet,-1
-	call	atok7
+	call	vz_atok7
 	mov	ax,cs:packet
-	ret
+	VZ_RET
 atok7_change_mode:
 	push	ax
@ -213,16 +213,17 @@ atok7_force_off:
 	push	ax
 	mov	ax,2
 call_atok7:
-	call	atok7
+	call	vz_atok7
 	pop	ax
-	ret
+	VZ_RET
-atok7:	pushm	<es,cs>
+vz_atok7:
 	pushm	<es,cs>
 	pop	es
 	mov	bx,offset cs:packet
 	call	cs:call_a7
 	pop	es
-	ret
+	VZ_RET
 init_a7:
 	tstw	cs:call_a7
@ -234,7 +235,7 @@ _if z
 	mov	word ptr cs:call_a7+2,es
 	popm	<bx,ax,es>
 _endif
-	ret
+	VZ_RET
 ENDIF
 ;--- MS-KANJI API ---			; ##156.90
@ -242,7 +243,7 @@ ENDIF
 msk_on:
 	mov	ah,80h
 	call	mskanji
-	ret
+	VZ_RET
 msk_off:
 	mov	ax,0
@ -253,7 +254,7 @@ msk_off:
 	pop	ax
 msk_act:
 msk_mask:
-	ret
+	VZ_RET
 mskanji	proc
 	push	bp
@ -268,7 +269,7 @@ mskanji	proc
 	mov	sp,bx
 	pop	bx
 	pop	bp
-	ret
+	VZ_RET
 mskanji	endp
 	endhs
@ -310,7 +311,7 @@ _endif
 	mov	tblsize,ax
 	mov	tblmode,dx
 	mov	fkeycnt,cl
-	ret
+	VZ_RET
 initkeytbl endp
 ;--- Init VZ key table ---
@ -335,7 +336,7 @@ _if e
 	mov	dh,60h			; ctrl+
 	call	initfnckey
 _endif
-	ret
+	VZ_RET
 initvzkey endp
 initxkey proc
@ -355,7 +356,7 @@ _repeat
 	inc	dl
  _endif
 _loop
-	ret	
+	VZ_RET	
 initxkey endp
 initfnckey proc
@ -399,7 +400,7 @@ _until e
 _if e
 	dec	si
 _endif
-	ret
+	VZ_RET
 initfnckey endp
 	endis
@ -418,7 +419,7 @@ getkeytbl1:
 	mov	ax,tblmode
 	int	0DCh
 	pop	ds
-	ret
+	VZ_RET
 getkeytbl endp
 ;	public	setkey
@ -450,7 +451,7 @@ _ifn e
 	call	swapktbl
 _endif
 	popm	<es,ds>
-	ret
+	VZ_RET
 setfnckey endp
 swapktbl proc
@ -466,7 +467,7 @@ swapk1:	mov	ax,[di]
 	xchg	[di+bx],ax
 	stosw
 	loop	swapk1
-	ret
+	VZ_RET
 swapktbl endp
 ;--- Get keycode ---
@ -556,7 +557,7 @@ _endif
 gctrl1:
 	call	cvtctrl
 gcode8:	mov	ah,TRUE
-gcode9:	ret
+gcode9:	VZ_RET
 getkeycode endp
 get_ringp	proc
@ -565,7 +566,7 @@ get_ringp	proc
 		movseg	es,ax
 		mov	ax,es:[ringp]
 		pop	es
-		ret
+		VZ_RET
 get_ringp 	endp
 ;--- Convert ctrl code ---
@ -594,7 +595,7 @@ _endif
 	cmp	al,XKEY_ESC
 	jb	cvtshift
 cvctr_x:stc
-	ret
+	VZ_RET
 cvctr2:
 	cmp	al,SCAN_CTR_F01
 _if ae
@ -652,7 +653,7 @@ cvctr7:
 	jz	cvctr9
 	or	al,00100000b
 cvctr9:	clc
-	ret
+	VZ_RET
 cvtctrl	endp
 ;--- Test Key bit ---
@ -673,7 +674,7 @@ testkey proc
 	shl	al,cl
 	test	es:[bx],al
 	pop	es
-	ret
+	VZ_RET
 testkey endp
 ;--- Get [CTRL]/[ALT]+tenkey ---
@ -708,7 +709,7 @@ tenk2:	mov	di,offset cgroup:tb_tenkey
 	jmps	tenk9
 tenk_x:	stc
 tenk9:	popm	<si,ax>
-	ret
+	VZ_RET
 ctrltenkey endp
 ;--- BIOS key function ---
@ -731,7 +732,7 @@ _while z
 IFDEF CVTKANA
 	call	cvtkanakey
 ENDIF
-	ret
+	VZ_RET
 wait_key endp
 	public	sense_key
@ -740,7 +741,7 @@ sense_key proc
 	bios	01h
 	tst	bh
 	pop	bx
-	ret
+	VZ_RET
 sense_key endp
 	public	read_key
@ -749,7 +750,7 @@ read_key proc
 	bios	05h
 	tst	bh
 	pop	bx
-	ret
+	VZ_RET
 read_key endp
 	public	flush_key
@ -765,7 +766,7 @@ _repeat
 	bios	00h
 _until
 	popm	<bx,ax>
-	ret
+	VZ_RET
 flush_key endp
 	public	shift_key
@ -776,19 +777,19 @@ shift_key proc
 	mov	al,es:[keysft]
 	mov	ah,al
 	pop	es
-	ret
+	VZ_RET
 shift_key endp
 	public	beep_on
 beep_on proc
 	outi	37h,6
-	ret
+	VZ_RET
 beep_on endp
 	public	beep_off
 beep_off proc
 	outi	37h,7
-	ret
+	VZ_RET
 beep_off endp
 ;****************************
@ -824,7 +825,7 @@ _endif
 	mov	latch,al
 	mov	trgc,0
 	pop	ds
-	ret
+	VZ_RET
 sm_gettrgkey endp
 ;--- Sense key ---
@ -869,7 +870,7 @@ sens4:
 sens5:	mov	latch,ah
 sens8:	mov	trgc,al
 	pop	ds
-	ret
+	VZ_RET
 sm_sensekey endp
 	assume	ds:nothing
@ -907,9 +908,9 @@ chkk3:	sub	al,'0'
 	mov	rolc,al
 	call	initrolc
 chkk0:	clc
-	ret
+	VZ_RET
 chkk9:	stc
-	ret
+	VZ_RET
 sm_chkkey endp
 ;--- Check [SHIFT] key ---
@ -941,11 +942,11 @@ chks1:
 	call	initrolc
 _endif
 	clc
-	ret
+	VZ_RET
 sm_chksft endp
 isDBCS	proc				; ##156.132
-	ret
+	VZ_RET
 isDBCS	endp
 	endhs
@ -954,4 +955,3 @@ isDBCS	endp
 ;	End of 'key98.asm'
 ; Copyright (C) 1989 by c.mos
 ;****************************
--- a/SRC/keyibm.asm
+++ b/SRC/keyibm.asm
@ -19,27 +19,27 @@ KEY_SHIFT	equ	00000011b
 KEY_CTRL	equ	00000100b
 KEY_ALT		equ	00001000b
-@F		equ	10000000b
+_AT_F		equ	10000000b
-S@F		equ	10100000b
+S_AT_F		equ	10100000b
-C@F		equ	11000000b
+C_AT_F		equ	11000000b
-A@F		equ	11100000b
+A_AT_F		equ	11100000b
-@SFT		equ	00100000b
+_AT_SFT		equ	00100000b
-@CTR		equ	01000000b
+_AT_CTR		equ	01000000b
-@ALT		equ	01100000b
+_AT_ALT		equ	01100000b
-@PGUP		equ	10010000b
+_AT_PGUP	equ	10010000b
-@PGDN		equ	10010001b
+_AT_PGDN	equ	10010001b
-@INS		equ	10010010b
+_AT_INS		equ	10010010b
-@DEL		equ	10010011b
+_AT_DEL		equ	10010011b
-@UP		equ	10010100b
+_AT_UP		equ	10010100b
-@LEFT		equ	10010101b
+_AT_LEFT	equ	10010101b
-@RIGHT		equ	10010110b
+_AT_RIGHT	equ	10010110b
-@DOWN		equ	10010111b
+_AT_DOWN	equ	10010111b
-@HOME		equ	10011000b
+_AT_HOME	equ	10011000b
-@END		equ	10011001b
+_AT_END		equ	10011001b
-@ESC		equ	10011010b
+_AT_ESC		equ	10011010b
-@TAB		equ	10011011b
+_AT_TAB		equ	10011011b
-@BS		equ	10011100b
+_AT_BS		equ	10011100b
-@CR		equ	10011101b
+_AT_CR		equ	10011101b
 IFDEF J31
 INT_ATOK	equ	6Fh
@ -97,32 +97,32 @@ tb_nkeycode	db	1Bh,09h,08h,0Dh
 tb_fkeyspc10	db	10,6,1,1,1,1,4,1,1,1,1,4
 tb_fkeyspc12	db	12,5,1,1,1,2,1,1,1,2,1,1,1,3
-tb_xkeycvt	db	@SFT+@TAB
+tb_xkeycvt	db	_AT_SFT+_AT_TAB
 		db	"QWERTYUIOP[]",0,0,"AS"			; ##156.87
 		db	"DFGHJKL",0,0,"@",0,"\ZXCV"		; ##156.87
-		db	"BNM",0,0,0,0,0,0,0,0,@F+1,@F+2,@F+3,@F+4,@F+5
+		db	"BNM",0,0,0,0,0,0,0,0,_AT_F+1,_AT_F+2,_AT_F+3,_AT_F+4,_AT_F+5
-		db	@F+6,@F+7,@F+8,@F+9,@F+10,0,0,@HOME
+		db	_AT_F+6,_AT_F+7,_AT_F+8,_AT_F+9,_AT_F+10,0,0,_AT_HOME
-		db	@UP,@PGUP,0,@LEFT,0,@RIGHT,0,@END
+		db	_AT_UP,_AT_PGUP,0,_AT_LEFT,0,_AT_RIGHT,0,_AT_END
-		db	@DOWN,@PGDN,@INS,@DEL,S@F+1,S@F+2,S@F+3,S@F+4
+		db	_AT_DOWN,_AT_PGDN,_AT_INS,_AT_DEL,S_AT_F+1,S_AT_F+2,S_AT_F+3,S_AT_F+4
-		db	S@F+5,S@F+6,S@F+7,S@F+8,S@F+9,S@F+10,C@F+1,C@F+2
+		db	S_AT_F+5,S_AT_F+6,S_AT_F+7,S_AT_F+8,S_AT_F+9,S_AT_F+10,C_AT_F+1,C_AT_F+2
-		db	C@F+3,C@F+4,C@F+5,C@F+6,C@F+7,C@F+8,C@F+9,C@F+10
+		db	C_AT_F+3,C_AT_F+4,C_AT_F+5,C_AT_F+6,C_AT_F+7,C_AT_F+8,C_AT_F+9,C_AT_F+10
-		db	A@F+1,A@F+2,A@F+3,A@F+4,A@F+5,A@F+6,A@F+7,A@F+8
+		db	A_AT_F+1,A_AT_F+2,A_AT_F+3,A_AT_F+4,A_AT_F+5,A_AT_F+6,A_AT_F+7,A_AT_F+8
-		db	A@F+9,A@F+10,0,@CTR+@LEFT,@CTR+@RIGHT,@CTR+@END
+		db	A_AT_F+9,A_AT_F+10,0,_AT_CTR+_AT_LEFT,_AT_CTR+_AT_RIGHT,_AT_CTR+_AT_END
 IFDEF JBM
-		db	@CTR+@PGDN,@CTR+@HOME,"1234567890-^",@CTR+@PGUP
+		db	_AT_CTR+_AT_PGDN,_AT_CTR+_AT_HOME,"1234567890-^",_AT_CTR+_AT_PGUP
 ELSE
-		db	@CTR+@PGDN,@CTR+@HOME,@F+1,@F+2,@F+3,@F+4,@F+5,@F+6
+		db	_AT_CTR+_AT_PGDN,_AT_CTR+_AT_HOME,_AT_F+1,_AT_F+2,_AT_F+3,_AT_F+4,_AT_F+5,_AT_F+6
-		db	@F+7,@F+8,@F+9,@F+10
+		db	_AT_F+7,_AT_F+8,_AT_F+9,_AT_F+10
-		db	@F+11,@F+12,@CTR+@PGUP,@F+11,@F+12,S@F+11
+		db	_AT_F+11,_AT_F+12,_AT_CTR+_AT_PGUP,_AT_F+11,_AT_F+12,S_AT_F+11
-		db	S@F+12,C@F+11,C@F+12,A@F+11,A@F+12
+		db	S_AT_F+12,C_AT_F+11,C_AT_F+12,A_AT_F+11,A_AT_F+12
 ;---------------------------- ##156.87
-		db	@CTR+@UP,0,0,0,@CTR+@DOWN,@CTR+@INS,@CTR+@DEL
+		db	_AT_CTR+_AT_UP,0,0,0,_AT_CTR+_AT_DOWN,_AT_CTR+_AT_INS,_AT_CTR+_AT_DEL
-		db	@CTR+@TAB,0,0,@ALT+@HOME,@ALT+@UP,@ALT+@PGUP,0
+		db	_AT_CTR+_AT_TAB,0,0,_AT_ALT+_AT_HOME,_AT_ALT+_AT_UP,_AT_ALT+_AT_PGUP,0
-		db	@ALT+@LEFT,0,@ALT+@RIGHT,0,@ALT+@END,@ALT+@DOWN
+		db	_AT_ALT+_AT_LEFT,0,_AT_ALT+_AT_RIGHT,0,_AT_ALT+_AT_END,_AT_ALT+_AT_DOWN
-		db	@ALT+@PGDN,@ALT+@INS,@ALT+@DEL,0,@ALT+@TAB
+		db	_AT_ALT+_AT_PGDN,_AT_ALT+_AT_INS,_AT_ALT+_AT_DEL,0,_AT_ALT+_AT_TAB
 tb_xkeyscan	dw	0300h,1C0Ah,1C00h,0E00Ah,0A600h,007Fh,0E7Fh,0E00h,0100h
-tb_xkeycode	db	0,@CTR+@CR,@ALT+@CR,@CTR+@CR,@ALT+@CR,@CTR+@BS,@CTR+@BS,@ALT+@BS,@ALT+@ESC
+tb_xkeycode	db	0,_AT_CTR+_AT_CR,_AT_ALT+_AT_CR,_AT_CTR+_AT_CR,_AT_ALT+_AT_CR,_AT_CTR+_AT_BS,_AT_CTR+_AT_BS,_AT_ALT+_AT_BS,_AT_ALT+_AT_ESC
 ;----------------------------
 ENDIF
@ -188,7 +188,7 @@ _if z
 _endif
 	mov	ah,al
 	int	INT_ATOK
-	ret
+	VZ_RET
 atok_off:
 atok7_off:
 	mov	ah,66h
@ -197,21 +197,21 @@ atok7_off:
 	mov	ah,0Bh
 	int	INT_ATOK
 	pop	ax
-	ret
+	VZ_RET
 atok_act:
 	mov	ah,20h
 	int	INT_ATOK
-	ret
+	VZ_RET
 atok_mask:
 	mov	ah,1Fh
 	int	INT_ATOK
-	ret
+	VZ_RET
 wxp_on:					; ##155.78
 	mov	ah,0
 	int	INT_WXP
-	ret
+	VZ_RET
 wxp_off:
 	mov	ah,4Ch
 	int	INT_WXP
@ -219,15 +219,15 @@ wxp_off:
 	mov	ax,0
 	int	INT_WXP
 	pop	ax
-	ret
+	VZ_RET
 wxp_act:
 	mov	ax,5300h
 	int	INT_WXP
-	ret
+	VZ_RET
 wxp_mask:
 	mov	ax,5301h
 	int	INT_WXP
-	ret
+	VZ_RET
 ENDIF
 ;--- FEP control for DOS/V ---
@ -244,14 +244,14 @@ ias_on:
 	pop	ax
 	mov	dl,al
 	bios_k	13h,0
-	ret
+	VZ_RET
 ias_off:
 	bios_k	13h,1
 	push	dx
 	and	dl,01000000b		; ##157.152
 	bios_k	13h,0
 	pop	ax
-	ret
+	VZ_RET
 ENDIF
 ;--- FEP control for PS/55 ---
@ -270,7 +270,7 @@ _if z
 _endif
 	mov	ah,al
 	int	INT_ATOK
-	ret
+	VZ_RET
 atok_off:
 atok7_off:
 	mov	ah,66h
@ -279,15 +279,15 @@ atok7_off:
 	mov	ah,0Bh
 	int	INT_ATOK
 	pop	ax
-	ret
+	VZ_RET
 atok_act:
 	mov	ah,20h
 	int	INT_ATOK
-	ret
+	VZ_RET
 atok_mask:
 	mov	ah,1Fh
 	int	INT_ATOK
-	ret
+	VZ_RET
 atok7_mask:
 	mov	ah,66h
 	int	INT_ATOK
@ -314,13 +314,13 @@ vje_mask:
 fep_mask2:
 	clr	ax
 	mov	cs:vct16.@seg,ax
-	ret
+	VZ_RET
 ;; VJEβは、call sense_key ; original int 16 に変更 ; call wait_key の
 ;; 動作を行なうと正しく sense したコードが得られないので注意
 vje_on:
 	mov	ah,1
 	int	INT_VJEB
-	ret
+	VZ_RET
 vje_off:
 	mov	ah,0
 	int	INT_VJEB
@ -328,7 +328,7 @@ vje_off:
 	movhl	ax,1,0
 	int	INT_VJEB
 	pop	ax
-	ret
+	VZ_RET
 ibm_mode:
 	bios_k	02h
@ -348,26 +348,26 @@ ibm_mode:
 	or	al, 40h
  _endif
 	or	al, 30h
-	ret	   
+	VZ_RET	   
 ibm_act:
 	mov	al,cs:mask_act
 ibm_on:
 	or	al, 30h
 	bios_k	05h
-	ret
+	VZ_RET
 ibm_off:
 	call	ibm_mode
 	push	ax
 	mov	al,30h
 	bios_k	05h
 	pop	ax
-	ret
+	VZ_RET
 ibm_mask:
 	call	ibm_mode
 	mov	cs:mask_act,al
 	mov	al,30h
 	bios_k	05h
-	ret
+	VZ_RET
 ENDIF
 ;--- MS-KANJI API ---
@ -375,7 +375,7 @@ ENDIF
 msk_on:
 	mov	ah,80h
 	call	mskanji
-	ret
+	VZ_RET
 msk_off:
 	mov	ax,0
@ -384,7 +384,7 @@ msk_off:
 	mov	ax,8001h
 	call	mskanji
 	pop	ax
-	ret
+	VZ_RET
 mskanji	proc
 	push	bp
@ -399,7 +399,7 @@ mskanji	proc
 	mov	sp,bx
 	pop	bx
 	pop	bp
-	ret
+	VZ_RET
 mskanji	endp
 ;--- Mask FEP for IBM ---
@ -458,7 +458,7 @@ ibmm1:	clr	di
 	mov	es:[16h*4],ax
 	mov	es:[16h*4+2],dx
 	sti
-ibmm9:	ret
+ibmm9:	VZ_RET
 ENDIF
@ -481,14 +481,14 @@ setfnckey:
 ENDIF
 initvzkey:
 IFDEF IBM
-	ret
+	VZ_RET
 getkeytbl:
 	extrn	checkVM		:near
 	call	is_dossilent
 	jmp	checkVM
 ELSE
 getkeytbl:
-	ret
+	VZ_RET
 ENDIF
 	public	initkeytbl
@ -496,7 +496,7 @@ initkeytbl proc
 	clr	ax
 	stosw
 	stosw
-	ret
+	VZ_RET
 initkeytbl endp
 ;--- Get keycode ---
@ -646,14 +646,14 @@ gspec1:
 	jmps	gcode8
 IFDEF JBM
 ctrl_bs:
-	mov	al,@CTR+@BS
+	mov	al,_AT_CTR+_AT_BS
 	jmps	gcode8
 ENDIF
 gctrl1:
 	call	cvtctrl
 gcode8:	mov	ah,TRUE
 	clc
-gcode9:	ret
+gcode9:	VZ_RET
 getkeycode endp
 IFDEF DOSV_BLINK
@ -669,7 +669,7 @@ _else
 	msdos	F_CONIO
  _while z
 _endif
-	ret
+	VZ_RET
 doswaitkey endp
 ENDIF
@ -679,7 +679,7 @@ get_ringp	proc
 		movseg	es,ax
 		mov	ax,es:[ringp]
 		pop	es
-		ret
+		VZ_RET
 get_ringp 	endp
 ;--- Convert ctrl code ---
@ -703,7 +703,7 @@ IFDEF J31				; ##151.10
 _ifn z
 	cmp	dx,0E08h		; ##155.80
  _if e
-	mov	al,@CTR+@BS
+	mov	al,_AT_CTR+_AT_BS
  _endif
 	jmps	cvctr9
 _endif
@ -714,10 +714,10 @@ ENDIF
 	add	al,10011010b		; [ESC]
 	test	ah,KEY_SHIFT
 _ifn z
-	or	al,@SFT
+	or	al,_AT_SFT
 _endif
 cvctr9:	clc
-	ret
+	VZ_RET
 cvtctrl	endp
 ;--- Convert special key ---
@ -744,15 +744,15 @@ ENDIF
 	stc
 	jz	cvspc9
 _if s
-	test	al,@ALT
+	test	al,_AT_ALT
  _if z
 	test	ah,KEY_CTRL
    _ifn z
-	or	al,@CTR
+	or	al,_AT_CTR
    _else
 	test	ah,KEY_SHIFT
      _ifn z
-	or	al,@SFT
+	or	al,_AT_SFT
      _endif
    _endif
  _endif
@ -760,70 +760,70 @@ _else
 	sub	al,20h
 _endif
 	clc
-cvspc9:	ret	
+cvspc9:	VZ_RET	
 cvtspec	endp
 IFDEF JBM
 ; @F11, @F12, S@F11, S@F12, C@F11, C@F12, @ALT+@UP, @ALT+@DOWN を判別
 cvtspec_func	proc
-	cmp	al,S@F+1
+	cmp	al,S_AT_F+1
 _if z
 	test	ah,KEY_SHIFT
  _if z
-	mov	al,@F+11
+	mov	al,_AT_F+11
  _endif
 _endif
-	cmp	al,S@F+2
+	cmp	al,S_AT_F+2
 _if z
 	test	ah,KEY_SHIFT
  _if z
-	mov	al,@F+12
+	mov	al,_AT_F+12
  _endif
 _endif
-	cmp	al,C@F+1
+	cmp	al,C_AT_F+1
 _if z
 	test	ah,KEY_CTRL
  _if z
-	mov	al,S@F+11
+	mov	al,S_AT_F+11
  _endif
 _endif
-	cmp	al,C@F+2
+	cmp	al,C_AT_F+2
 _if z
 	test	ah,KEY_CTRL
  _if z
-	mov	al,S@F+12
+	mov	al,S_AT_F+12
  _endif
 _endif
-	cmp	al,A@F+1
+	cmp	al,A_AT_F+1
 _if z
 	test	ah,KEY_ALT
  _if z
-	mov	al,C@F+11
+	mov	al,C_AT_F+11
  _endif
 _endif
-	cmp	al,A@F+2
+	cmp	al,A_AT_F+2
 _if z
 	test	ah,KEY_ALT
  _if z
-	mov	al,C@F+12
+	mov	al,C_AT_F+12
  _endif
 _endif
-	cmp	al,@PGUP
+	cmp	al,_AT_PGUP
 _if z
 	test	ah,KEY_ALT
  _ifn z
-	mov	al,@ALT+@UP
+	mov	al,_AT_ALT+_AT_UP
  _endif
 _endif
-	cmp	al,@PGDN
+	cmp	al,_AT_PGDN
 _if z
 	test	ah,KEY_ALT
  _ifn z
-	mov	al,@ALT+@DOWN
+	mov	al,_AT_ALT+_AT_DOWN
  _endif
 _endif
-	ret
+	VZ_RET
 cvtspec_func	endp
 ELSE
@ -852,7 +852,7 @@ _if e
 	stc
 _endif
 	pop	es
-	ret
+	VZ_RET
 cvtspec2 endp
 ENDIF
@ -880,7 +880,7 @@ _if e
 _endif
 	popf
 _endif
-	ret
+	VZ_RET
 bioskey	endp
 ENDIF
@ -924,13 +924,13 @@ ENDIF
 IFDEF CVTKANA
 	call	cvtkanakey
 ENDIF
-	ret
+	VZ_RET
 wait_key endp
 	public	sense_key
 sense_key proc
 	bios_k2	01h
-	ret
+	VZ_RET
 sense_key endp
 	public	read_key
@ -941,7 +941,7 @@ _ifn z
 	call	waitkey1
 	tst	ax
 _endif
-	ret
+	VZ_RET
 read_key endp
 	public	flush_key
@ -957,7 +957,7 @@ _repeat
 	bios_k2	00h
 _until
 	pop	ax
-	ret
+	VZ_RET
 flush_key endp
 	public	shift_key
@ -968,7 +968,7 @@ _ifn z
 	or	al,KEY_SHIFT
 _endif
 	mov	ah,al
-	ret
+	VZ_RET
 shift_key endp
 	public	beep_on
@ -976,7 +976,7 @@ beep_on proc
 	in	al,61h
 	or	al,03h
 	out	61h,al
-	ret
+	VZ_RET
 beep_on endp
 	public	beep_off
@ -984,7 +984,7 @@ beep_off proc
 	in	al,61h
 	and	al,not 03h
 	out	61h,al
-	ret
+	VZ_RET
 beep_off endp
 ;--- Check Function key ---
@ -1012,7 +1012,7 @@ ENDIF
 	jnz	chkfk1
 	mov	al,1
 chkfk1:	call	dispfkey
-chkfk9:	ret
+chkfk9:	VZ_RET
 checkfkey endp
 ;--- Display function key ---
@ -1060,7 +1060,7 @@ _endif
 	call	dispfkey1
 dspf8:	pop	ax
 	popm	<di,si,dx,cx,bx>
-dspf9:	ret
+dspf9:	VZ_RET
 ;
 dispfkey1:
@ -1141,7 +1141,7 @@ _until z
 IFDEF DOSV
 	call	vrefresh
 ENDIF
-	ret
+	VZ_RET
 putspces:
 	xchg	dh,dl
@ -1150,7 +1150,7 @@ putspces:
 	call	abputc1
  _loop
 	xchg	dh,dl
-	ret
+	VZ_RET
 dispfkey endp
@ -1158,7 +1158,7 @@ dispfkey endp
 	public	sm_gettrgkey
 sm_gettrgkey:
-	ret
+	VZ_RET
 	assume	ds:nothing
@ -1185,9 +1185,9 @@ chkk3:	sub	al,'0'
 	mov	rolc,al
 	call	initrolc
 chkk0:	clc
-	ret
+	VZ_RET
 chkk9:	stc
-	ret
+	VZ_RET
 sm_chkkey endp
 ;--- Check [SHIFT] key ---
@ -1219,7 +1219,7 @@ chks1:
 	call	initrolc
 _endif
 	clc
-	ret
+	VZ_RET
 sm_chksft endp
 ;--- Is DBCS mode? ---
@ -1239,7 +1239,7 @@ _if z
 _endif
  ENDIF
 ENDIF
-	ret
+	VZ_RET
 isDBCS endp
 	endhs
@ -1248,4 +1248,3 @@ isDBCS endp
 ;	End of 'keyIBM.asm'
 ; Copyright (C) 1989 by c.mos
 ;****************************
--- a/SRC/ledit.asm
+++ b/SRC/ledit.asm
@ -77,7 +77,7 @@ initcbuf proc
 	mov	cmax,cx
 	sub	cx,ax
 	mov	cbufsz,cx
-	ret
+	VZ_RET
 initcbuf endp
 	endis
@ -121,7 +121,7 @@ _endif
 	pop	ax
 	popm	<es,ds>
 le_nop:
-	ret
+	VZ_RET
 lineedit endp
 ;--- Command table ---
@ -178,7 +178,7 @@ chkd1:
 	test	al,ah
 chkd8:
 	popm	<bx,ax>
-	ret
+	VZ_RET
 isdelim	endp
@ -232,7 +232,7 @@ wlvl8:	tst	dl
 	jz	wlvl9
 	cmp	dh,dl
 wlvl9:	mov	dl,dh
-	ret
+	VZ_RET
 wordlevel endp
 ;--- Decriment si ---
@ -256,7 +256,7 @@ decs3:
 	pop	si
 	and	cx,1
 	sub	si,cx
-	ret
+	VZ_RET
 decsi	endp
 ;--- Shift buffer ---
@ -281,7 +281,7 @@ sftbuf	proc
 	dec	di
 	mov	[bp].bend,di
 	clc
-	ret
+	VZ_RET
 shftr:
 	mov	si,[bp].bend
 	mov	di,si
@ -295,7 +295,7 @@ shftr:
    rep	movsb
 	cld
 shft0:	clc
-	ret
+	VZ_RET
 shft_x:
 	tstb	[bp].inbuf
 _ifn s
@ -305,7 +305,7 @@ _ifn s
 	pop	si
 _endif
 	stc
-	ret
+	VZ_RET
 sftbuf	endp
 ;--- Store char to buffer ---
@ -360,7 +360,7 @@ _endif
 	mov	cend,di
 	popm	<es,ds,di,si,ax>
 _endif
-	ret
+	VZ_RET
 	assume	ds:cgroup
 cutold:
@ -384,7 +384,7 @@ _while a
 	mov	di,cbuf
    rep movsb
 	popm	<es,ds,si,dx,cx>
-	ret
+	VZ_RET
 storchr	endp
 	assume	ds:nothing
@ -428,7 +428,7 @@ _endif
 sttyp8:	mov	word ptr [bp].ctype,dx
 	mov	[bp].ccode,ax
 	popm	<si,ax>
-	ret
+	VZ_RET
 settype endp
 ;--- Char right ---
@ -437,14 +437,14 @@ le_charr proc
 	cmp	si,[bp].bend
 _if e
 	inc	ah
-	ret
+	VZ_RET
 _endif
 	tstb	[bp].ckanj
 _ifn z
 	inc	si
 _endif
 	inc	si
-	ret
+	VZ_RET
 le_charr endp
 ;--- Char left ---
@ -453,10 +453,10 @@ le_charl proc
 	cmp	si,[bp].btop
 _ifn e
 	dec	si
-	ret
+	VZ_RET
 _endif
 	dec	ah
-	ret
+	VZ_RET
 le_charl endp
 ;--- Word right ---
@ -465,7 +465,7 @@ le_wordr proc
 	cmp	si,[bp].bend
 _if e
 	inc	ah
-	ret
+	VZ_RET
 _endif
 	clr	dl
 _repeat
@ -475,9 +475,9 @@ _repeat
 	ja	wrdr8
 	cmp	si,[bp].bend
 _until e
-	ret
+	VZ_RET
 wrdr8:	dec	si
-	ret
+	VZ_RET
 le_wordr endp
 ;--- Word left ---
@ -486,7 +486,7 @@ le_wordl proc
 	cmp	si,[bp].btop
 _if e
 	dec	ah
-	ret
+	VZ_RET
 _endif
 	clr	dl
 _repeat
@ -504,19 +504,19 @@ _until e
 	jmps	wrdl9
 wrdl8:	mov	si,ax
 wrdl9:	clr	ah
-	ret
+	VZ_RET
 le_wordl endp
 ;--- Line top/end ---
 le_top	proc
 	mov	si,[bp].btop
-	ret
+	VZ_RET
 le_top	endp
 le_end	proc
 	mov	si,[bp].bend
-	ret
+	VZ_RET
 le_end	endp
 ;--- Insert mode ---
@ -535,7 +535,7 @@ set_insm:
  _endif
 _endif
 	mov	insm,al
-	ret
+	VZ_RET
 le_insmode endp
 ;--- Back char ---
@ -556,10 +556,10 @@ bspc9:	call	storchr
 	call	sftbuf
 	pop	si
 	clr	ah
-	ret
+	VZ_RET
 bscr:	
 	mov	ah,2
-	ret
+	VZ_RET
 le_bakchar endp
 ;--- Delete char ---
@ -578,7 +578,7 @@ delc8:	mov	bl,80h
 	jmp	bspc9
 delcr:	mov	ah,3
-	ret
+	VZ_RET
 le_delchar endp
 ;--- Back word ---
@ -652,7 +652,7 @@ le_delend proc
 	mov	ax,[bx]
 	mov	[si],ax
 dlin9:	clr	ah
-	ret
+	VZ_RET
 le_delend endp
 ;--- Space-Tab ---
@ -668,7 +668,7 @@ _repeat
 	call	outchr
 	pop	cx
 _loop
-	ret
+	VZ_RET
 ;--- Overwrite Tab ---
@ -676,7 +676,7 @@ ovwtab:
 	cmp	si,[bp].bend
 _if ae
 	inc	ah
-	ret
+	VZ_RET
 _endif
 	mov	cl,[bp].lx
 	tstb	[bp].ckanj
@ -688,7 +688,7 @@ _endif
 	mov	si,[bp].tfld
 	call	xtocp2
 	clr	ah
-	ret
+	VZ_RET
 ;--- Output char ---
@ -744,7 +744,7 @@ _endif
 	mov	[si],dl
 	inc	si
 over9:	clr	ah
-	ret
+	VZ_RET
 ;----- Column Overwrite mode -----
@ -804,7 +804,7 @@ column_ovw	proc
 		inc	si
 	_endif
 		clr	ah
-		ret
+		VZ_RET
 column_ovw	endp
 ;--- String copy ---
@ -840,7 +840,7 @@ _repeat
 	mov	dl,al
 	call	outchr
 _until
-copy9:	ret
+copy9:	VZ_RET
 le_copystr endp
 ;--- Char undo ---
@ -883,7 +883,7 @@ _loop
 	jns	undo9
 	mov	si,bx
 undo9:	clr	ah
-	ret
+	VZ_RET
 undocr:
 	pop	ax
 	pop	si
@ -891,7 +891,7 @@ undocr:
 	rol	ax,1
 	add	al,4
 	mov	ah,al		; if al=00 then ah=4, if al=80h then ah=5
-	ret
+	VZ_RET
 le_undo endp
 ;--- Word To upper/lower ---
@ -938,7 +938,7 @@ case6:
 case9:
 	pop	si
 	clr	ah
-	ret	
+	VZ_RET	
 le_case endp
 ;--- #? ---
@ -946,7 +946,7 @@ le_case endp
 le_redraw proc
 	call	off_silent
 	clr	ah
-	ret
+	VZ_RET
 le_redraw endp
 	endes
--- a/SRC/lk.bat
+++ b/SRC/lk.bat
@ -1,36 +0,0 @@
 echo off
 rem	-------	Link VZ, other tools -------
 rem	usage: lk [vmap, etc.]
 rem
 rem	%LNK%	:linker name cap (t, ) ex. set lnk=t
 if not "%1"=="" goto link_tool
 set LNKFILE=@vz.lnk
 set LNKCOM=vz%HARD%
 goto start
 :link_tool
 set LNKFILE=%1
 set LNKCOM=%1
 :start
 if "%LNK%"=="t" goto tlink
 :mslink
 link /m /noi %LNKFILE%,%LNKCOM%,%LNKCOM%;
 exe2bin %LNKCOM%.exe %LNKCOM%.com
 del %LNKCOM%.exe
 goto done
 :tlink
 tlink /c /m /t %LNKFILE%,%LNKCOM%,%LNKCOM%;
 if errorlevel 1 goto end
 :done
 if exist %LNKCOM%.sym del %LNKCOM%.sym
 dir %LNKCOM%.com
 :end
 set LNKFILE=
 set LNKCOM=
--- a/SRC/macro.asm
+++ b/SRC/macro.asm
@ -16,13 +16,13 @@ KEYMACID	equ	'BK'
 UNKMACID	equ	'UN'
 PRINTPARM	equ	16
-MAC_GET		equ	00000001b
+VZ_MAC_GET		equ	00000001b
-MAC_CHR		equ	00000010b
+VZ_MAC_CHR		equ	00000010b
-MAC_STR		equ	00000100b
+VZ_MAC_STR		equ	00000100b
-MAC_PAUSE	equ	00001000b
+VZ_MAC_PAUSE	equ	00001000b
-MAC_MENU	equ	00010000b
+VZ_MAC_MENU	equ	00010000b
-MAC_TBOX	equ	00100000b
+VZ_MAC_TBOX	equ	00100000b
-MAC_SEDIT	equ	10000000b
+VZ_MAC_SEDIT	equ	10000000b
 SKPSYMCNT	equ	8
@ -128,7 +128,7 @@ _mget		ends
 	extrn	scantbl		:near
 	extrn	dispmsg		:near
 	extrn	scan_flcmd	:near
-	extrn	flsyscall	:near
+;	extrn	flsyscall	:near
 	extrn	load_iniopt	:near
 	extrn	reset_histp	:near
 	extrn	open_ext	:near
@ -385,7 +385,7 @@ _if e
 	mov	ax,readmac
 _endif
 	mov	startmac,al
-inimac9:ret
+inimac9:VZ_RET
 initmacro endp
 	endis
@ -414,7 +414,7 @@ _until
 schmac3:	inc	si			; skip length word
 		inc	si
 		pop	ax
-schmac9:	ret
+schmac9:	VZ_RET
 schmacro 	endp
 		public	schsysmenu
@ -442,7 +442,7 @@ schmnu1:	mov	si,bx
 		popm	<bx,ax>
 		inc	si
 		inc	si
-		ret
+		VZ_RET
 schsysmenu	endp
 		public	schmdlmac
@ -450,7 +450,7 @@ schmdlmac:	mov	si,runmhp
 		jmps	schloc1
 schlocal 	proc
 		mov	si,[bx].mrootp
-		mov	dh,not LOCALMAC
+		mov	dh,not byte ptr LOCALMAC
 		tst	dl
 		jns	schloc2
 schloc1:	mov	dh,0FFh
@ -468,8 +468,8 @@ _repeat
 _until e
 		inc	si
 		inc	si
-		ret
+		VZ_RET
-schloc3:	and	dl,not LOCALMAC
+schloc3:	and	dl,not byte ptr LOCALMAC
 		jmp	schmacro
 schlocal	endp
@ -493,7 +493,7 @@ _repeat
 		lodsw
 		add	si,ax
 _until
-		ret
+		VZ_RET
 sch_last	endp
 ;----- Search module -----
@ -514,7 +514,7 @@ _repeat
 	_break e
 		mov	si,[si].mh_nextmdl
 _until
-schid9:		ret
+schid9:		VZ_RET
 sch_module	endp
 zx_schmodule	proc
@ -528,7 +528,7 @@ zx_schmodule	proc
 		pop	ax
 		mov	di,si
 		call	set_readmac
-		ret
+		VZ_RET
 zx_schmodule	endp
 ;----- Count module -----
@ -545,7 +545,7 @@ _repeat
 		dec	cx
 _until
 		not	cx
-cntmdl9:	ret
+cntmdl9:	VZ_RET
 cnt_module	endp
 ;----- Get module header -----
@ -567,7 +567,7 @@ _ifn z
  _until
 _endif
 		pop	ax
-		ret
+		VZ_RET
 get_module	endp
 ;----- Is it macro key? -----
@ -578,7 +578,7 @@ get_module	endp
 ismacro		proc
 		test	extsw,ESW_MAC
 	_ifn z
-		ret
+		VZ_RET
 	_endif
 		mov	dx,ax
 		mov	si,macrobuf	
@ -668,7 +668,7 @@ _ifn z
 	pop	dx
 _endif
 	clc
-	ret
+	VZ_RET
 ismac2:
 	mov	di,mputp
@ -678,7 +678,7 @@ _if e
 	not	al
 	mov	dl,al
 	stc
-	ret
+	VZ_RET
 _endif
 	tst	di
 _ifn z
@ -705,7 +705,7 @@ mac_on:
 	call	csroff
 _else
 	mov	bx,mnestp
-	cmp	al,MAC_PAUSE
+	cmp	al,VZ_MAC_PAUSE
  _if e
 	dec	[bx].mgetp
 	dec	[bx].mgetp
@ -746,7 +746,7 @@ _endif
 ;_endif
 	mov	[bx].mgetp,si
 ismac9:	stc
-	ret
+	VZ_RET
 ismacro	endp
 chkmacbuf:
@ -762,7 +762,7 @@ mac_putoff:
 macoff:	mov	mputp,NULL
 _endif
 	stc				; for postmacro
-	ret
+	VZ_RET
 scan_gmac proc
 _repeat
@ -770,7 +770,7 @@ _repeat
 	add	di,3
 	tstb	[di]
 _while s
-	ret
+	VZ_RET
 scan_gmac endp
 ;--- Off macro ---
@ -791,7 +791,7 @@ _else
 _endif
 	stc
 	pop	ds
-	ret
+	VZ_RET
 disperr	endp
 ;--- Do macro ---
@ -803,7 +803,7 @@ _ifn z
 	mov	si,offset cgroup:kmg_ng
 	call	dispkeymode
 	stc
-	ret
+	VZ_RET
 _endif
 	tstw	mputp
 	jnz	mac_putoff
@ -820,7 +820,7 @@ _endif
 	mov	si,offset cgroup:kmg_mac
 	call	dispkeymode
 	stc
-	ret
+	VZ_RET
 domacro	endp
 ;--- Post-macro ---
@ -830,14 +830,14 @@ postmacro proc
 	mov	ah,macmode
 	tst	ah
 	jz	post1
-	cmp	ah,MAC_PAUSE
+	cmp	ah,VZ_MAC_PAUSE
 	je	post_pause
-	cmp	ah,MAC_CHR
+	cmp	ah,VZ_MAC_CHR
 	je	to_macget
-	cmp	ah,MAC_STR
+	cmp	ah,VZ_MAC_STR
 	je	post_str
 post9:	clc
-	ret
+	VZ_RET
 post_str:
 	cmp	al,CM_CR
@ -845,8 +845,8 @@ post_str:
 	cmp	al,CM_ESC
 	jne	post9
 to_macget:
-	mov	macmode,MAC_GET
+	mov	macmode,VZ_MAC_GET
-	ret
+	VZ_RET
 post_pause:
 	call	to_macget
@ -909,7 +909,7 @@ _ifn z
 	stosb
 _endif
 	pop	ax
-	ret
+	VZ_RET
 dataend endp
 	public	schcmdsym
@ -925,7 +925,7 @@ _if e
 	sub	al,cl
 	clc
 _endif
-	ret
+	VZ_RET
 schcmdsym endp
 ;--- Update kbd macro ---
@ -1002,7 +1002,7 @@ _ifn z
  _endif
 	jmp	mac_ok
 _endif
-	ret	
+	VZ_RET	
 addmacro endp
 ;--- Pre-macro ---
@ -1030,7 +1030,7 @@ _ifn z
 	mov	si,offset cgroup:kmg_mac
 	call	dispkeymode
 _endif
-	test	macmode,MAC_GET
+	test	macmode,VZ_MAC_GET
 _if z
 	mov	dl,startmac
 	tst	dl
@ -1046,7 +1046,7 @@ _if z
    _endif
  _endif
 	clc
-	ret
+	VZ_RET
 _endif
 	tstb	stepf
 _ifn z
@ -1131,7 +1131,7 @@ prdata1:mov	dx,ax
 prdata2:clr	al
 	mov	[bx].mgetp,si
 	stc
-	ret
+	VZ_RET
 mac_chr:
 	call	scan_chr1
 	jmp	prdata2
@ -1183,7 +1183,7 @@ prstop1:clr	ax
 off_silent:
 	mov	ss:silent,0
 prmac9:	clc
-	ret
+	VZ_RET
 prmac_pop:
 	mov	si,[bx].mgettop
@ -1265,7 +1265,7 @@ _ifn z
 _endif
 	clr	al
 macmnu2:
-	mov	macmode,MAC_MENU
+	mov	macmode,VZ_MAC_MENU
 	xchg	bx,si
 	push	dx
 	push	sysmode
@ -1297,7 +1297,7 @@ macmnu3:
 	call	schmdlmac
 	jmps	maccal1
 macmnu9:stc
-	ret
+	VZ_RET
 ;--- Command (#nn,#a) ---
@ -1306,7 +1306,7 @@ mac_cmd:
 	jmpl	c,prmac_err
 	call	set_mgetp
 	stc
-	ret
+	VZ_RET
 ;--- Variables (a) ---
@ -1335,7 +1335,7 @@ readexpr1 proc
 	call	readexpr
 	pop	bx
 	lodsb
-	ret
+	VZ_RET
 readexpr1 endp
 ;--- Call macro (&nn,&a,&#) ---
@ -1495,7 +1495,7 @@ scsym_str:
 scsym4:	pop	dx
 	jmp	scsym2
 scsym8:	dec	si
-scsym9:	ret
+scsym9:	VZ_RET
 ;--- Label/jump (:A,>A,>nn) ---
@ -1577,7 +1577,7 @@ set_mgetp:
 _if a
 	mov	[bx].mgetp,si
 _endif
-	ret
+	VZ_RET
 ;----- On Key goto -----
@ -1653,7 +1653,7 @@ _if ae
 	mov	al,','
 	jmp	scansym1
 _endif
-	ret
+	VZ_RET
 tb_skipjmp:
 	ofs	scandeciw
@ -1682,12 +1682,12 @@ skp_blk:
 scan_chr1:
 	call	scan_chr
 	dec	si
-	ret
+	VZ_RET
 scan_str1:
 	call	scan_str
 	dec	si
-	ret
+	VZ_RET
 gmacn0:	call	isupper		;; &S?
 _ifn c
@ -1716,7 +1716,7 @@ _endif
 	add	dl,[di-3]
 	clr	al
 gmacn8:	clc
-gmacn9:	ret
+gmacn9:	VZ_RET
 specialjmp:
 	cmp	al,'>'
@ -1724,13 +1724,13 @@ specialjmp:
 	cmp	al,'*'
 	je	jmp_ref
 spjmp_x:clc
-	ret
+	VZ_RET
 jmp_next:
 	mov	si,[bx].mgettop
 	add	si,[si-2]
 	add	si,3
 	stc
-	ret
+	VZ_RET
 jmp_ref:
 	mov	dx,readmac
@ -1745,7 +1745,7 @@ _else
 	add	si,3
 _endif
 	stc
-	ret
+	VZ_RET
 jmp_abort:
 	mov	si,eventvct
@ -1754,7 +1754,7 @@ _ifn z
 	inc	si
 	inc	si
 	stc
-	ret
+	VZ_RET
 _endif
 	inc	sp
 	inc	sp
@ -1791,9 +1791,9 @@ _endif
 	pop	bx
 _endif
 scancm9:clc
-	ret
+	VZ_RET
 sccmd_x:stc
-	ret
+	VZ_RET
 scancmd	endp
 ;--- Read parameter ---
@ -1805,7 +1805,7 @@ readparm proc
 	call	readexpr0
 	jc	parm_x4
 	clc
-	ret
+	VZ_RET
 parm_x4:
 	inc	sp
 	inc	sp
@ -1819,10 +1819,10 @@ readnext proc
 	cmp	al,','
 	jne	parm_x
 	call	readexpr0
-	ret
+	VZ_RET
 parm_x:
 	stc
-	ret
+	VZ_RET
 readnext endp
 ;--- System macro ---
@ -1835,12 +1835,12 @@ smac_quit:
 	stl	[bx]
 set_mnestp:
 	mov	mnestp,bx
-sbrk9:	ret
+sbrk9:	VZ_RET
 smac_trace:
 	mov	stepf,TRUE
 smac_nop:
-	ret
+	VZ_RET
 smac_upper:
 	call	readparm
@ -1853,7 +1853,7 @@ _endif
 smac_silent:
 	mov	silent,1
-	ret
+	VZ_RET
 smac_redraw:
 	call	off_silent
@ -1861,14 +1861,14 @@ smac_redraw:
 _if z
 	call	redraw
 _endif
-	ret
+	VZ_RET
 smac_char:
-	mov	al,MAC_CHR
+	mov	al,VZ_MAC_CHR
 	jmps	smac8
 smac_line:
-	mov	al,MAC_STR
+	mov	al,VZ_MAC_STR
 	jmps	smac8
 smac_inkey:
@ -1888,15 +1888,15 @@ _else
 _endif
 set_retval:
 	mov	retval,ax
-	ret
+	VZ_RET
 smac_pause:
-	mov	al,MAC_PAUSE
+	mov	al,VZ_MAC_PAUSE
 smac8:	mov	macmode,al
 	inc	sp
 	inc	sp
 	clc
-	ret
+	VZ_RET
 	public	smac_output	;;;
 smac_output:
@ -1910,7 +1910,7 @@ _endif
 	inc	sp
 	inc	sp
 	stc
-	ret
+	VZ_RET
 sx_sprintf:
 	call	readparm
@ -1958,7 +1958,7 @@ _endif
 	pop	bx
 	cmp	ax,tmpbuf3		;;
 	je	prntcall
-	ret
+	VZ_RET
 prntcall:
 	mov	[bx].mgetp,si
@ -2000,7 +2000,7 @@ _else
 _endif
 	pop	bx
 	push	si
-	mov	macmode,MAC_TBOX
+	mov	macmode,VZ_MAC_TBOX
 	push	sysmode
 	call	windgetval
 	pop	sysmode
@ -2008,7 +2008,7 @@ _endif
 	call	to_macget
 	mov	retval,dx
 	pop	bx
-	ret
+	VZ_RET
 smac_beep:
 	test	word ptr syssw,SW_BEEP
@ -2016,7 +2016,7 @@ smac_beep:
 	call	beep_on
 	call	smac_wait
 	call	beep_off
-	ret
+	VZ_RET
 smac_wait:
 	call	readparm
@ -2027,7 +2027,7 @@ _ifn z
 	call	waitcrtv
  _loop
 _endif
-	ret
+	VZ_RET
 smac_rnd:
 	mov	ax,seed
@ -2112,7 +2112,7 @@ _if e
 	call	editloc
 	popm	<ds,si,bx>
 _endif
-	ret
+	VZ_RET
 smac_getdeci:
 	clr	al
@ -2153,7 +2153,7 @@ smaccall:
 	mov	[bx].mgettop,si
 	mov	[bx].mgetp,si
 	call	set_mnestp
-	ret
+	VZ_RET
 smac_err1:
 	jmp	smac_err
@ -2172,7 +2172,7 @@ _ifn c
 _endif
 	mov	retval,cx
 	pop	si			; ##156.144
-	ret
+	VZ_RET
 smac_video proc
 	call	readparm
@ -2183,7 +2183,7 @@ _else
 	mov	al,insm
 	call	csron
 _endif
-	ret
+	VZ_RET
 smac_video endp
 smac_fep proc				; ##156.110
@ -2198,7 +2198,7 @@ _ifn z
 _endif
 	call	ctrlfp
 	mov	fpmode,al
-	ret
+	VZ_RET
 smac_fep endp
 ;----- &z() macro loader -----
@ -2243,7 +2243,7 @@ smac_macload	proc
 		movseg	ds,ss
 		mov	retval,dx
 		popm	<bp,si,bx>
-		ret
+		VZ_RET
 smac_macload	endp
 retry_recust	proc
@ -2264,7 +2264,7 @@ _repeat
 	  _ifn c
 		call	re_cust1
 		jc	retry_recust
-		ret
+		VZ_RET
 	  _endif
 	_endif
 		mov	si,ss:[si].mh_nextmdl
@ -2272,7 +2272,7 @@ _repeat
 _until z
 retry_x:	stc
 		mov	dl,E_NOBUFFER
-		ret
+		VZ_RET
 retry_recust	endp
 ;----- String operations -----
@ -2305,7 +2305,7 @@ strcpy1:	tst	cx
 	_endif
 		call	strncpy
 		mov	ss:retval,di
-		ret
+		VZ_RET
 sx_strcpy	endp
 sx_strcat	proc
@ -2322,7 +2322,7 @@ stcmp1:		mov	ax,0
 		inc	ax
 	_endif
 strret1:	mov	ss:retval,ax
-		ret
+		VZ_RET
 sx_strcmp	endp
 sx_stricmp	proc
@ -2387,7 +2387,7 @@ sx_histcpy	proc
 		clr	cx
 		pop	ax
 		call	histcpy1
-		ret
+		VZ_RET
 sx_histcpy	endp
 sx_getenv	proc
@ -2401,7 +2401,7 @@ sx_getenv	proc
 		call	strcpy1
 	_endif
 		movseg	ds,ss
-		ret
+		VZ_RET
 sx_getenv	endp
 sx_parsepath	proc
@ -2411,7 +2411,7 @@ sx_parsepath	proc
 		mov	[di+2],bx
 		mov	[di+4],cx
 		mov	[di+8],si
-		ret
+		VZ_RET
 sx_parsepath	endp
 jx_iskanji	proc
@ -2425,7 +2425,7 @@ jx_cvtkana	proc
 		call	cvtkanakey
 	_endif
 		mov	retval,ax
-		ret
+		VZ_RET
 jx_cvtkana	endp
 ;----- Long int operations -----
@ -2434,21 +2434,21 @@ lx_mov		proc
 		xchg	si,di
 		movsw
 		movsw
-		ret
+		VZ_RET
 lx_mov		endp
 lx_addl		proc
 		ldl	[di]
 		add	[si],ax
 		adc	[si+2],dx
-		ret
+		VZ_RET
 lx_addl		endp
 lx_subl		proc
 		ldl	[di]
 		sub	[si],ax
 		sbb	[si+2],dx
-		ret
+		VZ_RET
 lx_subl		endp
 lx_cmpl		proc
@ -2463,17 +2463,17 @@ lx_cmpl		proc
 	  _endif
 	_endif
 		mov	retval,ax
-		ret
+		VZ_RET
 lx_cmpl		endp
 lx_addlw	proc
 		addlw	[si],dx
-		ret
+		VZ_RET
 lx_addlw	endp
 lx_sublw	proc
 		sublw	[si],dx
-		ret
+		VZ_RET
 lx_sublw	endp
 lx_mullw	proc
@ -2486,7 +2486,7 @@ lx_mullw	proc
 		popm	<dx,ax>
 		add	dx,cx
 		stl	[si]
-		ret
+		VZ_RET
 lx_mullw	endp
 lx_divlw	proc
@ -2495,7 +2495,7 @@ lx_divlw	proc
 		mov	retval,dx
 		clr	dx
 		stl	[si]
-		ret
+		VZ_RET
 lx_divlw	endp
 ;----- Misc. functions -----
@ -2508,9 +2508,9 @@ emac_sedit	proc
 		inc	sp
 		inc	sp
 		clc
-		ret
+		VZ_RET
 	_endif
-		ret
+		VZ_RET
 emac_sedit	endp
 ;----- Insert macro -----
@ -2573,7 +2573,7 @@ ins_macro	proc
 		call	init_maclink
 		pop	ax
 		clc
-insmac_x:	ret
+insmac_x:	VZ_RET
 ins_macro	endp
 ;----- Set store ptr -----
@ -2597,7 +2597,7 @@ set_storep	proc
 ;		dec	si
 ;		mov	macendp,si
 ;		mov	bx,di
-;		ret
+;		VZ_RET
 	    _endif
 	  _endif
 		clr	dl
@ -2667,7 +2667,7 @@ _until
 		mov	di,bx
 	  _endif
 	_endif
-		ret
+		VZ_RET
 set_storep	endp
 ;---- Set readmac -----
@ -2688,7 +2688,7 @@ _repeat
 		jz	stread9
 _loop
 		mov	readmac,di
-stread9:	ret
+stread9:	VZ_RET
 set_readmac	endp
 ;----- Delete macro -----
@ -2738,7 +2738,7 @@ del_macro	proc
 		call	init_maclink
 		clc
 delmac9:	popm	<es,ds>
-		ret
+		VZ_RET
 del_macro	endp
 zx_delmacro	proc
@ -2759,7 +2759,7 @@ _until a
 		skip1
 onrun_x:	stc
 		pop	bx
-		ret
+		VZ_RET
 onrun		endp
 		public	isrun
@ -2775,7 +2775,7 @@ _repeat
 _until a
 		clc
 isrun9:		pop	bx
-		ret
+		VZ_RET
 isrun		endp
 ;--- Print keyboard macro ---
@ -2798,7 +2798,7 @@ wmac2:	lods	ss:dummyw
 _until
 	pop	si
 	call	scrout_cp
-	ret	
+	VZ_RET	
 wmac3:
 	pushm	<ax,si>
 	mov	di,[bp].tnow
@ -2934,7 +2934,7 @@ _until
 		sub	ax,si
 		mov	macrosz,ax
 		popm	<es,ds>
-		ret
+		VZ_RET
 init_maclink	endp
 ;----- Init Event macro -----
@ -2964,7 +2964,7 @@ initevmac	proc
 		dec	si
 		dec	si
 	_endif
-		ret
+		VZ_RET
 initevmac	endp
 ;----- Do Event macro -----
@ -3001,7 +3001,7 @@ do_evmac	proc
 		skip2
 doevmac8:	clr	ax
 		popm	<ds,si,dx,cx>
-		ret
+		VZ_RET
 do_evmac	endp
 ;----- Do Event macro -----
@ -3024,7 +3024,7 @@ run_evmac	proc
 	_endif
 		mov	mnestbase,0
 		pop	ds
-		ret
+		VZ_RET
 run_evmac	endp
 		endes
@ -3034,4 +3034,3 @@ run_evmac	endp
 ;	End of 'macro.asm'
 ; Copyright (C) 1989 by c.mos
 ;****************************
--- a/SRC/main.asm
+++ b/SRC/main.asm
@ -22,7 +22,6 @@ refp	macro	label
 	endm
 ;--- External symbols ---
 	extrn	cmdsymtbl	:byte
 	extrn	scrnparm	:byte
 	extrn	flparm		:byte
@ -140,7 +139,7 @@ refp	macro	label
 	extrn	write_logtbl	:near
 	extrn	set_insm	:near
 	extrn	init_maclink	:near
-	extrn	init_module	:near
+;	extrn	init_module	:near
 	extrn	set_opnopt	:near
 	extrn	set_blktgt	:near
 	extrn	check_vwx	:near
@ -204,7 +203,11 @@ entry:		jmps	entry1
 vzversion:	db	"VZ1.60 ",0,EOF
 entry1:		jmp	init
 		dw	0
 IFDEF WASM
 nm_vz		db	<'VZ',0,0,0,0,0,0,0>
 ELSE
 GDATA nm_vz,	db,	<'VZ',0,0,0,0,0,0,0>
 ENDIF
 GDATA hardware,	db,	0
 		org	120h
@ -352,7 +355,6 @@ GDATA breakf,	db,	-1		; break flag	;##155.83, ##156.129
 GDATA dossw,	db,	0		; dos command switch  ##16
 GDATA doslen,	dw,	0		; dos command box len ##16
 GDATA tmppath,	db,	<TMPPATHSZ dup(?)> ; temporary path
 	endws
 	dseg
@ -420,9 +422,14 @@ GDATA tmpbuf3,	dw,	WD*2		; DTA,smooth,&?()
 GDATA pathbuf,	dw,	PATHSZ
 GDATA pathbuf2,	dw,	PATHSZ
 IFNDEF NOFILER
 IFDEF WASM
 flwork		dw	<type _filer>	; 1st filer work
 flwork2		dw	<type _filer>	; 2nd filer work
 ELSE
 GDATA flwork,	dw,	<type _filer>	; 1st filer work
 GDATA flwork2,	dw,	<type _filer>	; 2nd filer work
 ENDIF
 ENDIF
 GDATA inioptbuf,dw,	INIOPTSZ1+INIOPTSZ2+INIOPTSZ3
 GDATA save_end,	label,	word
 GDATA schstr,	dw,	STRSZ		; search buffer
@ -681,7 +688,7 @@ _ifn z
 	jmp	icst5
 _endif
 	call	readopt
-	ret
+	VZ_RET
 config	endp
 ;--- Read DEF file ---
@ -692,7 +699,7 @@ readdef	proc
 	cmp	byte ptr [si],SPC
 _if be
 	clr	si
-	ret
+	VZ_RET
 _endif
 	call	adddefpath
 	lodsb
@ -739,7 +746,7 @@ rdef_x:
 	clc
 _endif
 	pop	si
-	ret
+	VZ_RET
 readdef	endp
 ;--- Read option ---
@ -760,7 +767,7 @@ ropt1:	lodsb
 	je	ropt4
 	dec	si
 	mov	pathp,si
-ropt9:	ret
+ropt9:	VZ_RET
 ropt2:
 	lodsb
 	push	dx
@ -793,7 +800,7 @@ _if c
 	push	si
 	mov	ds,ax
 	call	parsepath
-	test	dl,PRS_ROOT
+	test	dl,VZ_PRS_ROOT
  _if z
 	call	getcurdir1
 	call	addsep
@ -818,7 +825,7 @@ inscvt:
 	inc	di
 	mov	tempend,di
 	call	insertcvt
-	ret
+	VZ_RET
 getcompath endp
 ;--- Get DEFfile path ---
@ -835,7 +842,7 @@ _if c
 	call	parsepath
 	pop	si
 _endif
-	test	dl,PRS_ROOT
+	test	dl,VZ_PRS_ROOT
 _ifn z
 	mov	cx,bx
 	sub	cx,si
@ -850,7 +857,7 @@ _endif
 	mov	si,bx
 	inc	di
 	mov	bx,di
-	test	dl,PRS_NAME
+	test	dl,VZ_PRS_NAME
 _ifn z
 	call	strcpy
 _else
@ -889,7 +896,7 @@ _endif
 	movseg	es,cs
 	call	strcpy
 	pop	es
-	ret
+	VZ_RET
 gettmppath endp
 ;--- Get FILES.$$$ path ---
@ -908,7 +915,7 @@ get_refpath	proc
 		call	addsep
 		mov	si,offset cgroup:nm_files
 		call	strcpy
-		ret
+		VZ_RET
 get_refpath	endp
 ;--- Init work ---
@ -1001,7 +1008,7 @@ _endif
 	mov	ss_stack,cx
 	sub	cx,di
 	call	memclear
-	ret
+	VZ_RET
 initwork endp
 initsize proc
@ -1022,7 +1029,7 @@ _else
 	shl	ax,cl
 _endif
 	mov	frees,ax
-	ret
+	VZ_RET
 initsize endp
 ;--- Init far work ---
@ -1086,7 +1093,7 @@ ENDIF
 	mov	cx,farbss_clr
 	call	memclear
 	pop	es
-	ret
+	VZ_RET
 initfarwork endp
 put_exmsmsg proc
@ -1099,7 +1106,7 @@ put_exmsmsg proc
 	movseg	ds,ss
 	movseg	es,ss
 	call	cputmg
-	ret
+	VZ_RET
 put_exmsmsg endp
 ;--- Allocate far memory ---
@ -1119,7 +1126,7 @@ _if c
 	mov	nears,cx
 	mov	usefar,TRUE
 _endif
-	ret
+	VZ_RET
 allocfar endp
 ;--- Set size ptr ---
@ -1131,7 +1138,7 @@ _repeat
 	add	ax,dx
 	call	chkmem
 _loop
-	ret
+	VZ_RET
 setsizep endp
 ;
 ;
@ -1182,7 +1189,7 @@ _loop
 	mov	es,ax
 	msdos	F_FREE
 	pop	es
-	ret
+	VZ_RET
 free_env endp
 ;--- Set root env seg ---
@ -1204,7 +1211,7 @@ _if z
 _endif
 	mov	envseg,ax
 	pop	es
-	ret
+	VZ_RET
 getrootenvs endp
 	endis		;
@ -1268,7 +1275,7 @@ ENDIF
 	public	cputc,cputs,cputmg,cputcrlf,cputstr
 cputc:
 	msdos	F_DSPCHR
-	ret
+	VZ_RET
 cputcrlf:
 	mov	dx,offset cgroup:mg_crlf
 cputmg:
@ -1276,10 +1283,10 @@ cputmg:
        movseg  ds,cs
        call    cputs
 	pop	ds
-	ret
+	VZ_RET
 cputs:
 	msdos	F_DSPSTR
-cputs9:	ret
+cputs9:	VZ_RET
 cputstr:
 	lodsb
@ -1301,7 +1308,7 @@ _if z
 	mov	ah,F_FREE
 _endif
 	int	21h
-	ret
+	VZ_RET
 ;--- Set environment path/name ---
 ;-->
@ -1324,7 +1331,7 @@ setenvvar proc
 	push	si
 	call	scanenv1
 	pop	di
-	ret
+	VZ_RET
 setenvvar endp
 ;--- Scan environment strings ---
@ -1363,7 +1370,7 @@ env_f:
 	pop	si
 	stc
 	popm	<si,cx>
-	ret
+	VZ_RET
 env_x:	
 	popm	<si,cx>
 	tst	si
@ -1373,7 +1380,7 @@ env_x:
 	clc
 	jne	env9
 	stc
-env9:	ret
+env9:	VZ_RET
 scanenv endp
 scanenv1 proc
@ -1381,7 +1388,7 @@ scanenv1 proc
 	mov	si,di
 	mov	ax,es
 	movseg	es,ss
-	ret
+	VZ_RET
 scanenv1 endp
 ;--- Add DEF path ---
@ -1406,7 +1413,7 @@ addpath2:
 	push	bx
 	push	si
 	call	parsepath
-	test	dl,PRS_ROOT
+	test	dl,VZ_PRS_ROOT
 _if z
 	mov	si,defpath
 	tstb	[si]			; ##100.02
@ -1425,13 +1432,13 @@ addp1:	lodsb
 addp2:	dec	si
 	dec	di	
 	mov	byte ptr [di],0
-	test	dl,PRS_NAME
+	test	dl,VZ_PRS_NAME
 _if z
 	mov	si,offset cgroup:nm_vz
 	call	strcpy
 _endif
 	pop	bx
-	test	dl,PRS_EXT
+	test	dl,VZ_PRS_EXT
 _if z
 	tst	bx
  _ifn z
@ -1445,7 +1452,7 @@ _if z
 _endif
 	pop	di
 	mov	dx,di
-	ret
+	VZ_RET
 adddefpath endp
 ;--- Offset to segment ---
@ -1460,10 +1467,10 @@ ofs2seg1:
 	mov	cl,4
 	shr	ax,cl
 	pop	cx
-	ret
+	VZ_RET
 _endif
 	mov	ax,1000h
-	ret
+	VZ_RET
 ofs2seg endp
 ;--- Segment to offset ---
@ -1474,13 +1481,13 @@ seg2ofs proc
 	cmp	ax,1000h
 _ifn b
 	mov	ax,0FFFFh
-	ret
+	VZ_RET
 _endif
 	push	cx
 	mov	cl,4
 	shl	ax,cl
 	pop	cx
-	ret
+	VZ_RET
 seg2ofs endp
 	endes
@ -1505,7 +1512,7 @@ enter_vz proc
 	call	setint24
 	call	getcurdir
 ;	call	setgbank
-	mov	ax,gtops		; ##152.26
+	mov	ax,ss:gtops		; ##152.26
 	tst	ax
 _if z
 	call	initfar
@ -1524,7 +1531,7 @@ _else
 _endif
 	mov	ax,gtops
 	mov	gtops0,ax
-entvz9:	ret
+entvz9:	VZ_RET
 enter_vz endp
 IF 0
@ -1542,7 +1549,7 @@ stack_cs:
 	mov	ss,cs:code_seg
 sppul:	sti
 	pushm	<di,si,dx,cx,bx>
-	ret
+	VZ_RET
 stack_gs endp
 ENDIF
@ -1587,7 +1594,7 @@ chkmem:
 	jc	memerr
 	cmp	ax,ssmax
 	jae	memerr
-	ret
+	VZ_RET
 memerr:
 	mov	dx,offset cgroup:mg_nospc
 cfgerr:	call	cputmg
@ -1616,7 +1623,7 @@ _endif
 	call	ld_wact
 	jz	readini2
 todsp1:	call	dspscr
-	ret
+	VZ_RET
 _endif
 toedit0:
 	call	ld_wact
@ -1748,7 +1755,7 @@ _endif
 ;_ifn z
 ;	call	resetscr
 ;_endif
-;	ret
+;	VZ_RET
 sedit	endp
 ;--- Init text screen ---
@ -1780,7 +1787,7 @@ _if z
 _endif
 	mov	[bp].fsiz,al
 	mov	[bp].fsiz0,al
-	ret
+	VZ_RET
 iniscr	endp
 	public	editloc
@ -1795,7 +1802,7 @@ editloc proc
 	mov	dl,[bp].tw_px
 	mov	cl,[bp].tw_sx
 	call	undercsr
-	ret
+	VZ_RET
 editloc endp
 ;--- Map text segment ---
@ -1835,7 +1842,7 @@ maptxt1:
     _endif
   _endif
 _endif
-	ret
+	VZ_RET
 maptext	endp
 ;--- Blach by code ---
@ -1915,7 +1922,7 @@ blan8:
 	sbb	ax,ax
 	mov	retval,ax
 se_dummy:
-blan9:	ret
+blan9:	VZ_RET
 blanch	endp
 	public	touch
@ -1928,7 +1935,7 @@ touch	proc
 	jne	touch9
 touch1:	xor	[bp].tchf,1
 touch9:	pop	ax
-	ret
+	VZ_RET
 touch	endp
 ;--- Command table ---
@ -2026,7 +2033,7 @@ _ifn z
 	popall	<es,ds>
 _endif
 	pop	ax
-	ret
+	VZ_RET
 redraw	endp
 ;----- Initilal option manager -----
@ -2046,7 +2053,7 @@ save_iniopt	proc
 		mov	si,offset cgroup:hist_top
 		mov	cx,INIOPTSZ3/2
 	rep	movsw
-		ret
+		VZ_RET
 save_iniopt	endp
 		public	load_iniopt
@ -2065,7 +2072,7 @@ load_iniopt	proc
 		mov	cx,INIOPTSZ2/2
 	rep	movsw
 		pop	si
-		ret
+		VZ_RET
 load_iniopt	endp
 		public	write_goption
@ -2079,7 +2086,7 @@ write_goption	proc
 		mov	cx,INIOPTSZ25/2
 		mov	dx,offset cgroup:tb_opt_atr
 		call	write_gopt
-		ret
+		VZ_RET
 write_goption	endp
 		public	reset_histp
@ -2090,7 +2097,7 @@ reset_histp	proc
 		mov	di,offset cgroup:hist_top
 		mov	cx,INIOPTSZ3/2
 	rep	movsw
-		ret
+		VZ_RET
 reset_histp	endp
 	endes
@ -2101,4 +2108,3 @@ reset_histp	endp
 ;	End of 'main.asm'
 ; Copyright (C) 1989 by c.mos
 ;****************************
--- a/SRC/memo.asm
+++ b/SRC/memo.asm
@ -81,7 +81,7 @@ settcp	proc
 settcp1:
 	call	setabsp
 	stl	[bp].tnowp
-	ret
+	VZ_RET
 settcp	endp
 	public	restcp,resetcp1
@ -94,7 +94,7 @@ resetcp1:
 	mov	si,ax
 	call	toplin
 	mov	[bp].tnow,si
-	ret
+	VZ_RET
 restcp	endp
 ;--- Mark block ---
@ -110,12 +110,12 @@ blkon1:	call	setnowp
 	sub	ax,[bp].tnow
 	mov	[bp].bofs,ax
 	clc
-	ret
+	VZ_RET
 _endif
 	mov	[bp].blkm,FALSE
 	call	scrout
 	clc
-	ret
+	VZ_RET
 se_markblk endp
 	public	setnowp,setabsp
@ -125,7 +125,7 @@ setabsp: clr	dx
 	sub	ax,[bp].ttop		; ##1.5
 	sbb	dx,0
 	addl	[bp].headp
-	ret
+	VZ_RET
 ;--- Init block pointer ---
 ;<--
@ -185,12 +185,12 @@ _endif
 iblk8:	pop	cx
 	mov	bl,cl
 	tst	si
-	ret
+	VZ_RET
 notblk:
 	mov	si,[bp].tnow
 	mov	bh,FALSE
-	ret
+	VZ_RET
 	endcs
@ -210,7 +210,7 @@ _ifn z
 	mov	sends,ax
 _endif
 	pop	ax
-	ret
+	VZ_RET
 setsends endp
 ;--- Clear stack ---
@ -235,7 +235,7 @@ _endif
 	call	setsends
 	pop	ax
 	clc
-	ret
+	VZ_RET
 clrstack endp
 ;--- Get end of main memory ---
@ -250,7 +250,7 @@ getsends proc
 _if z
 	mov	ax,rends
 _endif
-	ret
+	VZ_RET
 getsends endp
@ -297,7 +297,7 @@ opstk1:	mov	al,2
 _endif
 	clc
 opstk9:	pop	ds
-	ret
+	VZ_RET
 openstack endp
 	assume	ds:nothing
@ -341,7 +341,7 @@ spsh_x2:
 spsh_x:	mov	dl,E_NOMEM
 	call	disperr
 spsh_c:	stc
-spsh9:	ret
+spsh9:	VZ_RET
 spsh1:
 	tst	dx
 	jnz	sfull
@ -500,7 +500,7 @@ _else
 	clc
 _endif
 	popm	<ds,si,cx>
-	ret	
+	VZ_RET	
 cutstack endp
 ;--- Pull/Load from stack ---
@ -589,7 +589,7 @@ spul_x:
 	call	restcp
 spul_c:
 	stc
-	ret
+	VZ_RET
 spul8:
 	mov	al,bh
 	call	set_ret
@ -624,11 +624,11 @@ _if z
 _endif
 	call	scrout_fx
 	clc
-	ret
+	VZ_RET
 stkout1:
 	call	scrout_cp
 	clc
-	ret
+	VZ_RET
 se_pullblk endp
 se_loadblk endp
@ -647,7 +647,7 @@ gblk_x:		mov	bh,-1
 		popm	<es,si,bx>
 set_ret:	cbw
 		mov	retval,ax
-		ret		
+		VZ_RET		
 get_blkm	endp
 get_blkinfo	proc
@ -662,7 +662,7 @@ get_blkinfo	proc
 		mov	bh,es:[si]
 		clz
 	_endif
-		ret
+		VZ_RET
 get_blkinfo	endp
 ;--- Clear stack ---
@ -675,13 +675,13 @@ se_clrstack proc
 	stc
 	jz	skil9
 	call	clrstack
-skil9:	ret
+skil9:	VZ_RET
 mc_clrstack:
 	mov	di,ax
 	call	setsends
 	clc
-	ret
+	VZ_RET
 se_clrstack endp
 ;--- Jump block ---
@ -699,7 +699,7 @@ se_jumpblk proc
 	add	ax,cx
 	adc	dx,0
 	call	jumpto
-jblk9:	ret
+jblk9:	VZ_RET
 se_jumpblk endp
 ;----- Set Block target flag -----
@ -729,7 +729,7 @@ set_blktgt	proc
 		mov	ax,1
 	_endif
 		mov	[bp].blktgt,ax
-		ret
+		VZ_RET
 set_blktgt	endp
 ;--- Move text ---
@ -804,7 +804,7 @@ tful_x:	mov	dl,E_NOMEM
 tfulx1:	call	disperr
 tfulx2:	pop	dx
 	stc
-	ret
+	VZ_RET
 txtm1:
 	pop	dx
@ -838,7 +838,7 @@ tcut:
 	popm	<di,si>
 txtm2:	pop	cx
 	clc
-	ret
+	VZ_RET
 txtmov	endp
 	public	txtmov1
@ -851,7 +851,7 @@ txtmov1	proc
 	add	cx,di
 	mov	[bp].tend,cx		; update tend
 	pop	es
-	ret
+	VZ_RET
 txtmov1	endp
 	endcs
@ -899,7 +899,7 @@ memmove		proc
 	_endif
 		cld
 move9:		popm	<di,si,dx,cx,ax>
-		ret
+		VZ_RET
 memmove		endp
 ;----- Clear memory -----
@ -909,7 +909,7 @@ memclear	proc
 		clr	ax
 		shr	cx,1
 	rep	stosw
-		ret
+		VZ_RET
 memclear	endp
 	endbs
@ -944,7 +944,7 @@ tadj3:	inc	si
 	cmp	si,bx
 _until e
 	popm	<si,cx,bx>
-	ret
+	VZ_RET
 ptradj	endp
 	public	ptradj2
@ -974,7 +974,7 @@ _repeat
 _until e
 	popf
 	popm	<di,si,dx,cx,bx>
-	ret
+	VZ_RET
 padj2:
 	pushf
@ -993,11 +993,11 @@ padj3:	cmpl	[bp+si]
 	popf
 	jc	padj4
 	addlw	[bp+si],cx
-	ret
+	VZ_RET
 padj4:	neg	cx
 	sublw	[bp+si],cx
 	neg	cx
-	ret
+	VZ_RET
 padj5:
 	cmp	bx,[bp+si]+2
 	ja	padj9
@ -1007,7 +1007,7 @@ padj5:
 padj6:	mov	[bp+si],di
 	mov	[bp+si]+2,bx
 padj9:	popf
-	ret
+	VZ_RET
 ptradj2	endp
 ;--- Move segment ---
@ -1082,7 +1082,7 @@ smov9:
 	popm	<es,ds,di,si,dx,cx>
 	mov	ax,di
 	sub	ax,si
-	ret
+	VZ_RET
 sgmove1:
 	push	cx
@ -1101,7 +1101,7 @@ adj_stkp:
 	add	sends,ax
  _endif
 	add	rends,ax
-	ret
+	VZ_RET
 sgmove2:
 	test	si,EMSMASKW
@ -1115,7 +1115,7 @@ _ifn z
  _endif
 	pop	bp
 _endif
-	ret
+	VZ_RET
 sgmove	endp
 	endcs
@ -1140,7 +1140,7 @@ _repeat
 	mov	bp,[bp].w_next
 _until
 ;	add	rtops,ax
-	ret
+	VZ_RET
 adjustseg endp
 	public	adjustfar
@ -1151,7 +1151,7 @@ adjustfar proc
 	call	adjustseg
 	pop	bp
 	call	adj_stkp
-	ret
+	VZ_RET
 adjustfar endp
 	endes
@ -1179,7 +1179,7 @@ freemem proc
 	jnc	freem9
 freem0:	clr	ax
 freem9:	pop	ds
-	ret
+	VZ_RET
 freemem	endp
 	endcs
--- a/SRC/menu.asm
+++ b/SRC/menu.asm
@ -137,7 +137,7 @@ popupmenu proc
 	call	loadwloc
 popmn9:	pop	ds
 	mov	ss:retval,ax		; ##16
-	ret
+	VZ_RET
 popupmenu endp
 endwindow proc
@ -146,7 +146,7 @@ endwindow proc
 	call	popwindow
 	pop	ax
 	popf
-	ret
+	VZ_RET
 endwindow endp
 ;--- System menu ---
@ -168,7 +168,7 @@ _if e
 	mov	si,di
 _endif
 	call	popupmenu
-sysmnu9:ret
+sysmnu9:VZ_RET
 sysmenu	endp
 ;--- Do menu ---
@ -208,14 +208,14 @@ domn4:	cmp	al,CM_ESC
 domn_esc:
 	mov	ax,INVALID
 	stc
-	ret
+	VZ_RET
 domn_x:	mov	ah,0
 domn_k:	mov	al,ah
 domn_shift:			; ##16
 	mov	ah,cl		;
 	or	ah,80h		;
 	stc
-	ret
+	VZ_RET
 domn_cr:	
 	tst	cl
 	js	domn_x
@ -287,14 +287,14 @@ _endif
 domnc5:	mov	[bx].mn_sel,al
 	mov	ah,SEL_KEY
 domn9:	clc
-	ret
+	VZ_RET
 do_menu	endp
 extfunc proc
 	pushm	<bx,cx,dx,ds>
 	call	di
 	popm	<ds,dx,cx,bx>
-	ret
+	VZ_RET
 extfunc endp
 ;--- Check 1st key ---
@ -310,9 +310,9 @@ chkkey	proc
 	cmp	al,5Fh
 	ja	chkkey
 	cmp	al,ah
-	ret
+	VZ_RET
 chkky_x:clz
-	ret
+	VZ_RET
 chkkey	endp
 ;--- Draw menu ---
@ -372,7 +372,7 @@ _endif
 	inc	cl
 	cmp	dh,mn_h
 	jmpl	b,drmn1
-	ret
+	VZ_RET
 drawmenu endp
 dritm1:
@ -398,7 +398,7 @@ _endif
 	call	putc
 dritm7:	call	itematr
 dritm8:	call	puts_t
-dritm9:	ret
+dritm9:	VZ_RET
 drawitem endp
 ;--- Set item attr ---
@ -411,7 +411,7 @@ _if e
 	mov	al,ATR_WSEL
 _endif
 	call	setatr
-	ret
+	VZ_RET
 itematr	endp
 ;--- Draw border ---
@ -434,7 +434,7 @@ _ifn z
 	call	putspc
  _endif
 _endif
-	ret
+	VZ_RET
 drawborder endp
 redraw_border	proc
@ -444,7 +444,7 @@ redraw_border	proc
 		mov	si,titlep
 		call	drawborder
 		popm	<es,ds>
-		ret
+		VZ_RET
 redraw_border	endp
 ;--- Set message ptr ---
@ -465,7 +465,7 @@ _repeat
 _until z
 	mov	si,di
 	popm	<es,di,dx,cx>
-	ret
+	VZ_RET
 setmsgp	endp
 ;--- Adjust window position ---
@ -526,7 +526,7 @@ _endif
 	mov	refloc,dx
 	call	pushwindow
 	pop	bx
-	ret
+	VZ_RET
 adjwin1:
 	push	ax
@ -563,7 +563,7 @@ _if a
 _endif
 	inc	dl
 	pop	ax
-	ret	
+	VZ_RET	
 adjwin	endp
 ;****************************
@ -614,7 +614,7 @@ _endif
 	pop	drawfunc
 	call	loadwloc
 	popm	<ds,dx>
-	ret
+	VZ_RET
 windgets endp
 	endes
@ -671,7 +671,7 @@ drbar8:	mov	[bx].mb_c,cl
 	popm	<dx,cx>
 	call	setwindow
 	pop	ds
-	ret
+	VZ_RET
 drawmbar endp
 ;--- Do menu bar ---
@ -714,7 +714,7 @@ dobar2:
 	mov	al,cl
 	clc
 dobar9:	pop	ds
-	ret
+	VZ_RET
 do_mbar	endp
 ;----- Get menu bar key -----
@ -736,7 +736,7 @@ _loop
 		lodsb
 		mov	dl,al
 		pop	ds
-		ret
+		VZ_RET
 get_mbar	endp
 		endcs
@ -802,7 +802,7 @@ ENDIF
 	jmp	cmdmnu1
 cmdmnu8:clc
 cmdmnu9:pop	di
-	ret
+	VZ_RET
 cmdmenu	endp
 msgpoolp proc
@ -813,7 +813,7 @@ cmditemp:
 	mov	di,bx
 	add	di,type _menu
 	add	di,ax
-	ret
+	VZ_RET
 msgpoolp endp
 ;--- Click Variables ---
@ -822,7 +822,7 @@ msgpoolp endp
 click_var proc
 IFDEF NEWEXPR
 	mov	cx,ax
-	and	ch,not MENU_VAR
+	and	ch,not byte ptr MENU_VAR
 ELSE
 	mov	cl,al
 	clr	ch
@ -855,7 +855,7 @@ _if e
 	call	editloc
 _endif
 	movseg	ds,ss
-clkvar9:ret
+clkvar9:VZ_RET
 click_var endp
 	public	windgetval
@ -872,7 +872,7 @@ windgetval proc
 	call	scannum
 	jnc	getvar9
 getvar8:clr	dx
-getvar9:ret
+getvar9:VZ_RET
 windgetval endp
 ;--- Get command message ptr ---
@ -914,7 +914,7 @@ cmdmp2:
 	jmps	cmdmp8
 cmdmp7:	clr	si
 cmdmp8:	popm	<di,cx>
-	ret
+	VZ_RET
 getcmdmsgp endp
 ;--- Command item function ---
@ -942,11 +942,11 @@ cmdkey2:inc	cx
 	cmp	cl,[bx].mn_c
 	jne	cmdkey1
 	stc
-	ret
+	VZ_RET
 _endif
 	mov	al,cl
 	clc
-	ret
+	VZ_RET
 cmddraw:	
 	tstb	[bx].mn_valwd
 	jz	cmddr2
@ -985,7 +985,7 @@ cmddr5:
 	call	dispval
 cmddr7:	mov	dl,[bx].mn_wd
 	call	fillspc
-	ret
+	VZ_RET
 cmditem	endp
 ;--- Disp value ---
@ -1018,7 +1018,7 @@ val_cmd:
 val_var:
 IFDEF NEWEXPR
 	mov	cx,ax
-	and	ch,not MENU_VAR
+	and	ch,not byte ptr MENU_VAR
 ELSE
 	mov	cl,al
 	clr	ch
@ -1040,7 +1040,7 @@ _endif
 valvar1:
 	call	putval
 dspval8:popm	<di,dx,cx,bx>
-	ret
+	VZ_RET
 dispval	endp
 	public	putval
@ -1052,7 +1052,7 @@ putval	proc
 	call	printf
 	pop	ax
 	popm	<si,bx>
-	ret
+	VZ_RET
 putval	endp
 ;--- Disp key No. ---
@ -1082,7 +1082,7 @@ _endif
 	call	putc
 	call	putspc
 	pop	ax
-	ret
+	VZ_RET
 dispkeynum endp
 ;--- Disp command key ---
@ -1110,7 +1110,7 @@ _ifn c
 	call	putc
 _endif
 	pop	di
-	ret
+	VZ_RET
 dispkeycmd endp
 ;--- Disp macro key ---
@ -1125,7 +1125,7 @@ dispkeymac1:
 	lodsw
 	call	dispkeysym
 _endif
-	ret
+	VZ_RET
 dispkeymac endp
 ;---- Get item number -----
@ -1140,7 +1140,7 @@ getitemnum	proc
 	  _endif
 		mov	ah,MCHR_CMD
 	_endif
-		ret
+		VZ_RET
 getitemnum	endp
 ;--- Macro menu ---
@ -1234,21 +1234,21 @@ _else
  _if e
 	mov	readmac,si
 	clc
-	ret
+	VZ_RET
  _endif
 	mov	al,[si]
 _endif
 	mov	ah,MCHR_CALL
 	clc
-	ret
+	VZ_RET
 edtmac_c:
 	clr	si
 macmnu_x:
 	stc
-	ret
+	VZ_RET
 mdlmenu1:
 	call	popupmenu
-	ret
+	VZ_RET
 macromenu endp
 ;--- Draw Macro menu ---
@ -1257,7 +1257,7 @@ drawmac proc
 	tst	ah
 	jz	drmac0
 	stc
-	ret
+	VZ_RET
 drmac0:
 	mov	cx,ax
 	push	cx
@ -1279,7 +1279,7 @@ _if z
 	inc	si
 _endif
 	call	puts
-	ret
+	VZ_RET
 drawmac endp
 ;--- Draw Module menu ---
@ -1288,7 +1288,7 @@ draw_module	proc
 		cmp	ah,ITEM_DRAW
 	_ifn e
 		stc
-		ret
+		VZ_RET
 	_endif
 		mov	cx,ax
 		push	cx
@ -1338,7 +1338,7 @@ draw_module	proc
 		call	printf
 		pop	ax
 		pop	bx
-		ret
+		VZ_RET
 draw_module	endp
 ;----- Count macro/module -----
@ -1353,7 +1353,7 @@ cntmacro	proc
 skip_mdlttl:
 		add	si,[si].mh_namelen
 		add	si,type _mdlhead + 1
-		ret
+		VZ_RET
 	_endif
 		cmp	al,MENU_MDLMAC
 		je	cntmdlmac
@ -1371,9 +1371,9 @@ cntmac1:	lodsw
 		add	si,ax
 _until
 		not	cx
-		ret
+		VZ_RET
 cntmac2:	dec	si
-		ret
+		VZ_RET
 cntmacro	endp
 cntmdlmac	proc
@ -1400,9 +1400,9 @@ cntmmac1:	lodsw
 		add	si,ax
 _until
 		not	cx
-		ret
+		VZ_RET
 cntmmac2:	dec	si
-		ret
+		VZ_RET
 cntmdlmac	endp
 		endes
@ -1412,4 +1412,3 @@ cntmdlmac	endp
 ;	End of 'menu.asm'
 ; Copyright (C) 1989 by c.mos
 ;****************************
--- a/SRC/misc.asm
+++ b/SRC/misc.asm
@ -105,7 +105,7 @@ _ifn e
 	call	scrout_lx
 	call	touch
 _endif
-	ret
+	VZ_RET
 lmarg:
 	clr	cx
@ -182,7 +182,7 @@ _repeat
 _until e
 	pop	es
 lmrg8:	clc
-lmrg9:	ret
+lmrg9:	VZ_RET
 se_chgindent endp
 ;--- Modefy mode ---
@ -195,11 +195,11 @@ _if e
 _else
 	not	[bp].tchf
 _endif
-mmod9:	ret
+mmod9:	VZ_RET
 isviewmode:
 	cmp	[bp].tchf,TCH_VIEW
-	ret
+	VZ_RET
 se_readonly endp
 ;--- Compare two text ---
@ -282,7 +282,7 @@ tcmp3:	pushf
 	xchg	bp,bx
 	call	dspscr
 	popf
-	ret
+	VZ_RET
 se_textcomp endp
 	endcs
--- a/SRC/mk.bat
+++ b/SRC/mk.bat
@ -1,79 +0,0 @@
 echo off
 rem	-------	Make vz???.com -------
 rem	usage: mk [98,J31,IBM,IBMJ,AX,55,US]
 rem	       mk vmap
 rem
 rem	%ASM%	:assembler name cap (opt,t,m)  ex: set asm=opt
 if exist dummy goto init
 type nul >dummy
 :init
 if not "%1"=="" goto init2
 if not "%HARD%"=="" goto makevz
 goto mk_98
 :init2
 type nul >dummy
 for %%a in (98 j31 J31 ibm IBM ibmj IBMJ ax AX 55 us US) do if "%1"=="%%a" goto mk_%%a
 command /c ac %1
 lk %1
 :mk_98
 set HARD=
 set masm=/dPC98
 goto makevz
 :mk_J31
 set HARD=J31
 set masm=/dJ31
 goto makevz
 :mk_IBM
 set HARD=IBM
 set masm=/dIBMV
 goto makevz
 :mk_IBMJ
 set HARD=IBMJ
 set masm=/dIBMJ
 goto makevz
 :mk_AX
 set HARD=AX
 set masm=/dIBMAX
 goto makevz
 :mk_55
 set HARD=55
 set masm=/dJBM
 goto makevz
 :mk_US
 set HARD=US
 set masm=/dUS
 goto makevz
 :makevz
 echo ===== Make VZ%HARD% %2 =====
 set %ASM%asm=%MASM%
 if "%ASM%"=="opt" goto optmake
 if "%ASM%"=="t" goto tmake
 make vz.mak
 goto link
 :optmake
 optasm @vz.omk
 goto link
 :tmake
 make -fvz.mak
 goto link
 :link
 if errorlevel 1 goto error
 lk
 :error
 echo 
--- a/SRC/msg.asm
+++ b/SRC/msg.asm
@ -8,7 +8,7 @@
 ;--- Messages ---
-GDATA idword	label	byte
+GDATA idword,	label,	byte
 IFDEF PC98
 		db	'98'
 ENDIF
@ -81,7 +81,7 @@ GDATA mg_install,db,	<'
 GDATA mg_tsr2,	db,	<'（-zで解放）',CR,LF,'$'>
 GDATA mg_nospc,	db,	<'メモリが足りません.',CR,LF,'$'> ; ##155.85
-GDATA mg_harderr label byte			; ##151.08
+GDATA mg_harderr, label, byte			; ##151.08
 		db	'書込み禁止です',0
 		db	'指定が違います',0
 		db	'準備ができていません',0
@ -132,12 +132,12 @@ GDATA message,	db,	0
 		db	'Abandon Edit',0				;37
 		db	1,'Delete %u files. Sure',0			;38
-GDATA mg_exit,	db	<'Type EXIT to return.',CR,LF,'$'>
+GDATA mg_exit,	db,	<'Type EXIT to return.',CR,LF,'$'>
-GDATA mg_install,db	<'installed.'>
+GDATA mg_install,db,	<'installed.'>
-GDATA mg_tsr2,	db	<'(-z to remove)',CR,LF,'$'>
+GDATA mg_tsr2,	db,	<'(-z to remove)',CR,LF,'$'>
 GDATA mg_nospc,	db,	<'Out of memory.',CR,LF,'$'>
-GDATA mg_harderr label byte			; ##151.08
+GDATA mg_harderr, label, byte			; ##151.08
 		db	'write protected',0
 		db	'not exist',0
 		db	'not ready',0
@ -249,4 +249,3 @@ GDATA code_end,	label,	near
 _tail		ends
 	end
--- a/SRC/open.asm
+++ b/SRC/open.asm
@ -200,16 +200,16 @@ IFNDEF NOFILER
 ENDIF
 	call	wnd_reset
 	clc
-open9:	ret
+open9:	VZ_RET
 open_x:
 	cmp	dl,E_PATH
 	je	open1
 	stc
-	ret
+	VZ_RET
 toomany:
 	mov	dl,E_OPEN
 	call	disperr
-	ret
+	VZ_RET
 se_open endp
 ;--- Load file ---
@ -240,7 +240,7 @@ _endif
 	call	ld_wact
 	call	topen1			; ##16
 	jmp	open2
-load9:	ret
+load9:	VZ_RET
 se_load	endp
 ;--- Close file ---
@ -261,7 +261,7 @@ _endif
 	jz	close1
 	call	dspscr
 	clc
-close9:	ret
+close9:	VZ_RET
 close1:
 	call	putdosscrn
 	call	getdosscrn
@ -300,12 +300,12 @@ save2:	call	tsave
 	pushf
 	call	dspscr
 	popf
-save9:	ret
+save9:	VZ_RET
 save_x:
 	mov	dl,M_RDONLY
 	call	dispmsg
 	stc
-	ret
+	VZ_RET
 se_save endp
 ;--- Append file ---
@ -326,7 +326,7 @@ apnd1:	mov	dl,W_APPEND
 apnd8:	pushf				; ##153.45
 	call	dspscr
 	popf
-apnd9:	ret
+apnd9:	VZ_RET
 se_append endp
 ;--- Quit ---
@ -349,7 +349,7 @@ _until z
 	mov	retval,ax
 	tst	ax
 	pop	bp
-	ret
+	VZ_RET
 ismodify endp
 	public	se_quit,se_exit,closeall
@ -408,7 +408,7 @@ quit6:
 	mov	w_act,0
 	jmp	quit_vz
 quit9:	stc
-	ret
+	VZ_RET
 se_quit endp
 se_exit	proc
@ -449,7 +449,7 @@ _ifn c
 	call	checkpath
 	popf
 _endif
-	ret
+	VZ_RET
 se_rename endp
 rename	proc
@ -477,7 +477,7 @@ _ifn c
 	clc
 _endif
 	pop	ds
-	ret
+	VZ_RET
 rename	endp
 	public	setnewname
@ -495,7 +495,7 @@ setnewname proc
 	call	cutpath
 	call	settab			; ##151.07, ##156.116
 	pop	ds
-	ret
+	VZ_RET
 setnewname endp
 ;--- Input file name ---
@ -508,7 +508,7 @@ infile	proc
 	mov	si,fbuf
 	mov	cx,PATHSZ
 	call	windgets
-	ret
+	VZ_RET
 infile	endp
 ;--- Pre-Close ---
@ -531,7 +531,7 @@ precls1:
  _endif
 	popf
 _endif
-	ret
+	VZ_RET
 preclose endp
 ;--- Check path name ---
@ -576,7 +576,7 @@ chkp8:	cbw
 	mov	retval,ax
 	pop	ds
 	clc
-	ret
+	VZ_RET
 checkpath endp
 ;--- Select file ---
@ -623,7 +623,7 @@ ELSE
 	stc
 ENDIF
 sfile8:	mov	frompool,al
-sfile9:	ret
+sfile9:	VZ_RET
 sfile_e:
 	inc	sp
 	inc	sp
@ -651,7 +651,7 @@ IFNDEF NOFILER
 _endif
 ENDIF
 	pop	ds
-	ret
+	VZ_RET
 nextfile endp
 	endcs
@ -663,7 +663,7 @@ nextfile endp
 ; DS:SI :input string
 ;<--
 ; CY :end of line
-; DL :result bit (PRS_xxx)
+; DL :result bit (VZ_PRS_xxx)
 ; BX :file name ptr
 ; CX :file ext ptr
 ; SI :next ptr
@ -697,24 +697,24 @@ _endif
 	je	prs_wld
 	cmp	al,'?'
 	je	prs_wld
-pars2:	test	dl,PRS_EXT
+pars2:	test	dl,VZ_PRS_EXT
 _if z
-	or	dl,PRS_NAME
+	or	dl,VZ_PRS_NAME
 _endif
-	test	dl,PRS_ENDDIR
+	test	dl,VZ_PRS_ENDDIR
 	jz	pars1
-	and	dl,not PRS_ENDDIR
+	and	dl,not byte ptr VZ_PRS_ENDDIR
 	mov	bx,di			; ##153.31
 	jmp	pars1
-prs_drv:or	dl,PRS_DRV+PRS_ENDDIR+PRS_ROOT
+prs_drv:or	dl,VZ_PRS_DRV+VZ_PRS_ENDDIR+VZ_PRS_ROOT
 	jmps	prsdir2
 prs_dir:
 	tst	dl
 _if z
-	or	dl,PRS_ROOT
+	or	dl,VZ_PRS_ROOT
 _endif
-prsdir1:or	dl,PRS_DIR+PRS_ENDDIR
+prsdir1:or	dl,VZ_PRS_DIR+VZ_PRS_ENDDIR
-prsdir2:and	dl,not (PRS_NAME+PRS_EXT)
+prsdir2:and	dl,not (VZ_PRS_NAME+VZ_PRS_EXT)
 	jmp	pars1
 prs_ext:
 	cmp	byte ptr [si],'.'
@ -722,27 +722,27 @@ _if e
 	lodsb
 	jmp	prsdir1
 _endif
-	or	dl,PRS_EXT
+	or	dl,VZ_PRS_EXT
 	mov	cx,di			; ##153.31
-	test	dl,PRS_ENDDIR
+	test	dl,VZ_PRS_ENDDIR
 	jz	pars1
-prs_wld:or	dl,PRS_WILD
+prs_wld:or	dl,VZ_PRS_WILD
 	jmp	pars2
 pars5:
 	pop	di
-	test	dl,PRS_EXT		; ##156.114
+	test	dl,VZ_PRS_EXT		; ##156.114
 _if z
 	mov	cx,si
 _endif
-	test	dl,PRS_ENDDIR
+	test	dl,VZ_PRS_ENDDIR
 	jz	pars8
 	mov	bx,si
 parsedir:
-	and	dl,PRS_DRV+PRS_DIR+PRS_ROOT
+	and	dl,VZ_PRS_DRV+VZ_PRS_DIR+VZ_PRS_ROOT
 	dec	bx
 	mov	cx,bx
 pars8:	mov	parsef,dl
-	ret
+	VZ_RET
 parsepath endp
 	endes
@ -812,7 +812,7 @@ mkful1:	stosb
 _until be
 mkful2:	dec	di
 	mov	byte ptr es:[di],0
-	ret
+	VZ_RET
 makefulpath endp
 ;--- Set path case ---
@ -830,7 +830,7 @@ _else
 	call	strlwr
 _endif
 	pop	ds
-	ret
+	VZ_RET
 casepath endp
 ;--- Cut path name ---
@ -885,7 +885,7 @@ cutp3:	lodsb
 cutp4:	dec	si
 cutp5:	mov	[bp].labelp,si
 	pop	ds
-	ret
+	VZ_RET
 cutpath endp
 	assume	ds:cgroup
@ -929,7 +929,7 @@ ENDIF
 	push	di
 	call	casepath
 	pop	di
-	ret
+	VZ_RET
 setpath endp
 ;--- Search File ---
@ -949,13 +949,13 @@ searchfile proc
 	jmpln	z,findfile
 	mov	si,pathp
 	call	parsepath
-	test	dl,PRS_EXT
+	test	dl,VZ_PRS_EXT
 _if z
 	call	skipstr
 	dec	di
 	mov	putextp,di
 _endif
-	test	dl,PRS_ROOT
+	test	dl,VZ_PRS_ROOT
 _ifn z
 	mov	getdirp,0
 _endif
@ -1017,7 +1017,7 @@ findfile:
 	mov	si,di
 	call	casepath
 	clc
-	ret
+	VZ_RET
 noext:	stosb
 	jmps	findfile
@ -1043,7 +1043,7 @@ _endif
 nofile:
 	pop	di
 	stc
-	ret
+	VZ_RET
 searchfile endp
 	assume	ds:nothing
@ -1064,7 +1064,7 @@ finddir	proc
 	int	21h
 	cld
 	popm	<dx,cx,ax>
-	ret
+	VZ_RET
 finddir	endp
 ;--- Set TAB size by .EXT ---
@ -1079,7 +1079,7 @@ settab	proc
 	mov	cl,ntab
 	clr	ch
 	mov	[bp].extword,0
-	test	dl,PRS_EXT
+	test	dl,VZ_PRS_EXT
 	jz	stab8
 	inc	si
 	mov	ax,[si]
@ -1113,7 +1113,7 @@ _endif
 stab8:	mov	[bp].exttyp,ch
 ;	mov	[bp].tabr,cl		; ##156.116
 	pop	ds
-	ret
+	VZ_RET
 settab	endp
 ;--- Search EXT ---
@ -1154,7 +1154,7 @@ _endif
 	jmps	schext9
 schext0:clr	ch
 schext9:popm	<si,bx>
-	ret
+	VZ_RET
 searchext endp
 	public	isbinary
@ -1166,7 +1166,7 @@ _ifn z
 	call	searchext1
 _endif
 	popm	<es,di,dx,ax>
-	ret
+	VZ_RET
 isbinary endp
 	endcs
@ -1195,7 +1195,7 @@ _while c
 	jz	addsp9
 addsep1:mov	al,dirchr
 	stosb
-addsp9:	ret
+addsp9:	VZ_RET
 addsep	endp
 ;--- Is slash ? ---
@ -1205,7 +1205,7 @@ isslash	proc
 	cmp	al,'\'
 	je	islsh9
 	cmp	al,'/'
-islsh9:	ret
+islsh9:	VZ_RET
 isslash	endp
 ;--- After parse path ---
@ -1229,12 +1229,12 @@ _if z
 _endif
 	mov	parsef,dl
 	mov	getnamp,bx
-	test	dl,PRS_EXT
+	test	dl,VZ_PRS_EXT
 _if z
 	clr	cx
 _endif
 	mov	getextp,cx
-	ret
+	VZ_RET
 parsepath1 endp
 parsepath2 proc
@ -1242,13 +1242,13 @@ parsepath2 proc
 	call	parsepath
 	mov	di,si
 	pop	si
-	test	dl,PRS_NAME
+	test	dl,VZ_PRS_NAME
 _ifn z
-	test	dl,PRS_WILD
+	test	dl,VZ_PRS_WILD
 	jz	isdir
 _endif
 	stc
-	ret
+	VZ_RET
 parsepath2 endp
 ;--- Is directory ---
@ -1266,15 +1266,15 @@ _ifn c
  _ifn z
 	pop	cx
 	mov	bx,di
-	or	dl,PRS_DIR
+	or	dl,VZ_PRS_DIR
 	call	parsedir
 	stc
-	ret
+	VZ_RET
  _endif
 _endif
 	pop	cx
 	clc
-	ret
+	VZ_RET
 isdir	endp
 	assume	ds:cgroup
@ -1306,7 +1306,7 @@ _endif
 	call	cpycurdir
 	pop	ax
 	pop	ds
-	ret
+	VZ_RET
 getcurdir endp
 	assume	ds:nothing
@ -1320,7 +1320,7 @@ _ifn z
 _endif
 	mov	ah,':'
 	stosw
-	ret
+	VZ_RET
 getcurdrv endp
 cpycurdir proc
@ -1353,7 +1353,7 @@ _until z
 	mov	di,si
 	clc
 cpycd9:	pop	ds
-	ret
+	VZ_RET
 cpycurdir endp
 	endes
@ -1377,7 +1377,7 @@ readref		proc
 	_ifn e
 		dec	si
 		clc
-		ret
+		VZ_RET
 	_endif
 		push	si
 		call	chkline1		;;
@ -1390,14 +1390,14 @@ readref		proc
 		pushm	<ax,si>
 		call	parsepath
 		popm	<si,ax>
-		cmp	dl,PRS_EXT
+		cmp	dl,VZ_PRS_EXT
 	_if e
-		mov	dl,PRS_DIR
+		mov	dl,VZ_PRS_DIR
 		mov	bx,cx
 	_endif
 		mov	di,pathbuf
 		push	di
-		test	dl,PRS_DIR
+		test	dl,VZ_PRS_DIR
 	_ifn z
 IFNDEF NOFILER
 		push	[bx-1]
@ -1412,7 +1412,7 @@ ENDIF
 	_endif
 		cmp	al,'@'
 		je	rref0
-		test	dl,PRS_NAME
+		test	dl,VZ_PRS_NAME
 	_if z
 		mov	si,reffile
 	_endif
@ -1430,7 +1430,7 @@ rref0:		mov	si,defpath
 		call	addsep
 rref1:
 		mov	si,bx
-		test	dl,PRS_NAME
+		test	dl,VZ_PRS_NAME
 	_if z
 		mov	si,reffile
 	_endif
@ -1463,7 +1463,7 @@ rref_x:
 		jnc	rref3
 		msdos	F_CLOSE
 		stc
-		ret
+		VZ_RET
 	_endif
 		inc	dx
 		inc	dx
@ -1502,7 +1502,7 @@ _until
 		mov	fromref,TRUE
 rref9:
 		mov	pathp,si
-		ret
+		VZ_RET
 readref		endp
 read_curdir	proc
@ -1521,7 +1521,7 @@ read_curdir	proc
 		pop	si
 		call	skipchar
 		mov	pathp,si
-		ret
+		VZ_RET
 read_curdir	endp
 ;----- Write profile -----
@ -1561,7 +1561,7 @@ writeref:
 		msdos	F_CLOSE
 		mov	tchdir,TRUE		; ##155.76
 wref9:		mov	fullpath,FALSE
-		ret
+		VZ_RET
 se_writeref	endp
 ;----- Write editfile -----
@ -1588,7 +1588,7 @@ _repeat
 		mov	bp,[bp].w_next
 		tst	bp
 _until z
-		ret
+		VZ_RET
 write_editfile	endp
 pf_name		db	"%s",0
@ -1622,7 +1622,7 @@ w_name_cp	proc
 		popm	<ax,ax>
 	_endif
 		movseg	ds,ss
-		ret
+		VZ_RET
 w_name_cp	endp
 w_act_back	proc
@ -1647,7 +1647,7 @@ w_act_back	proc
 		mov	al,wys
 		call	w_option
 	_endif
-		ret
+		VZ_RET
 w_act_back	endp
 w_option	proc
@ -1667,7 +1667,7 @@ w_option1:	movseg	ds,cs
 		dec	di
 		add	sp,4
 		movseg	ds,ss
-		ret
+		VZ_RET
 w_option	endp
 w_text_opt	proc
@ -1686,7 +1686,7 @@ w_text_opt	proc
 		call	w_option
 	_endif
 ;		call	w_mark
-;		ret
+;		VZ_RET
 w_text_opt	endp
 w_mark		proc
@ -1714,7 +1714,7 @@ _repeat
 		cmp	cx,MARKCNT
 _until a
 		movseg	ds,ss
-		ret
+		VZ_RET
 w_mark		endp
 ;----- Save closing file info -----
@ -1745,7 +1745,7 @@ prof_close	proc
 		mov	bx,fbuf
 		call	histcpy_w
 prcls9:		pop	ds
-		ret
+		VZ_RET
 prof_close	endp
 ;----- Write grobal option -----
@ -1773,7 +1773,7 @@ _repeat
 		inc	dx
 		inc	dx
 _loop
-		ret
+		VZ_RET
 write_gopt	endp
 ;----- Write current dir -----
@ -1793,7 +1793,7 @@ write_curdir	proc
 		pop	dx
 		sub	cx,dx
 		msdos	F_WRITE
-		ret
+		VZ_RET
 write_curdir	endp
 ;----- Write history -----
@ -1811,7 +1811,7 @@ write_history	proc
 		mov	di,xbuf
 		call	w_history
 	_endif
-		ret
+		VZ_RET
 write_history	endp
 w_history	proc
@ -1833,7 +1833,7 @@ _until z
 		mov	di,dx
 		pop	[di]
 		call	write_crlf
-		ret
+		VZ_RET
 w_history	endp
 write_crlf	proc
@ -1842,7 +1842,7 @@ write_crlf	proc
 		mov	dx,offset cgroup:pro_crlf
 		msdos	F_WRITE
 		popm	<dx,cx>
-		ret
+		VZ_RET
 write_crlf	endp
 ;----- Read history -----
@ -1880,7 +1880,7 @@ _repeat
 		jz	r_hist_x
 		cmp	readbuf,LF
 _until e
-		ret
+		VZ_RET
 r_hist1:
 		dec	cx		; CRLF
 		dec	cx
@ -1894,10 +1894,10 @@ r_hist1:
 		mov	cx,-1
 		msdos	F_SEEK,1
 	_endif
-		ret
+		VZ_RET
 r_hist_x:
 		stc
-		ret
+		VZ_RET
 read_history	endp
 ;------------------------------------------------
@ -1920,7 +1920,7 @@ _ifn z
 		msdos	F_CLOSE
 	_endif
 _endif
-		ret
+		VZ_RET
 read_logtbl	endp
 		public	write_logtbl
@ -1941,11 +1941,11 @@ write_logtbl	proc
 		sub	cx,dx
 		msdos	F_WRITE
 		msdos	F_CLOSE
-		ret
+		VZ_RET
 	    _endif
 	  _endif
 	_endif
-		ret
+		VZ_RET
 write_logtbl	endp
 		public	open_file
@ -1958,7 +1958,7 @@ open_file	proc
 	_ifn c
 		mov	bx,ax
 	_endif
-		ret
+		VZ_RET
 open_file	endp
 ;----- Set "VZ.ENV" -----
@ -1977,7 +1977,7 @@ setvzenv	proc
 		mov	si,offset cgroup:nm_env
 		call	strcpy
 		pop	dx
-		ret
+		VZ_RET
 setvzenv	endp
 ;----- Check log file -----
@ -2011,7 +2011,7 @@ chk_logfile	proc
 	_endif
 		clc
 chklog9:	popm	<es,ds>
-		ret
+		VZ_RET
 chk_logfile	endp
 ;----- Scan Log file table -----
@ -2038,7 +2038,7 @@ _repeat
 _until
 		stc
 sclog9:		popm	<es,ds>
-		ret
+		VZ_RET
 scan_logtbl	endp
 ;----- Add Log file table -----
@ -2096,7 +2096,7 @@ _until a
 		clr	al
 		stosb
 addlog9:	popm	<es,ds>
-		ret
+		VZ_RET
 add_logtbl	endp
 		public	set_logtbl
@ -2114,7 +2114,7 @@ set_logtbl	proc
 		mov	al,LF
 		stosb
 tch_logtbl:	mov	ss:addlogf,TRUE
-		ret
+		VZ_RET
 set_logtbl	endp
 endlogtbl	proc
@ -2125,7 +2125,7 @@ _repeat
 		call	skipstr
 		add	di,type _logtbl
 _until
-		ret
+		VZ_RET
 endlogtbl	endp
 	endcs
@ -2135,4 +2135,3 @@ endlogtbl	endp
 ;	End of 'open.asm'
 ; Copyright (C) 1989 by c.mos
 ;****************************
--- a/SRC/printf.asm
+++ b/SRC/printf.asm
@ -27,13 +27,11 @@ printf	proc
 	movseg	ds,ss
 	call	puts
 	popm	<es,ds,di,si>
-	ret
+	VZ_RET
 printf	endp
 	public	sprintf
 sprintf	proc
 	include	sprintf.inc
 sprintf	endp
 	endes
@ -43,4 +41,3 @@ sprintf	endp
 ;	End of 'printf.asm'
 ; Copyright (C) 1989 by c.mos
 ;****************************
--- a/SRC/scrn.asm
+++ b/SRC/scrn.asm
@ -7,7 +7,7 @@
 ;--- External symbols ---
 	wseg
-	extrn	altsize		:byte
+;	extrn	altsize		:byte
 	extrn	atrtbl		:byte
 	extrn	atrucsr		:byte
 	extrn	atrflag		:byte
@ -48,7 +48,9 @@ ENDIF
 	extrn	optputs		:near
 	extrn	toupper		:near
 	extrn	resetfp		:near
 IFDEF PC98
 	extrn	sm_sensekey	:near
 ENDIF
 	dseg
@ -103,7 +105,7 @@ initscrn proc
 	mov	vsplit,cl
 	mov	hsplit,ch
 	call	resetscrnh
-	ret
+	VZ_RET
 initscrn endp
 	endis
@ -120,7 +122,7 @@ _ifn z
 	inc	sp
 	inc	sp
 _endif
-	ret
+	VZ_RET
 issilent endp
 is_dossilent proc
@ -129,7 +131,7 @@ _ifn z
 	inc	sp
 	inc	sp
 _endif
-	ret
+	VZ_RET
 is_dossilent endp
 ;--- Get/set window ---
@ -140,14 +142,14 @@ is_dossilent endp
 getwindow proc
 	mov	dx,word ptr win.px
 	mov	cx,word ptr win.sx
-	ret
+	VZ_RET
 getwindow endp
 	public	setwindow
 setwindow proc
 	mov	word ptr win.px,dx
 	mov	word ptr win.sx,cx
-	ret
+	VZ_RET
 setwindow endp
 ;--- Get dos window ---
@ -160,7 +162,7 @@ doswindow proc
 	call	dosheight
 	mov	cl,byte ptr doswd
 	clr	dx
-	ret
+	VZ_RET
 doswindow endp
 ;--- Set dos window ---
@ -171,7 +173,7 @@ setdoswindow proc
 	call	doswindow
 	call	setwindow
 	popm	<dx,cx,ax>
-	ret
+	VZ_RET
 setdoswindow endp
 ;--- Set command line window ---
@ -184,7 +186,7 @@ setcmdwindow proc
 	mov	ch,1
 	call	setwindow
 	call	setrefloc
-	ret
+	VZ_RET
 setcmdwindow endp
 dosloc1 proc
@ -195,7 +197,7 @@ dosloc1 proc
 _if a
 	mov	dh,ch
 _endif
-	ret
+	VZ_RET
 dosloc1 endp
 ;--- Save window,location ---
@ -235,7 +237,7 @@ chkscreen proc
 	mov	win.py,dh
 	mov	dosloc.py,dh
 	mov	byte ptr refloc+1,dh
-	ret
+	VZ_RET
 chkscreen endp
 ;--- Locate x,y ---
@ -248,7 +250,7 @@ locate	proc
 	call	mkwindp
 	mov	dsp.@off,di
 	pop	di
-	ret
+	VZ_RET
 locate	endp
 ;--- Get GVRAM work @seg ---
@ -259,7 +261,7 @@ getgvseg proc
 	call	ems_savemap
 	mov	ax,farseg
 	call	ems_map
-	ret
+	VZ_RET
 getgvseg endp
 ;--- Get locate x,y ---
@ -268,7 +270,7 @@ getgvseg endp
 	public	getloc
 getloc	proc
 	mov	dx,loc
-	ret
+	VZ_RET
 getloc	endp
 ;--- Set dos location ---
@ -278,7 +280,7 @@ setdosloc proc
 	mov	ax,loc
 	add	ax,word ptr win.px
 	mov	dosloc,ax
-	ret
+	VZ_RET
 setdosloc endp
 ;--- Set dos cursor ---
@ -291,7 +293,7 @@ setdoscsr proc
 	call	locate
 	mov	al,CSR_SYS
 	call	csron
-	ret
+	VZ_RET
 setdoscsr endp
 ;--- Get graphic char ---
@ -307,7 +309,7 @@ getgrafchr proc
 	sub	al,GRC
 	xlat	cs:dummy
 	pop	bx
-	ret
+	VZ_RET
 getgrafchr endp
 ;--- Init window parm. ---
@ -327,7 +329,7 @@ initwind proc
 	mov	dl,ch
 	clr	dh
 	clr	ch
-	ret
+	VZ_RET
 initwind endp
 ;--- Reset image ptr ---
@ -336,7 +338,7 @@ initwind endp
 clrwstack proc
 	mov	ax,imgstack
 	mov	imagep,ax
-	ret
+	VZ_RET
 clrwstack endp
 ;--- Set/Get cursor type ---
@ -347,14 +349,14 @@ clrwstack endp
 setcsrtype proc
 	mov	csr_i,dl
 	mov	csr_o,dh
-	ret
+	VZ_RET
 setcsrtype endp
 	public	getcsrtype
 getcsrtype proc
 	mov	dl,csr_i
 	mov	dh,csr_o
-	ret
+	VZ_RET
 getcsrtype endp
 ;--- Convert shift-JIS to JIS ---
@ -365,7 +367,7 @@ getcsrtype endp
 cvtjis	proc
 	mov	ax,dx
 	mstojis
-	ret
+	VZ_RET
 cvtjis	endp
 	endes
@ -400,7 +402,7 @@ _else
 	pop	bx
 _endif
 	pop	ax
-	ret
+	VZ_RET
 setgbank endp
 	endbs
@ -409,7 +411,7 @@ ENDIF
 IFDEF PC98
 	include	scrn98.asm
 ELSE
-	include	scrnIBM.asm
+	include	scrnibm.asm
 ENDIF
 	end
@ -418,4 +420,3 @@ ENDIF
 ;	End of 'scrn.asm'
 ; Copyright (C) 1989 by c.mos
 ;****************************
--- a/SRC/scrn98.asm
+++ b/SRC/scrn98.asm
@ -287,7 +287,7 @@ _if a
 	add	al,'A'-'9'-1
 _endif
 	add	al,'0'
-	ret
+	VZ_RET
 ;--- TAB ---
@ -418,7 +418,7 @@ _endif
 lend4:	pop	cx
 	cmp	cl,ch			; set Carry
 	popm	<es,bp>
-	ret
+	VZ_RET
 rightspc:
 	pushm	<cx,di>
@ -429,7 +429,7 @@ rightspc:
 	popm	<di,cx>
 	mov	ax,SPC
    rep stosw
-	ret
+	VZ_RET
 ctrlatr:
 	tstb	[bp].blkf
@ -444,7 +444,7 @@ _ifn s
 	mov	dl,al
 	pop	ax
 _endif
-	ret
+	VZ_RET
 disptext endp
@ -481,7 +481,7 @@ lineh0:	movhl	ax,19,15		; ##16
 _endif
 	mov	lineh,al
 	popm	<es,ax>
-	ret
+	VZ_RET
 dosheight endp
 check_20 proc
@ -490,7 +490,7 @@ check_20 proc
 	mov	es,ax
 	tstb	es:[dosscrn_25]
 	popm	<es,ax>
-	ret
+	VZ_RET
 check_20 endp
 ;--- Get dos location ---
@ -500,7 +500,7 @@ check_20 endp
 getdosloc proc
 	call	getdosloc1
 	mov	dosloc,dx
-	ret
+	VZ_RET
 getdosloc1:
 	call	getdosloc2
 setrefloc:
@ -508,7 +508,7 @@ setrefloc:
 	clr	dl
 	mov	refloc,dx
 	pop	dx
-	ret
+	VZ_RET
 getdosloc2:
 	push	es
 	clr	dx
@ -516,7 +516,7 @@ getdosloc2:
 	mov	dh,es:[dosloc_y]
 	mov	dl,es:[dosloc_x]
 	pop	es
-	ret
+	VZ_RET
 getdosloc endp
 ;--- Make screen pointer from x,y ---
@ -543,7 +543,7 @@ mkscrnp1:
 	shl	ax,1
 	add	di,ax
 	pop	ax
-	ret
+	VZ_RET
 mkscrnp	endp
 ;--- Set attribute ---
@ -553,7 +553,7 @@ mkscrnp	endp
 setatr	proc	
 	call	getatr
 setatr1:mov	dspatr,al
-	ret
+	VZ_RET
 setatr2:
 	call	getatr
 	test	al,ATTR_REV
@ -594,12 +594,12 @@ getatr2:
 	or	al,1
 	or	al,bl
 	pop	bx
-	ret
+	VZ_RET
 cvtatr:	push	bx
 	jmps	getatr2
 getatr1:
 	mov	al,dspatr
-	ret
+	VZ_RET
 getatr	endp
 ;--- Reverse attribute ---
@ -614,12 +614,12 @@ ELSE
 	ror	dspatr,cl
 	pop	cx
 ENDIF
-	ret
+	VZ_RET
 revatr	endp
 undatr	proc
 	xor	dspatr,ATTR_UL
-	ret
+	VZ_RET
 undatr	endp
 ;--- Fill attribute ---
@ -638,7 +638,7 @@ fillatr proc
 	clr	ah
    rep	stosw
 	popm	<es,di,cx>
-	ret
+	VZ_RET
 fillatr endp
 ;--- Display char ---
@ -649,11 +649,11 @@ putvram	proc
 	tstb	silent
 _if z
 	stovram	k
-	ret
+	VZ_RET
 _endif
 	inc	di
 	inc	di
-	ret
+	VZ_RET
 putvram	endp
 	public	putc,putcw,putspc,gputc
@ -674,7 +674,7 @@ putc1:	pushm	<dx,di,es>
 	mov	dsp.@off,di
 	inc	loc.x
 putc8:	popm	<es,di,dx>
-	ret
+	VZ_RET
 bslashc:
 	bslash	putc1
 putcw:	
@ -714,7 +714,7 @@ abputc	proc
 	mov	es,dsp.@seg
 	stovram
 	pop	es
-	ret
+	VZ_RET
 abputc	endp
 ;--- Display string ---
@ -838,7 +838,7 @@ puts8:
 	mov	dsp.@off,di
 	mov	loc.x,cl
 	popm	<es,di,dx,cx>
-	ret
+	VZ_RET
 puts	endp
 ;--- Fill space/char ---
@ -854,14 +854,14 @@ _repeat
  _break be
 	call	putc
 _until
-	ret
+	VZ_RET
 fillspc	endp
 	public	fillset
 fillset	proc
 	mov	al,loc.x
 	xchg	al,locx0
-	ret
+	VZ_RET
 fillset	endp
 ;--- Display vertical line ---
@ -890,7 +890,7 @@ _repeat
 _until z
 	mov	dsp.@off,di
 	popm	<es,di,dx,cx>
-vline9:	ret
+vline9:	VZ_RET
 vlinec	endp
 	public	vputc
@ -904,7 +904,7 @@ vputc	proc
 	mov	dsp.@off,di
 	inc	loc.x
 	popm	<es,di,dx>
-	ret
+	VZ_RET
 vputc	endp
 putck	proc
@ -919,12 +919,12 @@ putck	proc
 putck1:
 	mov	word ptr es:[di+2],0
 putck2:	call	putvram
-	ret
+	VZ_RET
 putck	endp
 getgrctbl proc				; ##156.DOSV
 	mov	bx,offset cgroup:grctbl
-	ret
+	VZ_RET
 getgrctbl endp
 IFNDEF NO_JIS83
@ -954,10 +954,10 @@ yes83:		inc	sp
 		mov	ax,cs:[bx]
 		xchg	al,ah
 		pop	bx
-		ret
+		VZ_RET
 not83:		pop	ax
 	_endif
-		ret
+		VZ_RET
 cvtjis83	endp
 cvtjis1		proc
@ -1017,7 +1017,7 @@ _repeat
 _until z
 	popm	<es,di,dx,cx>
 cls8:	pop	bx
-cls9:	ret
+cls9:	VZ_RET
 clr1:
 	call	issilent
@ -1034,7 +1034,7 @@ clsatr1:
 	clr	ah
    rep stosw
 	popm	<di,cx>
-	ret
+	VZ_RET
 cls	endp
@ -1084,7 +1084,7 @@ _endif
 	call	movescr
 	cld
 	popm	<es,ds>
-	ret
+	VZ_RET
 rollwind endp
 movescr proc
@ -1095,7 +1095,7 @@ movescr proc
 	add	di,bx
 	dec	dx
 	jnz	movescr
-	ret
+	VZ_RET
 movescr endp
 ;--- Get dos/current screen ---
@ -1109,7 +1109,7 @@ getdosscrn proc
 	call	getscrn
 	mov	si,OFF_ATR
 	call	getscrn
-	ret
+	VZ_RET
 getdosscrn endp
 IFNDEF NOFILER
@ -1122,7 +1122,7 @@ getcurscrn proc
 	mov	si,OFF_ATR
 	call	getscrn
 	call	chkline
-	ret
+	VZ_RET
 getcurscrn endp
 ENDIF
@ -1146,7 +1146,7 @@ cpyscrn:
 	add	di,ax
 	pop	ax
 	popm	<es,ds>
-	ret
+	VZ_RET
 getscrn endp
 ;--- Put dos/current screen ---
@ -1164,7 +1164,7 @@ putdosscrn proc
 	call	putscrn
 	mov	di,OFF_ATR
 	call	putscrn
-	ret
+	VZ_RET
 putdosscrn endp
 IFNDEF NOFILER
@ -1217,7 +1217,7 @@ _repeat
 	dec	dx
 _until z
 	popm	<es,ds>
-	ret
+	VZ_RET
 putcurwind endp
 ENDIF
@ -1252,7 +1252,7 @@ _until z
 	mov	es:[di],ax
 	call	ems_loadmap
 	popm	<es,ds,di,si,dx,cx>
-	ret
+	VZ_RET
 pushwindow endp
 	public	popwindow
@ -1282,7 +1282,7 @@ _repeat
 _until z
 popw8:	call	ems_loadmap
 	popm	<es,ds,di,si,dx,cx>
-	ret
+	VZ_RET
 popwindow endp
 initpwind proc
@ -1305,7 +1305,7 @@ initw3:	call	mkwindp
 	mov	al,ch
 	clr	ch
 	clr	ah
-	ret
+	VZ_RET
 initpwind endp
 ;--- Cursor ON/OFF ---			; ##153.41
@ -1319,7 +1319,7 @@ csron	proc
 _if s
 	bios	12h
 csroff1:mov	precsr,CSR_OFF
-csroff2:ret
+csroff2:VZ_RET
 _endif
 	pushm	<cx,dx,es>
 	clr	dx
@ -1396,7 +1396,7 @@ _else
 _endif
 	bios	11h
 csron8:	popm	<es,dx,cx>
-	ret
+	VZ_RET
 csron	endp
 ;--- Under line cursor ---
@ -1448,7 +1448,7 @@ _else
 _endif
 	pop	cx
 	pop	es
-ucsr9:	ret
+ucsr9:	VZ_RET
 undercsr endp
 ;--- Check 20/25 line ---
@ -1481,7 +1481,7 @@ chkline proc
    _endif
  _endif
 _endif
-	ret
+	VZ_RET
 chkline endp
 ;--- Change 20/25 line ---		; ##156.105
@ -1519,7 +1519,7 @@ _until
 	movseg	ds,ss
 	call	resetscrnh
 	pop	ds
- 	ret
+ 	VZ_RET
 chgline endp
 	public	resetscrnh
@ -1548,7 +1548,7 @@ _if b
 _endif
 	mov	hsplit,al
 	pop	ax
-splt9:	ret
+splt9:	VZ_RET
 resetscrnh endp
 ;--- Wait CRTV ---
@ -1562,7 +1562,7 @@ vwait1:
 vwait2:	in	al,60h
 	and  	al,20h
 	je	vwait2
-	ret
+	VZ_RET
 waitcrtv endp
 ;****************************
@ -1586,7 +1586,7 @@ _repeat
 _loop
 	pop	cx
 	call	sm_sensekey
-	ret
+	VZ_RET
 vwait	endp
 	public	smoothdown
@ -1603,7 +1603,7 @@ _repeat
 _while b
 	clr	al
 	out	76h,al
-	ret
+	VZ_RET
 smoothdown endp
 	public	smoothup1
@ -1617,7 +1617,7 @@ _if b
 	clr	al
 _endif
 	out	76h,al
-	ret
+	VZ_RET
 smoothup1 endp
 vwaith	proc
@ -1629,7 +1629,7 @@ vwaith	proc
 _repeat
 	call	vwait
 _loop
-	ret
+	VZ_RET
 vwaith	endp
 	public	smoothup2
@ -1651,7 +1651,7 @@ _if z
    _until z
  _endif
 _endif
-	ret
+	VZ_RET
 smoothup2 endp
 	public	smootharea
@ -1668,7 +1668,7 @@ smootharea proc
 	call	clrline
 	mov	al,[bp].tw_cy
 	dec	al
-	ret
+	VZ_RET
 smootharea endp
 	public	initrolc
@ -1696,12 +1696,12 @@ _if z
 	shr	al,cl
 _endif
 	mov	rolc1,al
-	ret
+	VZ_RET
 initrolc endp
 ishireso proc
 	test	ss:hardware,ID_PC98Hi
-	ret
+	VZ_RET
 ishireso endp
 ;--- Roll up/down for smooth scroll ---
@ -1725,7 +1725,7 @@ _ifn z
 	call	move_vram
 _endif
 	popm	<es,ds>
-	ret
+	VZ_RET
 rollup	endp
 	public	rolldwn
@ -1780,7 +1780,7 @@ _if s
 	call	rdown
 _endif
 	popm	<es,ds>
-	ret
+	VZ_RET
 rolldwn	endp
 rdown	proc
@ -1799,7 +1799,7 @@ _ifn z
    rep	movsw
 	cld
 _endif
-	ret
+	VZ_RET
 rdown	endp
 move_vram	proc
@ -1812,14 +1812,14 @@ move_vram	proc
 		add	di,OFF_ATR
 	_endif
 	rep	movsw
-		ret
+		VZ_RET
 move_vram	endp
 ;--- Reset CRT ---			; ##152.27
 	public	resetcrt
 resetcrt proc
-	ret
+	VZ_RET
 resetcrt endp
 ;--- Get Indicator Char --- 		; ##16
@ -1831,7 +1831,7 @@ _ifn e
 	mov	al,87h
 	add	al,cl
 _endif
-	ret
+	VZ_RET
 get_indichar endp
 	endhs
@ -1913,7 +1913,7 @@ _ifn z
  _endif
 _endif
 ENDIF
-	ret	
+	VZ_RET	
 initvram endp
 ;--- Check hardware ---
@ -1931,7 +1931,7 @@ _if e
 	stc
 _endif
 	pop	es
-	ret
+	VZ_RET
 checkhard endp
 	endis
--- a/SRC/scrnibm.asm
+++ b/SRC/scrnibm.asm
@ -368,7 +368,7 @@ _if a
 	add	al,'A'-'9'-1
 _endif
 	add	al,'0'
-	ret
+	VZ_RET
 ;--- TAB ---
@ -501,7 +501,7 @@ IFDEF DOSV
 ENDIF
 	cmp	cl,ch			; set Carry
 	popm	<es,bp>
-	ret
+	VZ_RET
 rightspc:
 _ifn cxz
@ -511,7 +511,7 @@ _ifn cxz
 	stovram
  _loop
 _endif
-	ret
+	VZ_RET
 ctrlatr:
 	tstb	[bp].blkf
@ -526,7 +526,7 @@ _ifn s
 	mov	dl,al
 	pop	ax
 _endif
-	ret
+	VZ_RET
 disptext endp
@ -580,7 +580,7 @@ ENDIF
 	inc	al
 	mov	linecnt,al
 	clr	cl
-	ret
+	VZ_RET
 dosheight endp
 getscrnsize proc
@ -612,7 +612,7 @@ _endif
  ENDIF
 ENDIF
 	mov	cs:scrnh,ch
-	ret
+	VZ_RET
 getscrnsize endp
 ;--- Get dos location ---		; ##156.89
@ -623,7 +623,7 @@ getdosloc proc
 	call	getdosloc1
 	mov	dosloc,dx
 ;	mov	cs:csrtype,ax
-	ret
+	VZ_RET
 getdosloc1:
 	call	getdosloc2
 setrefloc:
@ -631,7 +631,7 @@ setrefloc:
 	clr	dl
 	mov	refloc,dx
 	pop	dx
-	ret
+	VZ_RET
 getdosloc2:
 	pushm	<bx,cx>
 	mov	bh,0
@ -646,7 +646,7 @@ getdosloc2:
 ;ENDIF
 ;	mov	ax,cx
 	popm	<cx,bx>
-	ret
+	VZ_RET
 getdosloc endp
 ;--- Make screen pointer from x,y ---
@ -696,7 +696,7 @@ IFDEF DOSV
 	call	vrestore
 ENDIF
 	pop	ax
-	ret
+	VZ_RET
 mkscrnp	endp
 ;--- Set attribute ---
@ -706,7 +706,7 @@ mkscrnp	endp
 setatr	proc	
 	call	getatr
 setatr1:mov	dspatr,al
-	ret
+	VZ_RET
 setatr2:
 	call	getatr
 IFDEF J31
@ -739,7 +739,7 @@ _endif
 	xlat	dummy
 getatr2:
 	pop	bx
-	ret
+	VZ_RET
 cvtatr:	push	bx
 IFDEF JBM
 	jmps	cvtatr_x
@ -751,7 +751,7 @@ ENDIF
 	jmps	getatr2
 getatr1:
 	mov	al,dspatr
-	ret
+	VZ_RET
 getatr	endp
 ;--- Reverse attribute ---
@ -766,18 +766,18 @@ ELSE
 	ror	dspatr,cl
 	pop	cx
 ENDIF
-	ret
+	VZ_RET
 revatr	endp
 undatr	proc
 	xor	dspatr,ATTR_UL
-	ret
+	VZ_RET
 undatr	endp
 IFDEF J31
 grphatr	proc
 	xor	dspatr,ATTR_GRPH
-	ret
+	VZ_RET
 grphatr	endp
 ENDIF
@ -824,7 +824,7 @@ IFDEF DOSV
 	call	vrefresh_a
 ENDIF
 	popm	<es,di,cx>
-	ret
+	VZ_RET
 fillatr endp
 ;--- Display char ---
@ -835,18 +835,18 @@ putvram	proc
 	tstb	silent
 _if z
 	stovram	k
-	ret
+	VZ_RET
 _endif
 	inc	di
 	inc	di
-	ret
+	VZ_RET
 putvram	endp
 	public	putc,putcw,putspc,gputc
 putspc:	mov	al,SPC
 IFNDEF J31
 gputc:
-  IFDEF 0 ; JBM
+  IF 0 ; JBM
 	cmp	al,GRC_VR
 _if z
 	mov	al,' '
@ -863,7 +863,7 @@ _else
 	call	putc
  _endif
 _endif
-	ret
+	VZ_RET
  ENDIF
 ENDIF
 putc	proc
@ -885,7 +885,7 @@ _ifn z
 	inc	loc.x
 _endif
 putc8:	popm	<es,di,dx>
-	ret
+	VZ_RET
 bslashc:
 	bslash	putc1
 putcw:	
@ -904,7 +904,7 @@ gputc	proc
 	call	grphatr
 	call	putc
 	call	grphatr
-	ret
+	VZ_RET
 gputc	endp
 ENDIF
@ -919,7 +919,7 @@ IFDEF DOSV
 abputc	proc
 	call	abputc1
 	call	vrefresh1
-	ret
+	VZ_RET
 abputc	endp
 	public	abputc1
@ -928,7 +928,7 @@ abputc1	proc
 	mov	es,dsp.@seg
 	stovram
 	pop	es
-	ret
+	VZ_RET
 abputc1	endp
 ELSE
@ -939,7 +939,7 @@ abputc1:
 	mov	es,dsp.@seg
 	stovram
 	pop	es
-	ret
+	VZ_RET
 abputc	endp
 ENDIF
@ -1047,7 +1047,7 @@ puts8:
 	mov	dsp.@off,di
 	mov	loc.x,cl
 	popm	<es,di,dx,cx>
-	ret
+	VZ_RET
 puts	endp
 ;--- Fill space/char ---
@ -1063,14 +1063,14 @@ _repeat
  _break be
 	call	putc
 _until
-	ret
+	VZ_RET
 fillspc	endp
 	public	fillset
 fillset	proc
 	mov	al,loc.x
 	xchg	al,locx0
-	ret
+	VZ_RET
 fillset	endp
 ;--- Display vertical line ---
@ -1114,7 +1114,7 @@ IFDEF DOSV
 	mov	cs:predspoff,di
 ENDIF
 	popm	<es,di,dx,cx>
-vline9:	ret
+vline9:	VZ_RET
 vlinec	endp
 	public	vputc
@ -1131,7 +1131,7 @@ ENDIF
 	mov	dsp.@off,di
 	inc	loc.x
 	popm	<es,di,dx>
-	ret
+	VZ_RET
 vputc	endp
 putck	proc
@ -1173,7 +1173,7 @@ _endif
  ENDIF
 ENDIF
 putck2:	call	putvram
-	ret
+	VZ_RET
 putck	endp
 getgrctbl proc
@ -1190,7 +1190,7 @@ _ifn s
 _endif
  ENDIF
 ENDIF
-	ret
+	VZ_RET
 getgrctbl endp
 ;****************************
@ -1203,13 +1203,13 @@ getgrctbl endp
 	public	cls,clsatr,clrline,clrbtm,cls2
 clrbtm:
 clsatr:
-	ret
+	VZ_RET
 IFDEF DOSV
 cls2:
 	call	cls21
 	mov	ax,dsp.@off
 	mov	cs:predspoff,ax
-	ret
+	VZ_RET
 ENDIF
 clrline:
 	mov	ch,1
@ -1246,7 +1246,7 @@ IFDEF J31
 ENDIF
 	popm	<es,di,dx,cx>
 cls8:	pop	bx
-cls9:	ret
+cls9:	VZ_RET
 clr1:
 	call	issilent
@ -1284,7 +1284,7 @@ _endif
 	popm	<di,cx>
 clsatr1:
 ENDIF
-	ret
+	VZ_RET
 cls	endp
@ -1336,7 +1336,7 @@ _else
 	bios_v	07h
 _endif
 	popm	<es,ds,bp,bx>
-	ret
+	VZ_RET
 rollwind endp
 IFDEF DOSV
@ -1360,7 +1360,7 @@ _if e
    _endif
  _endif
 _endif
-	ret
+	VZ_RET
 flickoff endp
 ENDIF
@ -1373,7 +1373,7 @@ getdosscrn proc
 	mov	di,dosscrn
 	clr	si
 	call	getscrn
-	ret
+	VZ_RET
 getdosscrn endp
 IFNDEF NOFILER
@ -1437,7 +1437,7 @@ cpyscrn8:
 	add	di,ax
 	pop	ax
 	popm	<es,ds>
-	ret
+	VZ_RET
 getscrn endp
 ;--- Put dos/current screen ---
@ -1461,7 +1461,7 @@ IFNDEF J31
 ENDIF
 clrfkey:
 	mov	fkeymode,0
-pdos9:	ret
+pdos9:	VZ_RET
 putdosscrn endp
 IFNDEF NOFILER
@ -1473,7 +1473,7 @@ putcurscrn proc
 IFDEF DOSV
 	call	putscrn
 	call	vrefreshscrn
-	ret
+	VZ_RET
 ENDIF
 putcurscrn endp
 ENDIF
@ -1621,7 +1621,7 @@ ENDIF
 	dec	dx
 _until z
 	popm	<es,ds>
-	ret
+	VZ_RET
 putwind1 endp
 ;--- Push/Pop window ---
@ -1661,7 +1661,7 @@ IFDEF SHADOW
 ENDIF
 	call	ems_loadmap
 	popm	<es,ds,di,si,dx,cx>
-	ret
+	VZ_RET
 pushwindow endp
 	public	popwindow
@ -1705,7 +1705,7 @@ ENDIF
 _until z
 popw8:	call	ems_loadmap
 	popm	<es,ds,di,si,dx,cx>
-	ret
+	VZ_RET
 popwindow endp
 initpwind proc
@ -1732,7 +1732,7 @@ initw3:	call	mkwindp
 	mov	al,ch
 	clr	ch
 	clr	ah
-	ret
+	VZ_RET
 initpwind endp
 ;--- Draw Shadow ---
@ -1780,7 +1780,7 @@ IFNDEF US
 ENDIF
 	add	cx,ax
 	bios_v	0FFh
-shadw9:	ret	
+shadw9:	VZ_RET	
 drawshadow endp
 vshadow proc
@ -1794,7 +1794,7 @@ ENDIF
 	add	cx,3
 	bios_v	0FFh
 	popm	<di,cx,ax>
-	ret
+	VZ_RET
 vshadow endp
 ENDIF
@ -1822,7 +1822,7 @@ _if ae
 	sub	di,cx
 	sub	di,cx
 _endif
-	ret
+	VZ_RET
 chkkanjilow endp
 ENDIF
@ -1881,7 +1881,7 @@ plin8:
 	and	ax,1FFFh
 	mov	cs:bmap.@off,ax
 	popm	<di,dx,cx,ax>
-	ret
+	VZ_RET
 putline	endp
 ;--- Redraw a line (J31 only) ---
@ -1911,7 +1911,7 @@ _endif
 	jcxz	rlin8
 _loop
 rlin8:
-	ret
+	VZ_RET
 redrawline endp
 ENDIF
@ -2018,7 +2018,7 @@ csroff2:
  ENDIF
 ENDIF
 csroff1:
-	ret
+	VZ_RET
 csron	endp
 ;--- Display Word Cursor in DOSV ---
@ -2038,7 +2038,7 @@ _ifn z
 	call	vrefresh2
 _endif
 	popm	<es,di>
-	ret
+	VZ_RET
 clrWcsr endp
 chkWcsr	proc
@ -2063,7 +2063,7 @@ _if z
  _endif	
 	popm	<es,di>
 _endif
-	ret	
+	VZ_RET	
 chkWcsr	endp
 ENDIF
@ -2105,7 +2105,7 @@ _ifn s
 _endif
 	call	csron
 blcsr8:	popm	<es,cx>	
-blcsr9:	ret
+blcsr9:	VZ_RET
 blinkcsr endp
 ENDIF
@ -2206,7 +2206,7 @@ _endif
 	pop	cx
 ENDIF
 	pop	es
-ucsr9:	ret
+ucsr9:	VZ_RET
 undercsr endp
 ;--- Control Video Mode ---
@ -2222,7 +2222,7 @@ _if ae
 	mov	al,videomode
 _endif
 ENDIF
-	ret
+	VZ_RET
 loadVM	endp
 seteditVM proc
@ -2258,7 +2258,7 @@ ENDIF
 ;_ifn e
 ;	stc
 ;_endif
- 	ret
+ 	VZ_RET
 seteditVM endp
 setdosVM proc
@ -2277,7 +2277,7 @@ _ifn e
 _endif
 	call	dosheight
 ;	mov	dosh,ch			; ##157.149
-	ret
+	VZ_RET
 setdosVM endp
 	public	chkline1
@ -2294,7 +2294,7 @@ _if z
 	stc
  _endif
 _endif
-	ret
+	VZ_RET
 chkline1 endp
 is50line proc
@ -2307,9 +2307,9 @@ _if ae
 	jae	is50
 _endif
 	clc
-	ret
+	VZ_RET
 is50:	stc
-	ret
+	VZ_RET
 is50line endp
 clrbottom proc
@ -2320,7 +2320,7 @@ clrbottom proc
 	mov	al,ATR_DOS
 	call	setatr
 	call	cls2
-	ret
+	VZ_RET
 clrbottom endp
 IFDEF DOSV
@ -2328,7 +2328,7 @@ shiftoff proc
 	call	isDOSV
 	bios_k	14h,1
 	bios_v	1Dh,1
-	ret
+	VZ_RET
 shiftoff endp
 shiftchk proc
@ -2338,7 +2338,7 @@ shiftchk proc
 	bios_v	1Dh,2
 	add	ch,bl
 	pop	bx
-	ret
+	VZ_RET
 shiftchk endp
 ENDIF
@ -2366,7 +2366,7 @@ mode03:
 _endif
 	call	seteditVM1
 	call	clrfkey
-	ret
+	VZ_RET
 chgline endp
 	public	resetscrnh
@ -2382,7 +2382,7 @@ resetscrnh proc
 	mov	hsplit,ch
 	call	setdoswindow
 ;_endif
-	ret
+	VZ_RET
 resetscrnh endp
 ;--- Wait CRTV ---
@ -2399,7 +2399,7 @@ vwait2:	in	al,dx
 	and  	al,08h
 	jnz	vwait2
 	pop	dx
-	ret
+	VZ_RET
 waitcrtv endp
 ;--- Check DBCS mode ---		; ##156.132
@ -2434,7 +2434,7 @@ _endif
 	popm	<es,ds,bp>
  ENDIF
 ENDIF
-	ret
+	VZ_RET
 checkDBCS endp
 ;--- Smooth scroll sub ---
@ -2457,15 +2457,15 @@ _repeat
 	call	waitcrtv
 _loop
 smoothup2:
-	ret
+	VZ_RET
 initrolc:
 	mov	rolc1,al
-	ret
+	VZ_RET
 smootharea:
 	mov	al,[bp].tw_cy
-	ret
+	VZ_RET
 	public	rollup,rolldwn
 rollup	proc
@ -2482,7 +2482,7 @@ smroll1:
 	clr	dl
 	mov	ah,ATR_TXT
 	call	rollwind
-	ret
+	VZ_RET
 rollup	endp
 IFDEF J31
@ -2523,7 +2523,7 @@ _ifn z
 _endif
 	and	di,0FFFh
 	and	cs:bmap.@off,1FFFh
-	ret
+	VZ_RET
 stov1:
 stovram1:
 	stosw
@ -2562,7 +2562,7 @@ stov9w:	inc	cs:bmap.@off
 stov9:	inc	cs:bmap.@off
 	and	cs:bmap.@off,1FFFh
 	popm	<es,ds,di,si,cx,bx,ax>
-	ret
+	VZ_RET
 ;--- Imaging Space ---
 ;-->
@ -2662,7 +2662,7 @@ _ifn z
 	not	al
 _endif
 	stosb
-	ret
+	VZ_RET
 ibold3:	not	al
 	jmp	ibold2
@ -2854,7 +2854,7 @@ _ifn z
  _endif
 _endif
 	popm	<es,bx>
-	ret
+	VZ_RET
 ctrl_froll endp
 ENDIF
@ -2894,7 +2894,7 @@ _else
 	stosw
 _endif
 	popm	<dx,ax>
-	ret
+	VZ_RET
 _stovram endp
 ;	シフトＪＩＳコードの連続コードへの変換
@ -2934,7 +2934,7 @@ _else
  _endif
 _endif				; === 外字対応終了
 	popm	<dx,cx,bx>
-	ret
+	VZ_RET
 resident_ID	=	0A2E7h	; 常駐チェック用ID(int 2Fhで使用)
 				; cursor.com との通信用
@ -2957,7 +2957,7 @@ _if ae
 	popm	<es, ds, di, si, dx, cx, bx, ax>
  _endif
 _endif
-	ret
+	VZ_RET
 jbm_bslash	endp
 ENDIF
@ -2974,7 +2974,7 @@ _if z
 	add	sp,2
 	clc
 _endif
-	ret
+	VZ_RET
 isDOSV	endp
 	public	vrestore
@ -2991,7 +2991,7 @@ _ifn e
 _endif
 	pop	ax
 	mov	cs:predspoff,di
-	ret
+	VZ_RET
 vrestore endp
 	public	vrefresh
@ -3025,7 +3025,7 @@ vref3:	mov	es,dsp.@seg
 	bios_v	0FFh
 	mov	cs:vmdf,FALSE
 vref8:	popm	<es,di,cx,ax>
-vref9:	ret
+vref9:	VZ_RET
 vrefreshscrn endp
 vrefresh1 proc
@ -3042,12 +3042,12 @@ vrefresh2 proc
 	mov	cx,2
 	bios_v	0FFh
 	pop	cx
-	ret
+	VZ_RET
 vrefresh2 endp
 ELSE
 	public	vrestore
-vrestore: ret
+vrestore: VZ_RET
 ENDIF
 IFDEF IBM
@ -3099,7 +3099,7 @@ IFDEF DOSV
 	call	shiftchk
 	mov	cs:dosSFT,ch
 ENDIF
-	ret
+	VZ_RET
 checkVM endp
 ENDIF
@ -3108,7 +3108,7 @@ ENDIF
 	public	resetcrt
 resetcrt proc
-	ret
+	VZ_RET
 resetcrt endp
 IFDEF IBM
@ -3123,7 +3123,7 @@ _if e
 	clr	bl
 	bios_v	10h,3
 _endif
-	ret
+	VZ_RET
 blinkmode endp
 ENDIF
@ -3147,7 +3147,7 @@ _ifn e
 	bios_v	10h,2
  _endif
 _endif
-	ret
+	VZ_RET
 setpalette endp
 ENDIF
@ -3174,14 +3174,14 @@ _ifn e
  _endif
 _endif
 	pop	cx
-	ret
+	VZ_RET
 setpalette endp
 ENDIF
 getVM	proc
 	bios_v	0Fh
-	ret
+	VZ_RET
 getVM	endp
 ;--- Get Indicator Char --- 		; ##16
@ -3193,7 +3193,7 @@ get_indichar proc
 _if b
 	mov	al,0DDh
 _endif
-	ret
+	VZ_RET
 get_indichar endp
 	endhs
@ -3295,7 +3295,7 @@ IFDEF J31				; ##153.55
 	or	ch,al
 ENDIF
 	mov	cs:csrtype,cx
-	ret	
+	VZ_RET	
 initvram endp
 ;--- Check hardware ---
@ -3337,7 +3337,7 @@ IFDEF JBM
 	je	chkh9
 ENDIF
 	stc
-chkh9:	ret
+chkh9:	VZ_RET
 checkhard endp
 	endis
@ -3346,4 +3346,3 @@ checkhard endp
 ;	End of 'scrnIBM.asm'
 ; Copyright (C) 1989 by c.mos
 ;****************************
--- a/SRC/smooth.asm
+++ b/SRC/smooth.asm
@ -103,7 +103,7 @@ _repeat
 _until c
 rlup8: 	call	rlend
 rlup9:	clc
-	ret
+	VZ_RET
 se_smoothdn endp
 ;--- Smooth scroll Up ---
@ -154,7 +154,7 @@ _endif
 	jnc	rldn2
 rldn8: 	call	rlend
 rldn9:	clc
-	ret
+	VZ_RET
 se_smoothup endp
 ;--- Smooth scroll init ---
@ -180,7 +180,7 @@ _if s
 	clr	dx
 	call	undercsr
 _endif
-	ret
+	VZ_RET
 initrol endp
 initrol1 proc
@ -195,7 +195,7 @@ irol2:	mov	defatr,ATR_TXT
 	mov	cx,word ptr [bp].tw_sx
 	call	clsatr
 _endif
-	ret
+	VZ_RET
 initrol1 endp
 ;--- Common sub ---
@ -203,7 +203,7 @@ initrol1 endp
 bpact	proc
 	mov	bp,w_act
 	mov	ds,[bp].ttops
-	ret
+	VZ_RET
 bpact	endp
 bpback	proc
@ -212,7 +212,7 @@ _ifn b
 	mov	bp,w_back
 	mov	ds,[bp].ttops
 _endif
-	ret
+	VZ_RET
 bpback	endp
 rlend	proc
@ -229,7 +229,7 @@ disp4:	mov	al,[bp].wy		; ##101.23
 	mov	[bp].wys,al
 	call	scrout_fx
 	call	flush_key		; ##151.09
-	ret
+	VZ_RET
 rlend	endp
 dsppole	proc
@ -239,7 +239,7 @@ _if ae
 	mov	ch,1
 	call	disppole
 _endif
-	ret
+	VZ_RET
 dsppole	endp
 ;--- Scroll up sub ---
@ -251,7 +251,7 @@ inisup	proc
 	call	setbtmnumb
 	mov	[bp].w3,dx
 	clz
-isup9:	ret
+isup9:	VZ_RET
 inisup	endp
 nxtsup	proc
@ -260,7 +260,7 @@ nxtsup	proc
 	mov	[bp].tnow,si
 	mov	[bp].tnxt,si
 	mov	[bp].tcp,si
-	ret
+	VZ_RET
 nxtsup	endp
 dspsup	proc
@ -271,7 +271,7 @@ dspsup	proc
 	call	tout
 	mov	[bp].tbtm,si
 	mov	[bp].w3,dx
-	ret
+	VZ_RET
 dspsup	endp
 ;--- Scroll down sub ---
@ -284,7 +284,7 @@ inisdn	proc
 	call	sethomnumb
 	mov	[bp].w3,dx
 	clz
-isdn9:	ret
+isdn9:	VZ_RET
 inisdn	endp
 nxtsdn	proc
@ -302,7 +302,7 @@ nsdn1:	dec	[bp].w3
 _endif
 	call	prefld
 	mov	[bp].thom,si
-	ret
+	VZ_RET
 nxtsdn	endp
 dspsdn	proc
--- a/SRC/sprintf.inc
+++ b/SRC/sprintf.inc
@ -30,6 +30,7 @@ _printwk	ends
 ; SS:BX :parameter top ptr
 ; $ld_strseg :load %s str seg to DS
 ;   usage :" %[-][0][n][,][l]{d|u|x|c|s} "
 sprintf	proc
 $sprintf	proc
 		pushm	<bx,cx,dx,si,bp,ds,es>
@ -52,7 +53,7 @@ prnt8:
 		stosb
 		add	sp,type _printwk
 		popm	<es,ds,bp,si,dx,cx,bx>
-		ret
+		VZ_RET
 $sprintf	endp
 ;----- Analyze format -----
@ -96,7 +97,7 @@ prnt_form	proc
 		je	prnt_str
 		cmp	dl,'c'
 		je	prnt_chr
-		ret
+		VZ_RET
 ;----- %c : character -----
@ -111,7 +112,7 @@ prnt_chr:
 		stosw
 	  _endif
 	_endif
-		ret
+		VZ_RET
 ;----- %s : string -----
@ -145,7 +146,7 @@ pstr1:
 		mov	al,SPC
 	rep	stosb
 pstr8:		popm	<ds,si>
-		ret
+		VZ_RET
 ;----- %x,%u,%d : number -----
 ;(special thanks to Oh!No! & moritan)
@ -233,7 +234,7 @@ _until z
 		call	prnt_fill
 	_endif
 		popm	<si,bx>
-		ret
+		VZ_RET
 ;----- Fill space or '0' -----
@ -251,7 +252,7 @@ prnt_fill	proc
 	rep	stosb
 	_endif
 		pop	cx
-		ret
+		VZ_RET
 prnt_fill	endp
 prnt_form	endp
@ -284,10 +285,10 @@ _repeat
 		add	dx,ax
 		lodsb
 _until
-		ret
+		VZ_RET
 scandeci	endp
 sprintf	endp
 ;------------------------------------------------
 ;	End of sprintf.inc
 ;------------------------------------------------
--- a/SRC/std.inc
+++ b/SRC/std.inc
@ -116,7 +116,7 @@ O_UPDATE	equ	2
 IFDEF STDSEG
 cgroup		group	_TEXT,_DATA
-_TEXT		segment	byte public 'TEXT'
+_TEXT		segment	word public 'TEXT'
 _TEXT		ends
 _DATA		segment	word public 'DATA'
 _DATA		ends
@ -292,8 +292,27 @@ rcrm	macro	reg,imm
 	shiftm	rcr,reg,imm
 	endm
 echg	macro	reg
 	ifidni <reg>, <ax>
 	xchg ah, al
 	endif
 	ifidni <reg>, <bx>
 	xchg bh, bl
 	endif
 	ifidni <reg>, <cx>
 	xchg ch, cl
 	endif
 	ifidni <reg>, <dx>
 	xchg dh, dl
 	endif
 	endm
 movhl	macro	wreg,imm_h,imm_l
 	mov	wreg,((imm_h) shl 8)+((imm_l) and 0FFh)
 ;	xor	wreg, wreg
 ;	or	wreg, imm_h
 ;	echg	wreg
 ;	or	wreg, imm_l
 	endm
 bios	macro	cmd
@ -504,4 +523,3 @@ ENDIF
 ; Copyright (C) 1989 by c.mos
 ;****************************
 	.list	
--- a/SRC/string.asm
+++ b/SRC/string.asm
@ -131,7 +131,7 @@ schoption	db	"WCZXI"
 ;----- VWX API -----
 IFDEF REXP
-GDATA vwxapi	dd,	0
+GDATA vwxapi,	dd,	0
 		public	check_vwx
 check_vwx	proc
@ -155,7 +155,7 @@ exist_vwx:	or	extsw,ESW_VWX
 	  _endif
 	_endif
 		pop	es
-		ret
+		VZ_RET
 check_vwx	endp
 ENDIF
@ -170,7 +170,7 @@ windgetstr proc
 	mov	cx,STRSZ
 	call	windgets1
 	mov	sysmode0,SYS_SEDIT
-	ret
+	VZ_RET
 windgetstr endp
 ;--- Set target ptr ---
@ -193,7 +193,7 @@ settrgtp proc
 	jmps	stgt4
 stgt3:	mov	di,[bp].tend
 stgt4:	pop	dx
-	ret
+	VZ_RET
 settrgtp endp
 ;--- Search next string ---
@ -264,7 +264,7 @@ schs4:
 	pop	bx
 	stc
  _endif
-	ret
+	VZ_RET
 _endif
 ENDIF
 	mov	bp,schstr
@ -374,7 +374,7 @@ _endif
 	stc
 schs_x:	pop	bp
 schs9:	pop	bx
-	ret
+	VZ_RET
 sch_ic:
 	pushm	<di,cx>
  repne	scasb
@ -386,12 +386,12 @@ sch_ic:
 	sub	al,'a'-'A'
  repne	scasb
 	stz
-	ret
+	VZ_RET
 schic1:
 	popm	<cx,di>
 	sub	al,'a'-'A'
  repne	scasb
-	ret
+	VZ_RET
 search1	endp
@ -420,7 +420,7 @@ replace1 proc
 	mov	si,di
 	popm	<ds,cx>
 	clc
-repl9:	ret
+repl9:	VZ_RET
 replace1 endp
 ;--- Input search string ---
@ -433,7 +433,7 @@ se_setstr proc
 _ifn c
 	call	setretp
 _endif
-	ret
+	VZ_RET
 se_setstr endp
 setstr2 proc
@ -444,13 +444,13 @@ _if c
  _endif
 	mov	strf,FALSE
 	stc
-	ret
+	VZ_RET
 _endif
 	mov	pagm,PG_STRSCH
 	mov	strf,TRUE
 	call	dispstr
 	clc
-	ret
+	VZ_RET
 setstr2	endp
 inputstr proc
@ -462,7 +462,7 @@ inputstr proc
 	stc
 	jcxz	stst9
 	call	cvtschstr
-stst9:	ret
+stst9:	VZ_RET
 inputstr endp
 ;----- Set title seach string -----
@ -500,7 +500,7 @@ se_settsstr	proc
 	  _endif
 		mov	[bp].tsstr,si
 	_endif
-		ret
+		VZ_RET
 se_settsstr	endp
 		assume	ds:cgroup
@ -527,7 +527,7 @@ _loop
 		clr	al
 		stosb
 		pop	ds
-		ret
+		VZ_RET
 set_schopt	endp
 set_schflag	proc
@ -539,7 +539,7 @@ set_schflag	proc
 		shr	al,cl
 		or	al,dh
 		mov	schflag,al
-		ret
+		VZ_RET
 set_schflag	endp
 scan_optchar	proc
@ -570,7 +570,7 @@ _repeat
 		or	ah,al
 _until
 scoptc9:	mov	si,bx
-		ret
+		VZ_RET
 scan_optchar	endp
 ;--- Convert string ---
@ -687,7 +687,7 @@ _if z
 	stc
 _endif
 	pop	ds
-	ret
+	VZ_RET
 cvtstr	endp
 ;--- Convert search string ---
@ -764,7 +764,7 @@ _endif
 ENDIF
 	clc
 	pop	ds
-	ret
+	VZ_RET
 cvtschstr endp
 	assume	ds:nothing
@ -803,7 +803,7 @@ schini1:
 	call	getnum
 	mov	cx,strln
 	mov	si,[bp].tcp
-	ret
+	VZ_RET
 schini	endp
 	public	schfwd,schbwd
@ -846,7 +846,7 @@ srch9:	pushf
 	mov	si,[bp].tcp
 	call	scrout_cp
 	popf
-	ret
+	VZ_RET
 srchx:	mov	dl,M_XFOUND
 	call	dispmsg
@ -861,7 +861,7 @@ totopline:
 	je	attop9
 	inc	si
 	inc	si
-attop9:	ret
+attop9:	VZ_RET
 toendline:
 	cmp	si,[bp].ttop
@ -872,7 +872,7 @@ toendline:
 	je	atend9
 	dec	si
 	dec	si
-atend9:	ret
+atend9:	VZ_RET
 ;--- Replace string ---
@ -880,7 +880,7 @@ atend9:	ret
 se_replace proc
 chgs1:	call	inputstr
 	jnc	chgs11
-chgs9:	ret
+chgs9:	VZ_RET
 chgs11:
 	mov	dl,W_REPLACE
 	mov	al,GETS_INIT
@ -1025,9 +1025,9 @@ se_copystr proc
 	mov	al,CM_SCOPY
 	call	ledit
 	clc
-	ret
+	VZ_RET
 copys9:	stc
-	ret
+	VZ_RET
 se_copystr endp
 ;--- Copy word to buffer ---
@ -1072,7 +1072,7 @@ _ifn cxz
 _endif
 	clc
 getw9:	pop	ds
-	ret
+	VZ_RET
 getblk:
 	mov	cx,[bp].bofs
@ -1137,7 +1137,7 @@ rtag2:		stosb
 _while b
 		stc
 rtag9:		pop	ds
-		ret
+		VZ_RET
 rt_chkpath:
 		tst	ah
@ -1198,10 +1198,10 @@ isnamechar	proc
 		popm	<di,cx>
 		je	fn_yes
 		clc
-		ret
+		VZ_RET
 fn_yesc:	mov	ah,TRUE
 fn_yes:		stc
-		ret
+		VZ_RET
 isnamechar	endp
 ;--- Search 'KAKKO' ---
@ -1309,7 +1309,7 @@ _until
 isknj8:	stz
 isknj9:	pop	bx
 	pop	si
-	ret
+	VZ_RET
 	endcs
 	end
@ -1319,4 +1319,4 @@ isknj9:	pop	bx
 ; Copyright (C) 1989 by c.mos
 ;         VWX support by wing
 ;****************************
-
+
--- a/SRC/swap.asm
+++ b/SRC/swap.asm
@ -137,7 +137,7 @@ swapo8:
 		sub	cx,si
 		call	memcopy
 	_endif
-		ret
+		VZ_RET
 swapout		endp
 ;----- Swap out CS & SS -----
@ -150,7 +150,7 @@ swapout_cs	proc
 		tstb	usefar
 	_ifn z
 		stc
-		ret
+		VZ_RET
 	_endif
 		push	es
 		mov	ax,offset cgroup:cstop
@ -193,7 +193,7 @@ swapout_cs	proc
 	_endif
 		pop	bx
 		pop	es
-		ret
+		VZ_RET
 swapout_cs 	endp
 ;----- Swap out Text -----
@ -225,7 +225,7 @@ _repeat
 		cmp	si,di
 _while b
 		mov	textslots,cx
-		ret
+		VZ_RET
 swapout_text	endp
 ;----- Swap out block -----
@ -245,7 +245,7 @@ swapout_blk	proc
 		mov	[bx].xs_handle,ax
 		call	xmem_write
 	_endif
-		ret
+		VZ_RET
 swapout_blk	endp
 		endes
@ -265,7 +265,7 @@ swapin_blk	proc
 		mov	cx,ax
 		mov	ax,[bx].xs_handle
 		call	xmem_read
-		ret
+		VZ_RET
 swapin_blk	endp
 ;----- Swap in CS & SS -----
@ -325,7 +325,7 @@ swapin8:
 		call	memcopy
 	_endif
 		clc
-swapin9:	ret
+swapin9:	VZ_RET
 swapin_es 	endp
 		endbs
@ -340,7 +340,7 @@ swapin_cs	proc
 		call	swapclose
 		mov	bx,offset cgroup:xslot_ss
 		call	swapclose
-		ret
+		VZ_RET
 swapin_cs	endp
 ;----- Swap in text -----
@ -374,7 +374,7 @@ _repeat
 		pop	cx
 		add	bx,type _swapslot
 _loop
-		ret
+		VZ_RET
 swapin_text	endp
 ;--- Close Swap buffer ---
@ -383,7 +383,7 @@ swapclose	proc
 		clr	ax
 		xchg	ax,[bx].xs_handle
 		call	xmem_free
-		ret
+		VZ_RET
 swapclose	endp
 ;--- Change Stack ---
@ -429,7 +429,7 @@ set_ss:		mov	ss,ax
 		mov	cs:save_ds,ds
 		mov	es,cs:loseg
 		mov	es:save_ds,ds
-		ret
+		VZ_RET
 stack_ss	endp
 move_wseg	proc
@ -438,7 +438,7 @@ move_wseg	proc
 		mov	cx,offset cgroup:parbuf
 		sub	cx,si
 		call	memcopy
-		ret
+		VZ_RET
 move_wseg	endp
 		endes
@ -481,7 +481,7 @@ _endif
 	msdos	F_REALLOC
 swapo8:	call	allocTPA
 	pop	es
-	ret
+	VZ_RET
 swapout endp
 	endes
@ -500,7 +500,7 @@ memcopy proc
 _if c
 	movsb
 _endif
-	ret
+	VZ_RET
 memcopy endp
 	endbs
--- a/SRC/text.asm
+++ b/SRC/text.asm
@ -42,7 +42,7 @@ ENDIF
 	extrn	rends		:word
 	extrn	syssw		:word
 	extrn	tbsize		:word
-	extrn	tmpnamep	:word
+;	extrn	tmpnamep	:word
 	extrn	w_busy		:word
 	extrn	w_free		:word
 	extrn	tmpslot		:word
@ -70,7 +70,7 @@ ENDIF
 	extrn	initblk		:near
 	extrn	isviewmode	:near
 	extrn	jumpnum		:near
-	extrn	killmemtmp	:near
+;	extrn	killmemtmp	:near
 	extrn	ld_wact		:near
 	extrn	makefulpath	:near
 	extrn	maptext		:near
@ -79,7 +79,7 @@ ENDIF
 	extrn	ofs2seg		:near
 	extrn	parsepath	:near
 	extrn	ptradj		:near
-	extrn	readmemtmp	:near
+;	extrn	readmemtmp	:near
 	extrn	restcp		:near
 	extrn	scannum		:near
 	extrn	searchfile	:near
@ -109,7 +109,7 @@ ENDIF
 	extrn	wndsel		:near
 	extrn	wrdcpy		:near
 	extrn	wrdicmp		:near
-	extrn	writememtmp	:near
+;	extrn	writememtmp	:near
 	extrn	xmem_alloc	:near
 	extrn	xmem_free	:near
 	extrn	xmem_read	:near
@ -162,7 +162,7 @@ _if z
 	mov	fh_r,ax
 _endif
 opnr_x:	pop	ds
-	ret
+	VZ_RET
 open_r	endp
 ;--- Open for write ---
@ -192,7 +192,7 @@ _ifn c
 	mov	fh_w,ax
 _endif
 	pop	ds
-	ret
+	VZ_RET
 open_w	endp
 ;--- Open for append ---
@ -222,7 +222,7 @@ opna1:	clr	cx
 	not	cx
 	mov	dx,cx
 	msdos	F_SEEK,2
-opna9:	ret
+opna9:	VZ_RET
 open_a	endp
 	assume	ds:nothing
@ -236,7 +236,7 @@ close_r	proc
 _ifn z
 	msdos	F_CLOSE
 _endif
-	ret
+	VZ_RET
 close_r	endp
 close_w proc
@ -251,7 +251,7 @@ _ifn z
  _endif
 	msdos	F_CLOSE
 _endif
-	ret
+	VZ_RET
 close_w endp
 	assume	ds:cgroup
@ -311,7 +311,7 @@ _endif
 	pop	dx
 	msdos	F_RENAME		;ren 'TXT' as 'BAK'
 	stc				; ##100.20
-	ret
+	VZ_RET
 makebak endp
 ENDIF
@ -358,9 +358,9 @@ _repeat
 read3:	cmp	byte ptr [si-1],LF
 _until e
 	clz
-	ret
+	VZ_RET
 read9:	stz
-read_x:	ret
+read_x:	VZ_RET
 fread	endp
 ;--- Write file ---
@ -379,9 +379,9 @@ fwrite	proc
 	jne	writ_x
 	add	dx,ax
 	clc
-	ret
+	VZ_RET
 writ_x:	stc
-	ret
+	VZ_RET
 fwrite	endp
 ;--- Seek to head/end of file ---
@ -395,14 +395,14 @@ seekend	proc
 	clr	dx
 	msdos	F_SEEK,2
 	pop	cx
-	ret
+	VZ_RET
 seekend	endp
 seekhead proc
 	mov	dx,word ptr [bp].headp
 	mov	cx,word ptr [bp].headp+2
 	msdos	F_SEEK,0
-	ret
+	VZ_RET
 seekhead endp
 ;--- Set text ID ---
@ -417,7 +417,7 @@ _if e
 _endif
 	mov	idcount,ax
 	mov	[bp].textid,ax
-	ret
+	VZ_RET
 settextid endp
 	assume	ds:cgroup
@ -492,7 +492,7 @@ qwrit1:
 qwrit8:
 	popm	<es,ds,si>
 	pop	[di]
-	ret
+	VZ_RET
 qwrite	endp
 ;--- Read temp ---
@ -549,7 +549,7 @@ qread1:
 	pop	es:[di]
 	clc
 qread8:	popm	<es,ds,di,si>
-	ret
+	VZ_RET
 qread	endp
 ;--- Close temp ---
@ -561,7 +561,7 @@ qclose	proc
 	call	close_r
 	popm	<si,bx,ax>
 	popf
-	ret
+	VZ_RET
 qclose	endp
 ;--- Kill temp ---
@ -582,7 +582,7 @@ _repeat
 	cmp	di,tmpslot+2
 _until e
 	popm	<ds,di>
-	ret
+	VZ_RET
 qkill	endp
 ;--- Init temp slot ---
@ -596,7 +596,7 @@ inittmpslot proc
 	sub	cx,di
 	call	memclear
 	pop	es
-	ret
+	VZ_RET
 inittmpslot endp
 	assume	ds:nothing
@ -761,7 +761,7 @@ topen8:	cbw
 topen9:	pushf
 	call	close_r
 	popf
-	ret
+	VZ_RET
 addeof:
 	clrl	[bp].readp
@ -778,7 +778,7 @@ addeof1:
 	mov	byte ptr [si],LF
 	inc	si
 	mov	[bp].tend,si
-	ret
+	VZ_RET
 topen	endp
 copypath proc
@ -786,7 +786,7 @@ copypath proc
 	lea	di,[bp].path
 	movseg	es,ss
 	call	strcpy
-	ret
+	VZ_RET
 copypath endp
 	public	initlnumb
@ -796,7 +796,7 @@ initlnumb proc
 	mov	[bp].lnumb0,ax
 	mov	[bp].dnumb,ax
 	mov	[bp].dnumb0,ax
-	ret
+	VZ_RET
 initlnumb endp
 ;--- Read Top of file ---
@ -821,7 +821,7 @@ _endif
 	mov	word ptr [bp].readp,dx
 	or	[bp].largf,FL_TAIL+FL_TAILX
 rtop8:	clc
-rtop9:	ret
+rtop9:	VZ_RET
 readtop	endp
 ;----- Read start -----
@ -867,7 +867,7 @@ read_end	proc
 		mov	si,dx
 		call	addeof
 		clc
-		ret
+		VZ_RET
 read_end	endp
 ;----- Read Backword -----
@ -893,7 +893,7 @@ read_bwd	proc
 		tst	si
 	  _endif
 		mov	[bp].ttop,si
-		ret
+		VZ_RET
 read_bwd	endp
 ;----- Init log file -----		; ##16
@ -947,7 +947,7 @@ init_log	proc
 		mov	[bp].lnumb0,ax
 		or	[bp].nodnumb,2
 		pop	ds
-inilog9:	ret
+inilog9:	VZ_RET
 init_log	endp
 ;----- Check Log table -----
@ -972,7 +972,7 @@ chk_logtbl	proc
 		mov	di,si
 		movseg	es,ss
 		call	set_logtbl
-chklog9:	ret
+chklog9:	VZ_RET
 chk_logtbl	endp
 ;----- Scan paramater -----
@ -1041,7 +1041,7 @@ scjmp1:		mov	pathp,si
 	_endif
 		call	set_opnopt
 		jnc	scanpar1
-scanpar9:	ret
+scanpar9:	VZ_RET
 scan_parm	endp
 jump_lnumb	proc
@ -1059,7 +1059,7 @@ jump_lnumb	proc
 		call	se_textend
 	_endif
 		popm	<ds,si>
-		ret
+		VZ_RET
 jump_lnumb	endp
 jump_cp		proc
@ -1074,7 +1074,7 @@ jump_cp		proc
 		call	restcp
 		call	putnum
 		popm	<ds,si>
-		ret
+		VZ_RET
 jump_cp		endp
 scan_mark	proc
@ -1085,7 +1085,7 @@ scan_mark	proc
 		pop	di
 		shlm	di,2
 		stl	[bp+di].tretp
-		ret
+		VZ_RET
 scan_mark	endp
 ;--- Close text ---
@ -1098,21 +1098,21 @@ tclose	proc
 	call	close1
 	call	wndcls
 	call	setwnum
-clos9:	ret
+clos9:	VZ_RET
 tclose2:
 	movseg	ds,ss
 	call	ld_wact
 	call	close1
 	call	wndchg
-	ret
+	VZ_RET
 close1:
 	call	fclose
 	mov	si,[bp].tends
 	mov	di,[bp].ttops
 	call	sgmove2
-	ret
+	VZ_RET
 fclose:
 	movseg	ds,ss
@ -1132,7 +1132,7 @@ _ifn z
 	call	qkill
  _endif
 _endif
-	ret
+	VZ_RET
 tclose	endp
 ;--- Save/Append text ---
@ -1296,7 +1296,7 @@ _ifn z
 _else
 	call	newline
 _endif
-	ret
+	VZ_RET
 tsave	endp
 ;--- Init open ---
@ -1369,10 +1369,10 @@ _endif
 setttop:
 	mov	[bp].ttop,TEXTTOP
 	clc
-	ret
+	VZ_RET
 iopn_x:	mov	dl,E_NOMEM
 	stc
-	ret
+	VZ_RET
 iniopn	endp
 ;--- Memory open ---
@ -1397,7 +1397,7 @@ mopn1:
 	mov	[bp].tends,di
 	pop	[bp].ttops
 _endif
-	ret
+	VZ_RET
 memopn	endp
 	assume	ds:cgroup
@ -1432,7 +1432,7 @@ _until
 isex8:	clc
 	pop	bp
 isex9:	pop	ds
-	ret
+	VZ_RET
 isexist endp
 ;****************************
@ -1528,7 +1528,7 @@ nreadeof:
 nxtb8:	clc
 nxtb9:	mov	si,[bp].w2		; si=old tend
 	popm	<di,dx,cx,bx,ax>
-	ret
+	VZ_RET
 nexttext endp
 ;--- Read previous text ---
@ -1543,6 +1543,7 @@ pretext	proc
 	mov	[bp].w2,si
 	test	[bp].largf,FL_HEAD
 	jmpl	z,preb_c
 	nop
 	call	csroff
 	mov	ax,[bp].headsz		; ##16
 	tst	ax
@ -1630,7 +1631,7 @@ _endif
 	clc
 preb9:	mov	si,[bp].w2
 	popm	<di,dx,cx,bx,ax>
-	ret
+	VZ_RET
 pretext	endp
 readsize proc
@ -1640,7 +1641,7 @@ _if z
 	jbe	rsize9
 _endif
 	mov	ax,[bp].tbalt
-rsize9:	ret
+rsize9:	VZ_RET
 readsize endp
 ;--- Is top/end of file ? ---
@ -1664,7 +1665,7 @@ _else
 	clz
 _endif
 	pop	ax
-istop9:	ret
+istop9:	VZ_RET
 istop	endp
 ;--- To top of file ---
@ -1698,7 +1699,7 @@ retract:
 	call	initlnumb
 toptxt8:call	qclose
 	mov	si,[bp].ttop
-	ret
+	VZ_RET
 toptext endp
 ;----- To head of file -----		; ##16
@ -1794,7 +1795,7 @@ _repeat
 _until c
 endtxt8:	call	qclose
 		mov	si,[bp].tend
-		ret
+		VZ_RET
 endtext		endp
 ;--- Seek text ---
@ -1855,7 +1856,7 @@ _endif
 	popf
 	call	qclose
 	popm	<di,si,cx,bx>
-	ret
+	VZ_RET
 seektext endp
 ;--- Buffer overflow ---
@ -1904,7 +1905,7 @@ fulb2:
 fulb_o:	clc
 fulb9:	call	qclose
 	popm	<dx,cx,bx>
-	ret
+	VZ_RET
 fulb_x:	mov	dl,E_TEMP
 	call	disperr
@ -1926,7 +1927,7 @@ fulbh1:	mov	[bp].w2,si
 	sub	si,cx
 	sub	di,cx
 	clc
-fulbh9:	ret
+fulbh9:	VZ_RET
 fulltext endp
 ;--- Overflow 64KB ---
@ -1953,7 +1954,7 @@ _endif
 ovfbx:	stc
 ovfb9:	call	qclose
 	popm	<dx,bx>
-	ret
+	VZ_RET
 ovftext	endp
 ;--- Write head ---
@ -2000,7 +2001,7 @@ _endif
 	or	[bp].largf,FL_HEAD
 	clc
 whead9:	pop	si
-	ret
+	VZ_RET
 writhead endp
 ;--- Write tail ---
@ -2039,7 +2040,7 @@ wtail8:	pop	si
 	clc
 _endif
 	pop	si
-	ret
+	VZ_RET
 writtail endp
 ;--- Set top line number ---
@ -2054,7 +2055,7 @@ _ifn z
 _else
 	or	[bp].nodnumb,2
 _endif
-	ret
+	VZ_RET
 setnum0 endp
 	public	isdnumb
@ -2072,7 +2073,7 @@ _ifn z
  _endif
 _endif
 	pop	ax
-	ret
+	VZ_RET
 isdnumb	endp
 ;----- Open Ext-File -----
@ -2095,7 +2096,7 @@ open_ext	proc
 	_if c
 		mov	ss:opnpath,ax
 	_endif
-		ret
+		VZ_RET
 open_ext 	endp
 ;----- Close Ext-File -----
@ -2104,7 +2105,7 @@ open_ext 	endp
 close_ext	proc
 		movseg	ds,ss
 		call	close1
-		ret
+		VZ_RET
 close_ext	endp
 	endcs
@ -2114,4 +2115,3 @@ close_ext	endp
 ;	End of 'text.asm'
 ; Copyright (C) 1989 by c.mos
 ;****************************
--- a/SRC/view.asm
+++ b/SRC/view.asm
@ -125,13 +125,13 @@ _endif
 	cmp	ah,5
 	je	undo_del
 ledit9:	stc
-	ret
+	VZ_RET
 movpre:
 	mov	dl,255
 	call	declin
 	mov	al,[bp].lx
 	mov	[bp].lxs,al
-	ret
+	VZ_RET
 edtfld:
 	mov	dh,ch			;CH :location y
 	sub	dh,[bp].ly
@ -143,7 +143,7 @@ _if ae
 _endif
 	call	vscroll
 	clc
-	ret
+	VZ_RET
 ledit	endp
 ;--- Undo CR ---
@ -159,7 +159,7 @@ _ifn c
 	call	scrout_cp
 _endif
 	clc
-	ret
+	VZ_RET
 undo1:
 	mov	di,[bp].tcp
 	jmp	ins_crlf
@ -192,9 +192,9 @@ _ifn s
 _endif
 	call	scrout_cp
 	clc
-	ret
+	VZ_RET
 bscr9:	stc
-	ret
+	VZ_RET
 bs_cr	endp
 ;--- Delete CR ---
@ -220,7 +220,7 @@ _endif
 	mov	si,[bp].tcp
 	call	scrout_cp
 	popf
-	ret
+	VZ_RET
 del_cr	endp
 ;--- Cursor up/down ---
@ -244,7 +244,7 @@ mdwn1:	call	xtocp
 	mov	dx,0100h
 	call	vscroll
 	clc
-	ret
+	VZ_RET
 se_csrdn endp
 	public	se_csrup
@ -267,10 +267,10 @@ mup1:	dec	dh
 	mov	dx,0FF00h
 	call	vscroll
 	clc
-	ret
+	VZ_RET
 cantmove:
 	stc
-	ret
+	VZ_RET
 se_csrup endp
 ;--- Return ---
@ -306,7 +306,7 @@ _if b
 _endif
 	call	scrout_cp
 	popf
-retn9:	ret
+retn9:	VZ_RET
 se_return endp
 ;--- Insert blank line ---
@ -327,7 +327,7 @@ _ifn c
 	call	scrout_cp
 	clc
 _endif
-	ret
+	VZ_RET
 se_blank endp
 ;--- Auto indent ---
@ -385,7 +385,7 @@ indt2:	inc	cx
    rep movsb
 	mov	si,di
 	clc
-indt9:	ret
+indt9:	VZ_RET
 indent	endp
 ;--- Line number handle ---
@ -397,7 +397,7 @@ getnum	proc
 	call	setabsp
 	stl	[bp].toldp
 	pop	ax
-	ret
+	VZ_RET
 getnum	endp
 	public	putnum,putnum1
@ -458,17 +458,17 @@ _ifn z
  _endif
 	mov	[bp].wys,al	
 _endif
-	ret
+	VZ_RET
 putdnum:
 	call	isdnumb
 _ifn z
 	call	setdnum
 	stc
-	ret
+	VZ_RET
 _endif
 	or	[bp].nodnumb,1
-	ret
+	VZ_RET
 putnum	endp
 ;--- Return to last position ---
@ -480,7 +480,7 @@ mc_lastpos:
 	and	ax,[bp+di+2]
 	inc	ax
 	jnz	last1
-	ret
+	VZ_RET
 se_lastpos proc
 	mov	di,tretp
@ -497,7 +497,7 @@ jumpto:
 	mov	si,[bp].tcp
 	call	scrout_cp
 pret9:	clc
-	ret
+	VZ_RET
 se_lastpos endp
 markp	proc
@ -506,12 +506,12 @@ markp	proc
 	shlm	ax,2
 	add	ax,tretp
 	mov	di,ax
-	ret
+	VZ_RET
 mark_x:
 	inc	sp
 	inc	sp
 	stc
-	ret
+	VZ_RET
 markp	endp
 ;--- Mark cursor position ---
@ -525,7 +525,7 @@ setretp:
 	call	setabsp
 	stl	[bp].tretp
 	clc
-	ret
+	VZ_RET
 se_markpos endp
 mc_markpos proc
@ -534,7 +534,7 @@ mc_markpos proc
 	call	setabsp
 	stl	[bp+di]
 	clc
-	ret
+	VZ_RET
 mc_markpos endp
 ;--- Top/bottom of window ---
@ -585,7 +585,7 @@ sbtm3:	call	istop
 	call	prefldl
 sbtm4:	call	scrout_fx
 sbtm9:	clc
-	ret
+	VZ_RET
 do_smooth:
 	test	edtsw,EDT_SCROLL
@ -593,7 +593,7 @@ _ifn z
 	call	bx
 _endif
 	stc
-	ret
+	VZ_RET
 se_windtop endp
 ;--- Text Top/End ---
@ -606,7 +606,7 @@ se_texttop proc
 	call	initlnumb
 	mov	[bp].wys,0
 	call	scrout_fx
-	ret
+	VZ_RET
 se_texttop endp
 	public	se_textend
@ -627,7 +627,7 @@ _if e
 	mov	[bp].lnumb9,ax
 _endif
 	clc
-	ret
+	VZ_RET
 se_textend endp
 ;--- Change paging mode ---
@ -655,7 +655,7 @@ _if e
 	call	dispstr
 _endif
 	clc
-	ret
+	VZ_RET
 se_pagemode endp
 ;--- Page Up ---
@ -717,7 +717,7 @@ postjmp:
 	call	putnum
 	call	scrout
 	popf
-	ret
+	VZ_RET
 se_pageup endp
 ;--- Page Down ---
@ -766,7 +766,7 @@ postrol:
 	jcxz	roll1
 prol1:	call	scrout_fx
 	popf
-	ret
+	VZ_RET
 roll1:
 	cmp	dl,1
 	jne	prol1
@ -777,7 +777,7 @@ _if s
 _endif
 	call	vscroll2
 	popf
-	ret
+	VZ_RET
 pagelines:
 	mov	cl,[bp].tw_sy
@ -788,9 +788,9 @@ pagelines:
 _if z
 	inc	cx
 _endif
-	ret
+	VZ_RET
 pglin1:	dec	cx
-	ret
+	VZ_RET
 cmtdwn:
 	cmp	al,PG_STRSCH
@ -833,7 +833,7 @@ _endif
 	call	getnum
 	mov	si,[bp].tnow
 	stc
-chkts9:	ret
+chkts9:	VZ_RET
 chk_ts	endp
 cmtchk	proc
@ -869,9 +869,9 @@ _until e
 	pop	si
 	jne	cmtcx
 cmtco:	stc
-	ret
+	VZ_RET
 cmtcx:	clc
-	ret
+	VZ_RET
 cmtchk	endp
 skpst	proc
@ -889,7 +889,7 @@ _if c
 	lodsb
 _endif
 	cmp	al,LF
-	ret
+	VZ_RET
 skpst	endp
 ;--- Cancel line edit ---
@ -902,7 +902,7 @@ _ifn z
 	call	scrout_lx
 _endif
 	clc
-	ret
+	VZ_RET
 se_cancel endp
 ;--- Jump by line number ---
@ -924,7 +924,7 @@ mc_jumpnum:
 	call	viewpoint1
 	call	scrout_fx
 	clc
-jmpn9:	ret
+jmpn9:	VZ_RET
 se_jumpnum endp
 jumpnum proc
@ -967,9 +967,9 @@ jmpf3:	sub	[bp].lnumb,cx
 _endif
 	mov	[bp].tnow,si
 	clc
-	ret
+	VZ_RET
 jmpn_x:	stc
-	ret
+	VZ_RET
 jumpdnum:
 	mov	si,[bp].tfld
 	mov	cx,[bp].dnumb
@ -1002,7 +1002,7 @@ djmpf2:	call	prefld
  _endif
 _endif
 	clc
-	ret
+	VZ_RET
 jumpnum endp
 ;--- Set line numbler ---
@ -1039,7 +1039,7 @@ _until z
 	jz	slnum8
 	neg	dx
 slnum8:	popm	<es,di,cx,ax>
-	ret
+	VZ_RET
 setnum	endp
 ;--- Set display line numbler ---
@ -1082,7 +1082,7 @@ _ifn z
 	neg	dx
 _endif
 sdnum8:	popm	<di,si,cx,bx,ax>
-	ret
+	VZ_RET
 setdnum	endp
 ;--- Init display line numbler ---
@ -1122,7 +1122,7 @@ _endif
 	add	dx,[bp].dnumb0
 	mov	[bp].dnumb,dx
 	mov	[bp].nodnumb,0
-idnum9:	ret
+idnum9:	VZ_RET
 initdnumb endp
 ;--- Text locate x ---
@ -1140,7 +1140,7 @@ textloc_x proc
 _if c
 	call	scrout1
 _endif
-	ret
+	VZ_RET
 textloc_x endp
 ;--- Text locate y ---
@ -1158,14 +1158,14 @@ _repeat
 	call	se_csrdn
 	pop	cx
 _loop
-	ret
+	VZ_RET
 tlocy2:	neg	cx
 _repeat
 	push	cx
 	call	se_csrup
 	pop	cx
 _loop
-tlocy9:	ret
+tlocy9:	VZ_RET
 textloc_y endp
 ;--- Set view point ---
@ -1180,7 +1180,7 @@ viewpoint proc
 	mov	al,[bp].tw_sy
 	shr	al,1
 	mov	[bp].wys,al
-viewp9:	ret
+viewp9:	VZ_RET
 viewpoint endp
 	endcs
--- a/SRC/vmap.asm
+++ b/SRC/vmap.asm
@ -139,7 +139,7 @@ _repeat
 		or	dl,ah
 	_else
 		stc
-		ret
+		VZ_RET
 	_endif
 _until
 		test	dl,not OPT_N
@ -148,7 +148,7 @@ _until
 	_endif
 		mov	[bp].option,dl
 		clc
-		ret
+		VZ_RET
 readoption	endp
 ;------------------------------------------------
@ -196,7 +196,7 @@ err_mcb:
 	 	call	puts
 	  _endif
 	_endif
-		ret
+		VZ_RET
 ;----- Is exist UMB ? -----
 ;<-- AX :UMB top segment (0=not exist)
@ -213,7 +213,7 @@ _repeat
 		cmp	al,'M'
 _while e
 		stc
-		ret
+		VZ_RET
 isumb1:
 		cmp	[di].mcb_id,'M'
 		jne	isumb2
@ -222,7 +222,7 @@ isumb1:
 		call	nextmcb
 		mov	ax,ds
 foundumb:	clc
-		ret
+		VZ_RET
 isumb2:
 		mov	ax,ds
 		clr	al
@ -239,7 +239,7 @@ _repeat
 		cmp	ax,0F000h
 _until ae
 		clr	ax
-		ret
+		VZ_RET
 isexistumb	endp
 ;----- Display UMB total -----
@ -256,7 +256,7 @@ disp_umbsize	proc
 		call	printf1
 		pop	ax
 		call	putcrlf
-		ret
+		VZ_RET
 disp_umbsize	endp
 ;----- Walk Memory Arena -----
@ -278,7 +278,7 @@ arena1:
 		tstb	[bp].subsegment
 		jnz	arena2
 		stc
-		ret
+		VZ_RET
 	_endif
 		mov	[bp].subsegment,FALSE
 		cmp	[bp].version,4
@ -307,7 +307,7 @@ arena2:
 		mov	ax,[bp].mcbnext
 		tst	ax
 		jnz	arena1
-		ret
+		VZ_RET
 ;----- Stack MCBs -----
@ -405,7 +405,7 @@ stkmcb4:	tst	ax
 		jmp	stkmcb1
 stkmcb8:
 		pop	ds
-		ret
+		VZ_RET
 stack_mcbs	endp
 ;----- Compare MCB owner name -----
@ -418,7 +418,7 @@ cmp_name	proc
 		mov	cx,8
 	repe	cmpsb
 		popm	<di,si,cx>
-		ret
+		VZ_RET
 cmp_name	endp
 ;----- Check ROM -----
@ -440,7 +440,7 @@ check_rom	proc
 	  _endif
 notrom:		stc
 yesrom:		pop	ax
-		ret
+		VZ_RET
 check_rom	endp
 ;----- Display MCB header -----
@ -495,7 +495,7 @@ dsppsp:
 		mov	si,offset cgroup: pf_blks_size
 		call	printf1
 		add	sp,6
-		ret
+		VZ_RET
 disp_header	endp
 ;----- Display owner/parameters -----
@ -571,7 +571,7 @@ dspenv:		tstw	[bp].pspSeg
 		jmps	dspowpr9
 	_endif
 dspparm:	call	disp_param
-dspowpr9:	ret
+dspowpr9:	VZ_RET
 disp_owner_parm endp
 ;----- Is device subsegment ? -----
@ -592,7 +592,7 @@ issubseg	proc
 		mov	si,[si]
 	_endif
 		pop	di
-		ret
+		VZ_RET
 issubseg	endp
 ;----- Is CON device ? -----
@ -611,9 +611,9 @@ isdevice	proc
 		call	sputname
 		pop	ds
 		stc
-		ret
+		VZ_RET
 not_dev:	clc
-		ret
+		VZ_RET
 isdevice	endp
 ;----- Is buffers ? -----
@ -633,9 +633,9 @@ _repeat
 		cmp	ax,dx
 _until z
 		stc
-		ret
+		VZ_RET
 not_buf:	clc
-		ret
+		VZ_RET
 isbuffers	endp
 ;----- Display owner path in Env -----
@ -672,7 +672,7 @@ disp_envowner	proc
 		mov	si,di
 		call	sputlower
 dspown9:	clr	di
-		ret
+		VZ_RET
 disp_envowner	endp
 ;----- Display Env -----
@ -689,7 +689,7 @@ disp_env	proc
 		call	sputs
 		mov	[bp].dspvct,FALSE
 	_endif
-		ret
+		VZ_RET
 disp_env	endp
 ;----- Display parameter -----
@ -715,7 +715,7 @@ _repeat
 		mov	ax,VECTCOLMS
 		call	sputlimit
 _while b
-dsppr9:		ret
+dsppr9:		VZ_RET
 disp_param	endp
 ;----- Display fooked vectors -----
@ -738,7 +738,7 @@ _repeat
 	_endif
 nextvct:
 _loop
-		ret
+		VZ_RET
 dspvct1:
 		mov	al,[bp].vectcnt
 		tst	al
@ -769,7 +769,7 @@ nextmcb		proc
 		add	dx,[di].mcb_size
 		inc	dx
 		mov	ds,dx
-		ret
+		VZ_RET
 nextmcb		endp
 ;----- Check MCB ID -----
@ -780,7 +780,7 @@ check_mcb	proc
 	_ifn e
 		cmp	[di].mcb_id,'Z'
 	_endif
-		ret
+		VZ_RET
 check_mcb	endp
 ;----- Check System data -----
@ -795,7 +795,7 @@ check_sys1:
 		cmp	[di].mcb_id,'I'
 	  _endif
 	_endif
-		ret
+		VZ_RET
 check_sys	endp
 memarena	endp
@ -816,7 +816,7 @@ ems_xms		proc
 		mov	ax,bx
 		or	ax,cx
 	_if z
-		ret
+		VZ_RET
 	_endif
 		call	putcrlf
 		tst	bx
@ -903,7 +903,7 @@ ems_xms		proc
 		call	disp_page
 		call	putcrlf
 	_endif
-		ret
+		VZ_RET
 xmscolm		proc
 		tst	bx
@ -911,7 +911,7 @@ xmscolm		proc
 		mov	ax,XMSCOLMS
 		call	sfillspc
 	_endif
-		ret
+		VZ_RET
 xmscolm		endp
 ;----- Check EMS -----
@ -943,7 +943,7 @@ check_ems	proc
 		pop	ax
 		and	al,0Fh
 		mov	[bp].emsver2,ax
-noems:		ret
+noems:		VZ_RET
 check_ems	endp
@ -977,7 +977,7 @@ check_xms	proc
 		call	[bp].xms
 		mov	[bp].embfree,ax
 		mov	[bp].embmax,dx
-noxms:		ret
+noxms:		VZ_RET
 check_xms	endp
 ;----- Check HMA -----
@ -1017,7 +1017,7 @@ _loop
 		jmps	sethmaowner
 hmaunknown:	mov	si,offset cgroup: mg_unknown
 sethmaowner:	mov	[bp].hmaowner,si
-		ret
+		VZ_RET
 check_hma	endp
 ;----- Display EMS block -----
@ -1058,7 +1058,7 @@ _repeat
 		call	putcrlf
 _until
-		ret
+		VZ_RET
 disp_emsblk	endp
 ;----- Display EMS block page/size -----
@ -1076,7 +1076,7 @@ disp_page	proc
 		pop	ax
 		pop	ax
 		popm	<di,cx>
-		ret
+		VZ_RET
 disp_page	endp
 ems_xms		endp
@ -1099,7 +1099,7 @@ printf1		proc
 		dec	di
 		mov	[bp].putp,di
 		popm	<es,ds,di,bx>
-		ret
+		VZ_RET
 printf1		endp
 ;----- Put string -----
@ -1122,7 +1122,7 @@ puts		proc
 		msdos	F_WRITE
 	_endif
 		popm	<es,ds,di,dx,cx,bx,ax>
-		ret
+		VZ_RET
 puts		endp
 ;----- Put CR/LF & flash -----
@ -1135,7 +1135,7 @@ putcrlf		proc
 		call	puts
 		call	sputbegin
 		pop	si
-		ret
+		VZ_RET
 putcrlf		endp
 ;----- Put string to buffer -----
@ -1146,7 +1146,7 @@ sputbegin	proc
 		mov	[bp].putp,bx
 		mov	byte ptr ss:[bx],0
 		pop	bx
-		ret
+		VZ_RET
 sputbegin	endp
 ;
 ;----- sput string -----
@ -1160,7 +1160,7 @@ _repeat
 		call	sputc
 _until z
 		pop	ds
-		ret
+		VZ_RET
 sputs		endp
 ;
 ;----- sput char -----
@ -1179,7 +1179,7 @@ sputc		proc
 		mov	byte ptr es:[di],0
 	_endif
 		popm	<es,di>
-		ret
+		VZ_RET
 sputc		endp
 ;
 ;----- sput 8 char -----
@ -1194,7 +1194,7 @@ _repeat
 	_break z
 _loop
 		pop	cx
-		ret
+		VZ_RET
 sputname	endp
 ;
 ;----- sput 8 char to lower case -----
@ -1214,7 +1214,7 @@ _repeat
 		mov	[bp].dspown,TRUE
 _loop
 		pop	cx
-		ret
+		VZ_RET
 sputlower	endp
 ;
 ;----- char to lower case -----
@ -1228,7 +1228,7 @@ tolower		proc
 		add	al,20h
 	  _endif
 	_endif
-		ret
+		VZ_RET
 tolower		endp
 ;
 ;----- sput limit -----
@ -1240,7 +1240,7 @@ sputlimit	proc
 		add	ax,offset cgroup: pfbuf
 		cmp	[bp].putp,ax
 		pop	ax
-		ret
+		VZ_RET
 sputlimit	endp
 ;
 ;----- fill spaces -----
@ -1254,7 +1254,7 @@ _repeat
 		call	sputspc
 		pop	ax
 _until
-		ret
+		VZ_RET
 sfillspc	endp
 $ld_strseg	macro
--- a/SRC/vz.inc
+++ b/SRC/vz.inc
@ -7,6 +7,7 @@
 ;NOSWAP		equ	TRUE
 REXP		equ	TRUE		; VWX support by wing
 NEWEXPR		equ	TRUE		; new pointer handler by Sakakibara
 VZ_RET		equ	retn
 IFNDEF PC98
@ -205,13 +206,13 @@ SYS_GETC	equ	4
 ;--- Parse path result ---
-PRS_WILD	equ	00000001b
+VZ_PRS_WILD	equ	00000001b
-PRS_EXT		equ	00000010b
+VZ_PRS_EXT	equ	00000010b
-PRS_NAME	equ	00000100b
+VZ_PRS_NAME	equ	00000100b
-PRS_DIR		equ	00001000b
+VZ_PRS_DIR	equ	00001000b
-PRS_DRV		equ	00010000b
+VZ_PRS_DRV	equ	00010000b
-PRS_ROOT	equ	00100000b
+VZ_PRS_ROOT	equ	00100000b
-PRS_ENDDIR	equ	10000000b
+VZ_PRS_ENDDIR	equ	10000000b
 ;--- Char attribute ---
@ -341,10 +342,10 @@ CMF_VAL		equ	10000000b
 ;----- DOS Command exec switch -----
-DOS_TBOX	equ	0001b
+VZ_DOS_TBOX	equ	0001b
-DOS_GO		equ	0010b
+VZ_DOS_GO	equ	0010b
-DOS_RETURN	equ	0100b
+VZ_DOS_RETURN	equ	0100b
-DOS_BOXTTL	equ	1000b
+VZ_DOS_BOXTTL	equ	1000b
 ;--- Macro extra char ---
@ -475,7 +476,7 @@ TTLSTRSZ	equ	64
 TMPSZ		equ	256
 PATHSZ		equ	64
 MASKSZ		equ	32
-BACKSLASH	equ	0FCh
+VZ_BACKSLASH	equ	0FCh
 SYMCHR		equ	27h
 MARKCNT		equ	4
 ONEMS		equ	0FFFh
@ -484,7 +485,7 @@ PACKSZ		equ	13
 TEXTTOP		equ	2
 TMPSLOTCNT	equ	512
 BMPSIZE		equ	128
-DOSLEN		equ	128
+VZ_DOSLEN	equ	128
 PAGEMAX		equ	BMPSIZE*8
 EMSMASK		equ	0F0h
 EMSMASKW	equ	0F000h
@ -904,4 +905,3 @@ _text		ends
 	.list
 	assume	cs:cgroup, ss:cgroup
--- a/SRC/vz.lnk
+++ b/SRC/vz.lnk
@ -1,30 +0,0 @@
 main+
 alias+
 char+
 core+
 disp+
 dos+
 expr+
 filer+
 gets+
 harderr+
 inst+
 key+
 ledit+
 macro+
 memo+
 menu+
 misc+
 open+
 printf+
 scrn+
 smooth+
 string+
 text+
 view+
 wind+
 xscr+
 swap+
 ems+
 msg
--- a/SRC/vz.mak
+++ b/SRC/vz.mak
@ -1,66 +0,0 @@
 .asm.obj:
 	$(ASM)asm /ml $(MASM) $*;
 vz.com: main.obj alias.obj char.obj core.obj disp.obj dos.obj expr.obj\
 	filer.obj gets.obj harderr.obj inst.obj key.obj ledit.obj macro.obj\
 	memo.obj menu.obj misc.obj open.obj printf.obj scrn.obj smooth.obj\
 	string.obj text.obj view.obj wind.obj swap.obj ems.obj xscr.obj msg.obj
 main.obj: vz.inc main.asm
 alias.obj: vz.inc alias.asm
 char.obj: vz.inc char.asm
 core.obj: vz.inc core.asm
 disp.obj: vz.inc disp.asm
 dos.obj: vz.inc dos.asm
 expr.obj: vz.inc expr.asm
 filer.obj: vz.inc filer.asm
 gets.obj: vz.inc gets.asm
 harderr.obj: vz.inc harderr.asm
 inst.obj: vz.inc inst.asm
 key.obj: vz.inc key.asm key98.asm keyibm.asm dummy
 ledit.obj: vz.inc ledit.asm
 macro.obj: vz.inc macro.asm
 memo.obj: vz.inc memo.asm
 menu.obj: vz.inc menu.asm
 misc.obj: vz.inc misc.asm
 open.obj: vz.inc open.asm
 printf.obj: sprintf.inc printf.asm
 scrn.obj: vz.inc scrn.asm scrn98.asm scrnibm.asm dummy
 smooth.obj: vz.inc smooth.asm
 string.obj: vz.inc string.asm
 text.obj: vz.inc text.asm
 view.obj: vz.inc view.asm
 wind.obj: vz.inc wind.asm
 xscr.obj: vz.inc xscr.asm
 swap.obj: vz.inc swap.asm
 ems.obj: vz.inc ems.asm
 msg.obj: vz.inc msg.asm dummy
--- a/SRC/vz.omk
+++ b/SRC/vz.omk
@ -1,59 +0,0 @@
 main.obj vz.inc main.asm
 main /ml;
 alias.obj vz.inc alias.asm
 alias /ml;
 char.obj vz.inc char.asm
 char /ml;
 core.obj vz.inc core.asm
 core /ml;
 disp.obj vz.inc disp.asm
 disp /ml;
 dos.obj vz.inc dos.asm
 dos /ml;
 expr.obj vz.inc expr.asm
 expr /ml;
 filer.obj vz.inc filer.asm
 filer /ml;
 gets.obj vz.inc gets.asm
 gets /ml;
 harderr.obj vz.inc harderr.asm
 harderr /ml;
 inst.obj vz.inc inst.asm
 inst /ml;
 key.obj vz.inc key.asm key98.asm keyibm.asm dummy
 key /ml;
 ledit.obj vz.inc ledit.asm
 ledit /ml;
 macro.obj vz.inc macro.asm
 macro /ml;
 memo.obj vz.inc memo.asm
 memo /ml;
 menu.obj vz.inc menu.asm
 menu /ml;
 misc.obj vz.inc misc.asm
 misc /ml;
 open.obj vz.inc open.asm
 open /ml;
 printf.obj sprintf.inc printf.asm
 printf /ml;
 scrn.obj vz.inc scrn.asm scrn98.asm scrnibm.asm dummy
 scrn /ml;
 smooth.obj vz.inc smooth.asm
 smooth /ml;
 string.obj vz.inc string.asm
 string /ml;
 text.obj vz.inc text.asm
 text /ml;
 view.obj vz.inc view.asm
 view /ml;
 wind.obj vz.inc wind.asm
 wind /ml;
 xscr.obj vz.inc xscr.asm
 xscr /ml;
 swap.obj vz.inc swap.asm
 swap /ml;
 ems.obj vz.inc ems.asm
 ems /ml;
 msg.obj vz.inc msg.asm dummy
 msg /ml;
--- a/SRC/wind.asm
+++ b/SRC/wind.asm
@ -63,7 +63,7 @@ w_save		dw	0
 ld_wact proc
 	mov	bp,ss:w_act
 	tst	bp
-	ret
+	VZ_RET
 ld_wact endp
 	endes
@ -101,7 +101,7 @@ _loop
 	stosw				; w_busy
 	mov	ax,bp
 	stosw				; w_ext
-	ret
+	VZ_RET
 winit	endp
 	public	windcount
@ -117,7 +117,7 @@ _ifn z
 	inc	cx
 _endif
 	inc	cx			; ##16
-	ret
+	VZ_RET
 windcount endp
 ;--- Window open ---
@ -147,7 +147,7 @@ _else
 	call	cpyfmt
 _endif
 	mov	w_act,bp
-	ret
+	VZ_RET
 wndopn	endp
 ;--- Window close ---
@ -195,7 +195,7 @@ _else
 	call	cpyfmt
 _endif
 wcls8:	mov	w_act,bp
-	ret
+	VZ_RET
 wndcls	endp
 ;--- Window change ---
@ -213,7 +213,7 @@ _else
 _endif
 	mov	bp,ax
 	mov	[bp].w_next,0
-	ret
+	VZ_RET
 wndrmv:
 	mov	ax,w_act
 	mov	bp,ax
@ -221,10 +221,10 @@ wndrmv:
 	call	wlast
 _ifn c
 	mov	[bp].w_next,bx
-	ret
+	VZ_RET
 _endif
 	mov	w_busy,bx
-	ret
+	VZ_RET
 wndchg	endp
 ;--- Set window number ---
@ -247,7 +247,7 @@ _repeat
 _until
 	mov	textc,ax
 	pop	bp
-	ret
+	VZ_RET
 setwnum endp
 ;--- Set w_record pointer ---
@ -264,9 +264,9 @@ _repeat
 	mov	bp,[bp].w_next
 _until
 	clc
-	ret
+	VZ_RET
 wlast3:	stc
-	ret
+	VZ_RET
 wlast	endp
 ;--- Set window format ---
@ -289,7 +289,7 @@ _endif
 _if b
 	mov	[bp].wys,al
 _endif
-	ret
+	VZ_RET
 settextw endp
 	public	inifmt
@ -300,7 +300,7 @@ inifmt	proc
 	mov	al,SPLIT_A
 	call	settextw
 	mov	[bp].fofs,0
-	ret
+	VZ_RET
 inifmt	endp
 cpyfmt	proc
@ -315,7 +315,7 @@ cpyfmt	proc
    rep movsb
 	popm	<es,ds>
 	call	check_wy
-	ret
+	VZ_RET
 cpyfmt	endp
 	assume	ds:nothing
@ -338,7 +338,7 @@ _ifn z
  _endif
 _endif
 	clc
-	ret
+	VZ_RET
 se_chgwind endp
 	assume	ds:cgroup
@ -357,7 +357,7 @@ _ifn z
 	call	dspscr
 _endif
 	clc
-	ret
+	VZ_RET
 splitmode:
 	tst	al
 	jns	splitwd1
@ -373,7 +373,7 @@ _ifn z
 	xchg	bp,bx
 	call	inifmt
 _endif
-	ret
+	VZ_RET
 splitwd:
 	mov	al,[bp].wsplit
@ -396,7 +396,7 @@ yokowd:
 	sub	ch,dh
 	mov	al,SPLIT_D
 	call	settextw
-	ret
+	VZ_RET
 tatewd:
 	call	doswindow
 	add	dh,2
@ -413,7 +413,7 @@ tatewd:
 	sub	cl,dl
 	mov	al,SPLIT_R
 	call	settextw
-	ret
+	VZ_RET
 se_splitmode endp
 ;--- Split position ---
@ -432,7 +432,7 @@ wpos1:	mov	al,CSR_OFF
 	jnz	wpos2
 	call	newline
 wpos9:	clc
-	ret
+	VZ_RET
 wpos2:
 	movseg	ds,ss
 	push	ax
@ -507,7 +507,7 @@ resetscr:
 	call	dspscr
 	popm	<es,ds>
 	clc
-	ret
+	VZ_RET
 resetwind:
 	push	bp
 	movseg	ds,ss
@ -519,7 +519,7 @@ _ifn z
 _endif
 	call	splitwd
 	pop	bp
-	ret
+	VZ_RET
 se_xline endp
 ;--- Change active text ---		; ##153.37
@ -553,7 +553,7 @@ chgtext:
 	call	seekbp
 chgt1:	call	wndsel
 	call	dspscr
-chgt9:	ret
+chgt9:	VZ_RET
 mc_chgtext:
 	movseg	ds,ss
@ -573,7 +573,7 @@ _repeat
 	mov	bp,[bp].w_next
 _until
 	stc
-	ret
+	VZ_RET
 wndsel:
 	mov	bx,w_act
@ -623,7 +623,7 @@ wcons2:
 	jne	chgcon1
 	call	wndcls1
 	call	dspscr
-	ret
+	VZ_RET
 se_console endp
 	public	chgt_cons
@ -640,10 +640,10 @@ chgt_cons proc
 	mov	w_back,ax
 chgcon1:call	wndsel
 	call	dspscr
-	ret
+	VZ_RET
 chgcon_x:
 	stc
-	ret
+	VZ_RET
 chgt_cons endp
 ;--- Dump text name ---
@ -665,9 +665,9 @@ sel_number:
 	sub	al,'A'-'1'-9
 seltx1:	sub	al,'1'
 	clc
-	ret
+	VZ_RET
 seltx_x:stc
-	ret	
+	VZ_RET	
 _endif
 	push	bp
 	call	seekbp
@ -679,7 +679,7 @@ _endif
 	call	printf
 	popm	<ax,ax>
 	pop	bp
-	ret
+	VZ_RET
 dumptext endp
 seekbp	proc
@ -696,7 +696,7 @@ _repeat
 	tst	bp
 	jz	skbp1
 _until
-	ret
+	VZ_RET
 seekbp	endp
 ;----- Reset active/back window -----
@ -731,7 +731,7 @@ wnd_reset	proc
 	  _endif
 	_endif
 		popm	<ds,bp,bx>
-		ret
+		VZ_RET
 wnd_reset	endp
 	endcs
@ -741,4 +741,3 @@ wnd_reset	endp
 ;	End of 'wind.asm'
 ; Copyright (C) 1989 by c.mos
 ;****************************
--- a/SRC/xscr.asm
+++ b/SRC/xscr.asm
@ -105,7 +105,7 @@ _ifn z
 	mov	puttop,si
 	mov	putp,si
 _endif
-	ret
+	VZ_RET
 initcon endp
 	endis
@ -150,7 +150,7 @@ _ifn z
 _endif
 	movseg	ds,ss
 _endif
-	ret
+	VZ_RET
 opencon endp
 ;--- Pre/Post DOS ---
@ -175,7 +175,7 @@ _if z
 	mov	xpause,al		; ##152.17
 	pop	bp
 _endif
-	ret
+	VZ_RET
 preconfile endp
 	public	postconfile
@ -188,7 +188,7 @@ _ifn z
 	jnz	pstcon1
  _endif
 _endif
-	ret
+	VZ_RET
 pstcon1:
 	mov	di,putp
 	call	flushcontmp
@ -257,7 +257,7 @@ _endif
 	inc	dx
 	mov	[bp].lnumb,dx
 	popm	<ds,bp>
-	ret
+	VZ_RET
 postconfile endp
 	endcs
@ -299,7 +299,7 @@ slash1:
 	clr	ax
 	mov	es,ax
 	mov	byte ptr es:[grafflag],0
-	mov	al,BACKSLASH
+	mov	al,VZ_BACKSLASH
 	pushf
 	call	cs:vct29
 	mov	byte ptr es:[grafflag],1
@ -323,20 +323,20 @@ _ifn z
  _endif
 	call	isalpha
 	jc	skipesc9
-	ret
+	VZ_RET
 pausectrl:
 	xor	al,'1'
 	mov	xpause,al
 skipesc9:
 	mov	skipescf,FALSE
-	ret
+	VZ_RET
 _endif
 	cmp	al,ESCP
 	jne	puttmp2
 	test	syssw,SW_SKIPESC
 	jz	puttmp2
 	mov	skipescf,TRUE
-	ret
+	VZ_RET
 puttmp2:
 	tst	al
 	jz	puttmp9
@ -379,7 +379,7 @@ _endif
 	mov	di,puttop
 puttmp7:popm	<si,dx,cx,bx>
 puttmp8:mov	putp,di
-puttmp9:ret
+puttmp9:VZ_RET
 putcontmp endp
 ;--- Flush console tmp buffer ---
@ -435,7 +435,7 @@ _ifn cxz
 _endif
 flcon9:	pop	di
 	pop	es
-	ret
+	VZ_RET
 flushcontmp endp
 	endbs
@ -453,7 +453,7 @@ copyxptrs proc
 	mov	ax,es:conend
 	mov	conend,ax
 	pop	es
-	ret
+	VZ_RET
 copyxptrs endp
 ;--- Set/reset INT29h ---
@ -463,7 +463,7 @@ setint29 proc
 	mov	di,29h*4
 	mov	ax,offset cgroup:int29in
 	call	setint
-	ret
+	VZ_RET
 setint29 endp
 	public	resetint29
@ -471,7 +471,7 @@ resetint29 proc
 	mov	bx,offset cgroup:vct29
 	mov	di,29h*4
 	call	resetint
-	ret
+	VZ_RET
 resetint29 endp
 	endes
@ -490,7 +490,7 @@ chkint29 proc
 	call	setint29
 	jmps	chkcon9
 chkcon1:call	resetint29
-chkcon9:ret
+chkcon9:VZ_RET
 chkint29 endp
 	endcs
@ -501,4 +501,3 @@ ENDIF
 ;	End of 'xscr.asm'
 ; Copyright (C) 1989 by c.mos
 ;****************************
--- a/SRC/zcopy.asm
+++ b/SRC/zcopy.asm
@ -292,7 +292,7 @@ init		proc
 		mov	[bp].heap,ax
 		msdos	F_SWITCHAR,0
 		mov	[bp].swchr,dl
-		ret
+		VZ_RET
 init		endp
 init2		proc
@ -306,7 +306,7 @@ init2		proc
 		add	ax,cx
 		mov	[bp].dslottop,ax
 		mov	[bp].dslotseg,ax
-		ret
+		VZ_RET
 init2		endp
 init3		proc
@ -318,7 +318,7 @@ init3		proc
 		add	ax,CPYBFPARA
 	_endif
 		mov	[bp].cpybftop,ax
-		ret
+		VZ_RET
 init3		endp
 ofs2seg		proc
@ -329,14 +329,14 @@ ofs2seg		proc
 		mov	cl,4
 		shr	ax,cl
 		pop	cx
-		ret
+		VZ_RET
 ofs2seg		endp
 nextseg		proc
 		call	ofs2seg
 		mov	dx,ds
 		add	ax,dx
-		ret
+		VZ_RET
 nextseg		endp
 ;----- Display copied info -----
@ -428,7 +428,7 @@ info_del:	mov	si,offset cgroup: mg_deleted
 		mov	si,offset cgroup: mg_Bmoved
 info8:		call	putmsg
 		call	putcrlf
-		ret
+		VZ_RET
 disp_info	endp
 disp_files	proc
@ -436,7 +436,7 @@ disp_files	proc
 		call	putnumber
 		mov	si,offset cgroup: mg_files
 		call	putmsg
-		ret
+		VZ_RET
 disp_files	endp
 ;----- Display error message -----
@ -489,7 +489,7 @@ _loop
 		mov	al,cl
 	_endif
 		call	putcrlf
-		ret
+		VZ_RET
 disp_error	endp
 ;----- Display parameters -----
@ -531,7 +531,7 @@ _until
 		call	puts
 		call	putcrlf
 	_endif
-		ret
+		VZ_RET
 disp_parm	endp
 ENDIF
@ -553,7 +553,7 @@ parm_read:
 		inc	si
 		call	read_option
 		jnc	parm_read
-		ret
+		VZ_RET
 	_endif
 		cmp	al,'['
 	_if e
@ -646,7 +646,7 @@ parmend1:	jz	parm_end
 		jz	parm_dst
 parm_syntax:	mov	al,ER_SYNTAX
 parm_x:		stc
-		ret
+		VZ_RET
 	_endif
 		test	dl,PRS_EXT+PRS_WILD
 	_if z
@ -703,7 +703,7 @@ parm_end:
 		mov	al,ER_SAME
 		je	parm_x
 parm9:		clc
-		ret
+		VZ_RET
 parse_parm	endp
 ;----- Load parameter list -----
@ -719,7 +719,7 @@ loadparmlist	proc
 		add	[bp].parmlist,type Parmlist
 		dec	[bp].parmcnt
 		pop	di
-		ret
+		VZ_RET
 loadparmlist	endp
 ;----- Read response file -----
@ -761,10 +761,10 @@ read_ref	proc
 	_endif
 		stz
 rref9:		clc
-		ret
+		VZ_RET
 rref_x:		mov	al,ER_FILENG
 		stc
-		ret
+		VZ_RET
 read_ref	endp
 ;----- Set src dir from filelist -----
@ -786,7 +786,7 @@ set_srcdir	proc
 		call	getcurdir1
 		call	skipstr
 	_endif
-		ret
+		VZ_RET
 set_srcdir	endp
 ;----- Copy mask -----
@ -839,7 +839,7 @@ cpym1:		or	[bp].mode,CPY_MASK
 		pop	bx
 	_endif
 ;		call	copy_parm
-;		ret
+;		VZ_RET
 copy_mask	endp
 ;----- Copy a parameter -----
@ -876,7 +876,7 @@ cpypar1:
 		clr	al
 		stosb
 		pop	cx
-		ret
+		VZ_RET
 copy_parm	endp
 ;----- Make full path -----
@ -927,7 +927,7 @@ mkfull1:	call	strcpy
 		call	setcurdir
 mkfull9:	popm	<dx,cx,bx>
 		mov	si,cx
-		ret
+		VZ_RET
 mkfullpath	endp
 ;----- Get drive No. -----
@ -946,7 +946,7 @@ getdrive	proc
 	  _endif
 	_endif
 		inc	al
-		ret
+		VZ_RET
 getdrive	endp
 ;----- Get/Set current directory -----
@ -959,7 +959,7 @@ getcurdir	proc
 		call	getcurdir1
 		mov	al,dl
 		popm	<di,si,dx>
-		ret
+		VZ_RET
 getcurdir	endp
 getcurdir1	proc
@ -971,13 +971,13 @@ getcurdir1	proc
 		stosw
 		mov	si,di
 		msdos	F_CURDIR
-		ret
+		VZ_RET
 getcurdir1	endp
 setcurdir	proc
 		mov	dx,offset cgroup: pathbuf2
 		msdos	F_CHDIR
-		ret
+		VZ_RET
 setcurdir	endp
 ;----- Change to root directory -----
@ -991,7 +991,7 @@ cd_rootdir	proc
 		msdos	F_CHDIR
 		pop	ax
 		mov	[si],al
-		ret
+		VZ_RET
 cd_rootdir	endp
 ;----- File to directory -----
@ -1020,7 +1020,7 @@ file_to_dir	proc
 		mov	bx,cx
 	  _endif
 	_endif
-		ret
+		VZ_RET
 file_to_dir	endp
 ;----- Make destination directory -----
@ -1056,7 +1056,7 @@ mkdst1:		push	ax
 _until
 _endif
 mkdst8:		popm	<ds,si>
-		ret
+		VZ_RET
 make_dstdir	endp
 ;----- Read option -----
@ -1091,14 +1091,14 @@ read_option	proc
 		mov	ax,1
 		shl	ax,cl
 		or	word ptr [bp].option,ax
-		ret
+		VZ_RET
 ropt_x:		mov	dl,al
 		mov	al,ER_OPTION
 		stc
-		ret
+		VZ_RET
 ropt_help:	mov	al,ER_HELP
 		stc
-		ret
+		VZ_RET
 read_option	endp
 ;----- Parse path name -----
@ -1146,7 +1146,7 @@ prsdone1:	jmp	prs_done
 prs_error:
 		stc
 		pop	di
-		ret
+		VZ_RET
 prs_drive:
 		cmp	_pvc,'A'
 		jne	prs_done
@ -1248,7 +1248,7 @@ prs_done:
 		dec	si
 		clc
 		pop	di
-		ret
+		VZ_RET
 parse_path	endp
 isbslash	proc
@ -1256,7 +1256,7 @@ isbslash	proc
 	_ifn e
 		cmp	al,'/'
 	_endif
-		ret
+		VZ_RET
 isbslash	endp
 ;------------------------------------------------
@ -1287,12 +1287,12 @@ _repeat
 		mov	cl,MASK_DIR
 		call	scan_mask
 _while c
-		ret
+		VZ_RET
 readdirs1:
 		clr	si
 		clr	bx
 ;		call	read_a_dir
-;		ret
+;		VZ_RET
 read_dirs	endp
 ;----- Read a directory -----
@ -1417,7 +1417,7 @@ radir8:
 		test	[bp].option,OPT_S+OPT_G
 		jnz	read_subdir
-radir9:		ret
+radir9:		VZ_RET
 read_a_dir	endp
 ;----- Read sub-directory -----
@ -1455,7 +1455,7 @@ _repeat
 		add	di,type Dirslot
 _until
 		clc
-		ret
+		VZ_RET
 read_subdir	endp
 ;----- Get directories -----
@ -1538,7 +1538,7 @@ gdirs8:
 gdirs_x:
 		stc
 		pop	si
-		ret
+		VZ_RET
 get_dirs	endp
 ;----- Get files by response file -----
@ -1581,7 +1581,7 @@ gfiles1:
 		cmp	di,[bp].dslotmax
 		jb	gfiles1
 		stc
-		ret
+		VZ_RET
 gfiles8:	
 		mov	dx,offset cgroup: mask_all
 		mov	bh,[bp].option
@ -1591,7 +1591,7 @@ gfiles8:
 	_endif
 		mov	[bp].dslotp,di
 		clc
-		ret
+		VZ_RET
 get_files	endp
 ;---- Get a file from filelist -----
@ -1604,7 +1604,7 @@ get_a_file	proc
 		cmp	si,[bp].refend
 	_if ae
 		stc
-		ret
+		VZ_RET
 	_endif
 		pushm	<cx,di,es>
 		movseg	es,ds
@ -1640,7 +1640,7 @@ get_a_file	proc
 		dec	si
 		popm	<es,di,cx>
 		clc
-		ret
+		VZ_RET
 get_a_file	endp
 ;----- Make read path -----
@ -1655,7 +1655,7 @@ makepath:	pushm	<di,es>
 		mov	di,offset cgroup: pathbuf
 		call	makepath1
 		popm	<es,di>
-		ret
+		VZ_RET
 makesrcpath	endp
 makedstpath	proc
@ -1672,7 +1672,7 @@ makedstpath	proc
 	  _endif
 	_endif
 		movseg	ds,cs
-		ret
+		VZ_RET
 makedstpath	endp
 makedstpath1	proc
@ -1683,7 +1683,7 @@ makedstpath1	proc
 		mov	es,ax
 	  _endif
 		call	makepath
-		ret
+		VZ_RET
 makedstpath1	endp
 makepath1	proc
@ -1723,7 +1723,7 @@ makepath1	proc
 		pop	dx
 		pop	bx
 		movseg	ds,cs
-		ret
+		VZ_RET
 makepath1	endp
 ;----- Check destination directory -----
@ -1750,7 +1750,7 @@ check_dst	proc
 	  _ifn z
 		mov	di,[bp].dslotp
 	  _endif
-		ret
+		VZ_RET
 	_endif
 xdst_loop:
 		mov	di,[bp].dslotp
@ -1828,7 +1828,7 @@ xdst_clr:
  _until
 _endif
 		mov	di,[bp].dslotend
-		ret
+		VZ_RET
 check_dst	endp
 ;----- Check exclusive dir/mask -----
@ -1844,7 +1844,7 @@ _repeat
 	_break c
 		call	strskip
 _until
-		ret
+		VZ_RET
 check_ex	endp
 ;----- Scan mask -----
@ -1871,7 +1871,7 @@ _repeat
 _until
 scmask_c:	stc
 scmask9:	pop	cx
-		ret
+		VZ_RET
 scan_mask	endp
 ;----- Compare mask -----
@ -1887,7 +1887,7 @@ comp_mask	proc
 	  _if e
 		stc
 	  _endif
-		ret
+		VZ_RET
 	_endif
 		pushm	<si,di>
@ -1914,7 +1914,7 @@ cpmsk2:
 	_endif
 		clc
 cpmsk9:		popm	<di,si>
-		ret
+		VZ_RET
 cpmsk_a:
 _repeat
 		mov	al,es:[di]
@ -1989,7 +1989,7 @@ _until
 	  _endif
 	_endif
 		mov	al,EL_OK
-docpy9:		ret
+docpy9:		VZ_RET
 do_copy		endp
 		assume	ds:cgroup
@ -2056,7 +2056,7 @@ _until
 		msdos	F_CLOSE
 	_endif
 cfile9:		pop	ds
-		ret
+		VZ_RET
 copy_file	endp
 ;----- Requst copy buffer -----
@ -2079,7 +2079,7 @@ req_cpybf	proc
 		mov	cx,8
 	rep	stosw
 		clr	di
-req9:		ret
+req9:		VZ_RET
 req_cpybf	endp
 ;----- Flush buffer -----
@ -2149,7 +2149,7 @@ flush1:		call	do_verify
 	_endif
 		mov	ax,[bp].cpybftop
 		mov	[bp].cpybfend,ax
-flush9:		ret
+flush9:		VZ_RET
 do_flush	endp
 ;----- Open for write -----
@ -2226,7 +2226,7 @@ openw4:		inc	[bp].openwcnt
 openw5:
 		mov	[bp].cpybf_q,ax
 		clc
-openw9:		ret
+openw9:		VZ_RET
 open_write	endp
 open_w		proc
@ -2236,7 +2236,7 @@ open_w		proc
 		mov	al,O_UPDATE
 	    _endif
 		msdos	F_OPEN
-		ret
+		VZ_RET
 open_w		endp
 ;----- Open for /g -----
@ -2257,7 +2257,7 @@ open_gather	proc
 		pop	ax
 		pop	dx
 		clc
-		ret
+		VZ_RET
 	  _endif
 	_endif
 		pop	bx
@ -2267,7 +2267,7 @@ open_gather	proc
 		pop	dx
 		call	inc_ext
 		stc
-		ret
+		VZ_RET
 open_gather	endp
 inc_ext		proc
@ -2287,7 +2287,7 @@ _until z
 		inc	si
 		pop	[si]
 		mov	byte ptr [si+2],0
-		ret
+		VZ_RET
 inc_ext		endp
 ;----- Write file -----
@ -2348,7 +2348,7 @@ _until
 	_endif
 		mov	[bp].readmsgf,al
 write8:		clc
-write9:		ret
+write9:		VZ_RET
 do_write	endp
 ;----- Close files -----
@ -2400,7 +2400,7 @@ _until
 		mov	al,ER_DSKFULL
 		stc
 	_endif
-close9:		ret
+close9:		VZ_RET
 close_file	endp
 ;----- Close/Delete a file -----
@ -2456,7 +2456,7 @@ delete1:	msdos	F_CLOSE
 ;	    _endif
 	  _endif
 	_endif
-close19:	ret
+close19:	VZ_RET
 close1		endp
 ;----- Verify destination file -----
@ -2529,7 +2529,7 @@ verify3:	mov	ax,es:cb_next
 _until
 		clc
 		mov	[bp].fh_v,bx
-verify9:	ret
+verify9:	VZ_RET
 do_verify	endp
 ;----- Verify one block -----
@ -2579,11 +2579,11 @@ verb_x:
 		jc	verb9
 		clr	bx
 	      _endif
-		ret
+		VZ_RET
 	    _else
 		mov	al,ER_VERIFY
 		stc
-		ret
+		VZ_RET
 	    _endif
 	  _endif
 	_endif
@ -2599,7 +2599,7 @@ verb_x:
 	    _endif
 	  _endif
 		clc
-verb9:		ret
+verb9:		VZ_RET
 verify_block	endp
 ;----- Check for Incremental copy -----
@ -2660,7 +2660,7 @@ check_inc	proc
 chkinc8:
 		msdos	F_SEEK,1
 		stl	[di].cb_seek
-chkinc9:	ret
+chkinc9:	VZ_RET
 check_inc	endp
 ;---- Seek file -----
@ -2683,7 +2683,7 @@ _repeat
 _loop
 	  _endif
 	_endif
-		ret
+		VZ_RET
 do_seek		endp
 ;----- Make directory -----
@ -2747,7 +2747,7 @@ makedir		proc
 		msdos	F_ATTR,1
 	_endif
 		clc
-mkdir9:		ret
+mkdir9:		VZ_RET
 makedir		endp
 ;----- Display read message -----
@ -2766,7 +2766,7 @@ disp_readmsg	proc
 		call	putc
 	  _endif
 	_endif
-		ret
+		VZ_RET
 disp_readmsg	endp
 ;----- Display file name -----
@ -2825,7 +2825,7 @@ disp_fname	proc
 		call	putfname
 		popm	<es,ds>
 	_endif
-		ret
+		VZ_RET
 disp_fname	endp
 putfname	proc
@ -2861,7 +2861,7 @@ _repeat
 		call	putspc
 		inc	cx
 _until
-		ret
+		VZ_RET
 putfname	endp
 		assume	ds:cgroup
@ -2877,7 +2877,7 @@ echo_file	proc
 		inc	[bp].totalfiles
 	  _endif
 	_endif
-		ret
+		VZ_RET
 echo_file	endp
 ;------------------------------------------------
@ -2897,7 +2897,7 @@ init_move	proc
 	_if e
 		or	[bp].mode,MOV_SAMEDRV
 	_endif
-		ret
+		VZ_RET
 init_move	endp
 ;----- Move file -----
@ -2939,7 +2939,7 @@ move_file	proc
 	  _endif
 		inc	[bp].totalfiles
 	_endif
-move9:		ret
+move9:		VZ_RET
 move_file	endp
 ;----- Do delete -----
@ -2968,7 +2968,7 @@ do_delete	proc
 		call	delete_dirs
 dodel9:		mov	al,EL_OK
 		clc
-		ret
+		VZ_RET
 do_delete	endp
 ;----- Init delete -----
@ -2992,7 +2992,7 @@ init_del	proc
 	rep	stosb
 		call	getcurdir
 		call	cd_rootdir
-		ret
+		VZ_RET
 init_del	endp
 ;----- Delete directories -----
@ -3034,7 +3034,7 @@ _until z
 		call	setcurdir
 		pop	dx
 		msdos	F_CTRL_C,1
-		ret
+		VZ_RET
 delete_dirs	endp
 rmdir		proc
@ -3045,7 +3045,7 @@ rmdir		proc
 		msdos	F_RMDIR
 	  _endif
 	_endif
-		ret
+		VZ_RET
 rmdir		endp
 ;----- Delete by FCB -----
@ -3082,7 +3082,7 @@ _until
 	  _endif
 		pop	ds
 	_endif
-		ret
+		VZ_RET
 del_fcb		endp
 ;----- Delete by file handle -----
@ -3118,7 +3118,7 @@ _repeat
 	_endif
 		add	si,type Dirslot
 _until
-		ret
+		VZ_RET
 del_handle	endp
 ;----- Confirmation -----
@ -3152,7 +3152,7 @@ _ifn z
    _endif
  _endif
 _endif
-		ret
+		VZ_RET
 confirm		endp
 		assume	ds:cgroup
@ -3173,7 +3173,7 @@ skipspc1:
 		cmp	al,SPC
 		je	skipspc
 skpspc8:	dec	si
-		ret
+		VZ_RET
 skipspc		endp
 ;
 ;----- Skip string -----
@ -3186,7 +3186,7 @@ strskip		proc
 		call	skipstr
 		mov	si,di
 		popm	<es,di>
-		ret
+		VZ_RET
 strskip		endp
 skipstr		proc
@ -3196,7 +3196,7 @@ skipstr		proc
 	repnz	scasb
 		mov	ax,cx
 		pop	cx
-		ret
+		VZ_RET
 skipstr		endp
 ;
 ;----- Char to upper case -----
@ -3210,7 +3210,7 @@ toupper		proc
 		sub	al,'a'-'A'
 		stc
 	_endif
-		ret
+		VZ_RET
 toupper		endp
 ;
 ;----- Copy string -----
@ -3226,7 +3226,7 @@ _repeat
 		tst	al
 _until z
 		dec	di
-		ret
+		VZ_RET
 strcpy		endp
 ;
 ;----- Compare two strings -----
@ -3248,7 +3248,7 @@ strcmp		proc
 		pop	di
 	rep	cmpsb
 strcmp9:	popm	<di,si,cx>
-		ret
+		VZ_RET
 strcmp		endp
 ;
 ;----- Put char/string -----
@ -3260,7 +3260,7 @@ putc		proc
 		mov	dl,al
 		msdos	F_DSPCHR
 		pop	dx
-		ret
+		VZ_RET
 putc		endp
 putspc		endp
@ -3271,7 +3271,7 @@ putcrlf		proc
 		mov	al,LF
 		call	putc
 		pop	ax
-		ret
+		VZ_RET
 putcrlf		endp
 puts		proc
@ -3289,7 +3289,7 @@ puts		proc
 		mov	bx,1
 		msdos	F_WRITE
 puts9:		popm	<es,di,dx,cx,bx,ax>
-		ret
+		VZ_RET
 puts		endp
 putmsg		proc
@ -3297,7 +3297,7 @@ putmsg		proc
 		movseg	ds,cs
 		call	puts
 		pop	ds
-		ret
+		VZ_RET
 putmsg		endp
 ;
 ;----- Put number -----
@ -3344,7 +3344,7 @@ putnm6:		push	dx
 		tst	bx
 		jnz	putnm3
 		popm	<dx,bx>
-		ret
+		VZ_RET
 putnumber	endp