Changeset: 353 fdbozzo - 06/07/2014 15:14:42:

TESTS/ut__foxbin2prg.prg

@@ -128,10 +128,12 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 					, laProtected(1), lnProtected_Count, laProtected_Esperado(1), lnProtected_Count_Esperado ;
 					, laMethods(1,2), lnMethods_Count, laMethods_Esperado(1,2), lnMethods_Count_Esperado, lcExtraData
 				LOCAL loObj AS c_conversor_bin_a_prg OF "FOXBIN2PRG.PRG"
+				LOCAL loFoxBin2Prg AS c_foxbin2prg OF "FOXBIN2PRG.PRG"
 
 				*-- Algunos ajustes para mejor visualizaci<63>n de caracteres especiales
 				*tcPropValue				= oFXU_LIB.mejorarPresentacionCaracteresEspeciales( tcPropValue )
-				loObj		= NEWOBJECT("c_conversor_bin_a_prg", "FOXBIN2PRG.PRG")
+				loFoxBin2Prg	= NEWOBJECT("c_foxbin2prg", "FOXBIN2PRG.PRG")
+				loObj			= NEWOBJECT("c_conversor_bin_a_prg", "FOXBIN2PRG.PRG")
 
 				*-- Reserved3
 				loObj.get_PropsAndCommentsFrom_RESERVED3( toReg.RESERVED3, .F., @laPropsAndComments, @lnPropsAndComments_Count, '' )
@@ -146,8 +148,8 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 				loObj.get_PropsFrom_PROTECTED( toReg_Esperado.PROTECTED, .F., @laProtected_Esperado, @lnProtected_Count_Esperado, '' )
 
 				*-- Methods
-				loObj.get_ADD_OBJECT_METHODS( toReg, toReg, '', @laMethods, '', @lnMethods_Count, '', 0, '', 0 )
+				loObj.get_ADD_OBJECT_METHODS( toReg, toReg, '', @laMethods, '', @lnMethods_Count, '', 0, '', 0, loFoxBin2Prg )
-				loObj.get_ADD_OBJECT_METHODS( toReg_Esperado, toReg_Esperado, '', @laMethods_Esperado, '', @lnMethods_Count_Esperado, '', 0, '', 0 )
+				loObj.get_ADD_OBJECT_METHODS( toReg_Esperado, toReg_Esperado, '', @laMethods_Esperado, '', @lnMethods_Count_Esperado, '', 0, '', 0, loFoxBin2Prg )
 				lcExtraData	= tcParent + '.' + tcObjName + ' (' + tcClass + ')'
 
 
@@ -258,6 +260,9 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 						, ' Comprobaci<63>n de que existe el Method "' + TRANSFORM(laMethods_Esperado(I,1)) + '"' + " para " + lcExtraData )
 				ENDFOR
 				
+				loFoxBin2Prg = NULL
+				RELEASE loFoxBin2Prg
+
 			ENDCASE
 
 		ELSE
@@ -438,7 +443,7 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 	*******************************************************************************************************************************************
 	FUNCTION Deberia_Ejecutar_FOXBIN2PRG_ParaElForm_FB2P_FRM_1_SCX_YValidarLosCamposDelRegistro
 		LOCAL lnCodError, lnCodError_Esperado  ;
-			, lc_File, lc_InputFile, lc_OutputFile, lcParent, lcClass, lcObjName, loReg_Esperado, loReg, lcTipoBinario ;
+			, lc_File, lc_InputFile, lc_OutputFile, lc_OutputFile2, lcParent, lcClass, lcObjName, loReg_Esperado, loReg, lcTipoBinario ;
 			, loModulo AS CL_CLASE OF "FOXBIN2PRG.PRG" ;
 			, loCnv AS c_foxbin2prg OF "FOXBIN2PRG.PRG" ;
 			, loEx AS EXCEPTION
@@ -457,16 +462,17 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 			*-- DATOS DE ENTRADA
 			STORE 0 TO lnCodError
 			lc_File				= 'FB2P_FRM_1.SCX'
