From 5481e87aa18f270765e998b9d13f1058db7a6169b4f84a7134cf034087c4653c Mon Sep 17 00:00:00 2001
From: Gabriel Lorenzo <ermakina@gmail.com>
Date: Sat, 5 Apr 2003 17:45:49 +0000
Subject: [PATCH] =?UTF-8?q?a=C3=B1adido=20soporte=20de=20word=20release=20?=
 =?UTF-8?q?0.1.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dlls/src/dinmem/win32/dinmem.vcproj           |   2 +-
 dlls/src/edivstd/win32/edivstd.vcproj         |   2 +-
 dlls/src/file/file.c                          |   4 +
 dlls/src/file/win32/file.vcproj               |   2 +-
 dlls/src/graphics/win32/graphics.vcproj       |   2 +-
 dlls/src/input/win32/input.vcproj             |   2 +-
 dlls/src/math/win32/math.vcproj               |   2 +-
 dlls/src/text/win32/text.vcproj               |   2 +-
 ediv/CHANGE_LOG.txt                           |   4 +
 ediv/src/ediv/language.c                      |  14 +-
 ediv/src/shared/shared.h                      |   6 +-
 ediv/src/stub/inte.c                          | 349 ++++++++++++++++++
 ediv/src/stub/language.c                      |   2 +-
 ediv/src/visual c/ediv/ediv.vcproj            |   2 +-
 ediv/src/visual c/ediv_ws.suo                 | Bin 17408 -> 17408 bytes
 ediv/src/visual c/encrypt/encrypt.vcproj      |   7 +-
 ediv/src/visual c/stub/stub.vcproj            |   4 +-
 util/src/bmp2fnt/win32/bmp2fnt.vcproj         |   4 +-
 util/src/doku/win32/doku.vcproj               |   2 +-
 util/src/iconchanger/iconchanger.c            |   2 +-
 util/src/iconchanger/win32/iconchanger.vcproj |   2 +-
 21 files changed, 388 insertions(+), 28 deletions(-)

diff --git a/dlls/src/dinmem/win32/dinmem.vcproj b/dlls/src/dinmem/win32/dinmem.vcproj
index 3c688d8..e60b04c 100644
--- a/dlls/src/dinmem/win32/dinmem.vcproj
+++ b/dlls/src/dinmem/win32/dinmem.vcproj
@@ -60,7 +60,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../bin"
+			OutputDirectory="r:\dll\dinmem"
 			IntermediateDirectory="Release"
 			ConfigurationType="2"
 			CharacterSet="2">
diff --git a/dlls/src/edivstd/win32/edivstd.vcproj b/dlls/src/edivstd/win32/edivstd.vcproj
index 0c5a15e..5ab827a 100644
--- a/dlls/src/edivstd/win32/edivstd.vcproj
+++ b/dlls/src/edivstd/win32/edivstd.vcproj
@@ -60,7 +60,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../bin"
+			OutputDirectory="r:\dll\edivstd"
 			IntermediateDirectory="Release"
 			ConfigurationType="2"
 			CharacterSet="2">
diff --git a/dlls/src/file/file.c b/dlls/src/file/file.c
index 5e9c142..c50f073 100644
--- a/dlls/src/file/file.c
+++ b/dlls/src/file/file.c
@@ -22,6 +22,10 @@ int ExportaFuncs(EXPORTAFUNCS_PARAMS)
 	FUNCTION("fseek",3,eDiv_Fseek) ;
 	FUNCTION("flush",0,eDiv_Flush) ;
 	FUNCTION("fclose",1,eDiv_Fclose) ;
+
+//	FUNCTION("load",2,eDIV_Load);
+//	FUNCTION("save",3,eDIV_Save);
+
 	return TRUE ;
 
 }
diff --git a/dlls/src/file/win32/file.vcproj b/dlls/src/file/win32/file.vcproj
index ad9fa86..0622ed6 100644
--- a/dlls/src/file/win32/file.vcproj
+++ b/dlls/src/file/win32/file.vcproj
@@ -59,7 +59,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../bin"
+			OutputDirectory="r:\dll\file"
 			IntermediateDirectory="Release"
 			ConfigurationType="2"
 			CharacterSet="2">
diff --git a/dlls/src/graphics/win32/graphics.vcproj b/dlls/src/graphics/win32/graphics.vcproj
index 9f9d2d6..7b52c6a 100644
--- a/dlls/src/graphics/win32/graphics.vcproj
+++ b/dlls/src/graphics/win32/graphics.vcproj
@@ -60,7 +60,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../bin"
+			OutputDirectory="r:\dll\graphics"
 			IntermediateDirectory="Release"
 			ConfigurationType="2"
 			CharacterSet="2">
