From 1bd557bbd088642445030a27119fc72920a06f36 Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Sun, 4 Jan 2015 12:54:01 +0100
Subject: [PATCH 01/19] =?UTF-8?q?Changeset:=20599=20cuando=20DBF=5FConvers?=
 =?UTF-8?q?ion=5FSupport=3D4=20y=20el=20archivo=20de=20salida=20es=20igual?=
 =?UTF-8?q?=20al=20generado=20(Mike=20Potjer)=20-=20Mejora=20scx/vcx/sc2/v?=
 =?UTF-8?q?c2:=20Detecci=C3=B3n=20de=20nombres=20de=20objeto=20duplicados?=
 =?UTF-8?q?=20para=20notificar=20casos=20de=20corrupci=C3=B3n=20-=20Arregl?=
 =?UTF-8?q?o=20para=20"Error=202183:=20Operation=20requires=20that=20SET?=
 =?UTF-8?q?=20MULTILOCKS=20is=20set=20to=20ON"=20en=20algunas=20conversion?=
 =?UTF-8?q?es=20de=20DBF]=20-=20Actualizaci=C3=B3n=20inicial=20del=20archi?=
 =?UTF-8?q?vo=20de=20versi=C3=B3n=20y=20proyecto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FoxBin2PRGVersionFile.txt |   7 +++++--
 foxbin2prg.pj2            |   2 +-
 foxbin2prg.pjt            | Bin 677563 -> 677563 bytes
 foxbin2prg.pjx            | Bin 9123 -> 9123 bytes
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/FoxBin2PRGVersionFile.txt b/FoxBin2PRGVersionFile.txt
index 47019ad..996c299 100644
--- a/FoxBin2PRGVersionFile.txt
+++ b/FoxBin2PRGVersionFile.txt
@@ -2,8 +2,8 @@ Lparameters toUpdateInfo
 
 Local lcNote
 With toUpdateInfo
-    .VersionNumber        = 'v1.19.39'
-    .VersionDate          = Date(2015,01,01)
+    .VersionNumber        = 'v1.19.40'
+    .VersionDate          = Date(2015,01,04)
     .SourceFileUrl        = 'http://vfpxrepository.com/dl/thorupdate/Projects/FoxBin2Prg/FoxBin2Prg.Zip'
 
     .Link                 = 'http://vfpx.codeplex.com/wikipage?title=FoxBin2PRG'
@@ -17,6 +17,9 @@ Demo video using FoxBin2Prg with PlasticSCM: http://youtu.be/sE4wQ50Itqg
 
 Change History -------------------------------------------------------------
 
+2015/01/04	v1.19.40
+
+
 2015/01/01	v1.19.39
 - Bug fix vbs: vbs scripts does not show FoxBin2Prg process errors correctly
 - When using BIN2PRG or PRG2BIN keywords with FoxBin2Prg command line, allow processing one file (Mike Potjer)
diff --git a/foxbin2prg.pj2 b/foxbin2prg.pj2
index c1c9b82..f5b98aa 100644
--- a/foxbin2prg.pj2
+++ b/foxbin2prg.pj2
@@ -26,7 +26,7 @@ _LegalTrademark = "Creative Commons 4:	Reconocimiento - CompartirIgual (by-sa):
 _ProductName = "FOXBIN2PRG"
 _MajorVer = "1"
 _MinorVer = "19"
-_Revision = "39"
+_Revision = "40"
 _LanguageID = "1034"
 _AutoIncrement = "0"
 *</DevInfo>
diff --git a/foxbin2prg.pjt b/foxbin2prg.pjt
index 9ad7cf4a8a5203fa8ea6331b5ddd30c81bf20901..9f0b36729cbfc7592671427dd340f30c4de8394c 100644
GIT binary patch
delta 71
zcmdnJR&)1S%?$>eoF)bg3=D<_#wHU5r6(T{XK9Y$Y>(h%1Y#y2W(HywAZ7((HXvpP
PVh$kY+#bQnmFx=u#S9X6

delta 71
zcmdnJR&)1S%?$>eoW_<63=D<_#wHU5r6(T{XK9Y$Y>(h%1Y#y2W(HywAZ7((HXvpP
PVh$kY+#bQnmFx=u#_JM)

diff --git a/foxbin2prg.pjx b/foxbin2prg.pjx
index 7cf24a5d67a1af5e690054817a253824710ba17a..d35c037c71181fbe8e1111acabe1df2499e9917e 100644
GIT binary patch
delta 13
UcmZ4NzSy0`fS-|NBg=ec02{{xlmGw#

delta 13
UcmZ4NzSy0`fR9IXBg=ec0325XuK)l5


From 76fd8a7ffef878356c342f3b1c40d690817271d6 Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Sun, 4 Jan 2015 15:48:14 +0100
Subject: [PATCH 02/19] =?UTF-8?q?Changeset:=20600=20-=20Modificaci=C3=B3n?=
 =?UTF-8?q?=20FRX=20para=20caso=20de=20prueba=20y=20agregado=20de=20alguno?=
 =?UTF-8?q?s=20archivos=20mas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FoxBin2PRGVersionFile.txt                |   2 +-
 TESTS/DATOS_READONLY/fb2p_depto.db2      |  73 ++++++++++++++++++
 TESTS/DATOS_READONLY/fb2p_foxuser.fr2    |  92 +++++++++++++++++++++--
 TESTS/DATOS_READONLY/fb2p_foxuser.frt    | Bin 6519 -> 8820 bytes
 TESTS/DATOS_READONLY/fb2p_foxuser.frx    | Bin 12773 -> 13231 bytes
 TESTS/DATOS_READONLY/foxuser_fdbozzo.cdx | Bin 0 -> 15360 bytes
 TESTS/DATOS_READONLY/foxuser_fdbozzo.dbf | Bin 0 -> 4073 bytes
 TESTS/DATOS_READONLY/foxuser_fdbozzo.fpt | Bin 0 -> 28800 bytes
 8 files changed, 158 insertions(+), 9 deletions(-)
 create mode 100644 TESTS/DATOS_READONLY/fb2p_depto.db2
 create mode 100644 TESTS/DATOS_READONLY/foxuser_fdbozzo.cdx
 create mode 100644 TESTS/DATOS_READONLY/foxuser_fdbozzo.dbf
 create mode 100644 TESTS/DATOS_READONLY/foxuser_fdbozzo.fpt

diff --git a/FoxBin2PRGVersionFile.txt b/FoxBin2PRGVersionFile.txt
index 996c299..6df3398 100644
--- a/FoxBin2PRGVersionFile.txt
+++ b/FoxBin2PRGVersionFile.txt
@@ -18,7 +18,7 @@ Demo video using FoxBin2Prg with PlasticSCM: http://youtu.be/sE4wQ50Itqg
 Change History -------------------------------------------------------------
 
 2015/01/04	v1.19.40
-
+- Bug fix frx: Clean ASCII 0 from expression field for Cursors and Dataenvironment
 
 2015/01/01	v1.19.39
 - Bug fix vbs: vbs scripts does not show FoxBin2Prg process errors correctly
diff --git a/TESTS/DATOS_READONLY/fb2p_depto.db2 b/TESTS/DATOS_READONLY/fb2p_depto.db2
new file mode 100644
index 0000000..219fad7
--- /dev/null
+++ b/TESTS/DATOS_READONLY/fb2p_depto.db2
@@ -0,0 +1,73 @@
+*--------------------------------------------------------------------------------------------------------------------------------------------------------
+* (ES) AUTOGENERADO - ¡¡ATENCIÓN!! - ¡¡NO PENSADO PARA EJECUTAR!! USAR SOLAMENTE PARA INTEGRAR CAMBIOS Y ALMACENAR CON HERRAMIENTAS SCM!!
+* (EN) AUTOGENERATED - ATTENTION!! - NOT INTENDED FOR EXECUTION!! USE ONLY FOR MERGING CHANGES AND STORING WITH SCM TOOLS!!
+*--------------------------------------------------------------------------------------------------------------------------------------------------------
+*< FOXBIN2PRG: Version="1.19" SourceFile="fb2p_depto.dbf" /> (Solo para binarios VFP 9 / Only for VFP 9 binaries)
+*
+
+<TABLE>
+	<MemoFile></MemoFile>
+	<CodePage>1252</CodePage>
+	<LastUpdate>2014/01/06</LastUpdate>
+	<Database>fb2p_dbc.dbc</Database>
+	<FileType>0x00000030</FileType>
+	<FileType_Descrip>Visual FoxPro</FileType_Descrip>
+
+	<FIELDS>
+		<FIELD>
+			<Name>DEPTO</Name>
+			<Type>C</Type>
+			<Width>10</Width>
+			<Decimals>0</Decimals>
+			<Null>.F.</Null>
+			<NoCPTran>.F.</NoCPTran>
+			<Field_Valid_Exp>depto_field_validation_rule()</Field_Valid_Exp>
+			<Field_Valid_Text>depto_field_validation_message()</Field_Valid_Text>
+			<Field_Default_Value>"Depto."</Field_Default_Value>
+			<Table_Valid_Exp>fb2p_depto_record_rule_validation()</Table_Valid_Exp>
+			<Table_Valid_Text>fb2p_depto_record_rule_validation_message()</Table_Valid_Text>
+			<LongTableName>FB2P_DEPTO</LongTableName>
+			<Ins_Trig_Exp></Ins_Trig_Exp>
+			<Upd_Trig_Exp></Upd_Trig_Exp>
+			<Del_Trig_Exp>__ri_delete_fb2p_depto()</Del_Trig_Exp>
+			<TableComment>Comentario de "fb2p_depto"</TableComment>
+			<Autoinc_Nextval>0</Autoinc_Nextval>
+			<Autoinc_Step>0</Autoinc_Step>
+		</FIELD>
+		<FIELD>
+			<Name>DESCRIP</Name>
+			<Type>C</Type>
+			<Width>50</Width>
+			<Decimals>0</Decimals>
+			<Null>.F.</Null>
+			<NoCPTran>.F.</NoCPTran>
+			<Field_Valid_Exp></Field_Valid_Exp>
+			<Field_Valid_Text></Field_Valid_Text>
+			<Field_Default_Value></Field_Default_Value>
+			<Table_Valid_Exp></Table_Valid_Exp>
+			<Table_Valid_Text></Table_Valid_Text>
+			<LongTableName></LongTableName>
+			<Ins_Trig_Exp></Ins_Trig_Exp>
+			<Upd_Trig_Exp></Upd_Trig_Exp>
+			<Del_Trig_Exp></Del_Trig_Exp>
+			<TableComment></TableComment>
+			<Autoinc_Nextval>0</Autoinc_Nextval>
+			<Autoinc_Step>0</Autoinc_Step>
+		</FIELD>
+	</FIELDS>
+
+
+	<indexFile>FB2P_DEPTO.CDX</indexFile>
+
+	<INDEXES>
+		<INDEX>
+			<TagName>DEPTO</TagName>
+			<TagType>PRIMARY</TagType>
+			<Key>DEPTO</Key>
+			<Filter>depto=>"0"</Filter>
+			<Order>ASCENDING</Order>
+			<Collate>MACHINE</Collate>
+		</INDEX>
+	</INDEXES>
+
+</TABLE>
diff --git a/TESTS/DATOS_READONLY/fb2p_foxuser.fr2 b/TESTS/DATOS_READONLY/fb2p_foxuser.fr2
index 0e67a44..7adc67b 100644
--- a/TESTS/DATOS_READONLY/fb2p_foxuser.fr2
+++ b/TESTS/DATOS_READONLY/fb2p_foxuser.fr2
@@ -550,7 +550,7 @@ de Label Properties]]>
 	<user><![CDATA[]]>
 </Reportes>
 <Reportes 
-	platform="WINDOWS " uniqueid="" timestamp="0" objtype="8" objcode="0" name="" vpos="27708.333" hpos="16979.167" height="1666.667" width="11041.667" order="" unique=".F." environ=".F." boxchar=" " fillchar="N" pengreen="-1" penblue="-1" fillred="-1" fillgreen="-1" fillblue="-1" pensize="0" penpat="0" fillpat="0" fontface="Arial" fontstyle="0" fontsize="8" mode="1" ruler="0" rulerlines="0" grid=".F." gridv="0" gridh="0" float=".T." stretch=".F." stretchtop=".F." top=".F." bottom=".F." suptype="0" suprest="0" norepeat=".T." resetrpt="0" pagebreak=".F." colbreak=".F." resetpage=".F." general="0" spacing="2" double=".T." swapheader=".F." swapfooter=".F." ejectbefor=".F." ejectafter=".F." plain=".F." summary=".F." addalias=".F." offset="1" topmargin="0" botmargin="0" totaltype="1" resettotal="6" resoid="1" curpos=".T." supalways=".T." supovflow=".F." suprpcol="3" supgroup="6" supvalchng=".F." 
+	platform="WINDOWS " uniqueid="" timestamp="0" objtype="8" objcode="0" name="" vpos="27708.333" hpos="16979.167" height="1666.667" width="11041.667" order="" unique=".F." environ=".F." boxchar=" " fillchar="N" pengreen="-1" penblue="-1" fillred="-1" fillgreen="-1" fillblue="-1" pensize="0" penpat="0" fillpat="0" fontface="Arial" fontstyle="0" fontsize="8" mode="1" ruler="0" rulerlines="0" grid=".F." gridv="0" gridh="0" float=".T." stretch=".F." stretchtop=".F." top=".F." bottom=".F." suptype="0" suprest="0" norepeat=".T." resetrpt="0" pagebreak=".F." colbreak=".F." resetpage=".F." general="0" spacing="2" double=".T." swapheader=".F." swapfooter=".F." ejectbefor=".F." ejectafter=".F." plain=".F." summary=".F." addalias=".F." offset="1" topmargin="0" botmargin="0" totaltype="1" resettotal="6" resoid="1" curpos=".F." supalways=".T." supovflow=".F." suprpcol="3" supgroup="6" supvalchng=".F." 
 	<picture><![CDATA[]]>
 	<tag><![CDATA[]]>
 	<tag2><![CDATA[]]>
@@ -604,19 +604,31 @@ de Label Properties]]>
 	<user><![CDATA[]]>
 </Reportes>
 <Reportes 
-	platform="WINDOWS " uniqueid="" timestamp="0" objtype="25" objcode="0" name="dataenvironment" vpos="0.000" hpos="0.000" height="0.000" width="0.000" order="" unique=".F." environ=".F." boxchar=" " fillchar=" " pengreen="0" penblue="0" fillred="0" fillgreen="0" fillblue="0" pensize="0" penpat="0" fillpat="0" fontface="" fontstyle="0" fontsize="0" mode="0" ruler="0" rulerlines="0" grid=".F." gridv="0" gridh="0" float=".F." stretch=".F." stretchtop=".F." top=".F." bottom=".F." suptype="0" suprest="0" norepeat=".F." resetrpt="0" pagebreak=".F." colbreak=".F." resetpage=".F." general="0" spacing="0" double=".F." swapheader=".F." swapfooter=".F." ejectbefor=".F." ejectafter=".F." plain=".F." summary=".F." addalias=".F." offset="0" topmargin="0" botmargin="0" totaltype="0" resettotal="0" resoid="0" curpos=".F." supalways=".F." supovflow=".F." suprpcol="0" supgroup="0" supvalchng=".F." 
+	platform="WINDOWS " uniqueid="" timestamp="0" objtype="25" objcode="0" name="dataenvironment" vpos="0.000" hpos="0.000" height="0.000" width="0.000" order="" unique=".F." environ=".T." boxchar=" " fillchar=" " pengreen="0" penblue="0" fillred="0" fillgreen="0" fillblue="0" pensize="0" penpat="0" fillpat="0" fontface="" fontstyle="0" fontsize="0" mode="0" ruler="0" rulerlines="0" grid=".F." gridv="0" gridh="0" float=".F." stretch=".F." stretchtop=".F." top=".F." bottom=".F." suptype="0" suprest="0" norepeat=".F." resetrpt="0" pagebreak=".F." colbreak=".F." resetpage=".F." general="0" spacing="0" double=".F." swapheader=".F." swapfooter=".F." ejectbefor=".F." ejectafter=".F." plain=".F." summary=".F." addalias=".F." offset="0" topmargin="0" botmargin="0" totaltype="0" resettotal="0" resoid="0" curpos=".F." supalways=".F." supovflow=".F." suprpcol="0" supgroup="0" supvalchng=".F." 
 	<picture><![CDATA[]]>
 	<tag><![CDATA[
+PROCEDURE Destroy
+*------------------------------------------------------------------------------
+* Code for DESTROY event
+*------------------------------------------------------------------------------
+
+ENDPROC
+PROCEDURE Init
+*------------------------------------------------------------------------------
+* Code for INIT event
+*------------------------------------------------------------------------------
+
+ENDPROC
 ]]>
 	<tag2><![CDATA[]]>
 	<penred><![CDATA[0]]>
 	<style><![CDATA[]]>
 	<expr><![CDATA[Comment = 'Y este es el "Comment'
 Tag = 'Y este es el "Tooltip'
-Top = 220
-Left = 1
+Top = 322
+Left = 216
 Width = 520
-Height = 200
+Height = 488
 DataSource = .NULL.
 Name = "Dataenvironment"
 ]]>
@@ -627,16 +639,80 @@ Name = "Dataenvironment"
 <Reportes 
 	platform="WINDOWS " uniqueid="" timestamp="0" objtype="26" objcode="0" name="cursor" vpos="0.000" hpos="0.000" height="0.000" width="0.000" order="" unique=".F." environ=".F." boxchar=" " fillchar=" " pengreen="0" penblue="0" fillred="0" fillgreen="0" fillblue="0" pensize="0" penpat="0" fillpat="0" fontface="" fontstyle="0" fontsize="0" mode="0" ruler="0" rulerlines="0" grid=".F." gridv="0" gridh="0" float=".F." stretch=".F." stretchtop=".F." top=".F." bottom=".F." suptype="0" suprest="0" norepeat=".F." resetrpt="0" pagebreak=".F." colbreak=".F." resetpage=".F." general="0" spacing="0" double=".F." swapheader=".F." swapfooter=".F." ejectbefor=".F." ejectafter=".F." plain=".F." summary=".F." addalias=".F." offset="0" topmargin="0" botmargin="0" totaltype="0" resettotal="0" resoid="0" curpos=".F." supalways=".F." supovflow=".F." suprpcol="0" supgroup="0" supvalchng=".F." 
 	<picture><![CDATA[]]>
-	<tag><![CDATA[]]>
+	<tag><![CDATA[
+PROCEDURE Init
+*------------------------------------------------------------------------------
+* Cur_foxuser INIT event code
+*------------------------------------------------------------------------------
+
+ENDPROC
+]]>
 	<tag2><![CDATA[]]>
 	<penred><![CDATA[0]]>
 	<style><![CDATA[]]>
 	<expr><![CDATA[Comment = 'Y este es el "Comment'
 Tag = 'Y este es el "Tag'
+Top = 20
+Left = 10
+Height = 224
+Width = 90
 Alias = "foxuser"
 Order = "wizard_1"
-CursorSource = ..\..\..\test\varios\vcx2xml\foxuser_fdbozzo.dbf
-Name = "cursor1"
+CursorSource = foxuser_fdbozzo.dbf
+Name = "cur_foxuser"
+]]>
+	<supexpr><![CDATA[]]>
+	<comment><![CDATA[]]>
+	<user><![CDATA[]]>
+</Reportes>
+<Reportes 
+	platform="WINDOWS " uniqueid="" timestamp="0" objtype="26" objcode="0" name="cursor" vpos="0.000" hpos="0.000" height="0.000" width="0.000" order="" unique=".F." environ=".F." boxchar=" " fillchar=" " pengreen="0" penblue="0" fillred="0" fillgreen="0" fillblue="0" pensize="0" penpat="0" fillpat="0" fontface="" fontstyle="0" fontsize="0" mode="0" ruler="0" rulerlines="0" grid=".F." gridv="0" gridh="0" float=".F." stretch=".F." stretchtop=".F." top=".F." bottom=".F." suptype="0" suprest="0" norepeat=".F." resetrpt="0" pagebreak=".F." colbreak=".F." resetpage=".F." general="0" spacing="0" double=".F." swapheader=".F." swapfooter=".F." ejectbefor=".F." ejectafter=".F." plain=".F." summary=".F." addalias=".F." offset="0" topmargin="0" botmargin="0" totaltype="0" resettotal="0" resoid="0" curpos=".F." supalways=".F." supovflow=".F." suprpcol="0" supgroup="0" supvalchng=".F." 
+	<picture><![CDATA[]]>
+	<tag><![CDATA[
+PROCEDURE Init
+*------------------------------------------------------------------------------
+* Cur_fb2p_free INIT event code
+*------------------------------------------------------------------------------
+
+ENDPROC
+]]>
+	<tag2><![CDATA[]]>
+	<penred><![CDATA[0]]>
+	<style><![CDATA[]]>
+	<expr><![CDATA[Comment = "This is fb2p_free table comment"
+Top = 20
+Left = 150
+Height = 363
+Width = 90
+Alias = "fb2p_free"
+CursorSource = fb2p_free.dbf
+Name = "cur_fb2p_free"
+]]>
+	<supexpr><![CDATA[]]>
+	<comment><![CDATA[]]>
+	<user><![CDATA[]]>
+</Reportes>
+<Reportes 
+	platform="WINDOWS " uniqueid="" timestamp="0" objtype="26" objcode="0" name="relation" vpos="0.000" hpos="0.000" height="0.000" width="0.000" order="" unique=".F." environ=".F." boxchar=" " fillchar=" " pengreen="0" penblue="0" fillred="0" fillgreen="0" fillblue="0" pensize="0" penpat="0" fillpat="0" fontface="" fontstyle="0" fontsize="0" mode="0" ruler="0" rulerlines="0" grid=".F." gridv="0" gridh="0" float=".F." stretch=".F." stretchtop=".F." top=".F." bottom=".F." suptype="0" suprest="0" norepeat=".F." resetrpt="0" pagebreak=".F." colbreak=".F." resetpage=".F." general="0" spacing="0" double=".F." swapheader=".F." swapfooter=".F." ejectbefor=".F." ejectafter=".F." plain=".F." summary=".F." addalias=".F." offset="0" topmargin="0" botmargin="0" totaltype="0" resettotal="0" resoid="0" curpos=".F." supalways=".F." supovflow=".F." suprpcol="0" supgroup="0" supvalchng=".F." 
+	<picture><![CDATA[]]>
+	<tag><![CDATA[
+PROCEDURE Init
+*------------------------------------------------------------------------------
+* Relation1 INIT event code
+*------------------------------------------------------------------------------
+
+ENDPROC
+]]>
+	<tag2><![CDATA[]]>
+	<penred><![CDATA[0]]>
+	<style><![CDATA[]]>
+	<expr><![CDATA[Comment = "Relation comments between foxuser and fb2p_free"
+ParentAlias = "foxuser"
+RelationalExpr = "name"
+ChildAlias = "fb2p_free"
+ChildOrder = "caracter"
+OneToMany = .T.
+Name = "Relation1"
 ]]>
 	<supexpr><![CDATA[]]>
 	<comment><![CDATA[]]>
diff --git a/TESTS/DATOS_READONLY/fb2p_foxuser.frt b/TESTS/DATOS_READONLY/fb2p_foxuser.frt
index 5f9bd29614575a3121a23b4a01503574384921eb..a6ba927311e7b3b2f60e2c7844ebb2f0fac913ae 100644
GIT binary patch
delta 1574
zcmc&!O=}ZD7~V7`X%-f(r6CnRhFFpM5t2<CQ$e95D+V+P=@#ih;wC$57LwgCyV3L@
zIe0IG{RuhfN$}>)qc^2^6A`?6k|KDp7~k3KM;b#59(384osV~(_j#U~*&qD({2ar?
zO@?6tujcmyeH5{hq1i!rCK?!6Z({3KZ!r|R#Id5@MmJHK=Q;K+R!nH~sf_g?77MOs
zvsO2DJsNmfu9R{@eybv&JT^?C?{Ms8>r3Q{^(}G+B77G5D5uL9DLO%UVN<M>wh?}e
zHFF~K9LI93P|Q<Aj`eX1nmU<!`VeTLSP-WoUO0qE<wAt&9b)Lj>AeHJx2}zZ@<~r;
z3YvGY`lw-x=2toPzABpya9}-Y{fuR;@)BCEDtfnLU=rt82kq05tRWAq=n!`u@`<B5
zI5go$?|Akva(b%;P6DsE*ia1wuTtaNRfS-TOsUqyfNZBg@jq3rjmu1D(&I8Y%x*MQ
z$)MOCCZK=-uy0fEkUEArZz>_z6pk%QEjk(pldIm8Z_wu>4O;dL@-+N~MRNo<B~#Tk
zXH(venN)G6TvrTK!{!r=H8`F2ULr}8eN8~TED<o+cf#9p3e}@!q^8hq6DnE*@zkM)
z+LZkjt`>KuL}YBI*Cis=P5b<mG%V`(By9&^5@N#l(IuSnJ^bi<7@l%B5H-<TcFY-@
zdPDYp?GMomy(_P2^yilz9z2_Y=0%7b5cH`+1R=I*$9WEdFtkO-$3J1l`7>O#(}u%Y
zhSE+uy%dvS)~xfP#rOh@yoaEbX}PZu1L%a|%d9{El_>pFop|ms+=by?V0im!pDv>e
vN5BjtK%2sBK)BBY!x0mgS8BxL)Je$RgP?$RT`2Ic>VEi7bzR?Gy$inq;Rt*K

delta 120
zcmez3^4*AofkCpIfq{W>qu?jTi3*&P4cJ%~vonb?E}YCE;lXQUWWdYilbTkdV5?v_
zIbK47*~q|Pa+QSn<a8;1#vMR4mXkL~u}*#>WhSeq7Xv{hsl_ERWr;<Z`Nc71$rVNw
Txj8YDrKA<ui}Q;Nm3X-Tj)5V$