-			lc_InputFile		= FORCEPATH( lc_File, 'TESTS\DATOS_READONLY' )
+			lc_InputFile		= FORCEPATH( lc_File, oFXU_LIB.cPathDatosReadOnly )
-			lc_OutputFile		= FORCEPATH( lc_File, 'TESTS\DATOS_TEST' )
+			lc_OutputFile		= FORCEPATH( lc_File, oFXU_LIB.cPathDatosTest )
+			lc_OutputFile2		= FORCEEXT(lc_OutputFile, LEFT( JUSTEXT(lc_File),2 ) + '2' )
 			lcTipoBinario		= UPPER( JUSTEXT( lc_OutputFile ) )
 			loCnv.l_NoTimestamps			= .F.
 			loCnv.l_ClearUniqueID			= .F.
 
 			oFXU_LIB.copiarArchivosParaTest( FORCEEXT( lc_File, LEFT( JUSTEXT(lc_File),2 ) + '?' ) )
 
-			loCnv.Convertir( lc_OutputFile, .F., .F., .T. )
+			loCnv.Ejecutar( lc_OutputFile, '', '', '', '', '', '', '', '', .T. )
-			loCnv.Convertir( FORCEEXT(lc_OutputFile, LEFT( JUSTEXT(lc_File),2 ) + '2' ), .F., .F., .T. )
+			loCnv.Ejecutar( lc_OutputFile2, '', '', '', '', '', '', '', '', .T. )
 
 			SELECT 0
 			USE (lc_InputFile) SHARED AGAIN NOUPDATE ALIAS ARCHIVOBIN_IN