diff --git a/dlls/src/input/win32/input.vcproj b/dlls/src/input/win32/input.vcproj
index 9664d64..c0a33fc 100644
--- a/dlls/src/input/win32/input.vcproj
+++ b/dlls/src/input/win32/input.vcproj
@@ -60,7 +60,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../bin"
+			OutputDirectory="r:\dll\input"
 			IntermediateDirectory="Release"
 			ConfigurationType="2"
 			CharacterSet="2">
diff --git a/dlls/src/math/win32/math.vcproj b/dlls/src/math/win32/math.vcproj
index f5b18a5..0c6067e 100644
--- a/dlls/src/math/win32/math.vcproj
+++ b/dlls/src/math/win32/math.vcproj
@@ -59,7 +59,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../bin"
+			OutputDirectory="r:\dll\math"
 			IntermediateDirectory="Release"
 			ConfigurationType="2"
 			CharacterSet="2">
diff --git a/dlls/src/text/win32/text.vcproj b/dlls/src/text/win32/text.vcproj
index c51408c..fbdf673 100644
--- a/dlls/src/text/win32/text.vcproj
+++ b/dlls/src/text/win32/text.vcproj
@@ -59,7 +59,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../bin"
+			OutputDirectory="r:\dll\text"
 			IntermediateDirectory="Release"
 			ConfigurationType="2"
 			CharacterSet="2"
diff --git a/ediv/CHANGE_LOG.txt b/ediv/CHANGE_LOG.txt
index bf87932..b933ccb 100644
--- a/ediv/CHANGE_LOG.txt
+++ b/ediv/CHANGE_LOG.txt
@@ -1,3 +1,7 @@
+4/4/2003
+--------
+ * Añadido soporte para datos WORD. (Er_Makina)
+
 3/4/2003
 --------
  * ARREGLADO EL BUG DEL KILL!!! :PPP por fin!!! por supuesto, como todo