diff --git a/TESTS/DATOS_READONLY/fb2p_foxuser.frx b/TESTS/DATOS_READONLY/fb2p_foxuser.frx
index 8bef7683d9a36bc5e0de793f3ff6fe9affaf4a3f..43b6543947263463e6e163e3a429f3f45d936c56 100644
GIT binary patch
delta 865
zcmZXSyDvjg9LG-+6-w2kv~KThPrd8Wp8M);W0oLd60wya9mQhAAE1`+gq?vzBt|h*
zY+io=77+=H)#j${J->?I_W3^Y`<>*xubvnEBIIjGU-(ObW>Fg*M}cQa26kJBOsuyO
zS(ptH*~qjJWf2Y$Iryog9A4YW%j2d)k}i;pC^+d-@!EOZBv0azm@AgOvvi{p+Y6Io
zR+Pma6{YTDnX_st<!o1>by;i<MxaG+Wy8T&l>8i?dWrIt^qnHphQMJ=`i71jmB_%F
zMr2|pPGljSAhOZLiK;h+lC;IaOOpH?%6&w6*Nfn~U#3mrUdeGbaOJ(p)Llh3Orzp&
z4UunRa+rJze1yn`KSh+qXB|0s93?M@%Q2!n4#scrHqz@|VF_$cNZ-=2nkF(Zogp$Y
zA?BJFI6sXtwx7UvAcKeCQoQyZEQ@<1j4bD3MPY11K_S?UWzmF!&>E*=j1~F6rtKAZ
nwV6^GbJRc04_E3*{%g8>YEy0AYmB{Uf0}1;#%{glyifTBEKB2D

delta 718
zcmYk)IZpyn6a`?2p%4{ZKt==|+;CxeAUrWvxF8_1gJNZZ#@fbGt*j(5IhERLOiYZ4
ziH)&<*qP`LP&ym^1y(wlz`IQMopayZH_6=XeU)|0&}Mes>ni&804w=;#1~BBQvV^8
z!f^*FjonUC2JtRZ7G47>2a}PM$8U=YsCQFWM6HLk0f)tk>pmOmy;tHEn~k(8l9HO7
znkd;)lVZOO6|*?WStAv5+@~aBANON_+ycAw(tI<Y#g9aN0Ph2&pgR3(rD=|fLF(sl
zWFv*JV<*icHbe@;GfY}UpG;a(w-_C?Wf`9i>Q_)5Aw`tVg6C11URBP^xE*^E-xO66
zIuTR*g9+;6Sa4Fm26>W{fNqMkj_(#F@it9e3J)`+G|pW$Z61G4N!%lYLpM!iQTC8>
mh<ZtRxLE?*#xr~4zvKnE`7l41Wp*QJG>-_gkTP|mwf+NyE71G^

diff --git a/TESTS/DATOS_READONLY/foxuser_fdbozzo.cdx b/TESTS/DATOS_READONLY/foxuser_fdbozzo.cdx
new file mode 100644
index 0000000000000000000000000000000000000000..5f7579e15fe7deddeb5ffd0960e0cf10a07d0a4b
GIT binary patch
literal 15360
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

literal 0
HcmV?d00001

diff --git a/TESTS/DATOS_READONLY/foxuser_fdbozzo.dbf b/TESTS/DATOS_READONLY/foxuser_fdbozzo.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..6850805e1a458dda540cc71bb8a1640b3d2278cf
GIT binary patch
literal 4073
zcmeI!Nsk*v6bEpJAQUD<AQlM_gNo&VSZlAYqsMM%9Bg;1-7~|m27w3yDUn!`aA02r
zV)+Ox;RA3@BuF4!5E4jmV&4&n<pgJ5y=vRl6PN7|Kp#9k?O#7vS6BV3=&q&ZJ&i_V
z$7vKk>&N!(jYhedr`6TgHaIz}P8!|z_(E&fl<x=4{^<VxMezOUWA0CiwAs!Ey-oP9
zw+tWdH^QTJ<9f5_FAOe)zh{JB!g;${HmghhE8%2o{k0rKij8bv1>f(e@aT_g^Z!Sq
zLGmK)Y!H8x&6V_~yg6u7LR^P+h!8fBXTm9`G@%I-HJ=xI@@(kuUGkn9Yj)1?Yu)O%
z+<@v3EfnSMT}-VH?HP7&PVtVjeSIYiKPTqf>993i%{B&b$GPa4v__v7^Se8Fw^c$9
ztgqo<t)BP%$}>(??Rhu4gLbRm#`b`5?dO*93(zycD7R66;l#W7!08m97ulY)Rbr2V
zarKoF>M%?W@KB!VTK)0+l7w7_9*|I%WBuvxt6!}3y2FwXFz)@*g!3!VPifCeubt(-
zIhALcX)DpgXy9~9d&(^9tuzbQK?>{3B(aJ1^%)$r*8bgr2LtV4+;DR{`YG*q{ol{p
z-OeT<cc3RsQMz~JEtj?Wp}z|~S4`Qv(KAXJueaa%l_JCGun)a3mYRF3`fx{5t3Moc
z^Ip^SCL#OL6Ki;KVB|UFHQ&jKes|ExoPP*CON3$%&+@K|+<*WB{X-1X`ryRZ$0v-R
z+&zP<@4Zq<k{m+sx_?XmmqGs@2Gk)OrVD!nJ-*+1`$K=kdqD+%d*bWu3H$#jdd;Yj
z$6~%efDu>tNO>2%a0B$cMf~xJKN0hgSFLPNu6NT7@;-Xbr8XbLeE5D(qGv)f`eDqw
z=XLkE{{N`*#_*39@t>eqnlb(<`YGcx96z6VpD?CBkJTUN1LXM^=rPZ~ocQ|qAA3&7
zSH8ZaQhq(x3qrn`)c<y_hrId@J?7Q-bG;(uhss-Fe~kHXJ^Bef5k|?MXZZ1Y^b2~3
z2gZMm`EWh@4ZU#d(eE)Iu19~M*A(*S&zKMM=P&eJQf>eC-cmMYJsRcJKj>w`B>i_0
zzqAeKyOP%Kgi~05XV<?3y%v_)<(MCqu<5Ec1Xowy7<J7e{#x`LRttUIBK~^xBGFvl
zu!yJV6=Tw{sBf*N{ie?!j$U(SteEZn5-HIOWeim@ALi#OdRUL7>BhVZs?i1u-YMj>
z6p-h)#C({yw~p#7dmH*Gc@pN^Ui8dpYVM5rFyHR+UO>L>Tg2Zt@%Jy{_oK%=Jg|s=
zVB#N)`7l2ZqKDC+m_so?&O^x0N6}+`J~r1wem;&~x%_-$u7~`5(t9nbcxtYP{CpZc
z=I1jpALik+zP>PmJvYOT^YD4^m7?;6m=E*tMf8}5FU5SAhcBb&iA?w_F(1yCSJ5*q
z6@AV7Q}@F~nrB7nXUyxqzBXLEG28ncmY-j+a3}W7m=D|Y7S<<;(DF#kucp1cK7Sc3
nN69-QFL-^w6wb$^SRZz%N*=5HDf_o@JRkSo?I%wJ{^I`t%E`e+

literal 0
HcmV?d00001

diff --git a/TESTS/DATOS_READONLY/foxuser_fdbozzo.fpt b/TESTS/DATOS_READONLY/foxuser_fdbozzo.fpt
new file mode 100644
index 0000000000000000000000000000000000000000..314bd22680faac255bfe404717f7c964ff779d00
GIT binary patch
literal 28800
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

literal 0
HcmV?d00001


From 87e73c73abc53af255e3f0b3d48ac0abb9ceb8b1 Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Sun, 4 Jan 2015 15:48:30 +0100
Subject: [PATCH 03/19] =?UTF-8?q?Changeset:=20601=20-=20Mejora=20frx/lbx:?=
 =?UTF-8?q?=20Limpiar=20ASCII=200=20del=20campo=20expression=20de=20Dataen?=
 =?UTF-8?q?vironment,=20Cursores=20y=20Relaciones=20-=20Bug=20fix=20frx/lb?=
 =?UTF-8?q?x:=20Cuando=20se=20usa=20el=20entorno=20de=20datos,=20solo=20se?=
 =?UTF-8?q?=20est=C3=A1=20guardando=20un=20cursor,=20y=20si=20hay=20m?=
 =?UTF-8?q?=C3=A1s=20se=20pierden?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 foxbin2prg.prg | 330 +++++++++----------------------------------------
 1 file changed, 59 insertions(+), 271 deletions(-)

diff --git a/foxbin2prg.prg b/foxbin2prg.prg
index 30509dd..dab5aef 100644
--- a/foxbin2prg.prg
+++ b/foxbin2prg.prg
@@ -9068,7 +9068,7 @@ DEFINE CLASS c_conversor_prg_a_frx AS c_conversor_prg_a_bin
 							DO CASE
 							CASE loReg.ObjType == "1"
 								loReg.TAG	= .decode_SpecialCodes_1_31( loReg.TAG )
-							CASE loReg.ObjType == "25"
+							CASE INLIST(loReg.ObjType, "25", "26")	&& Dataenvironment, cursors and relations
 								loReg.TAG	= SUBSTR(loReg.TAG,3)	&& Quito el ENTER agregado antes
 							OTHERWISE
 								loReg.TAG	= .decode_SpecialCodes_1_31( loReg.TAG )
@@ -9804,10 +9804,8 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 		+ [<memberdata name="sortmethod" display="SortMethod"/>] ;
 		+ [<memberdata name="write_add_objects_withproperties" display="write_ADD_OBJECTS_WithProperties"/>] ;
 		+ [<memberdata name="write_all_object_methods" display="write_ALL_OBJECT_METHODS"/>] ;
-		+ [<memberdata name="write_cabecera_reporte" display="write_CABECERA_REPORTE"/>] ;
 		+ [<memberdata name="write_classmetadata" display="write_CLASSMETADATA"/>] ;
 		+ [<memberdata name="write_class_properties" display="write_CLASS_PROPERTIES"/>] ;
-		+ [<memberdata name="write_dataenvironment_reporte" display="write_DATAENVIRONMENT_REPORTE"/>] ;
 		+ [<memberdata name="write_dbc_header" display="write_DBC_HEADER"/>] ;
 		+ [<memberdata name="write_dbc_connections" display="write_DBC_CONNECTIONS"/>] ;
 		+ [<memberdata name="write_dbc_tables" display="write_DBC_TABLES"/>] ;
@@ -9820,7 +9818,6 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 		+ [<memberdata name="write_dbf_header" display="write_DBF_HEADER"/>] ;
 		+ [<memberdata name="write_dbf_fields" display="write_DBF_FIELDS"/>] ;
 		+ [<memberdata name="write_dbf_indexes" display="write_DBF_INDEXES"/>] ;
-		+ [<memberdata name="write_detalle_reporte" display="write_DETALLE_REPORTE"/>] ;
 		+ [<memberdata name="write_defined_pam" display="write_DEFINED_PAM"/>] ;
 		+ [<memberdata name="write_define_class" display="write_DEFINE_CLASS"/>] ;
 		+ [<memberdata name="write_define_class_comments" display="write_Define_Class_COMMENTS"/>] ;
@@ -9832,6 +9829,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 		+ [<memberdata name="write_objectmetadata" display="write_OBJECTMETADATA"/>] ;
 		+ [<memberdata name="write_outputfile" display="write_OutputFile"/>] ;
 		+ [<memberdata name="write_protected_properties" display="write_PROTECTED_Properties"/>] ;
+		+ [<memberdata name="write_txt_reporte" display="write_TXT_REPORTE"/>] ;
 		+ [</VFPData>]
 
 
@@ -11205,7 +11203,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 
 
 	*******************************************************************************************************************
-	PROCEDURE write_CABECERA_REPORTE
+	PROCEDURE write_TXT_REPORTE
 		LPARAMETERS toReg
 
 		TRY
@@ -11290,235 +11288,24 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 			ENDTEXT
 
 			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<picture><![CDATA[" + toReg.PICTURE + "]]>"
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<tag><![CDATA[" + THIS.encode_SpecialCodes_1_31( toReg.TAG ) + "]]>"
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<tag2><![CDATA[" + IIF( INLIST(toReg.ObjType,5,6,8), toReg.TAG2, STRCONV( toReg.TAG2,13 ) ) + "]]>"
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<penred><![CDATA[" + TRANSFORM(toReg.penred) + "]]>"
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<style><![CDATA[" + toReg.STYLE + "]]>"
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<expr><![CDATA[" + toReg.EXPR + "]]>"
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<supexpr><![CDATA[" + toReg.supexpr + "]]>"
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<comment><![CDATA[" + toReg.COMMENT + "]]>"
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<user><![CDATA[" + toReg.USER + "]]>"
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
-				<<lc_TAG_REPORTE_F>>
-			ENDTEXT
-
-		CATCH TO loEx
-			IF THIS.l_Debug AND _VFP.STARTMODE = 0
-				SET STEP ON
+			
+			IF INLIST(toReg.ObjType, 25, 26) && Dataenvironment, cursors and relations
+				C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<tag><![CDATA[" + CR_LF + toReg.TAG + "]]>"
+				C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<tag2><![CDATA[]]>"
+			ELSE
+				C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<tag><![CDATA[" + THIS.encode_SpecialCodes_1_31( toReg.TAG ) + "]]>"
+				C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<tag2><![CDATA[" + IIF( INLIST(toReg.ObjType,5,6,8), toReg.TAG2, STRCONV( toReg.TAG2,13 ) ) + "]]>"
 			ENDIF
 
-			THROW
-
-		ENDTRY
-
-		RETURN
-	ENDPROC
-
-
-	*******************************************************************************************************************
-	PROCEDURE write_DETALLE_REPORTE
-		LPARAMETERS toReg
-
-		TRY
-			LOCAL lc_TAG_REPORTE_I, lc_TAG_REPORTE_F, loEx AS EXCEPTION
-			lc_TAG_REPORTE_I	= '<' + C_TAG_REPORTE + ' '
-			lc_TAG_REPORTE_F	= '</' + C_TAG_REPORTE + '>'
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
-				<<lc_TAG_REPORTE_I>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
-				<<>>	platform="WINDOWS " uniqueid="<<toReg.UniqueID>>" timestamp="<<toReg.TimeStamp>>" objtype="<<toReg.ObjType>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				objcode="<<toReg.ObjCode>>" name="<<toReg.Name>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				vpos="<<toReg.vpos>>" hpos="<<toReg.hpos>>" height="<<toReg.height>>" width="<<toReg.width>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				order="<<toReg.order>>" unique="<<toReg.unique>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				environ="<<toReg.environ>>" boxchar="<<toReg.boxchar>>" fillchar="<<toReg.fillchar>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				pengreen="<<toReg.pengreen>>" penblue="<<toReg.penblue>>" fillred="<<toReg.fillred>>" fillgreen="<<toReg.fillgreen>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				fillblue="<<toReg.fillblue>>" pensize="<<toReg.pensize>>" penpat="<<toReg.penpat>>" fillpat="<<toReg.fillpat>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				fontface="<<toReg.fontface>>" fontstyle="<<toReg.fontstyle>>" fontsize="<<toReg.fontsize>>" mode="<<toReg.mode>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				ruler="<<toReg.ruler>>" rulerlines="<<toReg.rulerlines>>" grid="<<toReg.grid>>" gridv="<<toReg.gridv>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				gridh="<<toReg.gridh>>" float="<<toReg.float>>" stretch="<<toReg.stretch>>" stretchtop="<<toReg.stretchtop>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				top="<<toReg.top>>" bottom="<<toReg.bottom>>" suptype="<<toReg.suptype>>" suprest="<<toReg.suprest>>" norepeat="<<toReg.norepeat>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				resetrpt="<<toReg.resetrpt>>" pagebreak="<<toReg.pagebreak>>" colbreak="<<toReg.colbreak>>" resetpage="<<toReg.resetpage>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				general="<<toReg.general>>" spacing="<<toReg.spacing>>" double="<<toReg.double>>" swapheader="<<toReg.swapheader>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				swapfooter="<<toReg.swapfooter>>" ejectbefor="<<toReg.ejectbefor>>" ejectafter="<<toReg.ejectafter>>" plain="<<toReg.plain>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				summary="<<toReg.summary>>" addalias="<<toReg.addalias>>" offset="<<toReg.offset>>" topmargin="<<toReg.topmargin>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				botmargin="<<toReg.botmargin>>" totaltype="<<toReg.totaltype>>" resettotal="<<toReg.resettotal>>" resoid="<<toReg.resoid>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				curpos="<<toReg.curpos>>" supalways="<<toReg.supalways>>" supovflow="<<toReg.supovflow>>" suprpcol="<<toReg.suprpcol>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				supgroup="<<toReg.supgroup>>" supvalchng="<<toReg.supvalchng>>" <<>>
-			ENDTEXT
-
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<picture><![CDATA[" + toReg.PICTURE + "]]>"
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<tag><![CDATA[" + THIS.encode_SpecialCodes_1_31( toReg.TAG ) + "]]>"
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<tag2><![CDATA[" + IIF( INLIST(toReg.ObjType,5,6,8), toReg.TAG2, STRCONV( toReg.TAG2,13 ) ) + "]]>"
 			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<penred><![CDATA[" + TRANSFORM(toReg.penred) + "]]>"
 			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<style><![CDATA[" + toReg.STYLE + "]]>"
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<expr><![CDATA[" + toReg.EXPR + "]]>"
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<supexpr><![CDATA[" + toReg.supexpr + "]]>"
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<comment><![CDATA[" + toReg.COMMENT + "]]>"
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<user><![CDATA[" + toReg.USER + "]]>"
 
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
-				<<lc_TAG_REPORTE_F>>
-			ENDTEXT
-
-		CATCH TO loEx
-			IF THIS.l_Debug AND _VFP.STARTMODE = 0
-				SET STEP ON
+			IF INLIST(toReg.ObjType, 25, 26) && Dataenvironment, cursors and relations
+				C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<expr><![CDATA[" + CHRTRAN( toReg.EXPR, C_NULL_CHAR, '' ) + "]]>"
+			ELSE
+				C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<expr><![CDATA[" + toReg.EXPR + "]]>"
 			ENDIF
 
-			THROW
-
-		ENDTRY
-
-		RETURN
-	ENDPROC
-
-
-	*******************************************************************************************************************
-	PROCEDURE write_DATAENVIRONMENT_REPORTE
-		LPARAMETERS toReg
-
-		TRY
-			LOCAL lc_TAG_REPORTE_I, lc_TAG_REPORTE_F, loEx AS EXCEPTION
-			lc_TAG_REPORTE_I	= '<' + C_TAG_REPORTE + ' '
-			lc_TAG_REPORTE_F	= '</' + C_TAG_REPORTE + '>'
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
-				<<lc_TAG_REPORTE_I>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
-				<<>>	platform="WINDOWS " uniqueid="<<toReg.UniqueID>>" timestamp="<<toReg.TimeStamp>>" objtype="<<toReg.ObjType>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				objcode="<<toReg.ObjCode>>" name="<<toReg.Name>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				vpos="<<toReg.vpos>>" hpos="<<toReg.hpos>>" height="<<toReg.height>>" width="<<toReg.width>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				order="<<toReg.order>>" unique="<<toReg.unique>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				environ="<<toReg.environ>>" boxchar="<<toReg.boxchar>>" fillchar="<<toReg.fillchar>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				pengreen="<<toReg.pengreen>>" penblue="<<toReg.penblue>>" fillred="<<toReg.fillred>>" fillgreen="<<toReg.fillgreen>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				fillblue="<<toReg.fillblue>>" pensize="<<toReg.pensize>>" penpat="<<toReg.penpat>>" fillpat="<<toReg.fillpat>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				fontface="<<toReg.fontface>>" fontstyle="<<toReg.fontstyle>>" fontsize="<<toReg.fontsize>>" mode="<<toReg.mode>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				ruler="<<toReg.ruler>>" rulerlines="<<toReg.rulerlines>>" grid="<<toReg.grid>>" gridv="<<toReg.gridv>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				gridh="<<toReg.gridh>>" float="<<toReg.float>>" stretch="<<toReg.stretch>>" stretchtop="<<toReg.stretchtop>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				top="<<toReg.top>>" bottom="<<toReg.bottom>>" suptype="<<toReg.suptype>>" suprest="<<toReg.suprest>>" norepeat="<<toReg.norepeat>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				resetrpt="<<toReg.resetrpt>>" pagebreak="<<toReg.pagebreak>>" colbreak="<<toReg.colbreak>>" resetpage="<<toReg.resetpage>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				general="<<toReg.general>>" spacing="<<toReg.spacing>>" double="<<toReg.double>>" swapheader="<<toReg.swapheader>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				swapfooter="<<toReg.swapfooter>>" ejectbefor="<<toReg.ejectbefor>>" ejectafter="<<toReg.ejectafter>>" plain="<<toReg.plain>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				summary="<<toReg.summary>>" addalias="<<toReg.addalias>>" offset="<<toReg.offset>>" topmargin="<<toReg.topmargin>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				botmargin="<<toReg.botmargin>>" totaltype="<<toReg.totaltype>>" resettotal="<<toReg.resettotal>>" resoid="<<toReg.resoid>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				curpos="<<toReg.curpos>>" supalways="<<toReg.supalways>>" supovflow="<<toReg.supovflow>>" suprpcol="<<toReg.suprpcol>>" <<>>
-			ENDTEXT
-
-			TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
-				supgroup="<<toReg.supgroup>>" supvalchng="<<toReg.supvalchng>>" <<>>
-			ENDTEXT
-
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<picture><![CDATA[" + toReg.PICTURE + "]]>"
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<tag><![CDATA[" + CR_LF + toReg.TAG + "]]>"
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<tag2><![CDATA[]]>"
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<penred><![CDATA[" + TRANSFORM(toReg.penred) + "]]>"
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<style><![CDATA[" + toReg.STYLE + "]]>"
-			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<expr><![CDATA[" + toReg.EXPR + "]]>"
 			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<supexpr><![CDATA[" + toReg.supexpr + "]]>"
 			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<comment><![CDATA[" + toReg.COMMENT + "]]>"
 			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<user><![CDATA[" + toReg.USER + "]]>"
@@ -13087,10 +12874,17 @@ DEFINE CLASS c_conversor_frx_a_prg AS c_conversor_bin_a_prg
 					ERROR (TEXTMERGE(loLang.C_REPORT_NOT_IN_VFP9_FORMAT_LOC))
 				ENDIF
 
-				SELECT * FROM _TABLAORIG INTO CURSOR TABLABIN_0
-				USE IN (SELECT("_TABLAORIG"))
+				C_FB2PRG_CODE	= C_FB2PRG_CODE + toFoxBin2Prg.get_PROGRAM_HEADER()
+
+				*SELECT * FROM _TABLAORIG INTO CURSOR TABLABIN_0
+				*USE IN (SELECT("_TABLAORIG"))
+				SELECT * FROM _TABLAORIG ;
+					WHERE ObjType IN (1,25,26) ;
+					ORDER BY ObjType ASC ;
+					INTO CURSOR TABLABIN_0 READWRITE
 
 				*-- Header
+				SELECT TABLABIN_0
 				LOCATE FOR ObjType = 1
 				IF FOUND()
 					loRegCab	= NULL
@@ -13104,60 +12898,28 @@ DEFINE CLASS c_conversor_frx_a_prg AS c_conversor_bin_a_prg
 					ENDIF
 				ENDIF
 
-				*-- Dataenvironment
-				LOCATE FOR ObjType = 25
-				IF FOUND()
-					loRegDataEnv	= NULL
-					SCATTER MEMO NAME loRegDataEnv
-
-					IF toFoxBin2Prg.l_NoTimestamps
-						loRegDataEnv.TIMESTAMP	= 0
-					ENDIF
-					IF toFoxBin2Prg.l_ClearUniqueID
-						loRegDataEnv.UNIQUEID	= ''
-					ENDIF
-				ENDIF
-
-				*-- Cursor1 (¿puede haber más de 1 cursor?)
-				LOCATE FOR ObjType = 26
-				IF FOUND()
-					loRegCur	= NULL
-					SCATTER MEMO NAME loRegCur
-
-					IF toFoxBin2Prg.l_NoTimestamps
-						loRegCur.TIMESTAMP	= 0
-					ENDIF
-					IF toFoxBin2Prg.l_ClearUniqueID
-						loRegCur.UNIQUEID	= ''
-					ENDIF
-				ENDIF
-
 				IF .l_ReportSort_Enabled
 					*-- ORDENADO
-					SELECT * FROM TABLABIN_0 ;
+					SELECT * FROM _TABLAORIG ;
 						WHERE ObjType NOT IN (1,25,26) ;
-						ORDER BY vpos,hpos ;
+						ORDER BY vpos,hpos ASC ;
 						INTO CURSOR TABLABIN READWRITE
 				ELSE
 					*-- SIN ORDENAR (Sólo para poder comparar con el original)
-					SELECT * FROM TABLABIN_0 ;
+					SELECT * FROM _TABLAORIG ;
 						WHERE ObjType NOT IN (1,25,26) ;
 						INTO CURSOR TABLABIN
 				ENDIF
 
 				loRegObj	= NULL
-				USE IN (SELECT("TABLABIN_0"))
 
 
-				C_FB2PRG_CODE	= C_FB2PRG_CODE + toFoxBin2Prg.get_PROGRAM_HEADER()
-
 				*-- Recorro los registros y genero el texto
 				IF VARTYPE(loRegCab) = "O"
-					.write_CABECERA_REPORTE( @loRegCab )
+					.write_TXT_REPORTE( @loRegCab )
 				ENDIF
 
 				SELECT TABLABIN
-				GOTO TOP
 
 				SCAN ALL
 					loRegObj	= NULL
@@ -13170,16 +12932,41 @@ DEFINE CLASS c_conversor_frx_a_prg AS c_conversor_bin_a_prg
 						loRegObj.UNIQUEID	= ''
 					ENDIF
 
-					.write_DETALLE_REPORTE( @loRegObj )
+					.write_TXT_REPORTE( @loRegObj )
 				ENDSCAN
 
-				IF VARTYPE(loRegDataEnv) = "O"
-					.write_DATAENVIRONMENT_REPORTE( @loRegDataEnv )
+				*-- Dataenvironment
+				SELECT TABLABIN_0
+				LOCATE FOR ObjType = 25
+				IF FOUND()
+					loRegDataEnv	= NULL
+					SCATTER MEMO NAME loRegDataEnv
+
+					IF toFoxBin2Prg.l_NoTimestamps
+						loRegDataEnv.TIMESTAMP	= 0
+					ENDIF
+					IF toFoxBin2Prg.l_ClearUniqueID
+						loRegDataEnv.UNIQUEID	= ''
+					ENDIF
+
+					.write_TXT_REPORTE( @loRegDataEnv )
 				ENDIF
 
-				IF VARTYPE(loRegCur) = "O"
-					.write_DETALLE_REPORTE( @loRegCur )
-				ENDIF
+				*-- Cursors and Relations
+				SELECT TABLABIN_0
+				SCAN ALL FOR ObjType = 26
+					loRegCur	= NULL
+					SCATTER MEMO NAME loRegCur
+
+					IF toFoxBin2Prg.l_NoTimestamps
+						loRegCur.TIMESTAMP	= 0
+					ENDIF
+					IF toFoxBin2Prg.l_ClearUniqueID
+						loRegCur.UNIQUEID	= ''
+					ENDIF
+
+					.write_TXT_REPORTE( @loRegCur )
+				ENDSCAN
 
 
 				*-- Genero el FR2
@@ -13202,6 +12989,7 @@ DEFINE CLASS c_conversor_frx_a_prg AS c_conversor_bin_a_prg
 		FINALLY
 			USE IN (SELECT("TABLABIN"))
 			USE IN (SELECT("TABLABIN_0"))
+			USE IN (SELECT("_TABLAORIG"))
 			STORE NULL TO loRegObj, loRegCab, loRegDataEnv, loRegCur
 			RELEASE toModulo, toEx, toFoxBin2Prg ;
 				, lnCodError, loRegCab, loRegDataEnv, loRegCur, loRegObj, lnMethodCount, laMethods, laCode, laProtected, lnLen ;

From 32bfea6a3ccbe682da289f37578b76c1ef62542e Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Tue, 6 Jan 2015 12:47:33 +0100
Subject: [PATCH 04/19] =?UTF-8?q?Changeset:=20602=20-=20Actualizaci=C3=B3n?=
 =?UTF-8?q?=20del=20archivo=20de=20versi=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FoxBin2PRGVersionFile.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FoxBin2PRGVersionFile.txt b/FoxBin2PRGVersionFile.txt
index 6df3398..df14b68 100644
--- a/FoxBin2PRGVersionFile.txt
+++ b/FoxBin2PRGVersionFile.txt
@@ -18,7 +18,8 @@ Demo video using FoxBin2Prg with PlasticSCM: http://youtu.be/sE4wQ50Itqg
 Change History -------------------------------------------------------------
 
 2015/01/04	v1.19.40
-- Bug fix frx: Clean ASCII 0 from expression field for Cursors and Dataenvironment
+- Enhancement frx/lbx: Clean ASCII 0 from expression field for Dataenvironment, Cursors and Relations
+- Bug fix frx/lbx: When using Dataenvironment with more than one cursor, remaining cursors are lost
 
 2015/01/01	v1.19.39
 - Bug fix vbs: vbs scripts does not show FoxBin2Prg process errors correctly

From 8e13fa92742f34578768b8cf874c434c4b9e6c86 Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Wed, 7 Jan 2015 00:00:36 +0100
Subject: [PATCH 05/19] =?UTF-8?q?Changeset:=20603=20-=20Permitir=20configu?=
 =?UTF-8?q?rar=20la=20barra=20de=20progreso=20para=20que=20solamente=20apa?=
 =?UTF-8?q?rezca=20cuando=20se=20procesan=20m=C3=BAltiples=20archivos=20y?=
 =?UTF-8?q?=20no=20cuando=20se=20procesa=20solo=201=20(Jim=20Nelson)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FoxBin2PRGVersionFile.txt |   2 +-
 foxbin2prg.cfg            |   5 +-
 foxbin2prg.prg            | 103 ++++++++++++++++++++++----------------
 3 files changed, 64 insertions(+), 46 deletions(-)

diff --git a/FoxBin2PRGVersionFile.txt b/FoxBin2PRGVersionFile.txt
index 996c299..36dc7c6 100644
--- a/FoxBin2PRGVersionFile.txt
+++ b/FoxBin2PRGVersionFile.txt
@@ -18,7 +18,7 @@ Demo video using FoxBin2Prg with PlasticSCM: http://youtu.be/sE4wQ50Itqg
 Change History -------------------------------------------------------------
 
 2015/01/04	v1.19.40
-
+- Added new configuration "ShowProgressbar:2" to activate the progressbar only when a directory is selected and deactivate it for individual files (Jim Nelson)
 
 2015/01/01	v1.19.39
 - Bug fix vbs: vbs scripts does not show FoxBin2Prg process errors correctly
diff --git a/foxbin2prg.cfg b/foxbin2prg.cfg
index 813537d..94e1aa8 100644
--- a/foxbin2prg.cfg
+++ b/foxbin2prg.cfg
@@ -1,5 +1,5 @@
 ****************************************************************************************************
-* FOXBIN2PRG v1.19.38
+* FOXBIN2PRG v1.19.40
 * CONFIGURATION FILE / ARCHIVO DE CONFIGURACIÓN
 ****************************************************************************************************
 
@@ -13,7 +13,7 @@
 * If no values given, these are the DEFAULTS / Si no se proporcionan valores, estos son los PREDETERMINADOS
 *
 * extension: tx2=newext			&& Default FoxBin2Prg extensions ends in '2' (see at the bottom) / Las extensiones por defecto de FoxBin2Prg terminan en '2' (ver debajo de todo)
-* DontShowProgress: 0			&& Show progress bar by default in multi-file processing / Mostrar barra de progreso por defecto en procesamiento multi-archivo
+* ShowProgressbar: 1			&& 0=Don't show, 1=Allways show, 2= Show only for multi-file processing / 0=No mostrar, 1=Mostrar siempre, 2=Mostrar solamente para multi-procesamiento
 * DontShowErrors: 0				&& Show message errors by default / Mostrar mensajes de error por defecto
 * NoTimestamps: 1				&& Crear timespampt by default for minimize differences / Vaciar Timestamps por defecto para minimizar diferencias
 * Debug: 0						&& Don't Activate individual <file>.Log by default / No Activar <archivo>.Log por defecto
@@ -26,7 +26,6 @@
 * Language: (auto)				&& Language of shown messages and LOGs. EN=English, FR=French, ES=Español, DE=German, Not defined = AUTOMATIC [DEFAULT]
 
 *-- CONVERTION OPTIONS / OPCIONES DE CONVERSIÓN
-* XXX_Conversion_Support: N		&& 0=No support, 1=Generate TXT only (Diff), 2=Generate TXT and BIN (Merge)
 * PJX_Conversion_Support: 2		&& 0=No support, 1=Generate TXT only (Diff), 2=Generate TXT and BIN (Merge)
 * VCX_Conversion_Support: 2		&& 0=No support, 1=Generate TXT only (Diff), 2=Generate TXT and BIN (Merge)
 * SCX_Conversion_Support: 2		&& 0=No support, 1=Generate TXT only (Diff), 2=Generate TXT and BIN (Merge)
diff --git a/foxbin2prg.prg b/foxbin2prg.prg
index 30509dd..9399879 100644
--- a/foxbin2prg.prg
+++ b/foxbin2prg.prg
@@ -125,6 +125,7 @@
 * 18/12/2014	FDBOZZO		v1.19.39	Mejora: Cuando se procesa un directorio con foxbin2prg.exe solo y la clave INTERACTIVE, mostrar un diálogo para preguntar qué procesar (Mike Potjer)
 * 18/12/2014	FDBOZZO		v1.19.39	Bug fix vbs: Los scripts vbs no muestren los errores del proceso de FoxBin2Prg
 * 30/12/2014	FDBOZZO		v1.19.39	Bug fix dc2: Los datos de DisplayClass y DisplayClassLibrary tenían el valor de "Default" en vez del propio (Christopher Kurth/Ryan Harris)
+* 06/01/2015	FDBOZZO		v1.19.40	Mejora: Permitir configurar la barra de progreso para que solamente aparezca cuando se procesan múltiples archivos y no cuando se procesa solo 1 (Jim Nelson)
 * </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES>
 *
 *---------------------------------------------------------------------------------------------------
@@ -174,14 +175,15 @@
 * 19/11/2014	edyshor				MEJORA cfg v1.19.36: DBF_Conversion_Excluded no permite comentarios && al final (Agregado en v1.19.37)
 * 19/11/2014	edyshor				REPORTE BUG dbf v1.19.36: "String is too long to fit" cuando se procesa un DBF grande con DBF_Conversion_Support = 4 (Agregado en v1.19.37)
 * 19/11/2014	edyshor				MEJORA dbf v1.19.36: Nuevo parámetro ClearDBFLastUpdate para evitar diferencias por este dato (Agregado en v1.19.37)
-* 14/10/2014	Lutz Scheffler		MEJORA v1.19.36: Permitir generar una clase por archivo (pregunta)
-* 21/10/2014	Ryan Harris			MEJORA v1.19.36: Permitir generar una clase por archivo (sugerencia)
-* 04/12/2014	Francisco Prieto	MEJORA v1.19.36: Permitir hacer conversiones masivas bin2prg y prg2bin sin los scripts vbs
-* 12/12/2014	Álvaro Castrillón	MEJORA v1.19.36: Detección de métodos duplicados para notificar casos de corrupción
-* 16/12/2014	Mike Potjer			Mejora v1.19.38: Cuando se usan las claves BIN2PRG o PRG2BIN permitir procesar un archivo solo
-* 16/12/2014	Mike Potjer			Mejora v1.19.38: Agregar la clave SHOWMSG y dejar INTERACTIVE para un diálogo interactivo
-* 16/12/2014	Mike Potjer			Mejora v1.19.38: Cuando se procesa un directorio con foxbin2prg.exe solo y la clave INTERACTIVE, mostrar un diálogo para preguntar qué procesar
-* 30/12/2014	Ryan Harris			Reporte bug dbc v1.19.38: Los datos de DisplayClass y DisplayClassLibrary tenían el valor de "Default" en vez del propio
+* 14/10/2014	Lutz Scheffler		MEJORA v1.19.36: Permitir generar una clase por archivo (pregunta) (Agregado en v1.19.37)
+* 21/10/2014	Ryan Harris			MEJORA v1.19.36: Permitir generar una clase por archivo (sugerencia) (Agregado en v1.19.37)
+* 04/12/2014	Francisco Prieto	MEJORA v1.19.36: Permitir hacer conversiones masivas bin2prg y prg2bin sin los scripts vbs (Agregado en v1.19.38)
+* 12/12/2014	Álvaro Castrillón	MEJORA v1.19.36: Detección de métodos duplicados para notificar casos de corrupción (Agregado en v1.19.38)
+* 16/12/2014	Mike Potjer			Mejora v1.19.38: Cuando se usan las claves BIN2PRG o PRG2BIN permitir procesar un archivo solo (Agregado en v1.19.39)
+* 16/12/2014	Mike Potjer			Mejora v1.19.38: Agregar la clave SHOWMSG y dejar INTERACTIVE para un diálogo interactivo (Agregado en v1.19.39)
+* 16/12/2014	Mike Potjer			Mejora v1.19.38: Cuando se procesa un directorio con foxbin2prg.exe solo y la clave INTERACTIVE, mostrar un diálogo para preguntar qué procesar (Agregado en v1.19.39)
+* 30/12/2014	Ryan Harris			Reporte bug dbc v1.19.38: Los datos de DisplayClass y DisplayClassLibrary tenían el valor de "Default" en vez del propio (Agregado en v1.19.39)
+* 06/01/2015	Jim Nelson			Mejora v1.19.39: Permitir configurar la barra de progreso para que solamente aparezca cuando se procesan múltiples archivos y no cuando se procesa solo 1 (Agregado en v1.19.40)
 * </TESTEO Y REPORTE DE BUGS (AGRADECIMIENTOS)>
 *
 *---------------------------------------------------------------------------------------------------
@@ -529,7 +531,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 		+ [<memberdata name="l_redirectclassperfiletomain" display="l_RedirectClassPerFileToMain"/>] ;
 		+ [<memberdata name="l_reportsort_enabled" display="l_ReportSort_Enabled"/>] ;
 		+ [<memberdata name="l_showerrors" display="l_ShowErrors"/>] ;
-		+ [<memberdata name="l_showprogress" display="l_ShowProgress"/>] ;
+		+ [<memberdata name="n_showprogressbar" display="n_ShowProgressbar"/>] ;
 		+ [<memberdata name="l_test" display="l_Test"/>] ;
 		+ [<memberdata name="l_useclassperfile" display="l_UseClassPerFile"/>] ;
 		+ [<memberdata name="n_cfg_actual" display="n_CFG_Actual"/>] ;
@@ -603,7 +605,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 	c_TextErr						= ''
 	l_Test							= .F.
 	l_ShowErrors					= .T.
-	l_ShowProgress					= .T.
+	n_ShowProgressbar				= 1
 	l_AllowMultiConfig				= .T.
 	l_DropNullCharsFromCode			= .T.
 	l_Recompile						= .T.
@@ -728,7 +730,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 		LPARAMETERS tcTexto, tnValor, tnTotal, tnTipo
 
 		TRY
-			*-- Si o_Frm_Avance se habilitó de forma externa, l_ShowProgress podría ser .F. para controlarlo desde fuera.
+			*-- Si o_Frm_Avance se habilitó de forma externa, n_ShowProgressbar podría ser 0 para controlarlo desde fuera.
 			IF VARTYPE(THIS.o_Frm_Avance) = "O" THEN
 				*-- Cuando esta rutina se invoca desde el script, este método es el #1 y no puede cancelarse todavía
 				IF THIS.o_Frm_Avance.l_Cancelled AND PROGRAM(-1) > 1 THEN
@@ -781,11 +783,11 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 	ENDPROC
 
 
-	PROCEDURE l_ShowProgress_ACCESS
+	PROCEDURE n_ShowProgressbar_ACCESS
 		IF THIS.n_CFG_Actual = 0 OR ISNULL( THIS.o_Configuration( THIS.n_CFG_Actual ) )
-			RETURN THIS.l_ShowProgress
+			RETURN THIS.n_ShowProgressbar
 		ELSE
-			RETURN NVL( THIS.o_Configuration( THIS.n_CFG_Actual ).l_ShowProgress, THIS.l_ShowProgress )
+			RETURN NVL( THIS.o_Configuration( THIS.n_CFG_Actual ).n_ShowProgressbar, THIS.n_ShowProgressbar )
 		ENDIF
 	ENDPROC
 
@@ -1269,7 +1271,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 
 
 	PROCEDURE descargar_frm_avance
-		IF THIS.l_ShowProgress AND VARTYPE(THIS.o_Frm_Avance) = "O" THEN
+		IF THIS.n_ShowProgressbar <> 0 AND VARTYPE(THIS.o_Frm_Avance) = "O" THEN
 			THIS.o_Frm_Avance.Hide()
 			THIS.o_Frm_Avance.Release()
 			THIS.o_Frm_Avance = NULL
@@ -1405,11 +1407,20 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 
 						CASE LEFT( laConfig(I), 17 ) == LOWER('DontShowProgress:')
 							lcValue	= ALLTRIM( SUBSTR( laConfig(I), 18 ) )
-							IF NOT INLIST( TRANSFORM(tcDontShowProgress), '0', '1' ) AND INLIST( lcValue, '0', '1' ) THEN
+							IF NOT INLIST( TRANSFORM(tcDontShowProgress), '0', '1', '2' ) AND INLIST( lcValue, '0', '1', '2' ) THEN
 								tcDontShowProgress	= lcValue
+								lo_CFG.n_ShowProgressbar	= ICASE(lcValue=='0',1, lcValue=='1',0, 2)
 								.writeLog( C_TAB + JUSTFNAME(lcConfigFile) + ' > tcDontShowProgress:         ' + TRANSFORM(tcDontShowProgress) )
 							ENDIF
 
+						CASE LEFT( laConfig(I), 16 ) == LOWER('ShowProgressbar:')
+							lcValue	= ALLTRIM( SUBSTR( laConfig(I), 17 ) )
+							IF INLIST( lcValue, '0', '1', '2' ) THEN
+								lo_CFG.n_ShowProgressbar	= INT( VAL(lcValue) )
+								tcDontShowProgress	= ''
+								.writeLog( C_TAB + JUSTFNAME(lcConfigFile) + ' > ShowProgressbar:            ' + lcValue )
+							ENDIF
+
 						CASE LEFT( laConfig(I), 15 ) == LOWER('DontShowErrors:')
 							*-- Priorizo si tcDontShowErrors NO viene con "0" como parámetro, ya que los scripts vbs
 							*-- los utilizan para sobreescribir la configuración por defecto de foxbin2prg.cfg
@@ -1586,8 +1597,8 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 
 				*-- ESTOS SE EVALÚAN FUERA DEL IF PORQUE NO DEPENDEN DEL CFG
 				*-- Y PUEDEN VENIR TAMBIÉN DE PARÁMETROS EXTERNOS.
-				IF INLIST( TRANSFORM(tcDontShowProgress), '0', '1' ) THEN
-					lo_CFG.l_ShowProgress			= NOT (TRANSFORM(tcDontShowProgress)=='1')
+				IF INLIST( TRANSFORM(tcDontShowProgress), '0', '1', '2' ) THEN
+					lo_CFG.n_ShowProgressbar		= ICASE(tcDontShowProgress=='0',1, tcDontShowProgress=='1',0, 2)
 				ENDIF
 				IF NOT EMPTY(tcDontShowErrors)
 					lo_CFG.l_ShowErrors				= NOT (TRANSFORM(tcDontShowErrors) == '1')
@@ -1617,7 +1628,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 				.writeLog( C_TAB + 'l_CFG_CachedAccess:           ' + TRANSFORM(.l_CFG_CachedAccess) )
 				.writeLog( C_TAB + 'c_Foxbin2prg_ConfigFile:      ' + TRANSFORM(EVL(lo_CFG.c_Foxbin2prg_ConfigFile, '(Internal defaults)') ) )
 				.writeLog( C_TAB + 'tc_InputFile:                 ' + TRANSFORM(EVL(tc_InputFile,'') ) )
-				.writeLog( C_TAB + 'l_ShowProgress:               ' + TRANSFORM(.l_ShowProgress) )
+				.writeLog( C_TAB + 'n_ShowProgressbar:            ' + TRANSFORM(.n_ShowProgressbar) )
 				.writeLog( C_TAB + 'l_ShowErrors:                 ' + TRANSFORM(.l_ShowErrors) )
 				.writeLog( C_TAB + 'l_Recompile:                  ' + TRANSFORM(.l_Recompile) + ' (' + tcRecompile + ')' )
 				.writeLog( C_TAB + 'l_NoTimestamps:               ' + TRANSFORM(.l_NoTimestamps) )
@@ -1632,25 +1643,12 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 				.writeLog( C_TAB + 'l_ClearDBFLastUpdate:         ' + TRANSFORM(.l_ClearDBFLastUpdate) )
 				.writeLog( C_TAB + 'c_Language:                   ' + TRANSFORM(.c_Language) )
 
-				*-- Si existe una configuración y es NULL, se usa la predeterminada
-				*IF .n_CFG_Actual > 0 AND ISNULL( .o_Configuration( .n_CFG_Actual ) ) THEN
-				*	.n_CFG_Actual = 0
-				*ENDIF
-
-				*IF NOT llExiste_CFG_EnDisco OR .n_CFG_Actual = 0 THEN
-				*	.l_CFG_CachedAccess	= .T.	&& Es acceso cacheado porque usa config.por defecto sin archivo CFG
-				*ENDIF
-
-				*.writeLog( '> l_CFG_CachedAccess:          ' + TRANSFORM(.l_CFG_CachedAccess) ;
-				+ ' ( InputFile=' + EVL(tc_InputFile,'(no)') + ', CFG=' + EVL(lo_CFG.c_Foxbin2prg_ConfigFile, '(Internal defaults)') + ' )' )
-
 				IF NOT .l_Main_CFG_Loaded THEN
 					.l_Main_CFG_Loaded	= .T.
 				ENDIF
 
 				.l_ConfigEvaluated = .T.
 				.writeLog( )
-				*ENDIF && .l_ConfigEvaluated
 			ENDWITH && THIS
 
 		CATCH TO loEx
@@ -1996,11 +1994,6 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 					ENDIF
 
 
-					IF .l_ShowProgress
-						.cargar_frm_avance()
-					ENDIF
-
-
 					*-- Evaluación de FileSpec de entrada
 					DO CASE
 					CASE lcInputFile_Type == C_FILETYPE_FILE AND '*' $ JUSTEXT( tc_InputFile ) OR '?' $ JUSTEXT( tc_InputFile )
@@ -2015,6 +2008,10 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 
 					CASE lcInputFile_Type == C_FILETYPE_FILE AND '*' $ JUSTSTEM( tc_InputFile )
 						*-- SE QUIEREN TODOS LOS ARCHIVOS DE UNA EXTENSIÓN
+						IF .n_ShowProgressbar <> 0 THEN
+							.cargar_frm_avance()
+						ENDIF
+
 						lcFileSpec	= FULLPATH( tc_InputFile )
 
 						DO CASE
@@ -2045,6 +2042,10 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 					CASE ATC('-BIN2PRG', ('-' + tcType)) >= 1
 						.writeLog( '> ' + loLang.C_OPTION_LOC + ': BIN2PRG' )
 
+						IF .n_ShowProgressbar <> 0 THEN
+							.cargar_frm_avance()
+						ENDIF
+
 						DO CASE
 						CASE lcInputFile_Type == C_FILETYPE_DIRECTORY
 							*-- CONVERSION BIN2PRG DE UN DIRECTORIO Y SUBDIRECTORIOS
@@ -2098,6 +2099,10 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 					CASE ATC('-PRG2BIN', ('-' + tcType)) >= 1
 						.writeLog( '> ' + loLang.C_OPTION_LOC + ': PRG2BIN' )
 
+						IF .n_ShowProgressbar <> 0 THEN
+							.cargar_frm_avance()
+						ENDIF
+
 						DO CASE
 						CASE lcInputFile_Type == C_FILETYPE_DIRECTORY
 							*-- CONVERSION PRG2BIN DE UN DIRECTORIO Y SUBDIRECTORIOS
@@ -2190,6 +2195,10 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 						DO CASE
 						CASE UPPER( JUSTEXT( EVL(tc_InputFile,'') ) ) == 'PJX' AND EVL(tcType,'0') == '*'
 							*-- SE QUIEREN CONVERTIR A TEXTO TODOS LOS ARCHIVOS DE UN PROYECTO
+							IF .n_ShowProgressbar <> 0 THEN
+								.cargar_frm_avance()
+							ENDIF
+
 							.writeLog( '> ' + loLang.C_CONVERT_ALL_FILES_IN_A_PROJECT_LOC + ': ' + loLang.C_BINARY_TO_TEXT_LOC )
 							lcFileSpec	= FULLPATH( tc_InputFile )
 
@@ -2229,8 +2238,14 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 								ENDIF
 							ENDFOR
 
+							EXIT
+
 						CASE UPPER( JUSTEXT( EVL(tc_InputFile,'') ) ) == 'PJ2' AND EVL(tcType,'0') == '*'
 							*-- SE QUIEREN CONVERTIR A BINARIO TODOS LOS ARCHIVOS DE UN PROYECTO
+							IF .n_ShowProgressbar <> 0 THEN
+								.cargar_frm_avance()
+							ENDIF
+
 							.writeLog( '> ' + loLang.C_CONVERT_ALL_FILES_IN_A_PROJECT_LOC + ': ' + loLang.C_TEXT_TO_BINARY_LOC )
 							lcFileSpec	= FULLPATH( tc_InputFile )
 
@@ -2271,6 +2286,8 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 								ENDIF
 							ENDFOR
 
+							EXIT
+
 						CASE EVL(tcType,'0') <> '0' AND EVL(tcTextName,'0') <> '0'
 							*-- Compatibilidad con SourceSafe
 
@@ -2286,6 +2303,10 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 						ENDCASE
 
 						IF FILE(tc_InputFile)
+							IF .n_ShowProgressbar = 1 THEN
+								.cargar_frm_avance()
+							ENDIF
+
 							.writeLog( '> InputFile ' + loLang.C_IS_A_FILE_LOC )
 							tc_InputFile	= LOCFILE(tc_InputFile)
 							ERASE ( tc_InputFile + '.ERR' )
@@ -2350,9 +2371,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 
 			USE IN (SELECT("TABLABIN"))
 			THIS.writeLog_Flush()
-			IF THIS.l_ShowProgress
-				THIS.descargar_frm_avance()
-			ENDIF
+			THIS.descargar_frm_avance()
 			CD (JUSTPATH(THIS.c_CurDir))
 
 			DO CASE
@@ -21896,7 +21915,7 @@ DEFINE CLASS CL_CFG AS CUSTOM
 		+ [<memberdata name="l_recompile" display="l_Recompile"/>] ;
 		+ [<memberdata name="l_redirectclassperfiletomain" display="l_RedirectClassPerFileToMain"/>] ;
 		+ [<memberdata name="l_showerrors" display="l_ShowErrors"/>] ;
-		+ [<memberdata name="l_showprogress" display="l_ShowProgress"/>] ;
+		+ [<memberdata name="n_showprogressbar" display="n_ShowProgressbar"/>] ;
 		+ [<memberdata name="l_useclassperfile" display="l_UseClassPerFile"/>] ;
 		+ [<memberdata name="pjx_conversion_support" display="PJX_Conversion_Support"/>] ;
 		+ [<memberdata name="vcx_conversion_support" display="VCX_Conversion_Support"/>] ;
@@ -21921,7 +21940,7 @@ DEFINE CLASS CL_CFG AS CUSTOM
 	c_CurDir						= ''
 	l_Debug							= NULL
 	l_ShowErrors					= NULL
-	l_ShowProgress					= NULL
+	n_ShowProgressbar				= NULL
 	l_Recompile						= NULL
 	l_NoTimestamps					= NULL
 	l_ClearUniqueID					= NULL

From 216fd885f31c41cdff8044d75e4a7ac1c484ee9f Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Wed, 7 Jan 2015 00:05:52 +0100
Subject: [PATCH 06/19] =?UTF-8?q?Changeset:=20606=20-=20Actualizaci=C3=B3n?=
 =?UTF-8?q?=20log=20interno=20prg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 foxbin2prg.prg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/foxbin2prg.prg b/foxbin2prg.prg
index dab5aef..a18c327 100644
--- a/foxbin2prg.prg
+++ b/foxbin2prg.prg
@@ -125,6 +125,7 @@
 * 18/12/2014	FDBOZZO		v1.19.39	Mejora: Cuando se procesa un directorio con foxbin2prg.exe solo y la clave INTERACTIVE, mostrar un diálogo para preguntar qué procesar (Mike Potjer)
 * 18/12/2014	FDBOZZO		v1.19.39	Bug fix vbs: Los scripts vbs no muestren los errores del proceso de FoxBin2Prg
 * 30/12/2014	FDBOZZO		v1.19.39	Bug fix dc2: Los datos de DisplayClass y DisplayClassLibrary tenían el valor de "Default" en vez del propio (Christopher Kurth/Ryan Harris)
+* 04/01/2015	FDBOZZO		v1.19.40	Bug fix frx/lbx: Cuando se usa el entorno de datos, solo se está guardando un cursor, y si hay más se pierden
 * </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES>
 *
 *---------------------------------------------------------------------------------------------------

From f022a2b01019bf453cfd378e05dfc977da6478c4 Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Wed, 7 Jan 2015 00:29:11 +0100
Subject: [PATCH 07/19] Changeset: 608 - Bug fix dbf: [Error 12, variable
 "tcOutputFile" is not found] cuando DBF_Conversion_Support=4 y el archivo de
 salida es igual al generado (Mike Potjer)

---
 foxbin2prg.prg | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/foxbin2prg.prg b/foxbin2prg.prg
index 30509dd..2f1b598 100644
--- a/foxbin2prg.prg
+++ b/foxbin2prg.prg
@@ -125,6 +125,7 @@
 * 18/12/2014	FDBOZZO		v1.19.39	Mejora: Cuando se procesa un directorio con foxbin2prg.exe solo y la clave INTERACTIVE, mostrar un diálogo para preguntar qué procesar (Mike Potjer)
 * 18/12/2014	FDBOZZO		v1.19.39	Bug fix vbs: Los scripts vbs no muestren los errores del proceso de FoxBin2Prg
 * 30/12/2014	FDBOZZO		v1.19.39	Bug fix dc2: Los datos de DisplayClass y DisplayClassLibrary tenían el valor de "Default" en vez del propio (Christopher Kurth/Ryan Harris)
+* 07/01/2015	FDBOZZO		v1.19.40	Bug fix db2: [Error 12, Variable "TCOUTPUTFILE" is not found] cuando DBF_Conversion_Support=4 y el archivo de salida es igual al generado (Mike Potjer)
 * </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES>
 *
 *---------------------------------------------------------------------------------------------------
@@ -182,6 +183,7 @@
 * 16/12/2014	Mike Potjer			Mejora v1.19.38: Agregar la clave SHOWMSG y dejar INTERACTIVE para un diálogo interactivo
 * 16/12/2014	Mike Potjer			Mejora v1.19.38: Cuando se procesa un directorio con foxbin2prg.exe solo y la clave INTERACTIVE, mostrar un diálogo para preguntar qué procesar
 * 30/12/2014	Ryan Harris			Reporte bug dbc v1.19.38: Los datos de DisplayClass y DisplayClassLibrary tenían el valor de "Default" en vez del propio
+* 06/01/2015	Mike Potjer			Reporte bug db2: [Error 12, Variable "TCOUTPUTFILE" is not found] cuando DBF_Conversion_Support=4 y el archivo de salida es igual al generado (Agregado en v1.19.40)
 * </TESTEO Y REPORTE DE BUGS (AGRADECIMIENTOS)>
 *
 *---------------------------------------------------------------------------------------------------
@@ -11629,10 +11631,10 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 			LOCAL toFoxBin2Prg AS c_foxbin2prg OF 'FOXBIN2PRG.PRG'
 		#ENDIF
 
-		LOCAL llFileExists, lnBytes
+		LOCAL llFileExists, lnBytes, lcOutputFile
 		LOCAL loLang as CL_LANG OF 'FOXBIN2PRG.PRG'
 		loLang			= _SCREEN.o_FoxBin2Prg_Lang
-
+		lcOutputFile	= tcOutputFile
 		llFileExists	= FILE(tcOutputFile)
 
 		IF llFileExists AND FILETOSTR( tcOutputFile ) == tcCodigo THEN
@@ -13235,7 +13237,7 @@ DEFINE CLASS c_conversor_dbf_a_prg AS c_conversor_bin_a_prg
 		DODEFAULT( @toModulo, @toEx )
 
 		TRY
-			LOCAL lnCodError, laDatabases(1), lnDatabases_Count, laDatabases2(1), lnLen, lc_FileTypeDesc, laLines(1) ;
+			LOCAL lnCodError, laDatabases(1), lnDatabases_Count, laDatabases2(1), lnLen, lc_FileTypeDesc, laLines(1), lcOutputFile ;
 				, ln_HexFileType, ll_FileHasCDX, ll_FileHasMemo, ll_FileIsDBC, lc_DBC_Name, lnDataSessionID, lnSelect ;
 				, loTable AS CL_DBF_TABLE OF 'FOXBIN2PRG.PRG' ;
 				, loDBFUtils AS CL_DBF_UTILS OF 'FOXBIN2PRG.PRG'
@@ -13298,6 +13300,7 @@ DEFINE CLASS c_conversor_dbf_a_prg AS c_conversor_bin_a_prg
 						CASE FILE(.c_OutputFile) AND toFoxBin2Prg.FilesComparedAreEqual( .c_OutputFile + '.TMP', .c_OutputFile ) = 1
 							ERASE (.c_OutputFile + '.TMP')
 							*.writeLog( 'El archivo de salida [' + .c_OutputFile + '] no se sobreescribe por ser igual al generado.' )
+							lcOutputFile	= .c_OutputFile
 							.writeLog( TEXTMERGE(loLang.C_OUTPUT_FILE_IS_NOT_OVERWRITEN_LOC) )
 						CASE toFoxBin2Prg.doBackup( .F., .T., '', '', '' ) ;
 								AND toFoxBin2Prg.ChangeFileAttribute( .c_OutputFile, '-R' ) ;
@@ -22025,7 +22028,7 @@ DEFINE CLASS CL_LANG AS Custom
 	C_ONLY_SETNAME_AND_GETNAME_RECOGNIZED_LOC						= "Operation not recognized. Only SETNAME and GETNAME allowed."
 	C_OPTION_LOC													= "Option"
 	C_OUTER_CLASS_DOES_NOT_MATCH_INNER_CLASSES_LOC					= "The outer class does not match the inner classes"
-	C_OUTPUT_FILE_IS_NOT_OVERWRITEN_LOC								= "Optimization: Output file [<<tcOutputFile>>] was not overwritten because it is the same as was generated."
+	C_OUTPUT_FILE_IS_NOT_OVERWRITEN_LOC								= "Optimization: Output file [<<lcOutputFile>>] was not overwritten because it is the same as was generated."
 	C_OUTPUTFILE_NEWER_THAN_INPUTFILE_LOC							= "Optimization: Output file [<<THIS.c_OutputFile>>] was not regenerated because it is newer than the inputfile."
 	C_PRESS_ESC_TO_CANCEL											= "Press Esc to Cancel"
 	C_PROCEDURE_NOT_CLOSED_ON_LINE_LOC								= "Procedure not closed. Last line of code must be ENDPROC. [<<laLineas(1)>>, Recno:<<RECNO()>>]"
@@ -22070,7 +22073,7 @@ DEFINE CLASS CL_LANG AS Custom
 
 					lc_Foxbin2prg_FullPath		= SUBSTR( lcSys16, lnPosProg )
 					lc_Foxbin2prg_LangFile		= FORCEEXT( lc_Foxbin2prg_FullPath, 'H' )
-					llLangFileExists			= ( ADIR( laDirInfo, lc_Foxbin2prg_LangFile ) = 1 )
+					*llLangFileExists			= ( ADIR( laDirInfo, lc_Foxbin2prg_LangFile ) = 1 )	&& 07/01/2014. Anulado. Ya no tiene sentido el .h externo
 				ELSE
 					.n_LanguageSelectedMethod	= 1	&& 1=Assigned by Parameter
 				ENDIF
@@ -22168,7 +22171,7 @@ DEFINE CLASS CL_LANG AS Custom
 					.C_OBJECT_NAME_WITHOUT_OBJECT_OREG_LOC							= "Object [<<toObj.CLASS>>] ne contient pas l'objet oReg (niveau <<TRANSFORM(tnNivel)>>)"
 					.C_ONLY_SETNAME_AND_GETNAME_RECOGNIZED_LOC						= "Opération non reconnu. Seulement SETNAME et GETNAME permis."
 					.C_OUTER_CLASS_DOES_NOT_MATCH_INNER_CLASSES_LOC					= "La classe externe ne correspond pas à la classe interne"
-					.C_OUTPUT_FILE_IS_NOT_OVERWRITEN_LOC							= "Optimisation: fichier de sortie [<<tcOutputFile>>] ne était pas écrasé parce que ce est la même que celle générée."
+					.C_OUTPUT_FILE_IS_NOT_OVERWRITEN_LOC							= "Optimisation: fichier de sortie [<<lcOutputFile>>] ne était pas écrasé parce que ce est la même que celle générée."
 					.C_OUTPUTFILE_NEWER_THAN_INPUTFILE_LOC							= "Optimisation: fichier de sortie [<<THIS.c_OutputFile>>] n'a pas été régénéré car il est plus récent que le fichier d'entrée."
 					.C_PRESS_ESC_TO_CANCEL											= "Appuyez sur Esc pour Annuler"
 					.C_PROCEDURE_NOT_CLOSED_ON_LINE_LOC								= "Procédure pas fermé. Dernière ligne de code doit être ENDPROC. [<<laLineas(1)>>, Recno:<<RECNO()>>]"
@@ -22247,7 +22250,7 @@ DEFINE CLASS CL_LANG AS Custom
 					.C_OBJECT_NAME_WITHOUT_OBJECT_OREG_LOC							= "Objeto [<<toObj.CLASS>>] no contiene el objeto oReg (nivel <<TRANSFORM(tnNivel)>>)"
 					.C_ONLY_SETNAME_AND_GETNAME_RECOGNIZED_LOC						= "Operación no reconocida. Solo re reconoce SETNAME y GETNAME."
 					.C_OUTER_CLASS_DOES_NOT_MATCH_INNER_CLASSES_LOC					= "La clase externa no coincide con la clase interna"
-					.C_OUTPUT_FILE_IS_NOT_OVERWRITEN_LOC							= "Optimización: El archivo de salida [<<tcOutputFile>>] no se sobreescribe por ser igual al generado."
+					.C_OUTPUT_FILE_IS_NOT_OVERWRITEN_LOC							= "Optimización: El archivo de salida [<<lcOutputFile>>] no se sobreescribe por ser igual al generado."
 					.C_OUTPUTFILE_NEWER_THAN_INPUTFILE_LOC							= "Optimización: El archivo de salida [<<THIS.c_OutputFile>>] no se regenera por ser más nuevo que el de entrada."
 					.C_PRESS_ESC_TO_CANCEL											= "Pulse Esc para Cancelar"
 					.C_PROCEDURE_NOT_CLOSED_ON_LINE_LOC								= "Procedimiento sin cerrar. La última línea de código debe ser ENDPROC. [<<laLineas(1)>>, Recno:<<RECNO()>>]"
@@ -22326,7 +22329,7 @@ DEFINE CLASS CL_LANG AS Custom
 					.C_OBJECT_NAME_WITHOUT_OBJECT_OREG_LOC							= "Objekt [<<toObj.CLASS>>] enthält nicht oReg Objekt (level <<TRANSFORM(tnNivel)>>)"
 					.C_ONLY_SETNAME_AND_GETNAME_RECOGNIZED_LOC						= "Befehl nicht erkannt. Nur SETNAME und GETNAME erlaubt."
 					.C_OUTER_CLASS_DOES_NOT_MATCH_INNER_CLASSES_LOC					= "Die äußere Klasse nicht die innere Klassifizierung anzeigen lassen"
-					.C_OUTPUT_FILE_IS_NOT_OVERWRITEN_LOC							= "Optimierung: Ausgabedatei [<<tcOutputFile>>] wurde nicht überschrieben da sie dieselbe ist wie die neu generierte."
+					.C_OUTPUT_FILE_IS_NOT_OVERWRITEN_LOC							= "Optimierung: Ausgabedatei [<<lcOutputFile>>] wurde nicht überschrieben da sie dieselbe ist wie die neu generierte."
 					.C_OUTPUTFILE_NEWER_THAN_INPUTFILE_LOC							= "Optimierung: Ausgabedatei [<<THIS.c_OutputFile>>] wurde nicht erneuert da sie neuer ist als die Ursprungsdatei."
 					.C_PRESS_ESC_TO_CANCEL											= "Drücken Sie Esc für Abbrechen"
 					.C_PROCEDURE_NOT_CLOSED_ON_LINE_LOC								= "Procedur nicht geschlossen. Letzte Zeile des Codes muss ENDPROC sein. [<<laLineas(1)>>, Recno:<<RECNO()>>]"

From 6e3a3ac773bc92225017d910d78d4485d7814ece Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Wed, 7 Jan 2015 00:31:43 +0100
Subject: [PATCH 08/19] =?UTF-8?q?Changeset:=20609=20-=20Actualizaci=C3=B3n?=
 =?UTF-8?q?=20del=20archivo=20de=20versi=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FoxBin2PRGVersionFile.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FoxBin2PRGVersionFile.txt b/FoxBin2PRGVersionFile.txt
index 996c299..9f48179 100644
--- a/FoxBin2PRGVersionFile.txt
+++ b/FoxBin2PRGVersionFile.txt
@@ -18,7 +18,7 @@ Demo video using FoxBin2Prg with PlasticSCM: http://youtu.be/sE4wQ50Itqg
 Change History -------------------------------------------------------------
 
 2015/01/04	v1.19.40
-
+- Bug fix dbf: [Error 12, variable "tcOutputFile" is not found] when DBF_Conversion_Support=4 and output file is the same as existent one (Mike Potjer)
 
 2015/01/01	v1.19.39
 - Bug fix vbs: vbs scripts does not show FoxBin2Prg process errors correctly

From 261376a5acf244344ef349ae305cbc377b7af52a Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Wed, 7 Jan 2015 20:51:42 +0100
Subject: [PATCH 09/19] =?UTF-8?q?Changeset:=20613=20-=20Mejora=20vcx/scx:?=
 =?UTF-8?q?=20Detecci=C3=B3n=20de=20nombres=20de=20objeto=20duplicados=20p?=
 =?UTF-8?q?ara=20notificar=20casos=20de=20corrupci=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 foxbin2prg.prg | 330 ++++++++++++++++++++++++++-----------------------
 1 file changed, 175 insertions(+), 155 deletions(-)

diff --git a/foxbin2prg.prg b/foxbin2prg.prg
index 016b22a..b48c2b6 100644
--- a/foxbin2prg.prg
+++ b/foxbin2prg.prg
@@ -128,6 +128,7 @@
 * 04/01/2015	FDBOZZO		v1.19.40	Bug fix frx/lbx: Cuando se usa el entorno de datos, solo se está guardando un cursor, y si hay más se pierden
 * 06/01/2015	FDBOZZO		v1.19.40	Mejora: Permitir configurar la barra de progreso para que solamente aparezca cuando se procesan múltiples archivos y no cuando se procesa solo 1 (Jim Nelson)
 * 07/01/2015	FDBOZZO		v1.19.40	Bug fix db2: [Error 12, Variable "TCOUTPUTFILE" is not found] cuando DBF_Conversion_Support=4 y el archivo de salida es igual al generado (Mike Potjer)
+* 07/01/2015	FDBOZZO		v1.19.40	Mejora scx/vcx: Detección de nombres de objeto duplicados para notificar casos de corrupción
 * </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES>
 *
 *---------------------------------------------------------------------------------------------------
@@ -2854,7 +2855,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE normalizarCapitalizacionArchivos
 		LPARAMETERS tl_NormalizeInputFile, tcFileName
 
@@ -3036,7 +3037,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE RenameFile
 		LPARAMETERS tcFileName, tcEXE_CAPS, toFSO AS Scripting.FileSystemObject, tlRelanzarError
 
@@ -3052,7 +3053,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE RenameTmpFile2Tx2File
 		LPARAMETERS tcFileName
 
@@ -3076,14 +3077,14 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE set_Line
 		LPARAMETERS tcLine, taCodeLines, I
 		tcLine 	= LTRIM( taCodeLines(I), 0, ' ', CHR(9) )
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE writeErrorLog
 		LPARAMETERS tcText
 
@@ -3103,7 +3104,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE writeLog
 		LPARAMETERS tcText
 
@@ -3122,7 +3123,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	HIDDEN PROCEDURE Exception2Str
 		LPARAMETERS toEx AS EXCEPTION
 		LOCAL lcError
@@ -3513,7 +3514,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 	oFSO					= NULL
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE INIT
 		LOCAL lcSys16, lnPosProg
 		SET DELETED ON
@@ -3547,7 +3548,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE DESTROY
 		LOCAL loLang as CL_LANG OF 'FOXBIN2PRG.PRG'
 		loLang			= _SCREEN.o_FoxBin2Prg_Lang
@@ -3558,7 +3559,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarAsignacion_TAG_Indicado
 		*-- DETALLES: Este método está pensado para leer los tags FB2P_VALUE y MEMBERDATA, que tienen esta sintaxis:
 		*
@@ -3656,7 +3657,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE buscarObjetoDelMetodoPorNombre
 		LPARAMETERS tcNombreObjeto, toClase
 		*-- Caso 1: Un método de un objeto de la clase
@@ -3714,7 +3715,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	FUNCTION comprobarExpresionValida
 		LPARAMETERS tcAsignacion, tnCodError, tcExpNormalizada
 		LOCAL llError, loEx AS EXCEPTION
@@ -3848,7 +3849,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE desnormalizarAsignacion
 		LPARAMETERS tcAsignacion
 		LOCAL lcPropName, lcValor, lnCodError, lcExpNormalizada, lnPos, lcComentario
@@ -3861,7 +3862,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE desnormalizarValorPropiedad
 		*-- Este método se ejecuta cuando se regenera el binario desde el tx2
 		LPARAMETERS tcProp, tcValue, tcComentario
@@ -3911,7 +3912,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE desnormalizarValorXML
 		LPARAMETERS tcValor
 		*-- DESNORMALIZA EL TEXTO INDICADO, EXPANDIENDO LOS SÍMBOLOS XML ESPECIALES.
@@ -3949,7 +3950,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE encode_SpecialCodes_1_31
 		LPARAMETERS tcText
 		LOCAL I
@@ -3961,7 +3962,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	HIDDEN PROCEDURE Exception2Str
 		LPARAMETERS toEx AS EXCEPTION
 		LOCAL lcError
@@ -3973,7 +3974,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE fileTypeCode
 		LPARAMETERS tcExtension
 		tcExtension	= UPPER(tcExtension)
@@ -4217,7 +4218,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE identificarBloquesDeCodigo
 		LPARAMETERS taCodeLines, tnCodeLines, taLineasExclusion, tnBloquesExclusion, toModulo
 	ENDPROC
@@ -4341,7 +4342,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE lineaExcluida
 		LPARAMETERS tn_Linea, tnBloquesExclusion, taLineasExclusion
 
@@ -4349,7 +4350,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE lineIsOnlyCommentAndNoMetadata
 		LPARAMETERS tcLine, tcComment
 		LOCAL lllineIsOnlyCommentAndNoMetadata, ln_AT_Cmt
@@ -4370,7 +4371,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE normalizarAsignacion
 		LPARAMETERS tcAsignacion, tcComentario
 		LOCAL lcPropName, lcValor, lnCodError, lcExpNormalizada, lnPos
@@ -4383,7 +4384,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE normalizarValorPropiedad
 		*-- Este método se ejecuta cuando se genera el tx2 desde el binario
 		LPARAMETERS tcProp, tcValue, tcComentario
@@ -4430,7 +4431,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE normalizarValorXML
 		LPARAMETERS tcValor
 		*-- NORMALIZA EL TEXTO INDICADO, COMPRIMIENDO LOS SÍMBOLOS XML ESPECIALES.
@@ -4446,7 +4447,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	FUNCTION RowTimeStamp(ltDateTime)
 		* Generate a FoxPro 3.0-style row timestamp
 		*-- CONVIERTE UN DATO TIPO DATETIME EN TIMESTAMP NUMERICO USADO POR LOS ARCHIVOS SCX/VCX/etc.
@@ -4474,7 +4475,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDFUNC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE sortPropsAndValues_SetAndGetSCXPropNames
 		*--------------------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -4644,7 +4645,6 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	*******************************************************************************************************************
 	PROCEDURE sortPropsAndValues
 		* KNOWLEDGE BASE:
 		* 02/12/2013	FDBOZZO		Fidel Charny me pasó un ejemplo donde se pierden propiedades físicamente
@@ -4907,7 +4907,6 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	*******************************************************************************************************************
 	PROCEDURE writeLog
 		LPARAMETERS tcText
 
@@ -4984,7 +4983,6 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
 	PROCEDURE Convertir
 		*---------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -5001,7 +4999,6 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
 	FUNCTION get_ValueByName_FromListNamesWithValues
 		*-- ASIGNO EL VALOR DEL ARRAY DE DATOS Y VALORES PARA LA PROPIEDAD INDICADA
 		LPARAMETERS tcPropName, tcValueType, taPropsAndValues
@@ -5043,7 +5040,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_FoxBin2Prg
 		*------------------------------------------------------
 		*-- Analiza el bloque <FOXBIN2PRG>
@@ -5067,7 +5064,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_LIBCOMMENT
 		*------------------------------------------------------
 		*-- Analiza el bloque *<LIBCOMMENT: Comentarios />
@@ -5089,7 +5086,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE createProject
 		LPARAMETERS tcTableOrCursor	&& 'TABLE' or 'CURSOR'
 
@@ -5134,7 +5131,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE createProject_RecordHeader
 		LPARAMETERS toProject
 
@@ -5184,7 +5181,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE createClasslib
 		LPARAMETERS tcTableOrCursor	&& 'TABLE' or 'CURSOR'
 
@@ -5224,7 +5221,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE createClasslib_RecordHeader
 		LPARAMETERS toModulo
 
@@ -5246,7 +5243,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE createForm
 		LPARAMETERS tcTableOrCursor	&& 'TABLE' or 'CURSOR'
 
@@ -5286,7 +5283,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE createForm_RecordHeader
 		LPARAMETERS toModulo
 
@@ -5308,7 +5305,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE createReport
 		LPARAMETERS tcTableOrCursor	&& 'TABLE' or 'CURSOR'
 
@@ -5400,7 +5397,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE createMenu
 		LPARAMETERS tcTableOrCursor	&& 'TABLE' or 'CURSOR'
 
@@ -5442,7 +5439,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE emptyRecord
 		LOCAL loReg
 		SCATTER MEMO BLANK NAME loReg
@@ -5450,13 +5447,13 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE escribirArchivoBin
 		LPARAMETERS toModulo
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE classProps2Memo
 		*-- ARMA EL MEMO DE PROPERTIES CON LAS PROPIEDADES Y SUS VALORES
 		LPARAMETERS toClase
@@ -5519,7 +5516,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE objectProps2Memo
 		*-- ARMA EL MEMO DE PROPERTIES CON LAS PROPIEDADES Y SUS VALORES
 		LPARAMETERS toObjeto, toClase
@@ -5554,7 +5551,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE classMethods2Memo
 		LPARAMETERS toClase
 
@@ -5621,7 +5618,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE objectMethods2Memo
 		LPARAMETERS toObjeto, toClase
 
@@ -5664,7 +5661,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE getClassPropertyComment
 		*-- Devuelve el comentario (columna 2 del array toClase._Props) de la propiedad indicada,
 		*-- buscándola en la columna 2 por su nombre.
@@ -5689,7 +5686,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE getClassMethodComment
 		LPARAMETERS tcMethodName AS STRING, toClase
 
@@ -5718,7 +5715,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE getTextFrom_BIN_FileStructure
 		TRY
 			LOCAL lcStructure, lnSelect
@@ -5741,7 +5738,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE defined_PAM2Memo
 		*--------------------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -5753,7 +5750,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE strip_Dimensions
 		LPARAMETERS tcSeparatedCommaVars
 		LOCAL lnPos1, lnPos2, I
@@ -5770,7 +5767,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE hiddenAndProtected_PAM
 		LPARAMETERS toClase
 
@@ -5794,7 +5791,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE Evaluate_PAM
 		LPARAMETERS tcMemo AS STRING, tcPAM AS STRING, tcPAM_Type AS STRING, tcPAM_Visibility AS STRING
 
@@ -5821,7 +5818,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE insert_Object
 		LPARAMETERS toClase, toObjeto, toFoxBin2Prg
 
@@ -5900,7 +5897,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE insert_AllObjects
 		*-- Recorro primero los objetos con ZOrder definido, y luego los demás
 		*-- NOTA: Como consecuencia de una integración de código, puede que se hayan agregado objetos nuevos (desconocidos),
@@ -5985,7 +5982,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE set_Line
 		LPARAMETERS tcLine, taCodeLines, I
 		tcLine 	= LTRIM( taCodeLines(I), 0, ' ', CHR(9) )
@@ -5993,7 +5990,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarLineasDeProcedure
 		LPARAMETERS toClase, toObjeto, tcLine, taCodeLines, I, tnCodeLines, tcProcedureAbierto, tc_Comentario ;
 			, taLineasExclusion, tnBloquesExclusion
@@ -6076,7 +6073,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_ADD_OBJECT
 		LPARAMETERS toModulo, toClase, tcLine, I, taCodeLines, tnCodeLines
 
@@ -6136,10 +6133,20 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 					toObjeto._Nombre	= toObjeto._Parent + '.' + toObjeto._ObjName
 					toObjeto._Class		= ALLTRIM( STREXTRACT(tcLine + ' WITH', ' AS ', ' WITH', 1, 1) )
 
+					*-- Chequeo de nombre de objeto repetido para el mismo contenedor
+					IF ATC('cmdDeshacer',toObjeto._Nombre) > 0 THEN
+					*	SET STEP ON
+					ENDIF
+					IF NOT EMPTY(toClase._aPathObjNames) AND ASCAN( toClase._aPathObjNames, toObjeto._Nombre, 1, 0, 0, 2+4 ) THEN
+						.writeErrorLog( 'ERROR: Objeto repetido > ' + toObjeto._Class + '.' + toObjeto._Nombre + ' [Line:' + TRANSFORM(I) + ']' )
+					ENDIF
+
 					IF NOT toClase.l_ObjectMetadataInHeader
 						toClase.add_Object( toObjeto )
 					ENDIF
 
+					DIMENSION toClase._aPathObjNames(toClase._AddObject_Count)
+					toClase._aPathObjNames(toClase._AddObject_Count)	= toObjeto._Nombre
 
 					*-- Propiedades del ADD OBJECT
 					FOR I = I + 1 TO tnCodeLines
@@ -6206,7 +6213,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_DEFINED_PAM
 		*--------------------------------------------------------------------------------------------------------------
 		* 07/01/2014	FDBOZZO		Los *métodos deben ir siempre al final, si no los eventos ACCESS no se ejecutan!
@@ -6310,7 +6317,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_DEFINE_CLASS
 		LPARAMETERS toModulo, toClase, tcLine, taCodeLines, I, tnCodeLines, tcProcedureAbierto ;
 			, taLineasExclusion, tnBloquesExclusion, tc_Comentario
@@ -6485,7 +6492,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_ENDDEFINE
 		LPARAMETERS toClase, tcLine, I, tcProcedureAbierto
 
@@ -6518,7 +6525,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_HIDDEN
 		LPARAMETERS toClase, tcLine
 
@@ -6539,7 +6546,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_INCLUDE
 		LPARAMETERS toModulo, toClase, tcLine, taCodeLines, I, tnCodeLines, tcProcedureAbierto
 		LOCAL llBloqueEncontrado
@@ -6564,7 +6571,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_CLASSCOMMENTS
 		LPARAMETERS toClase, tcLine ,taCodeLines, tnCodeLines, I
 
@@ -6619,7 +6626,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_CLASSMETADATA
 		LPARAMETERS toClase, tcLine
 
@@ -6659,7 +6666,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_EXTERNAL_CLASS
 		*------------------------------------------------------
 		*-- Analiza el bloque *< EXTERNAL_CLASS: Name="nombre-clase" Baseclass="clase-base" />
@@ -6690,7 +6697,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_OBJECTMETADATA
 		LPARAMETERS toClase, tcLine
 
@@ -6726,7 +6733,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_OLE_DEF
 		LPARAMETERS toModulo, tcLine, taCodeLines, I, tnCodeLines, tcProcedureAbierto
 		LOCAL llBloqueEncontrado
@@ -6777,7 +6784,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_PROCEDURE
 		LPARAMETERS toModulo, toClase, toObjeto, tcLine, taCodeLines, I, tnCodeLines, tcProcedureAbierto ;
 			, tc_Comentario, taLineasExclusion, tnBloquesExclusion
@@ -6826,7 +6833,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_PROTECTED
 		LPARAMETERS toClase, tcLine
 
@@ -6847,7 +6854,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE evaluarDefinicionDeProcedure
 		LPARAMETERS toClase, I, tc_Comentario, tcProcName, tcProcType, toObjeto
 		*--------------------------------------------------------------------------------------------------------------
@@ -6928,7 +6935,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE identificarBloquesDeCodigo
 		*--------------------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -7037,7 +7044,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE identificarBloquesDeCabecera
 		*--------------------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -7140,7 +7147,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE verificar_CLASES_EXTERNAS
 		*--------------------------------------------------------------------------------
 		*-- Compara las clases definidas en la cabecera con las clases encontradas luego
@@ -7305,7 +7312,7 @@ DEFINE CLASS c_conversor_prg_a_vcx AS c_conversor_prg_a_bin
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE escribirArchivoBin
 		LPARAMETERS toModulo, toFoxBin2Prg
 		*-- Estructura del objeto toModulo generado:
@@ -7660,7 +7667,7 @@ DEFINE CLASS c_conversor_prg_a_scx AS c_conversor_prg_a_bin
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE escribirArchivoBin
 		LPARAMETERS toModulo, toFoxBin2Prg
 		*-- Estructura del objeto toModulo generado:
@@ -7914,7 +7921,7 @@ DEFINE CLASS c_conversor_prg_a_pjx AS c_conversor_prg_a_bin
 		+ [</VFPData>]
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE Convertir
 		*---------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -7975,7 +7982,7 @@ DEFINE CLASS c_conversor_prg_a_pjx AS c_conversor_prg_a_bin
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE escribirArchivoBin
 		LPARAMETERS toProject, toFoxBin2Prg
 		*-- -----------------------------------------------------------------------------------------------------------
@@ -8100,7 +8107,7 @@ DEFINE CLASS c_conversor_prg_a_pjx AS c_conversor_prg_a_bin
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE identificarBloquesDeCodigo
 		LPARAMETERS taCodeLines, tnCodeLines, taLineasExclusion, tnBloquesExclusion, toProject
 		*--------------------------------------------------------------------------------------------------------------
@@ -8192,7 +8199,7 @@ DEFINE CLASS c_conversor_prg_a_pjx AS c_conversor_prg_a_bin
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_BuildProj
 		*------------------------------------------------------
 		*-- Analiza el bloque <BuildProj>
@@ -8274,7 +8281,7 @@ DEFINE CLASS c_conversor_prg_a_pjx AS c_conversor_prg_a_bin
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_DevInfo
 		*------------------------------------------------------
 		*-- Analiza el bloque <DevInfo>
@@ -8325,7 +8332,7 @@ DEFINE CLASS c_conversor_prg_a_pjx AS c_conversor_prg_a_bin
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_ServerHead
 		*------------------------------------------------------
 		*-- Analiza el bloque <ServerHead>
@@ -8384,7 +8391,7 @@ DEFINE CLASS c_conversor_prg_a_pjx AS c_conversor_prg_a_bin
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_ServerData
 		*------------------------------------------------------
 		*-- Analiza el bloque <ServerData>
@@ -8446,7 +8453,7 @@ DEFINE CLASS c_conversor_prg_a_pjx AS c_conversor_prg_a_bin
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_FileComments
 		*------------------------------------------------------
 		*-- Analiza el bloque <FileComments>
@@ -8509,7 +8516,7 @@ DEFINE CLASS c_conversor_prg_a_pjx AS c_conversor_prg_a_bin
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_ExcludedFiles
 		*------------------------------------------------------
 		*-- Analiza el bloque <ExcludedFiles>
@@ -8572,7 +8579,7 @@ DEFINE CLASS c_conversor_prg_a_pjx AS c_conversor_prg_a_bin
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_TextFiles
 		*------------------------------------------------------
 		*-- Analiza el bloque <TextFiles>
@@ -8635,7 +8642,7 @@ DEFINE CLASS c_conversor_prg_a_pjx AS c_conversor_prg_a_bin
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_ProjectProperties
 		*------------------------------------------------------
 		*-- Analiza el bloque <ProjectProperties>
@@ -8776,7 +8783,7 @@ DEFINE CLASS c_conversor_prg_a_frx AS c_conversor_prg_a_bin
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE escribirArchivoBin
 		LPARAMETERS toReport, toFoxBin2Prg
 		*-- -----------------------------------------------------------------------------------------------------------
@@ -8872,7 +8879,7 @@ DEFINE CLASS c_conversor_prg_a_frx AS c_conversor_prg_a_bin
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE identificarBloquesDeCodigo
 		LPARAMETERS taCodeLines, tnCodeLines, taLineasExclusion, tnBloquesExclusion, toReport
 		*--------------------------------------------------------------------------------------------------------------
@@ -8934,7 +8941,7 @@ DEFINE CLASS c_conversor_prg_a_frx AS c_conversor_prg_a_bin
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_CDATA_inline
 		*------------------------------------------------------
 		*-- Analiza el bloque <picture>
@@ -8996,7 +9003,7 @@ DEFINE CLASS c_conversor_prg_a_frx AS c_conversor_prg_a_bin
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_platform
 		*------------------------------------------------------
 		*-- Analiza el bloque <platform=>
@@ -9046,7 +9053,7 @@ DEFINE CLASS c_conversor_prg_a_frx AS c_conversor_prg_a_bin
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque_Reportes
 		*------------------------------------------------------
 		*-- Analiza el bloque <reportes>
@@ -9209,7 +9216,7 @@ DEFINE CLASS c_conversor_prg_a_dbf AS c_conversor_prg_a_bin
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE escribirArchivoBin
 		LPARAMETERS toTable, toFoxBin2Prg
 		*-- -----------------------------------------------------------------------------------------------------------
@@ -9370,7 +9377,7 @@ DEFINE CLASS c_conversor_prg_a_dbf AS c_conversor_prg_a_bin
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE identificarBloquesDeCodigo
 		*--------------------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -9512,7 +9519,7 @@ DEFINE CLASS c_conversor_prg_a_dbc AS c_conversor_prg_a_bin
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE escribirArchivoBin
 		LPARAMETERS toDatabase, toFoxBin2Prg
 		*-- -----------------------------------------------------------------------------------------------------------
@@ -9551,7 +9558,7 @@ DEFINE CLASS c_conversor_prg_a_dbc AS c_conversor_prg_a_bin
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE identificarBloquesDeCodigo
 		*--------------------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -9635,7 +9642,7 @@ DEFINE CLASS c_conversor_prg_a_mnx AS c_conversor_prg_a_bin
 	n_MenuType		= 0
 	c_MenuLocation	= ''
 
-	*******************************************************************************************************************
+
 	PROCEDURE Convertir
 		*---------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -9855,7 +9862,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 		+ [</VFPData>]
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE Convertir
 		*---------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -9919,7 +9926,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE get_ADD_OBJECT_METHODS
 		LPARAMETERS toRegObj, toRegClass, tcMethods, taMethods, taCode, tnMethodCount ;
 			, taPropsAndComments, tnPropsAndComments_Count, taProtected, tnProtected_Count ;
@@ -9988,7 +9995,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE get_CLASS_METHODS
 		LPARAMETERS tnMethodCount, taMethods, taCode, taProtected, taPropsAndComments
 		*-- DEFINIR MÉTODOS DE LA CLASE
@@ -10059,7 +10066,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE get_NombresObjetosOLEPublic
 		LPARAMETERS ta_NombresObjsOle
 		*-- Obtengo los objetos "OLEPublic"
@@ -10079,7 +10086,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE get_PropsAndCommentsFrom_RESERVED3
 		*-- Sirve para el memo RESERVED3
 		*---------------------------------------------------------------------------------------------------
@@ -10138,7 +10145,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE get_PropsAndValuesFrom_PROPERTIES
 		*-- Sirve para el memo PROPERTIES
 		*---------------------------------------------------------------------------------------------------
@@ -10274,7 +10281,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE get_PropsFrom_PROTECTED
 		*-- Sirve para el memo PROTECTED
 		*---------------------------------------------------------------------------------------------------
@@ -10319,7 +10326,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE IndentarMemo
 		LPARAMETERS tcMethod, tcIndentation, tlKeepProcHeader
 		*-- INDENTA EL CÓDIGO DE UN MÉTODO DADO Y QUITA LA CABECERA DE MÉTODO (PROCEDURE/ENDPROC) SI LA ENCUENTRA
@@ -10392,7 +10399,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE MemoInOneLine
 		LPARAMETERS tcMethod
 
@@ -10423,7 +10430,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE set_MultilineMemoWithAddObjectProperties
 		LPARAMETERS taPropsAndValues, tnPropCount, tcLeftIndentation, tlNormalizeLine
 
@@ -10463,7 +10470,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE SortMethod
 		LPARAMETERS tcMethod, taMethods, taCode, tcSorted, tnMethodCount, taPropsAndComments, tnPropsAndComments_Count ;
 			, taProtected, tnProtected_Count, toFoxBin2Prg
@@ -10532,7 +10539,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC	&& SordMethod
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE Method2Array
 		LPARAMETERS tcMethod, taMethods, taCode, tcSorted, tnMethodCount, taPropsAndComments, tnPropsAndComments_Count ;
 			, taProtected, tnProtected_Count, toFoxBin2Prg
@@ -10765,7 +10772,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC	&& Method2Array
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE write_ADD_OBJECTS_WithProperties
 		LPARAMETERS toRegObj, tcCodigo
 
@@ -10841,7 +10848,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE write_ALL_OBJECT_METHODS
 		LPARAMETERS tcMethods, taMethods, taCode, tnMethodCount, taPropsAndComments, tnPropsAndComments_Count ;
 			, taProtected, tnProtected_Count, toFoxBin2Prg, tcCodigo
@@ -10880,7 +10887,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE write_CLASS_PROPERTIES
 		LPARAMETERS toRegClass, taPropsAndValues, taPropsAndComments, taProtected ;
 			, tnPropsAndValues_Count, tnPropsAndComments_Count, tnProtected_Count, tcCodigo
@@ -10951,7 +10958,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE write_DEFINED_PAM
 		*-- Escribo propiedades DEFINED (Reserved3) en este formato:
 		LPARAMETERS taPropsAndComments, tnPropsAndComments_Count, tcCodigo
@@ -11018,7 +11025,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE write_DEFINE_CLASS
 		LPARAMETERS ta_NombresObjsOle, toRegClass, tcCodigo
 
@@ -11039,7 +11046,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE write_DEFINE_CLASS_COMMENTS
 		LPARAMETERS toRegClass, tcCodigo
 		*-- Comentario de la clase
@@ -11062,7 +11069,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE write_ENDDEFINE_SiCorresponde
 		LPARAMETERS tnLastClass, tcCodigo
 		IF tnLastClass = 1
@@ -11076,7 +11083,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE write_EXTERNAL_CLASS_HEADER
 		LPARAMETERS toRegClass, toFoxBin2Prg, tcCodigo
 		*-- < EXTERNAL_CLASS Name = "class-name" Baseclass="base-class" />
@@ -11098,7 +11105,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE write_INCLUDE
 		LPARAMETERS toReg, tcCodigo
 		*-- #INCLUDE
@@ -11112,7 +11119,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE write_CLASSMETADATA
 		LPARAMETERS toRegClass, tcCodigo
 
@@ -11161,7 +11168,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE write_OBJECTMETADATA
 		LPARAMETERS toRegObj, tcCodigo
 		LOCAL lcNombre
@@ -11194,7 +11201,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE write_HIDDEN_Properties
 		*-- Escribo la definición HIDDEN de propiedades
 		LPARAMETERS tcHiddenProp, tcCodigo
@@ -11209,7 +11216,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE write_PROTECTED_Properties
 		*-- Escribo la definición PROTECTED de propiedades
 		LPARAMETERS tcProtectedProp, tcCodigo
@@ -11224,7 +11231,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE write_TXT_REPORTE
 		LPARAMETERS toReg
 
@@ -11349,7 +11356,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE write_DefinicionObjetosOLE
 		*-- Crea la definición del tag *< OLE: /> con la información de todos los objetos OLE
 		LPARAMETERS toFoxBin2Prg
@@ -11469,9 +11476,9 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE FixOle2Fields
-		*******************************************************************************************************************
+	
 		* (This method is taken from Open Source project TwoFox, from Christof Wallenhaupt - http://www.foxpert.com/downloads.htm)
 		* OLE2 contains the physical name of the OCX or DLL when a record refers to an ActiveX
 		* control. On different developer machines these controls can be located in different
@@ -11505,10 +11512,10 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	FUNCTION OcxOutsideProjDir
 		LPARAMETERS tcOcx, tcProjDir
-		*******************************************************************************************************************
+	
 		* (This method is taken from Open Source project TwoFox, from Christof Wallenhaupt - http://www.foxpert.com/downloads.htm)
 		* Returns .T. when the OCX control resides outside the project directory
 
@@ -11523,7 +11530,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 		RETURN m.llOutside
 
 
-		*******************************************************************************************************************
+	
 		* (This method is taken from Open Source project TwoFox, from Christof Wallenhaupt - http://www.foxpert.com/downloads.htm)
 		* Cambios de un campo OLE2 exclusivamente en el nombre del archivo
 	PROCEDURE TruncateOle2 (tcOcx)
@@ -11561,8 +11568,8 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
 		TRY
 			LOCAL lnCodError, loRegClass, loRegObj, lnMethodCount, laMethods(1), laCode(1), laProtected(1), lnLen, lnObjCount ;
 				, laPropsAndValues(1), laPropsAndComments(1), lnLastClass, lnRecno, lcMethods, lcObjName, la_NombresObjsOle(1) ;
-				, laObjs(1,3), I, lnPropsAndValues_Count, lnPropsAndComments_Count, lnProtected_Count, lcCodigo, laClasses(1,2) ;
-				, lnClassCount, lcOutputFile, lcExternalHeader, lnClassTotal, lnStepCount, lnStep
+				, laObjs(1,4), I, lnPropsAndValues_Count, lnPropsAndComments_Count, lnProtected_Count, lcCodigo, laClasses(1,2) ;
+				, lnClassCount, lcOutputFile, lcExternalHeader, lnClassTotal, lnStepCount, lnStep, lcObjPathInsideClass
 			STORE 0 TO lnCodError, lnLastClass, lnObjCount, lnPropsAndValues_Count, lnPropsAndComments_Count, lnProtected_Count ;
 				, lnMethodCount, lnClassCount, lnStepCount, lnStep
 			STORE '' TO laMethods, laCode, laProtected, laPropsAndComments, laObjs, lcCodigo, laClasses, lcOutputFile ;
@@ -11652,18 +11659,24 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
 
 					SCAN REST WHILE UPPER( TABLABIN.PLATFORM ) = "WINDOWS" AND LOWER( ALLTRIM( GETWORDNUM( TABLABIN.PARENT, 1, '.' ) ) ) == LOWER(lcObjName)
 						lnObjCount	= lnObjCount + 1
-						DIMENSION laObjs(lnObjCount,3)
 						loRegObj	= NULL
 						SCATTER MEMO NAME loRegObj
 
 						*-- Normalización de capitalización y de datos según parametrización
-						loRegObj.BASECLASS	= LOWER( loRegObj.BASECLASS )
-						loRegObj.CLASSLOC	= LOWER( loRegObj.CLASSLOC )
-						loRegObj.CLASS		= LOWER( loRegObj.CLASS )
+						loRegObj.BASECLASS		= LOWER( loRegObj.BASECLASS )
+						loRegObj.CLASSLOC		= LOWER( loRegObj.CLASSLOC )
+						loRegObj.CLASS			= LOWER( loRegObj.CLASS )
+						lcObjPathInsideClass	= LOWER( loRegObj.PARENT ) + '.' + LOWER( loRegObj.OBJNAME )
 
+						IF lnObjCount > 1 AND ASCAN( laObjs, lcObjPathInsideClass, 1, 0, 4, 2+4+8 ) > 0 THEN
+							.writeErrorLog( 'ERROR: Objeto repetido > ' + loRegObj.CLASS + '.' + lcObjPathInsideClass + ' [Recno:' + TRANSFORM(RECNO()) + ']' )
+						ENDIF
+
+						DIMENSION laObjs(lnObjCount,4)
 						laObjs(lnObjCount,1)	= loRegObj
-						laObjs(lnObjCount,2)	= RECNO()		&& ZOrder
-						laObjs(lnObjCount,3)	= lnObjCount	&& Alphabetic order
+						laObjs(lnObjCount,2)	= RECNO()				&& ZOrder
+						laObjs(lnObjCount,3)	= lnObjCount			&& Alphabetic order
+						laObjs(lnObjCount,4)	= lcObjPathInsideClass	&& To check duplicates
 
 						IF toFoxBin2Prg.l_NoTimestamps
 							loRegObj.TIMESTAMP	= 0
@@ -11853,7 +11866,7 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
 			LOCAL lnCodError, loRegClass, loRegObj, lnMethodCount, laMethods(1), laCode(1), laProtected(1), lnLen, lnObjCount ;
 				, laPropsAndValues(1), laPropsAndComments(1), lnLastClass, lnRecno, lcMethods, lcObjName, la_NombresObjsOle(1) ;
 				, laObjs(1,3), I, lnPropsAndValues_Count, lnPropsAndComments_Count, lnProtected_Count, lcCodigo, laClasses(1,2) ;
-				, lnClassCount, lcOutputFile, lcExternalHeader, lnClassTotal, lnStepCount, lnStep
+				, lnClassCount, lcOutputFile, lcExternalHeader, lnClassTotal, lnStepCount, lnStep, lcObjPathInsideClass
 			STORE 0 TO lnCodError, lnLastClass, lnObjCount, lnPropsAndValues_Count, lnPropsAndComments_Count, lnProtected_Count ;
 				, lnMethodCount, lnClassCount, lnStepCount, lnStep
 			STORE '' TO laMethods, laCode, laProtected, laPropsAndComments, laObjs, lcCodigo, laClasses, lcOutputFile ;
@@ -11958,7 +11971,6 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
 
 					SCAN REST WHILE UPPER( TABLABIN.PLATFORM ) = "WINDOWS" AND LOWER( ALLTRIM( GETWORDNUM( TABLABIN.PARENT, 1, '.' ) ) ) == LOWER(lcObjName)
 						lnObjCount	= lnObjCount + 1
-						DIMENSION laObjs(lnObjCount,3)
 						loRegObj	= NULL
 						SCATTER MEMO NAME loRegObj
 
@@ -11966,10 +11978,17 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
 						loRegObj.BASECLASS	= LOWER( loRegObj.BASECLASS )
 						loRegObj.CLASSLOC	= LOWER( loRegObj.CLASSLOC )
 						loRegObj.CLASS		= LOWER( loRegObj.CLASS )
+						lcObjPathInsideClass	= LOWER( loRegObj.PARENT ) + '.' + LOWER( loRegObj.OBJNAME )
 
+						IF lnObjCount > 1 AND ASCAN( laObjs, lcObjPathInsideClass, 1, 0, 4, 2+4+8 ) > 0 THEN
+							.writeErrorLog( 'ERROR: Objeto repetido > ' + loRegObj.CLASS + '.' + lcObjPathInsideClass + ' [Recno:' + TRANSFORM(RECNO()) + ']' )
+						ENDIF
+
+						DIMENSION laObjs(lnObjCount,4)
 						laObjs(lnObjCount,1)	= loRegObj
-						laObjs(lnObjCount,2)	= RECNO()		&& ZOrder
-						laObjs(lnObjCount,3)	= lnObjCount	&& Orden alfabético
+						laObjs(lnObjCount,2)	= RECNO()				&& ZOrder
+						laObjs(lnObjCount,3)	= lnObjCount			&& Alphabetic order
+						laObjs(lnObjCount,4)	= lcObjPathInsideClass	&& To check duplicates
 
 						IF toFoxBin2Prg.l_NoTimestamps
 							loRegObj.TIMESTAMP	= 0
@@ -12863,7 +12882,7 @@ DEFINE CLASS c_conversor_frx_a_prg AS c_conversor_bin_a_prg
 	+ [</VFPData>]
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE Convertir
 		*---------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -13632,6 +13651,7 @@ DEFINE CLASS CL_CLASE AS CL_CUS_BASE
 		+ [<memberdata name="l_objectmetadatainheader" display="l_ObjectMetadataInHeader"/>] ;
 		+ [<memberdata name="_addobject_count" display="_AddObject_Count"/>] ;
 		+ [<memberdata name="_addobjects" display="_AddObjects"/>] ;
+		+ [<memberdata name="_apathobjnames" display="_aPathObjNames"/>] ;
 		+ [<memberdata name="_aprocnames" display="_aProcNames"/>] ;
 		+ [<memberdata name="_baseclass" display="_BaseClass"/>] ;
 		+ [<memberdata name="_checked" display="_Checked"/>] ;
@@ -13682,7 +13702,7 @@ DEFINE CLASS CL_CLASE AS CL_CUS_BASE
 		+ [</VFPData>]
 
 
-	DIMENSION _Props[1,2], _AddObjects[1], _Procedures[1], _aProcNames[1]
+	DIMENSION _Props[1,2], _AddObjects[1], _Procedures[1], _aProcNames[1], _aPathObjNames[1]
 	l_ObjectMetadataInHeader	= .F.
 	c_TextErr			= ''
 	_Nombre				= ''
@@ -15376,7 +15396,7 @@ DEFINE CLASS CL_DBC AS CL_DBC_BASE
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE toText
 		TRY
 			LOCAL I, lcText, lcDBC, laCode(1,1), loEx AS EXCEPTION ;
@@ -15470,7 +15490,7 @@ DEFINE CLASS CL_DBC_CONNECTIONS AS CL_DBC_COL_BASE
 	#ENDIF
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque
 		*---------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -15537,7 +15557,7 @@ DEFINE CLASS CL_DBC_CONNECTIONS AS CL_DBC_COL_BASE
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE toText
 		*---------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -15787,7 +15807,7 @@ DEFINE CLASS CL_DBC_TABLES AS CL_DBC_COL_BASE
 	#ENDIF
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque
 		*---------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -15851,7 +15871,7 @@ DEFINE CLASS CL_DBC_TABLES AS CL_DBC_COL_BASE
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE toText
 		*---------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -17176,7 +17196,7 @@ DEFINE CLASS CL_DBC_FIELDS_VW AS CL_DBC_COL_BASE
 	#ENDIF
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque
 		*---------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -17241,7 +17261,7 @@ DEFINE CLASS CL_DBC_FIELDS_VW AS CL_DBC_COL_BASE
 	ENDPROC
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE toText
 		*---------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -17640,7 +17660,7 @@ DEFINE CLASS CL_DBC_RELATION AS CL_DBC_BASE
 	_RefIntegrity	= ''
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque
 		*---------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -18015,7 +18035,7 @@ DEFINE CLASS CL_DBF_FIELDS AS CL_COL_BASE
 	#ENDIF
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque
 		*---------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -18185,7 +18205,7 @@ DEFINE CLASS CL_DBF_FIELD AS CL_CUS_BASE
 	_AutoInc_Step			= 0		&& 18
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque
 		*---------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -18558,7 +18578,7 @@ DEFINE CLASS CL_DBF_RECORDS AS CL_COL_BASE
 	#ENDIF
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque
 		*---------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT)
@@ -18660,7 +18680,7 @@ DEFINE CLASS CL_DBF_RECORD AS CL_CUS_BASE
 	#ENDIF
 
 
-	*******************************************************************************************************************
+
 	PROCEDURE analizarBloque
 		*---------------------------------------------------------------------------------------------------
 		* PARÁMETROS:				(!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT)

From 3f8bbf75f3b034f6a707a54f07a2ff039589cd8b Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Thu, 8 Jan 2015 00:58:48 +0100
Subject: [PATCH 10/19] =?UTF-8?q?Changeset:=20614=20-=20Mejora=20vc2/sc2:?=
 =?UTF-8?q?=20Detecci=C3=B3n=20de=20nombres=20de=20objeto=20duplicados=20p?=
 =?UTF-8?q?ara=20notificar=20casos=20de=20corrupci=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 foxbin2prg.prg | 170 ++++++++++++++++++++++++++-----------------------
 1 file changed, 90 insertions(+), 80 deletions(-)

diff --git a/foxbin2prg.prg b/foxbin2prg.prg
index b48c2b6..1322837 100644
--- a/foxbin2prg.prg
+++ b/foxbin2prg.prg
@@ -4203,7 +4203,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	************************************************************************************************
+
 	PROCEDURE get_ValueFromNullTerminatedValue
 		LPARAMETERS tcNullTerminatedValue
 		LOCAL lcValue, lnNullPos
@@ -6115,6 +6115,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 					ENDIF
 
 					IF ISNULL(toObjeto)
+						Z			= 0
 						toObjeto	= CREATEOBJECT('CL_OBJETO')
 						*-- Luego se reasigna el ZOrder, pero si no lo hace, se pone último como si se acabara de agregar.
 						*-- Puede pasar si se agrega manualmente al TX2 y se olvida agregar la metadata OBJECTDATA.
@@ -6134,19 +6135,15 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 					toObjeto._Class		= ALLTRIM( STREXTRACT(tcLine + ' WITH', ' AS ', ' WITH', 1, 1) )
 
 					*-- Chequeo de nombre de objeto repetido para el mismo contenedor
-					IF ATC('cmdDeshacer',toObjeto._Nombre) > 0 THEN
-					*	SET STEP ON
-					ENDIF
-					IF NOT EMPTY(toClase._aPathObjNames) AND ASCAN( toClase._aPathObjNames, toObjeto._Nombre, 1, 0, 0, 2+4 ) THEN
-						.writeErrorLog( 'ERROR: Objeto repetido > ' + toObjeto._Class + '.' + toObjeto._Nombre + ' [Line:' + TRANSFORM(I) + ']' )
+					IF toClase._aPathObjName_Count > 0 AND ASCAN( toClase._aPathObjNames, toObjeto._Nombre, 1, 0, 0, 2+4 ) > 0 THEN
+						.writeErrorLog( 'ERROR: Objeto repetido > ' + toClase._Class + '.' + toObjeto._Nombre + ' [Line:' + TRANSFORM(I) + ']' )
 					ENDIF
 
-					IF NOT toClase.l_ObjectMetadataInHeader
+					IF NOT toClase.l_ObjectMetadataInHeader OR Z=0
 						toClase.add_Object( toObjeto )
 					ENDIF
 
-					DIMENSION toClase._aPathObjNames(toClase._AddObject_Count)
-					toClase._aPathObjNames(toClase._AddObject_Count)	= toObjeto._Nombre
+					toClase.add_PathObjName(toObjeto._Nombre)
 
 					*-- Propiedades del ADD OBJECT
 					FOR I = I + 1 TO tnCodeLines
@@ -13561,7 +13558,7 @@ DEFINE CLASS CL_MODULO AS CL_CUS_BASE
 	_Comment				= ''
 
 
-	************************************************************************************************
+
 	PROCEDURE add_OLE
 		LPARAMETERS toOle
 
@@ -13577,7 +13574,7 @@ DEFINE CLASS CL_MODULO AS CL_CUS_BASE
 	ENDPROC
 
 
-	************************************************************************************************
+
 	PROCEDURE add_Class
 		LPARAMETERS toClase
 
@@ -13593,7 +13590,7 @@ DEFINE CLASS CL_MODULO AS CL_CUS_BASE
 	ENDPROC
 
 
-	************************************************************************************************
+
 	PROCEDURE existeObjetoOLE
 		*-- Ubico el objeto ole por su nombre (parent+objname), que no se repite.
 		LPARAMETERS tcNombre, X
@@ -13644,6 +13641,7 @@ DEFINE CLASS CL_CLASE AS CL_CUS_BASE
 	#ENDIF
 
 	_MEMBERDATA	= [<VFPData>] ;
+		+ [<memberdata name="add_pathobjname" display="add_PathObjName"/>] ;
 		+ [<memberdata name="add_procedure" display="add_Procedure"/>] ;
 		+ [<memberdata name="add_property" display="add_Property"/>] ;
 		+ [<memberdata name="add_object" display="add_Object"/>] ;
@@ -13651,6 +13649,7 @@ DEFINE CLASS CL_CLASE AS CL_CUS_BASE
 		+ [<memberdata name="l_objectmetadatainheader" display="l_ObjectMetadataInHeader"/>] ;
 		+ [<memberdata name="_addobject_count" display="_AddObject_Count"/>] ;
 		+ [<memberdata name="_addobjects" display="_AddObjects"/>] ;
+		+ [<memberdata name="_apathobjname_count" display="_aPathObjName_Count"/>] ;
 		+ [<memberdata name="_apathobjnames" display="_aPathObjNames"/>] ;
 		+ [<memberdata name="_aprocnames" display="_aProcNames"/>] ;
 		+ [<memberdata name="_baseclass" display="_BaseClass"/>] ;
@@ -13704,55 +13703,68 @@ DEFINE CLASS CL_CLASE AS CL_CUS_BASE
 
 	DIMENSION _Props[1,2], _AddObjects[1], _Procedures[1], _aProcNames[1], _aPathObjNames[1]
 	l_ObjectMetadataInHeader	= .F.
-	c_TextErr			= ''
-	_Nombre				= ''
-	_ObjName			= ''
-	_Parent				= ''
-	_Checked			= .F.	&& Solo para Clases Externas: Permite saber si la clase fue checkeada contra la Clase Externa.
-	_Definicion			= ''
-	_Class				= ''
-	_ClassLoc			= ''
-	_OlePublic			= ''
-	_Ole				= ''
-	_Ole2				= ''
-	_UniqueID			= ''
-	_Comentario			= ''
-	_ClassIcon			= ''
-	_ProjectClassIcon	= ''
-	_Inicio				= 0
-	_Fin				= 0
-	_Ini_Cab			= 0
-	_Fin_Cab			= 0
-	_Ini_Cuerpo			= 0
-	_Fin_Cuerpo			= 0
-	_Prop_Count			= 0
-	_HiddenProps		= ''
-	_ProtectedProps		= ''
-	_HiddenMethods		= ''
-	_ProtectedMethods	= ''
-	_MetaData			= ''
-	_BaseClass			= ''
-	_TimeStamp			= 0
-	_Scale				= ''
-	_Defined_PAM		= ''
-	_includeFile		= ''
-	_AddObject_Count	= 0
-	_Procedure_Count	= 0
-	_PROPERTIES			= ''
-	_PROTECTED			= ''
-	_METHODS			= ''
-	_RESERVED1			= ''
-	_RESERVED2			= ''
-	_RESERVED3			= ''
-	_RESERVED4			= ''
-	_RESERVED5			= ''
-	_RESERVED6			= ''
-	_RESERVED7			= ''
-	_RESERVED8			= ''
-	_User				= ''
+	c_TextErr					= ''
+	_Nombre						= ''
+	_ObjName					= ''
+	_Parent						= ''
+	_Checked					= .F.	&& Solo para Clases Externas: Permite saber si la clase fue checkeada contra la Clase Externa.
+	_Definicion					= ''
+	_Class						= ''
+	_ClassLoc					= ''
+	_OlePublic					= ''
+	_Ole						= ''
+	_Ole2						= ''
+	_UniqueID					= ''
+	_Comentario					= ''
+	_ClassIcon					= ''
+	_ProjectClassIcon			= ''
+	_Inicio						= 0
+	_Fin						= 0
+	_Ini_Cab					= 0
+	_Fin_Cab					= 0
+	_Ini_Cuerpo					= 0
+	_Fin_Cuerpo					= 0
+	_Prop_Count					= 0
+	_HiddenProps				= ''
+	_ProtectedProps				= ''
+	_HiddenMethods				= ''
+	_ProtectedMethods			= ''
+	_MetaData					= ''
+	_BaseClass					= ''
+	_TimeStamp					= 0
+	_Scale						= ''
+	_Defined_PAM				= ''
+	_includeFile				= ''
+	_AddObject_Count			= 0
+	_aPathObjName_Count			= 0
+	_Procedure_Count			= 0
+	_PROPERTIES					= ''
+	_PROTECTED					= ''
+	_METHODS					= ''
+	_RESERVED1					= ''
+	_RESERVED2					= ''
+	_RESERVED3					= ''
+	_RESERVED4					= ''
+	_RESERVED5					= ''
+	_RESERVED6					= ''
+	_RESERVED7					= ''
+	_RESERVED8					= ''
+	_User						= ''
+
+
+	PROCEDURE Add_PathObjName
+		LPARAMETERS tcPathObjName
+
+		WITH THIS AS CL_CLASE OF 'FOXBIN2PRG.PRG'
+			._aPathObjName_Count	= ._aPathObjName_Count + 1
+			DIMENSION ._aPathObjNames(._aPathObjName_Count)
+			._aPathObjNames(._aPathObjName_Count)	= tcPathObjName
+		ENDWITH
+
+		RETURN
+	ENDPROC
 
 
-	************************************************************************************************
 	PROCEDURE add_Procedure
 		LPARAMETERS toProcedure
 
@@ -13776,7 +13788,6 @@ DEFINE CLASS CL_CLASE AS CL_CUS_BASE
 	ENDPROC
 
 
-	************************************************************************************************
 	PROCEDURE add_Property
 		LPARAMETERS tcProperty AS STRING, tcValue AS STRING, tcComment AS STRING
 
@@ -13790,7 +13801,6 @@ DEFINE CLASS CL_CLASE AS CL_CUS_BASE
 	ENDPROC
 
 
-	************************************************************************************************
 	PROCEDURE add_Object
 		LPARAMETERS toObjeto
 
@@ -13833,7 +13843,7 @@ DEFINE CLASS CL_PROCEDURE AS CL_CUS_BASE
 	_Inicio			= 0
 
 
-	************************************************************************************************
+
 	PROCEDURE add_Line
 		LPARAMETERS tcLine AS STRING
 
@@ -13897,7 +13907,7 @@ DEFINE CLASS CL_OBJETO AS CL_CUS_BASE
 	_ZOrder				= 0
 
 
-	************************************************************************************************
+
 	PROCEDURE add_Procedure
 		LPARAMETERS toProcedure
 
@@ -13925,7 +13935,7 @@ DEFINE CLASS CL_OBJETO AS CL_CUS_BASE
 	ENDPROC
 
 
-	************************************************************************************************
+
 	PROCEDURE add_Property
 		LPARAMETERS tcProperty AS STRING, tcValue AS STRING
 
@@ -14055,21 +14065,21 @@ DEFINE CLASS CL_PROJECT AS CL_COL_BASE
 	_AutoIncrement		= ''
 
 
-	************************************************************************************************
+
 	PROCEDURE INIT
 		DODEFAULT()
 		THIS._ServerHead	= CREATEOBJECT('CL_PROJ_SRV_HEAD')
 	ENDPROC
 
 
-	************************************************************************************************
+
 	PROCEDURE setParsedProjInfoLine
 		LPARAMETERS tcProjInfoLine
 		THIS.setParsedInfoLine( THIS, tcProjInfoLine )
 	ENDPROC
 
 
-	************************************************************************************************
+
 	PROCEDURE setParsedInfoLine
 		LPARAMETERS toObject, tcInfoLine
 		LOCAL lcAsignacion, lcCurDir
@@ -14083,7 +14093,7 @@ DEFINE CLASS CL_PROJECT AS CL_COL_BASE
 	ENDPROC
 
 
-	************************************************************************************************
+
 	PROCEDURE parseNullTerminatedValue
 		LPARAMETERS tcDevInfo, tnPos, tnLen
 		LOCAL lcValue, lnNullPos
@@ -14098,7 +14108,7 @@ DEFINE CLASS CL_PROJECT AS CL_COL_BASE
 	ENDPROC
 
 
-	************************************************************************************************
+
 	PROCEDURE parseDeviceInfo
 		LPARAMETERS tcDevInfo
 
@@ -14137,7 +14147,7 @@ DEFINE CLASS CL_PROJECT AS CL_COL_BASE
 	ENDPROC
 
 
-	************************************************************************************************
+
 	PROCEDURE getRowDeviceInfo
 		LPARAMETERS tcDevInfo
 
@@ -14183,7 +14193,7 @@ DEFINE CLASS CL_PROJECT AS CL_COL_BASE
 	ENDPROC
 
 
-	************************************************************************************************
+
 	PROCEDURE getFormattedDeviceInfoText
 		TRY
 			LOCAL lcText
@@ -18816,14 +18826,14 @@ DEFINE CLASS CL_PROJ_SRV_HEAD AS CL_CUS_BASE
 	_TypeLib			= ''
 
 
-	************************************************************************************************
+
 	PROCEDURE setParsedHeadInfoLine
 		LPARAMETERS tcHeadInfoLine
 		THIS.setParsedInfoLine( THIS, tcHeadInfoLine )
 	ENDPROC
 
 
-	************************************************************************************************
+
 	PROCEDURE setParsedInfoLine
 		LPARAMETERS toObject, tcInfoLine
 		LOCAL lcAsignacion, lcCurDir
@@ -18836,7 +18846,7 @@ DEFINE CLASS CL_PROJ_SRV_HEAD AS CL_CUS_BASE
 	ENDPROC
 
 
-	************************************************************************************************
+
 	PROCEDURE add_Server
 		LPARAMETERS toServerData
 
@@ -18852,7 +18862,7 @@ DEFINE CLASS CL_PROJ_SRV_HEAD AS CL_CUS_BASE
 	ENDPROC
 
 
-	************************************************************************************************
+
 	PROCEDURE getDataFromPair_LenData_Structure
 		LPARAMETERS tcData, tnPos, tnLen
 		LOCAL lcData, lnLen
@@ -18868,7 +18878,7 @@ DEFINE CLASS CL_PROJ_SRV_HEAD AS CL_CUS_BASE
 	ENDPROC
 
 
-	************************************************************************************************
+
 	PROCEDURE parseServerInfo
 		LPARAMETERS tcServerInfo
 
@@ -18926,7 +18936,7 @@ DEFINE CLASS CL_PROJ_SRV_HEAD AS CL_CUS_BASE
 	ENDPROC
 
 
-	************************************************************************************************
+
 	PROCEDURE getRowServerInfo
 		TRY
 			LOCAL lcStr, lnLenH, lnLen, lnPos ;
@@ -18974,7 +18984,7 @@ DEFINE CLASS CL_PROJ_SRV_HEAD AS CL_CUS_BASE
 	ENDPROC
 
 
-	************************************************************************************************
+
 	PROCEDURE getFormattedServerText
 		TRY
 			LOCAL lcText ;
@@ -19051,7 +19061,7 @@ DEFINE CLASS CL_PROJ_SRV_DATA AS CL_CUS_BASE
 	_Interface		= ''
 
 
-	************************************************************************************************
+
 	PROCEDURE getRowServerInfo
 		TRY
 			LOCAL lcStr, lnLen, lnPos
@@ -19089,7 +19099,7 @@ DEFINE CLASS CL_PROJ_SRV_DATA AS CL_CUS_BASE
 	ENDPROC
 
 
-	************************************************************************************************
+
 	PROCEDURE getFormattedServerText
 		TRY
 			LOCAL lcText

From 64c6b2d6be567174b23e6d4cd6857a792d0ddd7a Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Thu, 8 Jan 2015 02:01:56 +0100
Subject: [PATCH 11/19] =?UTF-8?q?Changeset:=20615=20-=20Ajuste=20de=20mens?=
 =?UTF-8?q?ajes=20e=20Internacionalizaci=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 foxbin2prg.prg | 82 +++++++++++++++++++++++++++++++++++---------------
 1 file changed, 58 insertions(+), 24 deletions(-)

diff --git a/foxbin2prg.prg b/foxbin2prg.prg
index 1322837..5a248a9 100644
--- a/foxbin2prg.prg
+++ b/foxbin2prg.prg
@@ -6091,8 +6091,11 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 			IF LEFT( tcLine, 11 ) == 'ADD OBJECT '
 				*-- Estructura a reconocer: ADD OBJECT 'frm_a.Check1' AS check [WITH]
 				WITH THIS AS c_conversor_prg_a_bin OF foxbin2prg.prg
+					LOCAL laPropsAndValues(1,2), lnPropsAndValues_Count, Z, lcProp, lcValue, lcNombre, lcObjName, lnPos ;
+						, loLang as CL_LANG OF 'FOXBIN2PRG.PRG'
+
 					llBloqueEncontrado	= .T.
-					LOCAL laPropsAndValues(1,2), lnPropsAndValues_Count, Z, lcProp, lcValue, lcNombre, lcObjName
+					loLang		= _SCREEN.o_Foxbin2prg_lang
 					tcLine		= CHRTRAN( tcLine, ['], ["] )
 
 					IF EMPTY(toClase._Fin_Cab)
@@ -6135,15 +6138,21 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 					toObjeto._Class		= ALLTRIM( STREXTRACT(tcLine + ' WITH', ' AS ', ' WITH', 1, 1) )
 
 					*-- Chequeo de nombre de objeto repetido para el mismo contenedor
-					IF toClase._aPathObjName_Count > 0 AND ASCAN( toClase._aPathObjNames, toObjeto._Nombre, 1, 0, 0, 2+4 ) > 0 THEN
-						.writeErrorLog( 'ERROR: Objeto repetido > ' + toClase._Class + '.' + toObjeto._Nombre + ' [Line:' + TRANSFORM(I) + ']' )
+					IF toClase._aPathObjName_Count > 0
+						lnPos	= ASCAN( toClase._aPathObjNames, toObjeto._Nombre, 1, 0, 1, 1+2+4+8 )
+
+						IF lnPos > 0 THEN
+							*-- ERROR: Objeto Duplicado
+							.writeErrorLog( '* ' + loLang.C_DUPLICATED_OBJECT_LOC + ' "' + toClase._Class + '.' + toObjeto._Nombre ;
+								+ '" @line ' + TRANSFORM(I) + ', (1st.Line:' + TRANSFORM(toClase._aPathObjNames(lnPos,2)) + ')' )
+						ENDIF
 					ENDIF
 
 					IF NOT toClase.l_ObjectMetadataInHeader OR Z=0
 						toClase.add_Object( toObjeto )
 					ENDIF
 
-					toClase.add_PathObjName(toObjeto._Nombre)
+					toClase.add_PathObjName(toObjeto._Nombre, I)
 
 					*-- Propiedades del ADD OBJECT
 					FOR I = I + 1 TO tnCodeLines
@@ -11566,16 +11575,18 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
 			LOCAL lnCodError, loRegClass, loRegObj, lnMethodCount, laMethods(1), laCode(1), laProtected(1), lnLen, lnObjCount ;
 				, laPropsAndValues(1), laPropsAndComments(1), lnLastClass, lnRecno, lcMethods, lcObjName, la_NombresObjsOle(1) ;
 				, laObjs(1,4), I, lnPropsAndValues_Count, lnPropsAndComments_Count, lnProtected_Count, lcCodigo, laClasses(1,2) ;
-				, lnClassCount, lcOutputFile, lcExternalHeader, lnClassTotal, lnStepCount, lnStep, lcObjPathInsideClass
+				, lnClassCount, lcOutputFile, lcExternalHeader, lnClassTotal, lnStepCount, lnStep, lcObjPathInsideClass, lnPos ;
+				, loLang as CL_LANG OF 'FOXBIN2PRG.PRG'
 			STORE 0 TO lnCodError, lnLastClass, lnObjCount, lnPropsAndValues_Count, lnPropsAndComments_Count, lnProtected_Count ;
 				, lnMethodCount, lnClassCount, lnStepCount, lnStep
 			STORE '' TO laMethods, laCode, laProtected, laPropsAndComments, laObjs, lcCodigo, laClasses, lcOutputFile ;
 				, C_FB2PRG_CODE, lcExternalHeader
 			STORE NULL TO loRegClass, loRegObj
+			loLang	= _SCREEN.o_Foxbin2prg_lang
 
 			WITH THIS AS c_conversor_vcx_a_prg OF 'FOXBIN2PRG.PRG'
 				USE (.c_InputFile) SHARED AGAIN NOUPDATE ALIAS _TABLAORIG
-				SELECT * FROM _TABLAORIG INTO CURSOR TABLABIN
+				SELECT _TABLAORIG.*,RECNO() regnum FROM _TABLAORIG INTO CURSOR TABLABIN
 				lnStepCount	= 7
 				USE IN (SELECT("_TABLAORIG"))
 
@@ -11665,13 +11676,19 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
 						loRegObj.CLASS			= LOWER( loRegObj.CLASS )
 						lcObjPathInsideClass	= LOWER( loRegObj.PARENT ) + '.' + LOWER( loRegObj.OBJNAME )
 
-						IF lnObjCount > 1 AND ASCAN( laObjs, lcObjPathInsideClass, 1, 0, 4, 2+4+8 ) > 0 THEN
-							.writeErrorLog( 'ERROR: Objeto repetido > ' + loRegObj.CLASS + '.' + lcObjPathInsideClass + ' [Recno:' + TRANSFORM(RECNO()) + ']' )
+						IF lnObjCount > 1 THEN
+							lnPos	= ASCAN( laObjs, lcObjPathInsideClass, 1, 0, 4, 1+2+4+8 )
+
+							IF lnPos > 0 THEN
+								*-- ERROR: Objeto Duplicado
+								.writeErrorLog( '* ' + loLang.C_DUPLICATED_OBJECT_LOC + ' "' + loRegObj.CLASS + '.' + lcObjPathInsideClass ;
+									+ '" @Recno ' + TRANSFORM(loRegObj.regnum) + ', (1st.Recno:' + TRANSFORM(laObjs(lnPos,2)) + ')' )
+							ENDIF
 						ENDIF
 
 						DIMENSION laObjs(lnObjCount,4)
 						laObjs(lnObjCount,1)	= loRegObj
-						laObjs(lnObjCount,2)	= RECNO()				&& ZOrder
+						laObjs(lnObjCount,2)	= loRegObj.regnum		&& ZOrder
 						laObjs(lnObjCount,3)	= lnObjCount			&& Alphabetic order
 						laObjs(lnObjCount,4)	= lcObjPathInsideClass	&& To check duplicates
 
@@ -11862,17 +11879,19 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
 		TRY
 			LOCAL lnCodError, loRegClass, loRegObj, lnMethodCount, laMethods(1), laCode(1), laProtected(1), lnLen, lnObjCount ;
 				, laPropsAndValues(1), laPropsAndComments(1), lnLastClass, lnRecno, lcMethods, lcObjName, la_NombresObjsOle(1) ;
-				, laObjs(1,3), I, lnPropsAndValues_Count, lnPropsAndComments_Count, lnProtected_Count, lcCodigo, laClasses(1,2) ;
-				, lnClassCount, lcOutputFile, lcExternalHeader, lnClassTotal, lnStepCount, lnStep, lcObjPathInsideClass
+				, laObjs(1,4), I, lnPropsAndValues_Count, lnPropsAndComments_Count, lnProtected_Count, lcCodigo, laClasses(1,2) ;
+				, lnClassCount, lcOutputFile, lcExternalHeader, lnClassTotal, lnStepCount, lnStep, lcObjPathInsideClass, lnPos ;
+				, loLang as CL_LANG OF 'FOXBIN2PRG.PRG'
 			STORE 0 TO lnCodError, lnLastClass, lnObjCount, lnPropsAndValues_Count, lnPropsAndComments_Count, lnProtected_Count ;
 				, lnMethodCount, lnClassCount, lnStepCount, lnStep
 			STORE '' TO laMethods, laCode, laProtected, laPropsAndComments, laObjs, lcCodigo, laClasses, lcOutputFile ;
 				, C_FB2PRG_CODE, lcExternalHeader
 			STORE NULL TO loRegClass, loRegObj
+			loLang	= _SCREEN.o_foxbin2prg_lang
 
 			WITH THIS AS c_conversor_scx_a_prg OF 'FOXBIN2PRG.PRG'
 				USE (.c_InputFile) SHARED AGAIN NOUPDATE ALIAS _TABLAORIG
-				SELECT * FROM _TABLAORIG INTO CURSOR TABLABIN
+				SELECT _TABLAORIG.*,RECNO() regnum FROM _TABLAORIG INTO CURSOR TABLABIN
 				USE IN (SELECT("_TABLAORIG"))
 
 				INDEX ON PADR(LOWER(PLATFORM + IIF(EMPTY(PARENT),'',ALLTRIM(PARENT)+'.')+OBJNAME),240) TAG PARENT_OBJ OF TABLABIN ADDITIVE
@@ -11972,18 +11991,24 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
 						SCATTER MEMO NAME loRegObj
 
 						*-- Normalización de capitalización y de datos según parametrización
-						loRegObj.BASECLASS	= LOWER( loRegObj.BASECLASS )
-						loRegObj.CLASSLOC	= LOWER( loRegObj.CLASSLOC )
-						loRegObj.CLASS		= LOWER( loRegObj.CLASS )
+						loRegObj.BASECLASS		= LOWER( loRegObj.BASECLASS )
+						loRegObj.CLASSLOC		= LOWER( loRegObj.CLASSLOC )
+						loRegObj.CLASS			= LOWER( loRegObj.CLASS )
 						lcObjPathInsideClass	= LOWER( loRegObj.PARENT ) + '.' + LOWER( loRegObj.OBJNAME )
 
-						IF lnObjCount > 1 AND ASCAN( laObjs, lcObjPathInsideClass, 1, 0, 4, 2+4+8 ) > 0 THEN
-							.writeErrorLog( 'ERROR: Objeto repetido > ' + loRegObj.CLASS + '.' + lcObjPathInsideClass + ' [Recno:' + TRANSFORM(RECNO()) + ']' )
+						IF lnObjCount > 1 THEN
+							lnPos	= ASCAN( laObjs, lcObjPathInsideClass, 1, 0, 4, 1+2+4+8 )
+
+							IF lnPos > 0 THEN
+								*-- ERROR: Objeto Duplicado
+								.writeErrorLog( '* ' + loLang.C_DUPLICATED_OBJECT_LOC + ' "' + loRegObj.CLASS + '.' + lcObjPathInsideClass ;
+									+ '" @Recno ' + TRANSFORM(loRegObj.regnum) + ', (1st.Recno:' + TRANSFORM(laObjs(lnPos,2)) + ')' )
+							ENDIF
 						ENDIF
 
 						DIMENSION laObjs(lnObjCount,4)
 						laObjs(lnObjCount,1)	= loRegObj
-						laObjs(lnObjCount,2)	= RECNO()				&& ZOrder
+						laObjs(lnObjCount,2)	= loRegObj.regnum		&& ZOrder
 						laObjs(lnObjCount,3)	= lnObjCount			&& Alphabetic order
 						laObjs(lnObjCount,4)	= lcObjPathInsideClass	&& To check duplicates
 
@@ -13701,7 +13726,7 @@ DEFINE CLASS CL_CLASE AS CL_CUS_BASE
 		+ [</VFPData>]
 
 
-	DIMENSION _Props[1,2], _AddObjects[1], _Procedures[1], _aProcNames[1], _aPathObjNames[1]
+	DIMENSION _Props[1,2], _AddObjects[1], _Procedures[1], _aProcNames[1], _aPathObjNames[1,2]
 	l_ObjectMetadataInHeader	= .F.
 	c_TextErr					= ''
 	_Nombre						= ''
@@ -13753,12 +13778,13 @@ DEFINE CLASS CL_CLASE AS CL_CUS_BASE
 
 
 	PROCEDURE Add_PathObjName
-		LPARAMETERS tcPathObjName
+		LPARAMETERS tcPathObjName, I
 
 		WITH THIS AS CL_CLASE OF 'FOXBIN2PRG.PRG'
 			._aPathObjName_Count	= ._aPathObjName_Count + 1
-			DIMENSION ._aPathObjNames(._aPathObjName_Count)
-			._aPathObjNames(._aPathObjName_Count)	= tcPathObjName
+			DIMENSION ._aPathObjNames(._aPathObjName_Count,2)
+			._aPathObjNames(._aPathObjName_Count,1)	= tcPathObjName
+			._aPathObjNames(._aPathObjName_Count,2)	= I
 		ENDWITH
 
 		RETURN
@@ -13776,7 +13802,7 @@ DEFINE CLASS CL_CLASE AS CL_CUS_BASE
 			*-- Verificación de Procedure repetido
 			IF ._Procedure_Count > 0 AND ASCAN( ._aProcNames, toProcedure._Nombre, 1, 0, 0, 1+2+4 ) > 0 THEN
 				.writeErrorLog( '* Duplicated Method "' + toProcedure._Nombre + '" of class "' ;
-					+ ._Nombre + '" in line ' + TRANSFORM(toProcedure._Inicio) )
+					+ ._Nombre + '" @line ' + TRANSFORM(toProcedure._Inicio) )
 			ENDIF
 
 			._Procedure_Count	= ._Procedure_Count + 1
@@ -13923,7 +13949,7 @@ DEFINE CLASS CL_OBJETO AS CL_CUS_BASE
 			*-- Verificación de Procedure repetido
 			IF ._Procedure_Count > 0 AND ASCAN( ._aProcNames, toProcedure._Nombre, 1, 0, 0, 1+2+4 ) > 0 THEN
 				.writeErrorLog( '* Duplicated Method "' + toProcedure._Nombre + '" of class.object "' ;
-					+ ._Nombre + '" in line ' + TRANSFORM(toProcedure._Inicio) )
+					+ ._Nombre + '" @line ' + TRANSFORM(toProcedure._Inicio) )
 			ENDIF
 
 			._Procedure_Count	= ._Procedure_Count + 1
@@ -21828,9 +21854,11 @@ DEFINE CLASS CL_LANG AS Custom
 	C_CONVERTING_FILE_LOC											= "Converting file"
 	C_DATA_ERROR_CANT_PARSE_UNPAIRING_DOUBLE_QUOTES_LOC				= "Data Error: Can't parse because of unpaired double-quotes on line <<lcMetadatos>>"
 	C_DUPLICATED_FILE_LOC											= "Duplicated file"
+	C_DUPLICATED_OBJECT_LOC											= "Duplicated Object"
 	C_ENDDEFINE_MARKER_NOT_FOUND_LOC								= "Cannot find end marker [ENDDEFINE] of line <<TRANSFORM( toClase._Inicio )>> for ID [<<toClase._Nombre>>]"
 	C_END_MARKER_NOT_FOUND_LOC										= "Cannot find end marker [<<ta_ID_Bloques(lnPrimerID,2)>>] that closes start marker [<<ta_ID_Bloques(lnPrimerID,1)>>] on line <<TRANSFORM(taBloquesExclusion(tnBloquesExclusion,1))>>"
 	C_END_OF_PROCESS_LOC											= "End of Process"
+	C_ERROR_LOC														= "ERROR"
 	C_ERRORS_FOUND_IN_FILE_LOC										= "ERRORS FOUND IN FILE"
 	C_EXTENSION_RECONFIGURATION_LOC									= "Extension Reconfiguration:"
 	C_EXTERNAL_CLASS_COUNT_DOES_NOT_MATCH_FOUND_CLASSES_LOC			= "External class count (<<toModulo._ExternalClasses_Count>>) does not match found classes (<<toModulo._Clases_Count>>) for file [<<toFoxBin2Prg.c_InputFile>>]"
@@ -21972,9 +22000,11 @@ DEFINE CLASS CL_LANG AS Custom
 					.C_CONVERTING_FILE_LOC											= "Conversion de fichiers"
 					.C_DATA_ERROR_CANT_PARSE_UNPAIRING_DOUBLE_QUOTES_LOC			= "Erreur de données: ne peut pas analyser en raison de guillemets non appariés en ligne <<lcMetadatos>>"
 					.C_DUPLICATED_FILE_LOC											= "fichier dupliqué"
+					.C_DUPLICATED_OBJECT_LOC										= "Object dupliqué"
 					.C_ENDDEFINE_MARKER_NOT_FOUND_LOC								= "Vous ne trouvez pas marqueur de fin [ENDDEFINE] de la ligne <<TRANSFORM(toClase._Inicio)>> ID [<<toClase._Nombre>>]"
 					.C_END_MARKER_NOT_FOUND_LOC										= "Vous ne trouvez pas fin marqueur [<<ta_ID_Bloques(lnPrimerID, 2)>>] qui ferme marqueur de début [<<ta_ID_Bloques(lnPrimerID, 1) >>] en ligne <<TRANSFORM(taBloquesExclusion (tnBloquesExclusion, 1))>>"
 					.C_END_OF_PROCESS_LOC											= "Fin du processus"
+					.C_ERROR_LOC													= "ERREUR"
 					.C_ERRORS_FOUND_IN_FILE_LOC										= "ERREURS TROUVÉ DANS LE FICHIER"
 					.C_EXTENSION_RECONFIGURATION_LOC								= "Extension Reconfiguration:"
 					.C_EXTERNAL_CLASS_COUNT_DOES_NOT_MATCH_FOUND_CLASSES_LOC		= "Nombre de classe externe (<<toModulo._ExternalClasses_Count>>) ne correspond pas classes trouvées (<<toModulo._Clases_Count>>) pour le fichier [<<toFoxBin2Prg.c_InputFile>>]"
@@ -22051,9 +22081,11 @@ DEFINE CLASS CL_LANG AS Custom
 					.C_CONVERTING_FILE_LOC											= "Convirtiendo archivo"
 					.C_DATA_ERROR_CANT_PARSE_UNPAIRING_DOUBLE_QUOTES_LOC			= "Error de datos: No se puede parsear porque las comillas no son pares en la línea <<lcMetadatos>>"
 					.C_DUPLICATED_FILE_LOC											= "Archivo duplicado"
+					.C_DUPLICATED_OBJECT_LOC										= "Objeto Duplicado"
 					.C_ENDDEFINE_MARKER_NOT_FOUND_LOC								= "No se ha encontrado el marcador de fin [ENDDEFINE] de la línea <<TRANSFORM( toClase._Inicio )>> para el identificador [<<toClase._Nombre>>]"
 					.C_END_MARKER_NOT_FOUND_LOC										= "No se ha encontrado el marcador de fin [<<ta_ID_Bloques(lnPrimerID,2)>>] que cierra al marcador de inicio [<<ta_ID_Bloques(lnPrimerID,1)>>] de la línea <<TRANSFORM(taBloquesExclusion(tnBloquesExclusion,1))>>"
 					.C_END_OF_PROCESS_LOC											= "Fin del Proceso"
+					.C_ERROR_LOC													= "ERROR"
 					.C_ERRORS_FOUND_IN_FILE_LOC										= "SE HAN ENCONTRADOS ERRORES EN EL ARCHIVO"
 					.C_EXTENSION_RECONFIGURATION_LOC								= "Reconfiguración de extensión:"
 					.C_EXTERNAL_CLASS_COUNT_DOES_NOT_MATCH_FOUND_CLASSES_LOC		= "El conteo de clases externas (<<toModulo._ExternalClasses_Count>>) no coincide con la cantidad encontrada (<<toModulo._Clases_Count>>) para el archivo [<<toFoxBin2Prg.c_InputFile>>]"
@@ -22130,9 +22162,11 @@ DEFINE CLASS CL_LANG AS Custom
 					.C_CONVERTING_FILE_LOC											= "Konvertiere Datei"
 					.C_DATA_ERROR_CANT_PARSE_UNPAIRING_DOUBLE_QUOTES_LOC			= "Datenfehler: Keine Analyse möglich da ungepaarte Anführungszeichen in Zeile <<lcMetadatos>>"
 					.C_DUPLICATED_FILE_LOC											= "Doppelte Datei"
+					.C_DUPLICATED_OBJECT_LOC										= "Doppelte Objekt"
 					.C_ENDDEFINE_MARKER_NOT_FOUND_LOC								= "Kann keinen Ende Marker [ENDDEFINE] in Zeile <<TRANSFORM( toClase._Inicio )>> für die ID [<<toClase._Nombre>>] finden"
 					.C_END_MARKER_NOT_FOUND_LOC										= "Kann keinen Ende Marker [<<ta_ID_Bloques(lnPrimerID,2)>>] welcher den Start Marker [<<ta_ID_Bloques(lnPrimerID,1)>>] in Zeile <<TRANSFORM(taBloquesExclusion(tnBloquesExclusion,1))>> schließt"
 					.C_END_OF_PROCESS_LOC											= "Ende der Prozess"
+					.C_ERROR_LOC													= "FEHLER"
 					.C_ERRORS_FOUND_IN_FILE_LOC										= "FEHLER IN FILE GEFUNDEN"
 					.C_EXTENSION_RECONFIGURATION_LOC								= "Erweiterungsneukonfiguration:"
 					.C_EXTERNAL_CLASS_COUNT_DOES_NOT_MATCH_FOUND_CLASSES_LOC		= "Externe Klassenzahl (<< toModulo._ExternalClasses_Count >>) nicht gefunden Klassen entsprechen (<< toModulo._Clases_Count >>) für Datei [<< toFoxBin2Prg.c_InputFile >>]"

From 96edf7d18fbe7ab44846e77f31ca8c414ea3e2e9 Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Thu, 8 Jan 2015 02:04:02 +0100
Subject: [PATCH 12/19] Changeset: 616 - Ajustes de beautify

---
 foxbin2prg.prg | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/foxbin2prg.prg b/foxbin2prg.prg
index 5a248a9..31b59d0 100644
--- a/foxbin2prg.prg
+++ b/foxbin2prg.prg
@@ -1348,7 +1348,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 
 				IF .l_Main_CFG_Loaded AND lo_Configuration.Count > 0
 					.n_CFG_Actual		= lo_Configuration.GetKey( lc_CFG_Path )	&& 0=No hay CFG cacheada, +1=Hay CFG cacheada
-					
+
 					IF .n_CFG_Actual > 0 THEN
 						lo_CFG			= lo_Configuration.Item(.n_CFG_Actual)
 						.l_CFG_CachedAccess	= .T.
@@ -1659,7 +1659,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 			loEx.UserValue	= loEx.UserValue + 'lcConfigFile = [' + TRANSFORM(lcConfigFile) + ']' + CR_LF
 			loEx.UserValue	= loEx.UserValue + 'lc_CFG_Path = [' + TRANSFORM(lc_CFG_Path) + ']' + CR_LF
 			loEx.UserValue	= loEx.UserValue + 'lcValue = [' + TRANSFORM(lcValue) + ']' + CR_LF
-			
+
 			IF THIS.l_Debug AND _VFP.STARTMODE = 0
 				SET STEP ON
 			ENDIF
@@ -2342,7 +2342,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 			IF VARTYPE(loLang) <> 'O' THEN
 				loLang		= CREATEOBJECT("CL_LANG","EN")
 			ENDIF
-			
+
 			toEx.UserValue	= toEx.UserValue + 'FoxBin2Prg: [' + THIS.c_Foxbin2prg_FullPath + '] (EXE Version: ' + THIS.c_FB2PRG_EXE_Version + ')' + CR_LF
 
 			IF ATC('-SHOWMSG', ('-' + tcType)) >= 1 THEN
@@ -3427,9 +3427,9 @@ ENDDEFINE
 
 
 *******************************************************************************************************************
-DEFINE CLASS c_conversor_base AS SESSION
+DEFINE CLASS C_CONVERSOR_BASE AS SESSION
 	#IF .F.
-		LOCAL THIS AS c_conversor_base OF 'FOXBIN2PRG.PRG'
+		LOCAL THIS AS C_CONVERSOR_BASE OF 'FOXBIN2PRG.PRG'
 	#ENDIF
 	_MEMBERDATA	= [<VFPData>] ;
 		+ [<memberdata name="analizarasignacion_tag_indicado" display="analizarAsignacion_TAG_Indicado"/>] ;
@@ -4179,7 +4179,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 
 			IF PCOUNT() > 3
 				*-- EVALUAR UNA ASIGNACIÓN QUE PUEDE SER MULTILÍNEA (memberdata, fb2p_value, etc)
-				WITH THIS AS c_conversor_base OF 'FOXBIN2PRG.PRG'
+				WITH THIS AS C_CONVERSOR_BASE OF 'FOXBIN2PRG.PRG'
 					DO CASE
 					CASE .analizarAsignacion_TAG_Indicado( @tcPropName, @tcValue, @taCodeLines, tnCodeLines, @I ;
 							, C_FB2P_VALUE_I, C_FB2P_VALUE_F, C_LEN_FB2P_VALUE_I, C_LEN_FB2P_VALUE_F )
@@ -4669,7 +4669,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 			DIMENSION laPropsAndValues( tnPropsAndValues_Count, lnArrayCols )
 			ACOPY( taPropsAndValues, laPropsAndValues )
 
-			WITH THIS AS c_conversor_base OF 'FOXBIN2PRG.PRG'
+			WITH THIS AS C_CONVERSOR_BASE OF 'FOXBIN2PRG.PRG'
 				IF m.tnSortType >= 1
 					* CON SORT:
 					* - A las que no tienen '.' les pongo 'A' por delante, y al resto 'B' por delante para que queden al final
@@ -4933,7 +4933,7 @@ ENDDEFINE
 
 
 *******************************************************************************************************************
-DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
+DEFINE CLASS c_conversor_prg_a_bin AS C_CONVERSOR_BASE
 	#IF .F.
 		LOCAL THIS AS c_conversor_prg_a_bin OF 'FOXBIN2PRG.PRG'
 	#ENDIF
@@ -6095,7 +6095,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
 						, loLang as CL_LANG OF 'FOXBIN2PRG.PRG'
 
 					llBloqueEncontrado	= .T.
-					loLang		= _SCREEN.o_Foxbin2prg_lang
+					loLang		= _SCREEN.o_FoxBin2Prg_Lang
 					tcLine		= CHRTRAN( tcLine, ['], ["] )
 
 					IF EMPTY(toClase._Fin_Cab)
@@ -9816,7 +9816,7 @@ ENDDEFINE	&& CLASS c_conversor_prg_a_mnx AS c_conversor_prg_a_bin
 
 
 *******************************************************************************************************************
-DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
+DEFINE CLASS c_conversor_bin_a_prg AS C_CONVERSOR_BASE
 	#IF .F.
 		LOCAL THIS AS c_conversor_bin_a_prg OF 'FOXBIN2PRG.PRG'
 	#ENDIF
@@ -11323,7 +11323,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 			ENDTEXT
 
 			C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<picture><![CDATA[" + toReg.PICTURE + "]]>"
-			
+
 			IF INLIST(toReg.ObjType, 25, 26) && Dataenvironment, cursors and relations
 				C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<tag><![CDATA[" + CR_LF + toReg.TAG + "]]>"
 				C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + "	<tag2><![CDATA[]]>"
@@ -11484,7 +11484,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 
 
 	PROCEDURE FixOle2Fields
-	
+
 		* (This method is taken from Open Source project TwoFox, from Christof Wallenhaupt - http://www.foxpert.com/downloads.htm)
 		* OLE2 contains the physical name of the OCX or DLL when a record refers to an ActiveX
 		* control. On different developer machines these controls can be located in different
@@ -11521,7 +11521,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 
 	FUNCTION OcxOutsideProjDir
 		LPARAMETERS tcOcx, tcProjDir
-	
+
 		* (This method is taken from Open Source project TwoFox, from Christof Wallenhaupt - http://www.foxpert.com/downloads.htm)
 		* Returns .T. when the OCX control resides outside the project directory
 
@@ -11536,7 +11536,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 		RETURN m.llOutside
 
 
-	
+
 		* (This method is taken from Open Source project TwoFox, from Christof Wallenhaupt - http://www.foxpert.com/downloads.htm)
 		* Cambios de un campo OLE2 exclusivamente en el nombre del archivo
 	PROCEDURE TruncateOle2 (tcOcx)
@@ -11582,7 +11582,7 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
 			STORE '' TO laMethods, laCode, laProtected, laPropsAndComments, laObjs, lcCodigo, laClasses, lcOutputFile ;
 				, C_FB2PRG_CODE, lcExternalHeader
 			STORE NULL TO loRegClass, loRegObj
-			loLang	= _SCREEN.o_Foxbin2prg_lang
+			loLang	= _SCREEN.o_FoxBin2Prg_Lang
 
 			WITH THIS AS c_conversor_vcx_a_prg OF 'FOXBIN2PRG.PRG'
 				USE (.c_InputFile) SHARED AGAIN NOUPDATE ALIAS _TABLAORIG
@@ -11887,7 +11887,7 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
 			STORE '' TO laMethods, laCode, laProtected, laPropsAndComments, laObjs, lcCodigo, laClasses, lcOutputFile ;
 				, C_FB2PRG_CODE, lcExternalHeader
 			STORE NULL TO loRegClass, loRegObj
-			loLang	= _SCREEN.o_foxbin2prg_lang
+			loLang	= _SCREEN.o_FoxBin2Prg_Lang
 
 			WITH THIS AS c_conversor_scx_a_prg OF 'FOXBIN2PRG.PRG'
 				USE (.c_InputFile) SHARED AGAIN NOUPDATE ALIAS _TABLAORIG
@@ -13777,7 +13777,7 @@ DEFINE CLASS CL_CLASE AS CL_CUS_BASE
 	_User						= ''
 
 
-	PROCEDURE Add_PathObjName
+	PROCEDURE add_PathObjName
 		LPARAMETERS tcPathObjName, I
 
 		WITH THIS AS CL_CLASE OF 'FOXBIN2PRG.PRG'

From 236f0b8c9aa4a6f3f562806cd9d0b3270efd4199 Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Thu, 8 Jan 2015 02:07:36 +0100
Subject: [PATCH 13/19] =?UTF-8?q?Changeset:=20618=20-=20Actualizaci=C3=B3n?=
 =?UTF-8?q?=20del=20archivo=20log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FoxBin2PRGVersionFile.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FoxBin2PRGVersionFile.txt b/FoxBin2PRGVersionFile.txt
index d59baac..a102746 100644
--- a/FoxBin2PRGVersionFile.txt
+++ b/FoxBin2PRGVersionFile.txt
@@ -20,8 +20,9 @@ Change History -------------------------------------------------------------
 2015/01/04	v1.19.40
 - Enhancement frx/lbx: Clean ASCII 0 from expression field for Dataenvironment, Cursors and Relations
 - Bug fix frx/lbx: When using Dataenvironment with more than one cursor, remaining cursors are lost
-- Added new configuration "ShowProgressbar:2" to activate the progressbar only when a directory is selected and deactivate it for individual files (Jim Nelson)
+- Feature: Added new configuration "ShowProgressbar:2" to activate the progressbar only when a directory is selected and deactivate it for individual files (Jim Nelson)
 - Bug fix dbf: [Error 12, variable "tcOutputFile" is not found] when DBF_Conversion_Support=4 and output file is the same as existent one (Mike Potjer)
+- Feature: Added new code checking to find duplicated object names for the same class and container to notify those cases of vcx/scx file corruption
 
 2015/01/01	v1.19.39
 - Bug fix vbs: vbs scripts does not show FoxBin2Prg process errors correctly

From c1402de8aa3b996408b5726e498bcf97f247bb01 Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Thu, 8 Jan 2015 19:49:33 +0100
Subject: [PATCH 14/19] =?UTF-8?q?Changeset:=20620=20-=20Mejora=20de=20mens?=
 =?UTF-8?q?ajes=20en=20los=20logs=20de=20errores=20-=20Mejora=20en=20detec?=
 =?UTF-8?q?ci=C3=B3n=20de=20las=20estructuras=20de=20programa=20mal=20inde?=
 =?UTF-8?q?ntadas=20(DEFINE/ENDDEFINE/PROCEDURE/ENDPROC/etc)=20-=20Mejora?=
 =?UTF-8?q?=20en=20detecci=C3=B3n=20de=20tablas=20DBF=20inv=C3=A1lidas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 foxbin2prg.prg | 90 ++++++++++++++++++++++++++++++++------------------
 1 file changed, 57 insertions(+), 33 deletions(-)

diff --git a/foxbin2prg.prg b/foxbin2prg.prg
index 31b59d0..915055f 100644
--- a/foxbin2prg.prg
+++ b/foxbin2prg.prg
@@ -2415,11 +2415,11 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 
 		LOCAL loLang as CL_LANG OF 'FOXBIN2PRG.PRG'
 		loLang			= _SCREEN.o_FoxBin2Prg_Lang
-		tcErrorInfo		= THIS.Exception2Str(@toEx) + CR_LF + CR_LF + loLang.C_SOURCEFILE_LOC + TRANSFORM(THIS.c_InputFile)
+		tcErrorInfo		= THIS.Exception2Str(@toEx) + CR_LF + loLang.C_SOURCEFILE_LOC + TRANSFORM(THIS.c_InputFile) + CR_LF
 		ADDPROPERTY(_SCREEN, 'ExitCode', toEx.ERRORNO)
 
 		*-- Escribo la información de error en la variable log de errores
-		THIS.writeErrorLog( TTOC(DATETIME(),3) + '  ' + REPLICATE('-', 80) )
+		THIS.writeErrorLog( REPLICATE('-', 100), 1 )
 		THIS.writeErrorLog( tcErrorInfo )
 		THIS.writeErrorLog( )
 
@@ -2742,7 +2742,8 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 
 					*-- Logueo los errores
 					IF NOT EMPTY(loConversor.c_TextErr) THEN
-						.writeErrorLog( PADR( loLang.C_ERRORS_FOUND_IN_FILE_LOC + ' [' + .c_InputFile + '] ', 100, '-' ) )
+						.writeErrorLog( REPLICATE( '-', 100 ), 1 )
+						.writeErrorLog( loLang.C_ERRORS_FOUND_IN_FILE_LOC + ' [' + .c_InputFile + '] ' )
 						.writeErrorLog( loConversor.c_TextErr )
 						.writeErrorLog( )
 					ENDIF
@@ -3086,10 +3087,14 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 
 
 	PROCEDURE writeErrorLog
-		LPARAMETERS tcText
+		LPARAMETERS tcText, tnTimestamp
 
 		TRY
-			THIS.c_TextErr	= THIS.c_TextErr + TTOC(DATETIME(),3) + '  ' + EVL(tcText,'') + CR_LF
+			IF EVL(tnTimestamp,0) = 1 THEN
+				THIS.c_TextErr	= THIS.c_TextErr + TTOC(DATETIME(),3) + '  '
+			ENDIF
+
+			THIS.c_TextErr	= THIS.c_TextErr + EVL(tcText,'') + CR_LF
 			THIS.l_Error	= .T.
 		CATCH
 		ENDTRY
@@ -3106,10 +3111,14 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 
 
 	PROCEDURE writeLog
-		LPARAMETERS tcText
+		LPARAMETERS tcText, tnTimestamp
 
 		TRY
-			THIS.c_TextLog	= THIS.c_TextLog + TTOC(DATETIME(),3) + '  ' + EVL(tcText,'') + CR_LF
+			IF EVL(tnTimestamp,0) = 1 THEN
+				THIS.c_TextLog	= THIS.c_TextLog + TTOC(DATETIME(),3) + '  '
+			ENDIF
+
+			THIS.c_TextLog	= THIS.c_TextLog + EVL(tcText,'') + CR_LF
 		CATCH
 		ENDTRY
 	ENDPROC
@@ -3128,9 +3137,16 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 		LPARAMETERS toEx AS EXCEPTION
 		LOCAL lcError
 		lcError		= 'Error ' + TRANSFORM(toEx.ERRORNO) + ', ' + toEx.MESSAGE + CR_LF ;
-			+ toEx.PROCEDURE + ', ' + TRANSFORM(toEx.LINENO) + CR_LF ;
-			+ toEx.LINECONTENTS + CR_LF ;
-			+ EVL(toEx.USERVALUE,'')
+			+ toEx.PROCEDURE + ', ' + TRANSFORM(toEx.LINENO) + CR_LF
+
+		IF NOT EMPTY(toEx.LINECONTENTS)
+			lcError	= lcError + toEx.LINECONTENTS + CR_LF
+		ENDIF
+
+		IF NOT EMPTY(toEx.USERVALUE)
+			lcError	= lcError + EVL(toEx.USERVALUE,'')
+		ENDIF
+
 		RETURN lcError
 	ENDPROC
 
@@ -10620,6 +10636,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS C_CONVERSOR_BASE
 					ENDIF
 
 					lnLine_Len	= LEN( laLine(I) )
+					lcLine		= LTRIM( laLine(I), 0, C_TAB, ' ' )
 
 					DO CASE
 					CASE laLineasExclusion(I)
@@ -10629,63 +10646,62 @@ DEFINE CLASS c_conversor_bin_a_prg AS C_CONVERSOR_BASE
 							*-- Invalid method code, as outer code added for tools like ReFox or others, is cleaned up
 						ENDIF
 
-					CASE lnTextNodes = 0 AND UPPER( LEFT(laLine(I), 10) ) == 'PROCEDURE '
+					CASE lnTextNodes = 0 AND UPPER( LEFT(lcLine, 10) ) == 'PROCEDURE '
 						tnMethodCount	= tnMethodCount + 1
 						DIMENSION taMethods(tnMethodCount, 3), taCode(tnMethodCount)
-						taMethods(tnMethodCount, 1)	= RTRIM( SUBSTR(laLine(I), 11) )
+						taMethods(tnMethodCount, 1)	= RTRIM( SUBSTR(lcLine, 11) )
 						taMethods(tnMethodCount, 2)	= tnMethodCount
 						taMethods(tnMethodCount, 3)	= ''
 						taCode(tnMethodCount)		= 'PROCEDURE ' + taMethods(tnMethodCount, 1) + CR_LF && laLine(I) + CR_LF
 						llProcOpen					= .T.
 
-					CASE lnTextNodes = 0 AND UPPER( LEFT(laLine(I), 9) ) == 'FUNCTION '	&& NOT VALID WITH VFP IDE, BUT 3rd. PARTY SOFTWARE CAN USE IT
+					CASE lnTextNodes = 0 AND UPPER( LEFT(lcLine, 9) ) == 'FUNCTION '	&& NOT VALID WITH VFP IDE, BUT 3rd. PARTY SOFTWARE CAN USE IT
 						tnMethodCount	= tnMethodCount + 1
 						DIMENSION taMethods(tnMethodCount, 3), taCode(tnMethodCount)
-						taMethods(tnMethodCount, 1)	= RTRIM( SUBSTR(laLine(I), 10) )
+						taMethods(tnMethodCount, 1)	= RTRIM( SUBSTR(lcLine, 10) )
 						taMethods(tnMethodCount, 2)	= tnMethodCount
 						taMethods(tnMethodCount, 3)	= ''
 						taCode(tnMethodCount)		= 'PROCEDURE ' + taMethods(tnMethodCount, 1) + CR_LF && laLine(I) + CR_LF
 						llProcOpen					= .T.
 
-					CASE lnTextNodes = 0 AND UPPER( LEFT(laLine(I), 17) ) == 'HIDDEN PROCEDURE '
+					CASE lnTextNodes = 0 AND UPPER( LEFT(lcLine, 17) ) == 'HIDDEN PROCEDURE '
 						tnMethodCount	= tnMethodCount + 1
 						DIMENSION taMethods(tnMethodCount, 3), taCode(tnMethodCount)
-						taMethods(tnMethodCount, 1)	= RTRIM( SUBSTR(laLine(I), 18) )
+						taMethods(tnMethodCount, 1)	= RTRIM( SUBSTR(lcLine, 18) )
 						taMethods(tnMethodCount, 2)	= tnMethodCount
 						taMethods(tnMethodCount, 3)	= 'HIDDEN '
 						taCode(tnMethodCount)		= 'HIDDEN PROCEDURE ' + taMethods(tnMethodCount, 1) + CR_LF && laLine(I) + CR_LF
 						llProcOpen					= .T.
 
-					CASE lnTextNodes = 0 AND UPPER( LEFT(laLine(I), 16) ) == 'HIDDEN FUNCTION '	&& NOT VALID WITH VFP IDE, BUT 3rd. PARTY SOFTWARE CAN USE IT
+					CASE lnTextNodes = 0 AND UPPER( LEFT(lcLine, 16) ) == 'HIDDEN FUNCTION '	&& NOT VALID WITH VFP IDE, BUT 3rd. PARTY SOFTWARE CAN USE IT
 						tnMethodCount	= tnMethodCount + 1
 						DIMENSION taMethods(tnMethodCount, 3), taCode(tnMethodCount)
-						taMethods(tnMethodCount, 1)	= RTRIM( SUBSTR(laLine(I), 17) )
+						taMethods(tnMethodCount, 1)	= RTRIM( SUBSTR(lcLine, 17) )
 						taMethods(tnMethodCount, 2)	= tnMethodCount
 						taMethods(tnMethodCount, 3)	= 'HIDDEN '
 						taCode(tnMethodCount)		= 'HIDDEN PROCEDURE ' + taMethods(tnMethodCount, 1) + CR_LF && laLine(I) + CR_LF
 						llProcOpen					= .T.
 
-					CASE lnTextNodes = 0 AND UPPER( LEFT(laLine(I), 20) ) == 'PROTECTED PROCEDURE '
+					CASE lnTextNodes = 0 AND UPPER( LEFT(lcLine, 20) ) == 'PROTECTED PROCEDURE '
 						tnMethodCount	= tnMethodCount + 1
 						DIMENSION taMethods(tnMethodCount, 3), taCode(tnMethodCount)
-						taMethods(tnMethodCount, 1)	= RTRIM( SUBSTR(laLine(I), 21) )
+						taMethods(tnMethodCount, 1)	= RTRIM( SUBSTR(lcLine, 21) )
 						taMethods(tnMethodCount, 2)	= tnMethodCount
 						taMethods(tnMethodCount, 3)	= 'PROTECTED '
 						taCode(tnMethodCount)		= 'PROTECTED PROCEDURE ' + taMethods(tnMethodCount, 1) + CR_LF && laLine(I) + CR_LF
 						llProcOpen					= .T.
 
-					CASE lnTextNodes = 0 AND UPPER( LEFT(laLine(I), 19) ) == 'PROTECTED FUNCTION '	&& NOT VALID WITH VFP IDE, BUT 3rd. PARTY SOFTWARE CAN USE IT
+					CASE lnTextNodes = 0 AND UPPER( LEFT(lcLine, 19) ) == 'PROTECTED FUNCTION '	&& NOT VALID WITH VFP IDE, BUT 3rd. PARTY SOFTWARE CAN USE IT
 						tnMethodCount	= tnMethodCount + 1
 						DIMENSION taMethods(tnMethodCount, 3), taCode(tnMethodCount)
-						taMethods(tnMethodCount, 1)	= RTRIM( SUBSTR(laLine(I), 20) )
+						taMethods(tnMethodCount, 1)	= RTRIM( SUBSTR(lcLine, 20) )
 						taMethods(tnMethodCount, 2)	= tnMethodCount
 						taMethods(tnMethodCount, 3)	= 'PROTECTED '
 						taCode(tnMethodCount)		= 'PROTECTED PROCEDURE ' + taMethods(tnMethodCount, 1) + CR_LF && laLine(I) + CR_LF
 						llProcOpen					= .T.
 
-					CASE lnTextNodes = 0 AND LEFT(laLine(I), 7) == 'ENDPROC'
-						lcLine		= UPPER( CHRTRAN( laLine(I) , '&'+CHR(9)+CHR(0), '   ') ) + ' '
-						IF lnLine_Len >= 7 AND LEFT(lcLine,8) == 'ENDPROC '
+					CASE lnTextNodes = 0 AND LEFT(lcLine, 7) == 'ENDPROC'
+						IF lnLine_Len >= 7 AND LEFT( UPPER( CHRTRAN( lcLine , '&'+CHR(9)+CHR(0), '   ') ) + ' ' ,8) == 'ENDPROC '
 							*-- Es el final de estructura ENDPROC
 							IF NOT llProcOpen
 								*-- Esto no es normal, porque hay más de un ENDPROC, por lo que se ignora.
@@ -10693,29 +10709,28 @@ DEFINE CLASS c_conversor_bin_a_prg AS C_CONVERSOR_BASE
 							ENDIF
 						ELSE
 							*-- Es otra cosa (variable, etc)
-							taCode(tnMethodCount)	= taCode(tnMethodCount) + laLine(I) + CR_LF
+							taCode(tnMethodCount)	= taCode(tnMethodCount) + lcLine + CR_LF
 							LOOP
 						ENDIF
 
-						taCode(tnMethodCount)	= taCode(tnMethodCount) + laLine(I) &&+ CR_LF
+						taCode(tnMethodCount)	= taCode(tnMethodCount) + lcLine &&+ CR_LF
 						llProcOpen				= .F.
 
 					CASE lnTextNodes = 0 AND LEFT(laLine(I), 7) == 'ENDFUNC'	&& NOT VALID WITH VFP IDE, BUT 3rd. PARTY SOFTWARE CAN USE IT
-						lcLine		= UPPER( CHRTRAN( laLine(I) , '&'+CHR(9)+CHR(0), '   ') ) + ' '
-						IF lnLine_Len >= 7 AND LEFT(lcLine,8) == 'ENDFUNC '
+						IF lnLine_Len >= 7 AND LEFT( UPPER( CHRTRAN( laLine(I) , '&'+CHR(9)+CHR(0), '   ') ) + ' ' ,8) == 'ENDFUNC '
 							*-- Es el final de estructura ENDPROC
 							IF NOT llProcOpen
 								*-- Esto no es normal, porque hay más de un ENDFUNC, por lo que se ignora.
 								LOOP
 							ENDIF
-							laLine(I)	= STRTRAN( laLine(I), 'ENDFUNC', 'ENDPROC' )
+							lcLine	= STRTRAN( lcLine, 'ENDFUNC', 'ENDPROC' )
 						ELSE
 							*-- Es otra cosa (variable, etc)
-							taCode(tnMethodCount)	= taCode(tnMethodCount) + laLine(I) + CR_LF
+							taCode(tnMethodCount)	= taCode(tnMethodCount) + lcLine + CR_LF
 							LOOP
 						ENDIF
 
-						taCode(tnMethodCount)	= taCode(tnMethodCount) + laLine(I) &&+ CR_LF
+						taCode(tnMethodCount)	= taCode(tnMethodCount) + lcLine &&+ CR_LF
 						llProcOpen				= .F.
 
 						*CASE tnMethodCount = 0 OR NOT llProcOpen AND LEFT( LTRIM(laLine(I)),1 ) = '*'
@@ -21260,12 +21275,14 @@ DEFINE CLASS CL_DBF_UTILS AS SESSION
 
 		TRY
 			LOCAL lnHandle, lcStr, lnDataPos, lnFieldCount, lnVal, I, loEx AS EXCEPTION ;
-				, lnCodePage, lcCodePageDesc ;
+				, lnCodePage, lcCodePageDesc, lnFileLength ;
 				, loField AS CL_DBF_UTILS_FIELD OF 'FOXBIN2PRG.PRG'
 			STORE NULL TO loField
 			tn_HexFileType	= 0
 			STORE '' TO tcDBC_Name, lcStr
 			lnHandle		= FOPEN(tc_FileName,0)
+			lnFileLength	= FSEEK(lnHandle,0,2)
+			= FSEEK(lnHandle,0)
 
 			IF lnHandle = -1
 				EXIT
@@ -21277,6 +21294,13 @@ DEFINE CLASS CL_DBF_UTILS AS SESSION
 				.c_FileName					= tc_FileName
 				lcStr						= FREAD(lnHandle,1)		&& 0		File type
 				tn_HexFileType				= EVALUATE( TRANSFORM(ASC(lcStr),'@0') )
+
+				IF lnFileLength < 328 OR .fileTypeDescription(tn_HexFileType) = 'Unknown'
+					ERROR 15, tc_FileName
+				ELSE
+					MESSAGEBOX( .fileTypeDescription(tn_HexFileType), 0+4096 )
+				ENDIF
+
 				.n_HexFileType				= tn_HexFileType
 				lcStr						= FREAD(lnHandle,3)		&& 1-3		Last update (YYMMDD)
 				.c_LastUpdate				= PADL(ASC(LEFT(lcStr,1)),2,'0') + '/' + PADL(ASC(SUBSTR(lcStr,2,1)),2,'0') + '/' + PADL(ASC(RIGHT(lcStr,1)),2,'0')

From 683d66a26fc3c8bb681ca31c0790a1ba983252e7 Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Thu, 8 Jan 2015 20:31:44 +0100
Subject: [PATCH 15/19] Changeset: 621 - Agregados algunos tipos de archivo DBF

---
 foxbin2prg.prg | 46 +++++++++++++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/foxbin2prg.prg b/foxbin2prg.prg
index 915055f..6803891 100644
--- a/foxbin2prg.prg
+++ b/foxbin2prg.prg
@@ -21297,8 +21297,6 @@ DEFINE CLASS CL_DBF_UTILS AS SESSION
 
 				IF lnFileLength < 328 OR .fileTypeDescription(tn_HexFileType) = 'Unknown'
 					ERROR 15, tc_FileName
-				ELSE
-					MESSAGEBOX( .fileTypeDescription(tn_HexFileType), 0+4096 )
 				ENDIF
 
 				.n_HexFileType				= tn_HexFileType
@@ -21399,30 +21397,48 @@ DEFINE CLASS CL_DBF_UTILS AS SESSION
 		LOCAL lcFileType
 
 		DO CASE
-		CASE tn_HexFileType = 0x02
+		CASE tn_HexFileType = 0x02													&& VFP 9 SP2 Help file, VFPX Edition v1.07.2 debug (beta) // http://stackoverflow.com/questions/3391525/which-header-format-can-be-assumed-by-reading-an-initial-dbf-byte
 			lcFileType	= 'FoxBASE / dBase II'
-		CASE tn_HexFileType = 0x03
+		CASE tn_HexFileType = 0x03													&& VFP 9 SP2 Help file, VFPX Edition v1.07.2 debug (beta) // http://stackoverflow.com/questions/3391525/which-header-format-can-be-assumed-by-reading-an-initial-dbf-byte
 			lcFileType	= 'FoxBASE+ / FoxPro /dBase III PLUS / dBase IV, no memo'
-		CASE tn_HexFileType = 0x30
+		CASE tn_HexFileType = 0x05													&& http://stackoverflow.com/questions/3391525/which-header-format-can-be-assumed-by-reading-an-initial-dbf-byte
+			lcFileType	= 'dBase V, no memo'
+		CASE tn_HexFileType = 0x2F													&& https://msdn.microsoft.com/en-us/subscriptions/securedownloads/st4a0s68%28v=vs.80%29
+			lcFileType	= 'dBase+/dBase III PLUS, no memo'
+		CASE tn_HexFileType = 0x30													&& VFP 9 SP2 Help file, VFPX Edition v1.07.2 debug (beta) // http://stackoverflow.com/questions/3391525/which-header-format-can-be-assumed-by-reading-an-initial-dbf-byte
 			lcFileType	= 'Visual FoxPro'
-		CASE tn_HexFileType = 0x31
+		CASE tn_HexFileType = 0x31													&& VFP 9 SP2 Help file, VFPX Edition v1.07.2 debug (beta) // http://stackoverflow.com/questions/3391525/which-header-format-can-be-assumed-by-reading-an-initial-dbf-byte
 			lcFileType	= 'Visual FoxPro, autoincrement enabled'
-		CASE tn_HexFileType = 0x32
+		CASE tn_HexFileType = 0x32													&& VFP 9 SP2 Help file, VFPX Edition v1.07.2 debug (beta) // http://stackoverflow.com/questions/3391525/which-header-format-can-be-assumed-by-reading-an-initial-dbf-byte
 			lcFileType	= 'Visual FoxPro, Varchar, Varbinary, or Blob-enabled'
-		CASE tn_HexFileType = 0x43
+		CASE tn_HexFileType = 0x43													&& VFP 9 SP2 Help file, VFPX Edition v1.07.2 debug (beta) // http://stackoverflow.com/questions/3391525/which-header-format-can-be-assumed-by-reading-an-initial-dbf-byte
 			lcFileType	= 'dBASE IV SQL table files, no memo'
-		CASE tn_HexFileType = 0x63
+		CASE tn_HexFileType = 0x62													&& https://msdn.microsoft.com/en-us/subscriptions/securedownloads/st4a0s68%28v=vs.80%29
+			lcFileType	= 'dBASE IV SQL table files, no memo'
+		CASE tn_HexFileType = 0x63													&& VFP 9 SP2 Help file, VFPX Edition v1.07.2 debug (beta) // http://stackoverflow.com/questions/3391525/which-header-format-can-be-assumed-by-reading-an-initial-dbf-byte
 			lcFileType	= 'dBASE IV SQL system files, no memo'
-		CASE tn_HexFileType = 0x83
+		CASE tn_HexFileType = 0x7B													&& http://stackoverflow.com/questions/3391525/which-header-format-can-be-assumed-by-reading-an-initial-dbf-byte
+			lcFileType	= 'dBASE IV, with memo'
+		CASE tn_HexFileType = 0x82													&& https://msdn.microsoft.com/en-us/subscriptions/securedownloads/st4a0s68%28v=vs.80%29
+			lcFileType	= 'dBASE IV SQL system files, no memo'
+		CASE tn_HexFileType = 0x83													&& VFP 9 SP2 Help file, VFPX Edition v1.07.2 debug (beta) // http://stackoverflow.com/questions/3391525/which-header-format-can-be-assumed-by-reading-an-initial-dbf-byte
 			lcFileType	= 'FoxBASE+/dBASE III PLUS, with memo'
-		CASE tn_HexFileType = 0x8B
+		CASE tn_HexFileType = 0x8B													&& VFP 9 SP2 Help file, VFPX Edition v1.07.2 debug (beta) // http://stackoverflow.com/questions/3391525/which-header-format-can-be-assumed-by-reading-an-initial-dbf-byte
 			lcFileType	= 'dBASE IV with memo'
-		CASE tn_HexFileType = 0xCB
+		CASE tn_HexFileType = 0x8E													&& http://stackoverflow.com/questions/3391525/which-header-format-can-be-assumed-by-reading-an-initial-dbf-byte
+			lcFileType	= 'dBASE IV with SQL table'
+		CASE tn_HexFileType = 0xCA													&& https://msdn.microsoft.com/en-us/subscriptions/securedownloads/st4a0s68%28v=vs.80%29
+			lcFileType	= 'dBASE IV with memo'
+		CASE tn_HexFileType = 0xCB													&& VFP 9 SP2 Help file, VFPX Edition v1.07.2 debug (beta) // http://stackoverflow.com/questions/3391525/which-header-format-can-be-assumed-by-reading-an-initial-dbf-byte
 			lcFileType	= 'dBASE IV SQL table files, with memo'
-		CASE tn_HexFileType = 0xF5
+		CASE tn_HexFileType = 0xE5													&& http://stackoverflow.com/questions/3391525/which-header-format-can-be-assumed-by-reading-an-initial-dbf-byte
+			lcFileType	= 'Clipper SIX driver, with SMT memo'
+		CASE tn_HexFileType = 0xF5													&& VFP 9 SP2 Help file, VFPX Edition v1.07.2 debug (beta) // http://stackoverflow.com/questions/3391525/which-header-format-can-be-assumed-by-reading-an-initial-dbf-byte
 			lcFileType	= 'FoxPro 2.x (or earlier) with memo'
-		CASE tn_HexFileType = 0xFB
-			lcFileType	= 'FoxBASE (?)'
+		CASE tn_HexFileType = 0xFA													&& https://msdn.microsoft.com/en-us/subscriptions/securedownloads/st4a0s68%28v=vs.80%29
+			lcFileType	= 'FoxPro 2.x (or earlier) with memo'
+		CASE tn_HexFileType = 0xFB													&& VFP 9 SP2 Help file, VFPX Edition v1.07.2 debug (beta) // http://stackoverflow.com/questions/3391525/which-header-format-can-be-assumed-by-reading-an-initial-dbf-byte
+			lcFileType	= 'FoxBASE (with memo?)'
 		OTHERWISE
 			lcFileType	= 'Unknown'
 		ENDCASE

From fcbe37affcfb6ed6e2f96ca8159313a5d1c710ee Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Thu, 8 Jan 2015 20:45:56 +0100
Subject: [PATCH 16/19] =?UTF-8?q?Changeset:=20622=20-=20Modificaci=C3=B3n?=
 =?UTF-8?q?=20de=20los=20Tests=20Unitarios=20FoxUnit=20para=20la=20nueva?=
 =?UTF-8?q?=20configuraci=C3=B3n=20"ShowProgressbar"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...rg__c_foxbin2prg__EvaluarConfiguracion.prg | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/TESTS/ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion.prg b/TESTS/ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion.prg
index 2eb40a6..52b42c5 100644
--- a/TESTS/ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion.prg
+++ b/TESTS/ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion.prg
@@ -82,7 +82,7 @@ DEFINE CLASS ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion AS FxuTestCase O
 				THIS.messageout( 'MNX_Conversion_Support: ' + TRANSFORM(loFB2P_Esperado.MNX_Conversion_Support) )
 				THIS.messageout( 'DBF_Conversion_Support: ' + TRANSFORM(loFB2P_Esperado.DBF_Conversion_Support) )
 				THIS.messageout( 'DBC_Conversion_Support: ' + TRANSFORM(loFB2P_Esperado.DBC_Conversion_Support) )
-				THIS.messageout( 'l_ShowProgress: ' + TRANSFORM(loFB2P_Esperado.l_ShowProgress) )
+				THIS.messageout( 'n_ShowProgressbar: ' + TRANSFORM(loFB2P_Esperado.n_ShowProgressbar) )
 				THIS.messageout( 'l_ShowErrors: ' + TRANSFORM(loFB2P_Esperado.l_ShowErrors) )
 				THIS.messageout( 'l_Recompile: ' + TRANSFORM(loFB2P_Esperado.l_Recompile) )
 				THIS.messageout( 'l_NoTimestamps: ' + TRANSFORM(loFB2P_Esperado.l_NoTimestamps) )
@@ -100,7 +100,7 @@ DEFINE CLASS ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion AS FxuTestCase O
 				THIS.assertequals( TRANSFORM(loFB2P_Esperado.MNX_Conversion_Support), TRANSFORM(loFB2P.MNX_Conversion_Support), '> MNX_Conversion_Support' )
 				THIS.assertequals( TRANSFORM(loFB2P_Esperado.DBF_Conversion_Support), TRANSFORM(loFB2P.DBF_Conversion_Support), '> DBF_Conversion_Support' )
 				THIS.assertequals( TRANSFORM(loFB2P_Esperado.DBC_Conversion_Support), TRANSFORM(loFB2P.DBC_Conversion_Support), '> DBC_Conversion_Support' )
-				THIS.assertequals( TRANSFORM(loFB2P_Esperado.l_ShowProgress), TRANSFORM(loFB2P.l_ShowProgress), '> l_ShowProgress' )
+				THIS.assertequals( TRANSFORM(loFB2P_Esperado.n_ShowProgressbar), TRANSFORM(loFB2P.n_ShowProgressbar), '> n_ShowProgressbar' )
 				THIS.assertequals( TRANSFORM(loFB2P_Esperado.l_ShowErrors), TRANSFORM(loFB2P.l_ShowErrors), '> l_ShowErrors' )
 				THIS.assertequals( TRANSFORM(loFB2P_Esperado.l_Recompile), TRANSFORM(loFB2P.l_Recompile), '> l_Recompile' )
 				THIS.assertequals( TRANSFORM(loFB2P_Esperado.l_NoTimestamps), TRANSFORM(loFB2P.l_NoTimestamps), '> l_NoTimestamps' )
@@ -167,7 +167,7 @@ DEFINE CLASS ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion AS FxuTestCase O
 			ADDPROPERTY( loFB2P_Esperado, 'MNX_Conversion_Support', 2 )
 			ADDPROPERTY( loFB2P_Esperado, 'DBF_Conversion_Support', 1 )
 			ADDPROPERTY( loFB2P_Esperado, 'DBC_Conversion_Support', 2 )
-			ADDPROPERTY( loFB2P_Esperado, 'l_ShowProgress', .T. )
+			ADDPROPERTY( loFB2P_Esperado, 'n_ShowProgressbar', 1 )
 			ADDPROPERTY( loFB2P_Esperado, 'l_ShowErrors', .T. )
 			ADDPROPERTY( loFB2P_Esperado, 'l_Recompile', .T. )
 			ADDPROPERTY( loFB2P_Esperado, 'l_NoTimestamps', .T. )
@@ -220,7 +220,7 @@ DEFINE CLASS ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion AS FxuTestCase O
 			ADDPROPERTY( loFB2P_Esperado, 'MNX_Conversion_Support', 1 )
 			ADDPROPERTY( loFB2P_Esperado, 'DBF_Conversion_Support', 2 )
 			ADDPROPERTY( loFB2P_Esperado, 'DBC_Conversion_Support', 1 )
-			ADDPROPERTY( loFB2P_Esperado, 'l_ShowProgress', .F. )
+			ADDPROPERTY( loFB2P_Esperado, 'n_ShowProgressbar', 0 )
 			ADDPROPERTY( loFB2P_Esperado, 'l_ShowErrors', .F. )
 			ADDPROPERTY( loFB2P_Esperado, 'l_Recompile', .T. )
 			ADDPROPERTY( loFB2P_Esperado, 'l_NoTimestamps', .F. )
@@ -238,7 +238,7 @@ DEFINE CLASS ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion AS FxuTestCase O
 			STRTOFILE( 'MNX_Conversion_Support: 1' + CRLF, 'TESTS\DATOS_TEST\foxbin2prg.cfg', 1 )
 			STRTOFILE( 'DBF_Conversion_Support: 2' + CRLF, 'TESTS\DATOS_TEST\foxbin2prg.cfg', 1 )
 			STRTOFILE( 'DBC_Conversion_Support: 1' + CRLF, 'TESTS\DATOS_TEST\foxbin2prg.cfg', 1 )
-			STRTOFILE( 'DontShowProgress: 1' + CRLF, 'TESTS\DATOS_TEST\foxbin2prg.cfg', 1 )
+			STRTOFILE( 'ShowProgressbar: 0' + CRLF, 'TESTS\DATOS_TEST\foxbin2prg.cfg', 1 )
 			STRTOFILE( 'DontShowErrors: 1' + CRLF, 'TESTS\DATOS_TEST\foxbin2prg.cfg', 1 )
 			*STRTOFILE( 'Recompile: ' + CRLF, 'TESTS\DATOS_TEST\foxbin2prg.cfg', 1 )
 			STRTOFILE( 'NoTimestamps: 0' + CRLF, 'TESTS\DATOS_TEST\foxbin2prg.cfg', 1 )
@@ -290,7 +290,7 @@ DEFINE CLASS ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion AS FxuTestCase O
 			ADDPROPERTY( loFB2P_Esperado, 'MNX_Conversion_Support', 1 )
 			ADDPROPERTY( loFB2P_Esperado, 'DBF_Conversion_Support', 2 )
 			ADDPROPERTY( loFB2P_Esperado, 'DBC_Conversion_Support', 1 )
-			ADDPROPERTY( loFB2P_Esperado, 'l_ShowProgress', .T. )
+			ADDPROPERTY( loFB2P_Esperado, 'n_ShowProgressbar', 1 )
 			ADDPROPERTY( loFB2P_Esperado, 'l_ShowErrors', .T. )
 			ADDPROPERTY( loFB2P_Esperado, 'l_Recompile', .T. )
 			ADDPROPERTY( loFB2P_Esperado, 'l_NoTimestamps', .T. )
@@ -998,13 +998,13 @@ DEFINE CLASS ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion AS FxuTestCase O
 
 			*-- DATOS DE ENTRADA
 			STORE 0 TO lnCodError
-			lcSeteo			= 'l_ShowProgress'
-			leValorEsperado	= .T.
+			lcSeteo			= 'n_ShowProgressbar'
+			leValorEsperado	= 1
 
 
 			*-- TEST
 			loFB2P.EvaluarConfiguracion()
-			leValor		= loFB2P.l_ShowProgress
+			leValor		= loFB2P.n_ShowProgressbar
 			
 
 		CATCH TO loEx
@@ -1036,13 +1036,13 @@ DEFINE CLASS ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion AS FxuTestCase O
 
 			*-- DATOS DE ENTRADA
 			STORE 0 TO lnCodError
-			lcSeteo			= 'l_ShowProgress'
-			leValorEsperado	= .T.
+			lcSeteo			= 'n_ShowProgressbar'
+			leValorEsperado	= 1
 
 
 			*-- TEST
 			loFB2P.EvaluarConfiguracion()
-			leValor		= loFB2P.l_ShowProgress
+			leValor		= loFB2P.n_ShowProgressbar
 			
 
 		CATCH TO loEx
@@ -1074,13 +1074,13 @@ DEFINE CLASS ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion AS FxuTestCase O
 
 			*-- DATOS DE ENTRADA
 			STORE 0 TO lnCodError
-			lcSeteo			= 'l_ShowProgress'
-			leValorEsperado	= .F.
+			lcSeteo			= 'n_ShowProgressbar'
+			leValorEsperado	= 0
 
 
 			*-- TEST
 			loFB2P.EvaluarConfiguracion()
-			leValor		= loFB2P.l_ShowProgress
+			leValor		= loFB2P.n_ShowProgressbar
 			
 
 		CATCH TO loEx

From 77e7b7a9866c682463611cc3186f3d35df20d8b4 Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Sun, 11 Jan 2015 12:00:16 +0100
Subject: [PATCH 17/19] Changeset: 623 - Fix for "Error 2183: Operation
 requires that SET MULTILOCKS is set to ON" in some DBF convertions

---
 foxbin2prg.prg | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/foxbin2prg.prg b/foxbin2prg.prg
index 6803891..b075263 100644
--- a/foxbin2prg.prg
+++ b/foxbin2prg.prg
@@ -666,6 +666,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 		SET HOURS TO 24
 		SET CENTURY ON
 		SET SAFETY OFF
+		SET MULTILOCKS ON
 		SET TABLEPROMPT OFF
 		SET POINT TO '.'
 		SET SEPARATOR TO ','
@@ -3538,6 +3539,7 @@ DEFINE CLASS C_CONVERSOR_BASE AS SESSION
 		SET HOURS TO 24
 		SET CENTURY ON
 		SET SAFETY OFF
+		SET MULTILOCKS ON
 		SET TABLEPROMPT OFF
 		SET BLOCKSIZE TO 0
 		SET EXACT ON

From b138857a7af2a0c64d63f3c86ba60c91fdf363bb Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Sun, 11 Jan 2015 19:16:02 +0100
Subject: [PATCH 18/19] =?UTF-8?q?Changeset:=20624=20-=20Generaci=C3=B3n=20?=
 =?UTF-8?q?del=20EXE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 foxbin2prg.exe | Bin 509905 -> 505724 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/foxbin2prg.exe b/foxbin2prg.exe
index dd4f859b7d8d9d89510036ef208a8451b4ba5aac..0e2604c5fe4deb5a6d6f87dc80aa904070f9d467 100644
GIT binary patch
delta 34697
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
EA70_`Bme*a

delta 32682
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
LVz@&t%roSFt8s09


From 242f3ec98b86cff611e5668732eab8d264ea2c3d Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Sun, 11 Jan 2015 19:30:58 +0100
Subject: [PATCH 19/19] =?UTF-8?q?Changeset:=20626=20-=20Actualizaci=C3=B3n?=
 =?UTF-8?q?=20del=20archivo=20de=20versi=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FoxBin2PRGVersionFile.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/FoxBin2PRGVersionFile.txt b/FoxBin2PRGVersionFile.txt
index a102746..aea4cd2 100644
--- a/FoxBin2PRGVersionFile.txt
+++ b/FoxBin2PRGVersionFile.txt
@@ -3,7 +3,7 @@ Lparameters toUpdateInfo
 Local lcNote
 With toUpdateInfo
     .VersionNumber        = 'v1.19.40'
-    .VersionDate          = Date(2015,01,04)
+    .VersionDate          = Date(2015,01,11)
     .SourceFileUrl        = 'http://vfpxrepository.com/dl/thorupdate/Projects/FoxBin2Prg/FoxBin2Prg.Zip'
 
     .Link                 = 'http://vfpx.codeplex.com/wikipage?title=FoxBin2PRG'
@@ -17,12 +17,13 @@ Demo video using FoxBin2Prg with PlasticSCM: http://youtu.be/sE4wQ50Itqg
 
 Change History -------------------------------------------------------------
 
-2015/01/04	v1.19.40
+2015/01/11	v1.19.40
 - Enhancement frx/lbx: Clean ASCII 0 from expression field for Dataenvironment, Cursors and Relations
 - Bug fix frx/lbx: When using Dataenvironment with more than one cursor, remaining cursors are lost
 - Feature: Added new configuration "ShowProgressbar:2" to activate the progressbar only when a directory is selected and deactivate it for individual files (Jim Nelson)
 - Bug fix dbf: [Error 12, variable "tcOutputFile" is not found] when DBF_Conversion_Support=4 and output file is the same as existent one (Mike Potjer)
-- Feature: Added new code checking to find duplicated object names for the same class and container to notify those cases of vcx/scx file corruption
+- Feature scx/vcx/sc2/vc2: Added new code checking to find duplicated object names for the same class and container to notify those cases of file corruption
+- Fix for "Error 2183: Operation requires that SET MULTILOCKS is set to ON" in some DBF convertions
 
 2015/01/01	v1.19.39
 - Bug fix vbs: vbs scripts does not show FoxBin2Prg process errors correctly