@@ -1272,6 +1278,120 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 	ENDFUNC
 
 
+	*******************************************************************************************************************************************
+	FUNCTION Deberia_GenerarUnArchivo_SC2_DesdeUnBinarioQueContieneNullsEnElCodigo_SinLosNulls
+		LOCAL lnCodError, lnCodError_Esperado  ;
+			, lc_File, lc_OutputFile, lc_OutputFileTx2, lc_OutputFileBak, lcExt2, lcFileName, lnNulls, lnNulls_Esperados ;
+			, lcParent, lcClass, lcObjName, loReg_Esperado ;
+			, loCtl AS f_optiongroup OF "TESTS\DATOS_READONLY\LIB_CONTROLES.VCX" ;
+			, loCnv AS c_foxbin2prg OF "FOXBIN2PRG.PRG" ;
+			, loEx AS EXCEPTION
+		#IF .F.
+			PUBLIC oFXU_LIB AS CL_FXU_CONFIG OF 'TESTS\fxu_lib_objetos_y_funciones_de_soporte.PRG'
+		#ENDIF
+
+		TRY
+			loEx		= NULL
+			loCnv		= NEWOBJECT("c_foxbin2prg", "FOXBIN2PRG.PRG")
+			loCnv.EvaluarConfiguracion( '', '', '1', '1', '1', '4', '1', '0' )
+			*loCnv.l_DropNullCharsFromCode	= .T.
+			*loCnv.l_Test				= .T.
+
+
+			*-- DATOS DE ENTRADA
+			STORE 0 TO lnCodError, lnCodError_Esperado, lnNulls, lnNulls_Esperados
+			lcFileName			= 'f_nullchars_incode.scx'
+			lnNulls_Esperados	= 0
+			
+			*-- Copio la librer<65>a en DATOS_TEST
+			lc_File				= UPPER(lcFileName)
+			lcExt2				= loCnv.Get_Ext2FromExt( JUSTEXT( lc_File ) )
+			lc_OutputFile		= FORCEPATH( lc_File, oFXU_LIB.cPathDatosTest )
+			lc_OutputFileTx2	= FORCEEXT( FORCEPATH( lc_File, oFXU_LIB.cPathDatosTest ), lcExt2 )
+			lc_OutputFileBak	= lc_OutputFileTx2 + '.bak'
+
+			oFXU_LIB.copiarArchivosParaTest( FORCEEXT( lc_File, LEFT( JUSTEXT(lc_File),2 ) + '?' ) )
+			COPY FILE (lc_OutputFileTx2) TO (lc_OutputFileBak)
+
+			*-- Genero TX2
+			loCnv.Ejecutar( lc_OutputFile, .F., .F., .F., '1', '0', '1', '', '', .T., '', SYS(5)+CURDIR() )
+			lnNulls		= OCCURS( CHR(0), FILETOSTR( lc_OutputFileTx2 ) )
+
+			*-- Comparo resultados
+			THIS.messageout( "Se comprueba si el archivo texto generado contiene NULLs" )
+			THIS.messageout( "NULLs esperados:   " + TRANSFORM(lnNulls_Esperados) )
+			THIS.messageout( "NULLs encontrados: " + TRANSFORM(lnNulls) )
+			THIS.assertequals( lnNulls_Esperados, lnNulls, "COMPROBACI<43>N THE NULLS" )
+
+
+		CATCH TO loEx
+			THIS.Evaluate_results( loEx, lnCodError_Esperado, lc_OutputFile, lcParent, lcClass, lcObjName, loReg_Esperado )
+
+		FINALLY
+			STORE NULL TO loCnv, loCtl
+			RELEASE loCnv, loCtl
+		ENDTRY
+
+	ENDFUNC
+
+
+	*******************************************************************************************************************************************
+	FUNCTION Deberia_GenerarUnArchivo_SC2_DesdeUnBinarioQueContieneNullsEnElCodigo_ConLosNulls
+		LOCAL lnCodError, lnCodError_Esperado  ;
+			, lc_File, lc_OutputFile, lc_OutputFileTx2, lc_OutputFileBak, lcExt2, lcFileName, lnNulls, lnNulls_Esperados ;
+			, lcParent, lcClass, lcObjName, loReg_Esperado ;
+			, loCtl AS f_optiongroup OF "TESTS\DATOS_READONLY\LIB_CONTROLES.VCX" ;
+			, loCnv AS c_foxbin2prg OF "FOXBIN2PRG.PRG" ;
+			, loEx AS EXCEPTION
+		#IF .F.
+			PUBLIC oFXU_LIB AS CL_FXU_CONFIG OF 'TESTS\fxu_lib_objetos_y_funciones_de_soporte.PRG'
+		#ENDIF
+
+		TRY
+			loEx		= NULL
+			loCnv		= NEWOBJECT("c_foxbin2prg", "FOXBIN2PRG.PRG")
+			loCnv.EvaluarConfiguracion( '', '', '1', '1', '1', '4', '1', '0' )
+			loCnv.l_DropNullCharsFromCode	= .F.
+			*loCnv.l_Test				= .T.
+
+
+			*-- DATOS DE ENTRADA
+			STORE 0 TO lnCodError, lnCodError_Esperado, lnNulls, lnNulls_Esperados
+			lcFileName			= 'f_nullchars_incode.scx'
+			lnNulls_Esperados	= 2
+			
+			*-- Copio la librer<65>a en DATOS_TEST
+			lc_File				= UPPER(lcFileName)
+			lcExt2				= loCnv.Get_Ext2FromExt( JUSTEXT( lc_File ) )
+			lc_OutputFile		= FORCEPATH( lc_File, oFXU_LIB.cPathDatosTest )
+			lc_OutputFileTx2	= FORCEEXT( FORCEPATH( lc_File, oFXU_LIB.cPathDatosTest ), lcExt2 )
+			lc_OutputFileBak	= lc_OutputFileTx2 + '.bak'
+
+			oFXU_LIB.copiarArchivosParaTest( FORCEEXT( lc_File, LEFT( JUSTEXT(lc_File),2 ) + '?' ) )
+			COPY FILE (lc_OutputFileTx2) TO (lc_OutputFileBak)
+
+			*-- Genero TX2
+			loCnv.Ejecutar( lc_OutputFile, .F., .F., .F., '1', '0', '1', '', '', .T., '', SYS(5)+CURDIR() )
+			lnNulls		= OCCURS( CHR(0), FILETOSTR( lc_OutputFileTx2 ) )
+
+			*-- Comparo resultados
+			THIS.messageout( "Se comprueba si el archivo texto generado contiene NULLs" )
+			THIS.messageout( "NULLs esperados:   " + TRANSFORM(lnNulls_Esperados) )
+			THIS.messageout( "NULLs encontrados: " + TRANSFORM(lnNulls) )
+			THIS.assertequals( lnNulls_Esperados, lnNulls, "COMPROBACI<43>N THE NULLS" )
+
+
+		CATCH TO loEx
+			THIS.Evaluate_results( loEx, lnCodError_Esperado, lc_OutputFile, lcParent, lcClass, lcObjName, loReg_Esperado )
+
+		FINALLY
+			STORE NULL TO loCnv, loCtl
+			RELEASE loCnv, loCtl
+		ENDTRY
+
+	ENDFUNC
+
+
 	*******************************************************************************************************************************************
 	FUNCTION Evaluate_TX2_Output_Test
 		LPARAMETERS tcFileName