diff --git a/ediv/src/ediv/language.c b/ediv/src/ediv/language.c
index e80f080..e6b591d 100644
--- a/ediv/src/ediv/language.c
+++ b/ediv/src/ediv/language.c
@@ -1,6 +1,6 @@
 /*
  * eDiv Compiler
- * Copyright (C) 2000-2002 Sion, Ltd.
+ * Copyright (C) 2000-2003 Sion, Ltd.
  * http://www.sionhq.com
  *
  * This program is free software; you can redistribute it and/or modify
@@ -757,7 +757,7 @@ char* translate(int id_cadena)
 	case 0:	/* español */
 		{
 			static char* msg[] = {
-				/* 0	*/ " **** Compilador eDIV " VERSION " ****\nCopyleft (c) 2000-2002 Sion, Ltd.\nhttp://ediv.divsite.net\n",
+				/* 0	*/ " **** Compilador eDIV " VERSION " ****\nCopyleft (c) 2000-2003 Sion, Ltd.\nhttp://ediv.divsite.net\n",
 				/* 1	*/ "ATENCION: Esta version de eDIV esta inacabada.\nPor favor informe de cualquier bug a: ediv@divsite.net\n",
 				/* 2	*/ "Ayuda de opciones de comando:\n\n",
 				/* 3	*/ "%s [opciones] archivo.prg [ejecutable]\n\n",
@@ -825,7 +825,7 @@ char* translate(int id_cadena)
 	case 1:	/* italiano */
 		{
 			static char* msg[] = {
-				/* 0	*/ " **** Compilatore eDIV " VERSION " ****\nCopyleft (c) 2000-2002 Sion, Ltd.\nhttp://ediv.divsite.net\n",
+				/* 0	*/ " **** Compilatore eDIV " VERSION " ****\nCopyleft (c) 2000-2003 Sion, Ltd.\nhttp://ediv.divsite.net\n",
 				/* 1	*/ "ATTENZIONE: Questa versione di eDIV è incompleta.\nPer favore informa su qualunque bug a: ediv@divsite.net\n",
 				/* 2	*/ "Guida opzioni di comando:\n\n",
 				/* 3	*/ "%s [opzioni] archivio.prg [eseguibile]\n\n",
@@ -893,7 +893,7 @@ char* translate(int id_cadena)
 	case 2:	/* portugués */
 		{
 			static char* msg[] = {
-				/* 0	*/ " **** Compilador eDIV " VERSION " ****\nCopyleft (c) 2000-2002 Sion, Ltd.\nhttp://ediv.divsite.net\n",
+				/* 0	*/ " **** Compilador eDIV " VERSION " ****\nCopyleft (c) 2000-2003 Sion, Ltd.\nhttp://ediv.divsite.net\n",
 				/* 1    */ "ATENÇÃO: Esta versão de eDIV está inacabada.\nPor favor informe-nos de qualquer bug a: ediv@divsite.net\n",
 				/* 2    */ "Ajuda de opções de comando:\n\n",
 				/* 3    */ "%s [opções] arquivo.prg [executavel]\n\n",
@@ -963,7 +963,7 @@ char* translate(int id_cadena)
 	case 3:	/* inglés */
 		{
 			static char* msg[] = {
-				/* 0	*/ " **** eDIV Compiler " VERSION " ****\nCopyleft (c) 2000-2002Sion, Ltd.\nhttp://ediv.divsite.net\n",
+				/* 0	*/ " **** eDIV Compiler " VERSION " ****\nCopyleft (c) 2000-2003Sion, Ltd.\nhttp://ediv.divsite.net\n",
 				/* 1	*/ "WARNING: This version of eDIV is unfinished.\nPlease report any bug to: ediv@divsite.net\n",
 				/* 2	*/ "Command line help:\n\n",
 				/* 3	*/ "%s [options] file.prg [executable]\n\n",
@@ -1031,7 +1031,7 @@ char* translate(int id_cadena)
 	case 4: /* catalán */
 		{
 			static char* msg[] = {
-				/* 0	*/ " **** Compilador eDIV " VERSION " ****\nCopyleft (c) 2000-2002 Sion, Ltd.\nhttp://ediv.divsite.net\n",
+				/* 0	*/ " **** Compilador eDIV " VERSION " ****\nCopyleft (c) 2000-2003 Sion, Ltd.\nhttp://ediv.divsite.net\n",
 				/* 1	*/ "ATENCIÓ: Aquesta versió d' eDIV està sense acabar.\nSi us plau, informi de qualsevol bug a: ediv@divsite.net\n",
 				/* 2	*/ "Ajuda d' opcions de comand:\n\n",
 				/* 3	*/ "%s [opcions] arxiu.prg [executable]\n\n",
@@ -1098,7 +1098,7 @@ char* translate(int id_cadena)
 	case 5: /* euskera */
 		{
 			static char* msg[] = {
-				/* 0	*/ " **** eDIV konpiladorea " VERSION " ****\nCopyleft (c) 2000-2002 Sion, Ltd.\nhttp://ediv.divsite.net\n",
+				/* 0	*/ " **** eDIV konpiladorea " VERSION " ****\nCopyleft (c) 2000-2003 Sion, Ltd.\nhttp://ediv.divsite.net\n",
 				/* 1	*/ "KONTUZ: eDIV bertsio hau ez dago bukaturik.\nMesedez eman berri edozein akatzi buruz helbide honetan: ediv@divsite.net\n",
 				/* 2	*/ "Komandoei buruzko laguntza:\n\n",
 				/* 3	*/ "%s [aukerak] archivo.prg [exekutagarria]\n\n",
diff --git a/ediv/src/shared/shared.h b/ediv/src/shared/shared.h
index c61fb58..e3969ea 100644
--- a/ediv/src/shared/shared.h
+++ b/ediv/src/shared/shared.h
@@ -25,8 +25,8 @@
 #ifndef __EDIV_SHARED_H_
 #define __EDIV_SHARED_H_
 
-#define VERSION "0.1.1 (Orion)" /* Version y codename */
-#define la_clave "Open_eDiv"    /* Clave de cifrado   */
+#define VERSION "0.1.3 (Betelgeuse)" /* Version y codename */
+#define la_clave "81ab50e9c20d"    /* Clave de cifrado   */
 
 #define uchar char
 #define byte unsigned char
@@ -35,7 +35,7 @@
 #define ulong unsigned int
 #define dword unsigned int
 
-#define magic "eDIV Stub\x1a\x0d\x0a\xff"
+#define magic "eDIVstub0\x1a\x0d\x0a\xff"
 
 #define long_header 9 /* Longitud de la cabecera al inicio de los programas */
 
diff --git a/ediv/src/stub/inte.c b/ediv/src/stub/inte.c
index fd2373d..665b116 100644
--- a/ediv/src/stub/inte.c
+++ b/ediv/src/stub/inte.c
@@ -652,6 +652,355 @@ int proceso( int num, int padre )
 			sp-=2;
 			mem[procs_s[num_proc].id+_param_offset]++;
 			break;
+
+		/* OPERACIONES CON DATOS DE TIPO WORD */
+
+		case lptrwor:
+			pila[sp-1]=(unsigned int)memw[pila[sp-1]*2+pila[sp]];
+			sp--;
+			break;
+		case lasiwor:
+			pila[sp-2]=(unsigned int)(memw[pila[sp-2]*2+pila[sp-1]]=(word)pila[sp]);
+			sp-=2;
+			break;
+		case liptwor:
+			pila[sp-1]=(unsigned int)++memw[pila[sp-1]*2+pila[sp]];
+			sp--;
+			break;
+		case lptiwor:
+			utemp=pila[sp-1];
+			pila[sp-1]=(unsigned int)memw[utemp*2+pila[sp]]++;
+			sp--;
+			break;
+		case ldptwor:
+			pila[sp-1]=(unsigned int)--memw[pila[sp-1]*2+pila[sp]];
+			sp--;
+			break;
+		case lptdwor:
+			utemp=pila[sp-1];
+			pila[sp-1]=(unsigned int)memw[utemp*2+pila[sp]]--;
+			sp--;
+			break;
+		case ladawor:
+			pila[sp-2]=(unsigned int)(memw[pila[sp-2]*2+pila[sp-1]]+=(word)pila[sp]);
+			sp-=2;
+			break;
+		case lsuawor:
+			pila[sp-2]=(unsigned int)(memw[pila[sp-2]*2+pila[sp-1]]-=(word)pila[sp]);
+			sp-=2;
+			break;
+		case lmuawor:
+			pila[sp-2]=(unsigned int)(memw[pila[sp-2]*2+pila[sp-1]]*=(word)pila[sp]);
+			sp-=2;
+			break;
+		case ldiawor:
+/*			#ifdef DEBUG
+				if (pila[sp]==0) {
+					memw[pila[sp-2]*2+pila[sp-1]]=0;
+					sp-=2; pila[sp]=0;
+					v_function=-2; e(145);
+					if (call_to_debug) { process_stoped=id; return; }
+					break;
+				}
+			#endif*/
+			pila[sp-2]=(unsigned int)(memw[pila[sp-2]*2+pila[sp-1]]/=(word)pila[sp]);
+			sp-=2;
+			break;
+		case lmoawor:
+/*			#ifdef DEBUG
+				if (pila[sp]==0) {
+					memw[pila[sp-2]*2+pila[sp-1]]=0;
+					sp-=2; pila[sp]=0;
+					v_function=-2; e(145);
+					if (call_to_debug) { process_stoped=id; return; }
+					break;
+				}
+			#endif*/
+			pila[sp-2]=(unsigned int)(memw[pila[sp-2]*2+pila[sp-1]]%=(word)pila[sp]);
+			sp-=2;
+			break;
+		case lanawor:
+			pila[sp-2]=(unsigned int)(memw[pila[sp-2]*2+pila[sp-1]]&=(word)pila[sp]);
+			sp-=2;
+			break;
+		case lorawor:
+			pila[sp-2]=(unsigned int)(memw[pila[sp-2]*2+pila[sp-1]]|=(word)pila[sp]);
+			sp-=2;
+			break;
+		case lxoawor:
+			pila[sp-2]=(unsigned int)(memw[pila[sp-2]*2+pila[sp-1]]^=(word)pila[sp]);
+			sp-=2;
+			break;
+		case lsrawor:
+			pila[sp-2]=(unsigned int)(memw[pila[sp-2]*2+pila[sp-1]]>>=(word)pila[sp]);
+			sp-=2;
+			break;
+		case lslawor:
+			pila[sp-2]=(unsigned int)(memw[pila[sp-2]*2+pila[sp-1]]<<=(word)pila[sp]);
+			sp-=2;
+			break;
+		case lcpawor:
+			_param_offset=reservedptr("param_offset");
+			if ((unsigned)pila[mem[procs_s[num_proc].id+_param_offset]]<256) {
+				memw[pila[sp-1]*2+pila[sp]]=(word)pila[mem[procs_s[num_proc].id+_param_offset]];
+			} else {
+				if (pila[mem[procs_s[num_proc].id+_param_offset]]<imem_max+258*4)
+					memw[pila[sp-1]*2+pila[sp]]=memw[pila[mem[procs_s[num_proc].id+_param_offset]]*2];
+				else
+					memw[pila[sp-1]*2+pila[sp]]=(word)pila[mem[procs_s[num_proc].id+_param_offset]];
+			} sp-=2; mem[procs_s[num_proc].id+_param_offset]++; break;
+
+
+		/* OPERACIONES CON DATOS DE TIPO STRING */
+		/* Nota: un puntero a cadena menor a 256 se trata siempre como "%c" */
+
+#ifdef esto_pa_la_0_1_4
+
+		case lstrcpy:
+/*			#ifdef DEBUG
+				if ((mem[pila[sp-1]-1]&0xFFF00000)!=0xDAD00000) {
+					sp--; v_function=-2; e(164);
+					if (call_to_debug) { process_stoped=id; return; }
+					break;
+				}
+				if ((unsigned)pila[sp]>255) if ((mem[pila[sp-1]-1]&0xFFFFF)+1<strlen((char*)&mem[pila[sp]])) {
+					sp--; v_function=-2; e(140);
+					if (call_to_debug) { process_stoped=id; return; }
+					break;
+				}
+			#endif*/
+			if ((unsigned)pila[sp]>255) strcpy((char*)&mem[pila[sp-1]],(char*)&mem[pila[sp]]);
+			else sprintf((char*)&mem[pila[sp-1]],"%c\0",pila[sp]);
+			sp--;
+			break;
+
+		case lstrfix:
+			if (pila[sp-1]>=(oo=strlen(&memb[pila[sp-2]*4]))) {
+				for (;oo<pila[sp-1];oo++) {
+					memb[pila[sp-2]*4+oo]=' ';
+				} memb[pila[sp-2]*4+oo+1]=0;
+			} break;
+
+		case lstrcat:
+/*			#ifdef DEBUG
+				if ((mem[pila[sp-1]-1]&0xFFF00000)!=0xDAD00000) {
+					sp--; v_function=-2; e(164);
+					if (call_to_debug) { process_stoped=id; return; }
+					break;
+				}
+				if ((unsigned)pila[sp]>255) oo=strlen((char*)&mem[pila[sp]]); else oo=1;
+				if ((mem[pila[sp-1]-1]&0xFFFFF)+1<strlen((char*)&mem[pila[sp-1]])+oo) {
+					sp--; v_function=-2; e(140);
+					if (call_to_debug) { process_stoped=id; return; }
+					break;
+				}
+			#endif*/
+			if ((unsigned)pila[sp]>255) strcat((char*)&mem[pila[sp-1]],(char*)&mem[pila[sp]]);
+			else sprintf((char*)&mem[pila[sp-1]],"%s%c\0",(char*)&mem[pila[sp-1]],pila[sp]);
+			sp--;
+			break;
+
+		case lstradd: /* Strcat "en el aire" (ojo, el aire tiene tambien 0xDAD00402) */
+/*			#ifdef DEBUG
+				if ((unsigned)pila[sp-1]>255) oo=strlen((char*)&mem[pila[sp-1]]); else oo=1;
+				if ((unsigned)pila[sp]>255) oo+=strlen((char*)&mem[pila[sp]]); else oo+=1;
+				if (oo>=1028) {
+					sp--; v_function=-2; e(140);
+					if (call_to_debug) { process_stoped=id; return; }
+					break;
+				}
+			#endif*/
+			if ((unsigned)pila[sp-1]>255) {
+				if ((unsigned)pila[sp]>255) {
+					sprintf((char*)&mem[nullstring[nstring]],"%s%s\0",(char*)&mem[pila[sp-1]],(char*)&mem[pila[sp]]);
+				} else {
+					sprintf((char*)&mem[nullstring[nstring]],"%s%c\0",(char*)&mem[pila[sp-1]],pila[sp]);
+				}
+			} else {
+				if ((unsigned)pila[sp]>255) {
+					sprintf((char*)&mem[nullstring[nstring]],"%c%s\0",pila[sp-1],(char*)&mem[pila[sp]]);
+				} else {
+					sprintf((char*)&mem[nullstring[nstring]],"%c%c\0",pila[sp-1],pila[sp]);
+				}
+			}
+			pila[--sp]=nullstring[nstring];
+			nstring=((nstring+1)&3);
+			break;
+
+		case lstrdec: /* cambio de tamaño "en el aire" (no da error, hace lo que puede) */
+			oo=strlen((char*)&mem[pila[sp-1]]);
+			if (oo<1028) {
+				strcpy((char*)&mem[nullstring[nstring]],(char*)&mem[pila[sp-1]]);
+				if (pila[sp]>0) { // Quitar caracteres
+					if (pila[sp]>=oo) memb[nullstring[nstring]*4]=0;
+					else memb[nullstring[nstring]*4+oo-pila[sp]]=0;
+				} else if (pila[sp]<0) { // A¤adir (?) caracteres (por homogeneidad)
+					pila[sp]=oo-pila[sp]; // Nueva longitud
+					if (pila[sp]>1025) pila[sp]=1025;
+					for (;oo<pila[sp];oo++) {
+						memb[nullstring[nstring]*4+oo]=' ';
+					} memb[nullstring[nstring]*4+oo]=0;
+				}
+			} else mem[nullstring[nstring]]=0;
+			pila[--sp]=nullstring[nstring];
+			nstring=((nstring+1)&3);
+			break;
+
+		case lstrsub: /* cambio de tamaño a un string */
+			oo=strlen((char*)&mem[pila[sp-1]]);
+/*			#ifdef DEBUG
+				if ((mem[pila[sp-1]-1]&0xFFF00000)!=0xDAD00000) {
+					sp--; v_function=-2; e(164);
+					if (call_to_debug) { process_stoped=id; return; }
+					break;
+				}
+				if ((mem[pila[sp-1]-1]&0xFFFFF)+1<oo-pila[sp]) {
+					sp--; v_function=-2; e(140);
+					if (call_to_debug) { process_stoped=id; return; }
+					break;
+				}
+			#endif*/
+			if (pila[sp]>0) { // Quitar caracteres
+				if (pila[sp]>=oo) memb[pila[sp-1]*4]=0;
+				else memb[pila[sp-1]*4+oo-pila[sp]]=0;
+			} else if (pila[sp]<0) { // A¤adir (?) caracteres (por homogeneidad)
+				pila[sp]=oo-pila[sp]; // Nueva longitud
+				for (;oo<pila[sp];oo++) {
+					memb[pila[sp-1]*4+oo]=' ';
+				} memb[pila[sp-1]*4+oo]=0;
+			} sp--;
+			break;
+
+		case lstrlen:
+			if ((unsigned)pila[sp]>255) pila[sp]=strlen((char*)&mem[pila[sp]]); else pila[sp]=1;
+			break;
+
+		case lstrigu:
+			if ((unsigned)pila[sp-1]>255) {
+				if ((unsigned)pila[sp]>255) {
+					if (strcmp((char*)&mem[pila[sp-1]],(char*)&mem[pila[sp]])) pila[sp-1]=0; else pila[sp-1]=1;
+				} else {
+					if (strcmp((char*)&mem[pila[sp-1]],(char*)&pila[sp])) pila[sp-1]=0; else pila[sp-1]=1;
+				}
+			} else {
+				if ((unsigned)pila[sp]>255) {
+					if (strcmp((char*)&pila[sp-1],(char*)&mem[pila[sp]])) pila[sp-1]=0; else pila[sp-1]=1;
+				} else {
+					pila[sp-1]=(pila[sp-1]==pila[sp]);
+				}
+			} sp--; break;
+
+		case lstrdis:
+			if ((unsigned)pila[sp-1]>255) {
+				if ((unsigned)pila[sp]>255) {
+					if (strcmp((char*)&mem[pila[sp-1]],(char*)&mem[pila[sp]])) pila[sp-1]=1; else pila[sp-1]=0;
+				} else {
+					if (strcmp((char*)&mem[pila[sp-1]],(char*)&pila[sp])) pila[sp-1]=1; else pila[sp-1]=0;
+				}
+			} else {
+				if ((unsigned)pila[sp]>255) {
+					if (strcmp((char*)&pila[sp-1],(char*)&mem[pila[sp]])) pila[sp-1]=1; else pila[sp-1]=0;
+				} else {
+					pila[sp-1]=(pila[sp-1]!=pila[sp]);
+				}
+			} sp--; break;
+			break;
+
+		case lstrmay:
+			if ((unsigned)pila[sp-1]>255) {
+				if ((unsigned)pila[sp]>255) {
+					if (strcmp((char*)&mem[pila[sp-1]],(char*)&mem[pila[sp]])>0) pila[sp-1]=1; else pila[sp-1]=0;
+				} else {
+					if (strcmp((char*)&mem[pila[sp-1]],(char*)&pila[sp])>0) pila[sp-1]=1; else pila[sp-1]=0;
+				}
+			} else {
+				if ((unsigned)pila[sp]>255) {
+					if (strcmp((char*)&pila[sp-1],(char*)&mem[pila[sp]])>0) pila[sp-1]=1; else pila[sp-1]=0;
+				} else {
+					pila[sp-1]=(pila[sp-1]>pila[sp]);
+				}
+			} sp--; break;
+			break;
+
+		case lstrmen:
+			if ((unsigned)pila[sp-1]>255) {
+				if ((unsigned)pila[sp]>255) {
+					if (strcmp((char*)&mem[pila[sp-1]],(char*)&mem[pila[sp]])<0) pila[sp-1]=1; else pila[sp-1]=0;
+				} else {
+					if (strcmp((char*)&mem[pila[sp-1]],(char*)&pila[sp])<0) pila[sp-1]=1; else pila[sp-1]=0;
+				}
+			} else {
+				if ((unsigned)pila[sp]>255) {
+					if (strcmp((char*)&pila[sp-1],(char*)&mem[pila[sp]])<0) pila[sp-1]=1; else pila[sp-1]=0;
+				} else {
+					pila[sp-1]=(pila[sp-1]<pila[sp]);
+				}
+			} sp--; break;
+			break;
+
+		case lstrmei:
+			if ((unsigned)pila[sp-1]>255) {
+				if ((unsigned)pila[sp]>255) {
+					if (strcmp((char*)&mem[pila[sp-1]],(char*)&mem[pila[sp]])<=0) pila[sp-1]=1; else pila[sp-1]=0;
+				} else {
+					if (strcmp((char*)&mem[pila[sp-1]],(char*)&pila[sp])<=0) pila[sp-1]=1; else pila[sp-1]=0;
+				}
+			} else {
+				if ((unsigned)pila[sp]>255) {
+					if (strcmp((char*)&pila[sp-1],(char*)&mem[pila[sp]])<=0) pila[sp-1]=1; else pila[sp-1]=0;
+				} else {
+					pila[sp-1]=(pila[sp-1]<=pila[sp]);
+				}
+			} sp--; break;
+			break;
+
+		case lstrmai:
+			if ((unsigned)pila[sp-1]>255) {
+				if ((unsigned)pila[sp]>255) {
+					if (strcmp((char*)&mem[pila[sp-1]],(char*)&mem[pila[sp]])>=0) pila[sp-1]=1; else pila[sp-1]=0;
+				} else {
+					if (strcmp((char*)&mem[pila[sp-1]],(char*)&pila[sp])>=0) pila[sp-1]=1; else pila[sp-1]=0;
+				}
+			} else {
+				if ((unsigned)pila[sp]>255) {
+					if (strcmp((char*)&pila[sp-1],(char*)&mem[pila[sp]])>=0) pila[sp-1]=1; else pila[sp-1]=0;
+				} else {
+					pila[sp-1]=(pila[sp-1]>=pila[sp]);
+				}
+			} sp--; break;
+			break;
+
+		case lcpastr:
+/*			#ifdef DEBUG
+				if ((mem[pila[sp]-1]&0xFFF00000)!=0xDAD00000) {
+					sp--; mem[id+_Param]++; v_function=-2; e(164);
+					if (call_to_debug) { process_stoped=id; return; }
+					break;
+				}
+				if ((unsigned)pila[mem[id+_Param]]>255) {
+					if ((mem[pila[sp]-1]&0xFFFFF)+1<strlen((char*)&mem[pila[mem[id+_Param]]])) {
+						sp--; mem[id+_Param]++; v_function=-2; e(140);
+						if (call_to_debug) { process_stoped=id; return; }
+						break;
+					}
+				}
+			#endif*/
+			if ((unsigned)pila[mem[id+_Param]]>255)
+				strcpy((char*)&mem[pila[sp]],(char*)&mem[pila[mem[id+_Param]]]);
+			else sprintf((char*)&mem[pila[sp]],"%c\0",pila[mem[id+_Param]]);
+			sp--; mem[id+_Param]++;
+			break;
+#endif
+
+		/* Comprobación de punteros nulos */
+		case lnul:
+/*			#ifdef DEBUG
+				if (!pila[sp]) {
+					v_function=-2; e(165);
+					if (call_to_debug) { process_stoped=id; return; }
+				}
+			#endif*/
+			break;
 		}
 
 		#ifdef DBG
diff --git a/ediv/src/stub/language.c b/ediv/src/stub/language.c
index ee234fd..c617188 100644
--- a/ediv/src/stub/language.c
+++ b/ediv/src/stub/language.c
@@ -1,6 +1,6 @@
 /*
  * eDiv Compiler
- * Copyleft (C) 2000-2002 Sion Entertainment
+ * Copyleft (C) 2000-2003 Sion Entertainment
  * http://www.sion-e.com
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/ediv/src/visual c/ediv/ediv.vcproj b/ediv/src/visual c/ediv/ediv.vcproj
index 25c65ca..2ca813f 100644
--- a/ediv/src/visual c/ediv/ediv.vcproj	
+++ b/ediv/src/visual c/ediv/ediv.vcproj	
@@ -58,7 +58,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
+			OutputDirectory="r:\ediv"
 			IntermediateDirectory="Release"
 			ConfigurationType="1"
 			CharacterSet="2">
diff --git a/ediv/src/visual c/ediv_ws.suo b/ediv/src/visual c/ediv_ws.suo
index 375ab06967a193d8d2a5552751887b8238eaf6b93f4a3f5f3aa820d7f316a2c0..2d5685f6d2a70d0fdcaa27c409ca1ec2b170f1c6236960468e7be6399c55314c 100644
GIT binary patch
delta 695
zcmZqZU~K4M+>pb<cfmyR&aB^u7?~M>KyPyu%Rde#J;upZymd_F9Gidf&SSEaXJTNs
z(G>?N0D)x^3^faYd`1YD;TJ<Sg8_pvgCQ#eI|Cz7bSF^aAP~z;z9=Bf$q!^H05LC!
zw@I*qk@3XjN}+m2lg&Sc<k%URCre0a>zw2Qsz_x>VaQ}C1F|-A0Er|9BZf2}Jrg8X
z%uvEm3KU{s5Z;_G6)GyOfZb7>Z|l!xV%Y>#H@U`0#bP^<u?mPc0Pz|iUJJzQfOtI+
zZwBIj|NsAo;VnS^Rv_L6k~?6e!MMpJlX3E1eRg(5h+Uh@O??<yKwjT`-0Uf<s1g<@
zh)zCeGhdh;XhaauKRH002y}ZYgZ1QMTYW7T1}labs4tCx;zbO}Kz=ZTKSL-`JyMvy
zm^@KZfAW7bi^;}zQ^l3BSOjv#eLGP`b`^-^<lpv&lOG7Mu=z1DFeEZfHglK=aq4LY
zE=Fx}hSyAI8G!-$|Gz2|10zr~(1l=t8k<ZEA0|09NIEmP0^Q{eB!d|IfTRzD9)mMO
z07Jm!iMAS(CrRpooMw*SH@MA6&<~%y(~ev8>}nIC_xsk~1Em=@pkpL}7@SHZ_<$@`
MAQk~)5P+!!0D!Wb3jhEB

delta 488
zcmZqZU~K4M+>pb<x4~C_6YsA>jLZxS3=KM)t62VVFg;_KT*X_*6wJQ)7w<eKOJybo
z=9~j8Km}m1OoE~21dz`N<}oq+VyI>?U@&GdWMyDuU<8Wt0wtt?SYYx+0b$N4phz4@
zEr_>Cu!50s&E!g<dPalIKZWGj8I>nXNNMW?asd^jGNdqMGL!*X${au<iNS~=4M-<~
z<cb+e7)pUc3=FF`=Szi(imPCE)aKjzbD3EF{r~@ea*dISDu}TPsA&TbuL0t<K)eo!
z*8?#~4vaSjS~G4k$z<d^&H%LP|9@48(VNRneHd9lKHYrW>?y0L8WtNBCm*z#&(8`p
z%?0TEB%l-18LTI7uoRu#Vk<X!m6P~n0~U53cwjLwyqG*uQh)M$C%eg(cKzb&Sd0YO
wci&EwkzE5KIr+D};bcV?k;x7Y?GV?TcHm;1e2i0jl2gOv3Dzb!@dFkS0Hq9u?*IS*

diff --git a/ediv/src/visual c/encrypt/encrypt.vcproj b/ediv/src/visual c/encrypt/encrypt.vcproj
index 66ff6b8..33c9df2 100644
--- a/ediv/src/visual c/encrypt/encrypt.vcproj	
+++ b/ediv/src/visual c/encrypt/encrypt.vcproj	
@@ -60,7 +60,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
+			OutputDirectory="r:\encrypt"
 			IntermediateDirectory="Release"
 			ConfigurationType="1"
 			CharacterSet="2">
@@ -72,7 +72,10 @@
 				AdditionalIncludeDirectories="../../shared"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="TRUE"
-				RuntimeLibrary="4"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="TRUE"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/ediv/src/visual c/stub/stub.vcproj b/ediv/src/visual c/stub/stub.vcproj
index 1380dee..e8f306b 100644
--- a/ediv/src/visual c/stub/stub.vcproj	
+++ b/ediv/src/visual c/stub/stub.vcproj	
@@ -67,7 +67,7 @@ makelib.bat win32.rel
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
+			OutputDirectory="r:\stub"
 			IntermediateDirectory="Release"
 			ConfigurationType="1"
 			CharacterSet="2">
@@ -161,7 +161,7 @@ makelib.bat win32.dbg
 		</Configuration>
 		<Configuration
 			Name="Release con trazador|Win32"
-			OutputDirectory="Release con trazador"
+			OutputDirectory="r:\stub.rel"
 			IntermediateDirectory="Release con trazador"
 			ConfigurationType="1"
 			CharacterSet="2">
diff --git a/util/src/bmp2fnt/win32/bmp2fnt.vcproj b/util/src/bmp2fnt/win32/bmp2fnt.vcproj
index 33768d8..f343d73 100644
--- a/util/src/bmp2fnt/win32/bmp2fnt.vcproj
+++ b/util/src/bmp2fnt/win32/bmp2fnt.vcproj
@@ -56,7 +56,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../bin"
+			OutputDirectory="r:\b2f"
 			IntermediateDirectory="Release"
 			ConfigurationType="1"
 			CharacterSet="2">
@@ -67,7 +67,7 @@
 				OmitFramePointers="TRUE"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="TRUE"
-				RuntimeLibrary="4"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/util/src/doku/win32/doku.vcproj b/util/src/doku/win32/doku.vcproj
index af768f0..c9f7dcd 100644
--- a/util/src/doku/win32/doku.vcproj
+++ b/util/src/doku/win32/doku.vcproj
@@ -54,7 +54,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../bin"
+			OutputDirectory="r:\doku"
 			IntermediateDirectory="Release"
 			ConfigurationType="1"
 			CharacterSet="2">
diff --git a/util/src/iconchanger/iconchanger.c b/util/src/iconchanger/iconchanger.c
index bd36c9b..c92f01f 100644
--- a/util/src/iconchanger/iconchanger.c
+++ b/util/src/iconchanger/iconchanger.c
@@ -56,7 +56,7 @@ int main(int argc, char* argv[])
 	int i,j;
 	int ok=0;
 
-	printf("eDIV IconChanger - Copyright (c) Sion Ltd. 2002\n\n");
+	printf("eDIV IconChanger - Copyright (c) Sion Ltd. 2002-2003\n\n");
 	if(argc!=3) {
 		printf("Modo de uso:\n\n    %s <programa.exe> <icono.ico>\n\n",argv[0]);
 		exit(2);
diff --git a/util/src/iconchanger/win32/iconchanger.vcproj b/util/src/iconchanger/win32/iconchanger.vcproj
index 8acf9f1..1ba69e2 100644
--- a/util/src/iconchanger/win32/iconchanger.vcproj
+++ b/util/src/iconchanger/win32/iconchanger.vcproj
@@ -54,7 +54,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../bin"
+			OutputDirectory="r:\iconchanger"
 			IntermediateDirectory="Release"
 			ConfigurationType="1"
 			CharacterSet="2">