foxbin2prg.prg

@@ -90,6 +90,7 @@
 * 14/06/2014	FDBOZZO		v1.19.24	Arreglo bug vcx/scx: Un campo de tabla llamado "text" que comienza la l<>nea puede confundirse con la estructura TEXT/ENDTEXT y reconocer mal el resto del c<>digo
 * 16/06/2014	FDBOZZO		v1.19.25	Mejora: Agregado soporte de configuraciones (CFG) por directorio que, si existen, se usan en lugar del principal (Mario Peschke)
 * 17/06/2014	FDBOZZO		v1.19.25	Mejora: Si durante la generaci<63>n de binarios o de textos se producen errores, mostrar un mensaje avisando de ello (Pedro Guti<74>rrez M.)
+* 06/07/2014	FDBOZZO		v1.19.26	Mejora: Cuando se convierten binarios a texto, los CHR(0) pasan tambi<62>n, pudiendo provocar falsa detecci<63>n como binario. Se agrega opci<63>n para quitar los NULLs. (Matt Slay)
 * 27/06/2014	FDBOZZO		v1.19.26	Mejora: Si el campo memo "methods" de los vcx/scx contiene asteriscos fuera de lugar (que no deber<65>a), FoxBin2Prg lo procesa igualmente. (Daniel S<>nchez)
 * 06/07/2014	FDBOZZO		v1.19.26	Bug Fix cfg: ExtraBackupLevel no se tiene en cuenta cuando se usa multi-configuraci<63>n
 * </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES>
@@ -126,6 +127,7 @@
 * 13/06/2014	Mario Peschke		REPORTE BUG vcx/scx v1.19.23: Los campos de tabla con nombre "text" a veces provocan corrupci<63>n del binario generado (Arreglado en v1.19.24)
 * 16/06/2014	Mario Peschke		MEJORA v1.19.24: Agregado soporte de configuraciones (CFG) por directorio que, si existen, se usan en lugar del CFG principal (Agregado en v1.19.25)
 * 17/06/2014	Pedro Guti<74>rrez M.	MEJORA v1.19.24: Si durante la generaci<63>n de binarios o de textos se producen errores, mostrar un mensaje avisando de ello (Agregado en v1.19.25)
+* 02/07/2014	Matt Slay			MEJORA v1.19.25: Se filtran algunos CHR(0) de los binarios al tx2, provocando que a veces no sea reconocido como texto. Deber<65>an poderse quitar los NULLs (Arreglado en v1.19.26)
 * 27/06/2014	Daniel S<>nchez		MEJORA v1.19.25: Si el campo memo "methods" de los vcx/scx contiene asteriscos fuera de lugar (que no deber<65>a), FoxBin2Prg falla. Deber<65>a poder procesarlo igual.
 * </TESTEO Y REPORTE DE BUGS (AGRADECIMIENTOS)>
 *
@@ -280,6 +282,7 @@ LPARAMETERS tc_InputFile, tcType, tcTextName, tlGenText, tcDontShowErrors, tcDeb
 #DEFINE C_TAB						CHR(9)
 #DEFINE C_CR						CHR(13)
 #DEFINE C_LF						CHR(10)
+#DEFINE C_NULL_CHAR					CHR(0)
 #DEFINE CR_LF						C_CR + C_LF
 #DEFINE C_MPROPHEADER				REPLICATE( CHR(1), 517 )
 *-- Fin / End
@@ -447,6 +450,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 		+ [<memberdata name="lfilemode" display="lFileMode"/>] ;
 		+ [<memberdata name="l_cfg_cachedaccess" display="l_CFG_CachedAccess"/>] ;
 		+ [<memberdata name="l_allowmulticonfig" display="l_AllowMultiConfig"/>] ;
+		+ [<memberdata name="l_dropnullcharsfromcode" display="l_DropNullCharsFromCode"/>] ;
 		+ [<memberdata name="l_clearuniqueid" display="l_ClearUniqueID"/>] ;
 		+ [<memberdata name="l_configevaluated" display="l_ConfigEvaluated"/>] ;
 		+ [<memberdata name="l_debug" display="l_Debug"/>] ;
@@ -517,6 +521,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 	l_ShowErrors			= .T.
 	l_ShowProgress			= .T.
 	l_AllowMultiConfig		= .T.
+	l_DropNullCharsFromCode	= .T.
 	l_Recompile				= .T.
 	l_NoTimestamps			= .T.
 	l_ClearUniqueID			= .T.
@@ -1148,21 +1153,28 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 								lcValue	= ALLTRIM( SUBSTR( laConfig(I), 15 ) )
 								IF NOT INLIST( TRANSFORM(tcClearUniqueID), '0', '1' ) AND INLIST( lcValue, '0', '1' ) THEN
 									tcClearUniqueID	= lcValue
-									.writeLog( JUSTFNAME(lcConfigFile) + ' > ClearUniqueID:          ' + TRANSFORM(ALLTRIM( SUBSTR( laConfig(I), 15 )) ) )
+									.writeLog( JUSTFNAME(lcConfigFile) + ' > ClearUniqueID:          ' + TRANSFORM(lcValue) )
 								ENDIF
 
 							CASE LEFT( laConfig(I), 20 ) == LOWER('OptimizeByFilestamp:')
 								lcValue	= ALLTRIM( SUBSTR( laConfig(I), 21 ) )
 								IF NOT INLIST( TRANSFORM(tcOptimizeByFilestamp), '0', '1' ) AND INLIST( lcValue, '0', '1' ) THEN
 									tcOptimizeByFilestamp	= lcValue
-									.writeLog( JUSTFNAME(lcConfigFile) + ' > OptimizeByFilestamp:    ' + TRANSFORM(ALLTRIM( SUBSTR( laConfig(I), 21 )) ) )
+									.writeLog( JUSTFNAME(lcConfigFile) + ' > OptimizeByFilestamp:    ' + TRANSFORM(lcValue) )
 								ENDIF
 
 							CASE LEFT( laConfig(I), 17 ) == LOWER('AllowMultiConfig:')
 								lcValue	= ALLTRIM( SUBSTR( laConfig(I), 18 ) )
 								IF INLIST( lcValue, '0', '1' ) THEN
 									.l_AllowMultiConfig	= ( TRANSFORM(lcValue) == '1' )
-									.writeLog( JUSTFNAME(lcConfigFile) + ' > AllowMultiConfig:    ' + TRANSFORM(ALLTRIM( SUBSTR( laConfig(I), 18 )) ) )
+									.writeLog( JUSTFNAME(lcConfigFile) + ' > AllowMultiConfig:       ' + TRANSFORM(lcValue) )
+								ENDIF
+
+							CASE LEFT( laConfig(I), 22 ) == LOWER('DropNullCharsFromCode:')
+								lcValue	= ALLTRIM( SUBSTR( laConfig(I), 23 ) )
+								IF INLIST( lcValue, '0', '1' ) THEN
+									.l_DropNullCharsFromCode	= ( TRANSFORM(lcValue) == '1' )
+									.writeLog( JUSTFNAME(lcConfigFile) + ' > DropNullCharsFromCode:  ' + TRANSFORM(lcValue) )
 								ENDIF
 
 							CASE LEFT( laConfig(I), 23 ) == LOWER('PJX_Conversion_Support:')
@@ -1256,14 +1268,15 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 					ENDIF
 
 					.writeLog( '---' )
-					.writeLog( '> l_ShowProgress:         ' + TRANSFORM(.l_ShowProgress) )
+					.writeLog( '> l_ShowProgress:          ' + TRANSFORM(.l_ShowProgress) )
-					.writeLog( '> l_ShowErrors:           ' + TRANSFORM(.l_ShowErrors) )
+					.writeLog( '> l_ShowErrors:            ' + TRANSFORM(.l_ShowErrors) )
-					.writeLog( '> l_Recompile:            ' + TRANSFORM(.l_Recompile) + ' (' + EVL(tcRecompile,'') + ')' )
+					.writeLog( '> l_Recompile:             ' + TRANSFORM(.l_Recompile) + ' (' + EVL(tcRecompile,'') + ')' )
-					.writeLog( '> l_NoTimestamps:         ' + TRANSFORM(.l_NoTimestamps) )
+					.writeLog( '> l_NoTimestamps:          ' + TRANSFORM(.l_NoTimestamps) )
-					.writeLog( '> l_ClearUniqueID:        ' + TRANSFORM(.l_ClearUniqueID) )
+					.writeLog( '> l_ClearUniqueID:         ' + TRANSFORM(.l_ClearUniqueID) )
-					.writeLog( '> l_Debug:                ' + TRANSFORM(.l_Debug) )
+					.writeLog( '> l_Debug:                 ' + TRANSFORM(.l_Debug) )
-					.writeLog( '> n_ExtraBackupLevels:    ' + TRANSFORM(.n_ExtraBackupLevels) )
+					.writeLog( '> n_ExtraBackupLevels:     ' + TRANSFORM(.n_ExtraBackupLevels) )
-					.writeLog( '> l_OptimizeByFilestamp:  ' + TRANSFORM(.l_OptimizeByFilestamp) )
+					.writeLog( '> l_OptimizeByFilestamp:   ' + TRANSFORM(.l_OptimizeByFilestamp) )
+					.writeLog( '> l_DropNullCharsFromCode: ' + TRANSFORM(.l_DropNullCharsFromCode) )
 
 					lo_CFG	= NULL
 					RELEASE lo_CFG
@@ -8124,16 +8137,20 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	*******************************************************************************************************************
 	PROCEDURE get_ADD_OBJECT_METHODS
 		LPARAMETERS toRegObj, toRegClass, tcMethods, taMethods, taCode, tnMethodCount ;
-			, taPropsAndComments, tnPropsAndComments_Count, taProtected, tnProtected_Count
+			, taPropsAndComments, tnPropsAndComments_Count, taProtected, tnProtected_Count ;
+			, toFoxBin2Prg
 
 		EXTERNAL ARRAY taPropsAndComments, taProtected
+		#IF .F.
+			LOCAL toFoxBin2Prg AS c_foxbin2prg OF 'FOXBIN2PRG.PRG'
+		#ENDIF
 
 		TRY
 			LOCAL lcMethodName
 
 			WITH THIS AS c_conversor_bin_a_prg OF 'FOXBIN2PRG.PRG'
 				.SortMethod( toRegObj.METHODS, @taMethods, @taCode, '', @tnMethodCount ;
-					, @taPropsAndComments, tnPropsAndComments_Count, @taProtected, tnProtected_Count )
+					, @taPropsAndComments, tnPropsAndComments_Count, @taProtected, tnProtected_Count, @toFoxBin2Prg )
 
 				*-- Ubico los m<>todos protegidos y les cambio la definici<63>n.
 				*-- Los m<>todos se deben generar con la ruta completa, porque si no es imposible saber a que objeto corresponden,
@@ -8515,11 +8532,14 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 	*******************************************************************************************************************
 	PROCEDURE SortMethod
 		LPARAMETERS tcMethod, taMethods, taCode, tcSorted, tnMethodCount, taPropsAndComments, tnPropsAndComments_Count ;
-			, taProtected, tnProtected_Count
+			, taProtected, tnProtected_Count, toFoxBin2Prg
 		*-- 29/10/2013	Fernando D. Bozzo
 		*-- Se tiene en cuenta la posibilidad de que haya un PROC/ENDPROC dentro de un TEXT/ENDTEXT
 		*-- cuando es usado en un generador de c<>digo o similar.
 		EXTERNAL ARRAY taMethods, taCode, taPropsAndComments, taProtected
+		#IF .F.
+			LOCAL toFoxBin2Prg AS c_foxbin2prg OF 'FOXBIN2PRG.PRG'
+		#ENDIF
 
 		*-- ESTRUCTURA DE LOS ARRAYS CREADOS:
 		*-- taMethods[1,3]
@@ -8543,6 +8563,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 				DIMENSION laLine(1), taMethods(1,3)
 				STORE '' TO laLine, taMethods, taCode
 				STORE 0 TO tnMethodCount, lnTextNodes
+				
 				lnLineCount	= ALINES(laLine, m.tcMethod)	&& NO aplicar nung<6E>n formato ni limpieza, que es el C<>DIGO FUENTE
 
 				*-- Delete beginning empty lines before first "PROCEDURE", that is the first not empty line.
@@ -8576,6 +8597,10 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 
 				*-- Analyze and count line methods, get method names and consolidate block code
 				FOR I = 1 TO lnLineCount
+					IF toFoxBin2Prg.l_DropNullCharsFromCode
+						laLine(I)	= CHRTRAN( laLine(I), C_NULL_CHAR, '' )
+					ENDIF
+
 					lnLine_Len	= LEN( laLine(I) )
 
 					DO CASE
@@ -8790,7 +8815,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 
 	*******************************************************************************************************************
 	PROCEDURE write_ALL_OBJECT_METHODS
-		LPARAMETERS tcMethods, taPropsAndComments, tnPropsAndComments_Count, taProtected, tnProtected_Count
+		LPARAMETERS tcMethods, taPropsAndComments, tnPropsAndComments_Count, taProtected, tnProtected_Count, toFoxBin2Prg
 
 		*-- Finalmente, todos los m<>todos los ordeno y escribo juntos
 		LOCAL laMethods(1), laCode(1), lnMethodCount, I, lcMethods
@@ -8801,7 +8826,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 
 			WITH THIS AS c_conversor_bin_a_prg OF 'FOXBIN2PRG.PRG'
 				.SortMethod( @tcMethods, @laMethods, @laCode, '', @lnMethodCount ;
-					, @taPropsAndComments, tnPropsAndComments_Count, @taProtected, tnProtected_Count )
+					, @taPropsAndComments, tnPropsAndComments_Count, @taProtected, tnProtected_Count, @toFoxBin2Prg )
 
 				FOR I = 1 TO lnMethodCount
 					*-- Genero los m<>todos indentados
@@ -9863,7 +9888,7 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
 					DIMENSION laMethods(1,3)
 					laMethods	= ''
 					.SortMethod( loRegClass.METHODS, @laMethods, @laCode, '', @lnMethodCount ;
-						, @laPropsAndComments, lnPropsAndComments_Count, @laProtected, lnProtected_Count )
+						, @laPropsAndComments, lnPropsAndComments_Count, @laProtected, lnProtected_Count, @toFoxBin2Prg )
 
 					.write_CLASS_METHODS( @lnMethodCount, @laMethods, @laCode, @laProtected, @laPropsAndComments )
 
@@ -9891,10 +9916,11 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
 						ENDIF
 
 						.get_ADD_OBJECT_METHODS( @loRegObj, @loRegClass, @lcMethods, @laMethods, @laCode, @lnMethodCount ;
-							, @laPropsAndComments, lnPropsAndComments_Count, @laProtected, lnProtected_Count )
+							, @laPropsAndComments, lnPropsAndComments_Count, @laProtected, lnProtected_Count, @toFoxBin2Prg )
 					ENDSCAN
 
-					.write_ALL_OBJECT_METHODS( @lcMethods, @laPropsAndComments, lnPropsAndComments_Count, @laProtected, lnProtected_Count )
+					.write_ALL_OBJECT_METHODS( @lcMethods, @laPropsAndComments, lnPropsAndComments_Count, @laProtected ;
+						, lnProtected_Count, @toFoxBin2Prg )
 
 					GOTO RECORD (lnRecno)
 				ENDSCAN
@@ -10100,7 +10126,7 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
 					DIMENSION laMethods(1,3)
 					laMethods	= ''
 					.SortMethod( loRegClass.METHODS, @laMethods, @laCode, '', @lnMethodCount ;
-						, @laPropsAndComments, lnPropsAndComments_Count, @laProtected, lnProtected_Count )
+						, @laPropsAndComments, lnPropsAndComments_Count, @laProtected, lnProtected_Count, @toFoxBin2Prg )
 
 					.write_CLASS_METHODS( @lnMethodCount, @laMethods, @laCode, @laProtected, @laPropsAndComments )
 
@@ -10130,10 +10156,11 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
 						ENDIF
 
 						.get_ADD_OBJECT_METHODS( @loRegObj, @loRegClass, @lcMethods, @laMethods, @laCode, @lnMethodCount ;
-							, @laPropsAndComments, lnPropsAndComments_Count, @laProtected, lnProtected_Count )
+							, @laPropsAndComments, lnPropsAndComments_Count, @laProtected, lnProtected_Count, @toFoxBin2Prg )
 					ENDSCAN
 
-					.write_ALL_OBJECT_METHODS( @lcMethods, @laPropsAndComments, lnPropsAndComments_Count, @laProtected, lnProtected_Count )
+					.write_ALL_OBJECT_METHODS( @lcMethods, @laPropsAndComments, lnPropsAndComments_Count, @laProtected ;
+						, lnProtected_Count, @toFoxBin2Prg )
 
 					GOTO RECORD (lnRecno)
 				ENDSCAN